melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,841 Commits 2 Branches 0 Tags 2 GiB
19ba91f77a
Commit Graph

9841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
8326c1c279 Merge pull request #7005 from Diederikvanderpant/bugfix-1.1.x 
added shift register pins for reprapworld keypad v1.1
 2017-06-11 23:12:11 -05:00
Scott Lahteine
979a6a6459 Merge pull request #7037 from thinkyhead/bf_config_CL-260 
CL-260 configs
 2017-06-11 19:55:37 -05:00
Scott Lahteine
07f8da36d2 CL-260 configs 2017-06-11 19:40:13 -05:00
Scott Lahteine
dce665a083 Merge pull request #7025 from magnuspub/patch-1 
Mod in language_it.h
 2017-06-11 19:09:46 -05:00
Scott Lahteine
7b09ab6bda Merge pull request #7033 from Bob-the-Kuhn/pinsDebug-&-dac_mcp4728-fixes 
Fix pinsDebug problem & add capability to display more than 70 pins
 2017-06-11 19:09:09 -05:00
Scott Lahteine
5bdb4bbc5e Merge pull request #7030 from thinkyhead/bf_circular_scroll 
Circular scrolling of the status message
 2017-06-11 19:07:38 -05:00
Scott Lahteine
634b7fa7d4 Merge pull request #7031 from thinkyhead/bf_save_218_bytes 
Reduce Marlin by ~218 bytes
 2017-06-11 19:05:45 -05:00
Federico
772275ab0c Create language_it.h 2017-06-11 10:37:34 +02:00
Bob-the-Kuhn
11e28f389e fix pinsDebug.h error, add capability to display more than 70 pins. 2017-06-10 22:01:15 -05:00
Scott Lahteine
21217d53df Circular scrolling of the status message 2017-06-10 20:56:00 -05:00
Scott Lahteine
da8e946efb Reduce size of heater state print code 2017-06-10 20:26:17 -05:00
Scott Lahteine
dde8bb7c8b Fix extrude_min_temp compiler warning 2017-06-10 20:07:36 -05:00
Scott Lahteine
83263076dc Merge pull request #7014 from fiveangle/fix_get-set_DrvPct_declarations 
fix get/setDrvPct declarations
 2017-06-10 19:06:50 -05:00
Scott Lahteine
ec61b07836 Merge pull request #7027 from thinkyhead/bf_water_is_wet 
Followup to German language update
 2017-06-10 19:04:19 -05:00
Scott Lahteine
57a51fd5db Tweak some else clauses 2017-06-10 16:40:10 -05:00
Scott Lahteine
fc89de6d8b Followup to German language update 2017-06-10 16:27:39 -05:00
Scott Lahteine
6c9b5ab8e8 Merge pull request #6929 from p3p/pr_issue_template 
Add template for github issues
 2017-06-10 16:16:20 -05:00
Federico
92011e3d8c Create language_it.h 2017-06-10 21:50:14 +02:00
Dave Johnson
7864b133a8 Fix get/setDrvPct declarations 2017-06-09 20:21:28 -07:00
Scott Lahteine
0b6b7c9c7e Merge pull request #7013 from thinkyhead/bf_german_update 
Update language_de.h
 2017-06-09 21:41:19 -05:00
Scott Lahteine
f17a3c2474 Merge pull request #6889 from thinkyhead/bf_at90usb_mapping 
Unify all AVR90USB pin mappings
 2017-06-09 21:00:13 -05:00
Kai
5a72b6818e update language_de.h 
Following #6990 some more translations and some grammar fixes
 2017-06-09 19:45:09 -05:00
Scott Lahteine
4cc5444144 Merge pull request #7008 from Bob-the-Kuhn/Z_MIN_PROBE_ENDSTOP-and-Z_MAX_PIN 
Can't use "#define Z_MIN_PROBE_PIN Z_MAX_PIN" in configuration.h
 2017-06-09 19:42:56 -05:00
Scott Lahteine
51bc50214a Save 8 bytes of SRAM 2017-06-09 19:20:16 -05:00
Scott Lahteine
748bf32388 Unify AVR90USB: pinsDebug changes 2017-06-09 19:20:16 -05:00
Scott Lahteine
5426fc1735 Unify AVR90USB: Pins cleanup 2017-06-09 18:48:12 -05:00
Scott Lahteine
87d8223251 Unify AVR90USB: Pins remap to Arduino 2017-06-09 18:48:12 -05:00
Scott Lahteine
b378deaf89 Unify AVR90USB: fastio changes 2017-06-09 18:21:57 -05:00
Scott Lahteine
f4b76b1ee7 Merge pull request #7011 from thinkyhead/bf_serial_macros 
Tweak serial macros
 2017-06-09 17:58:20 -05:00
Scott Lahteine
e94f79ccea Patch some serial macros 2017-06-09 17:17:23 -05:00
Scott Lahteine
d91710e9aa Followup for UBL translated strings 2017-06-09 16:59:26 -05:00
Scott Lahteine
761df686bd Minor cleanup in gcode.h 2017-06-09 16:59:26 -05:00
Thomas Moore
897bc2ac1f Updates for ensure_safe_temperature (#6963) 
* Updates for ensure_safe_temperature

* M600 fixes
 2017-06-09 15:19:08 -05:00
Bob-the-Kuhn
1c107b3949 delete problem line 2017-06-09 11:53:36 -05:00
Diederik van der Pant
5b270417ed added shift register pins for reprapworld keypad v1.1 
I recently upgraded my Marlin to V1.1.x and decided to publish my fix to make marlin compile properly when #define board megatronics 2 in combination with #define reprapworld keypad v1.1. It was previously described in the comments of a closed pull request. MarlinFirmware#472. All the buttons on the keypad are now operational.
 2017-06-09 14:17:47 +02:00
bgort
2f55870edb [New Feature] I2C position encoder support (#6946) 
* [New Feature] I2C position encoder support

I plan to continue improving/cleaning this up, as there areas that need work.

* let the cleanups begin.

* progress

* more progress

* comments, rename files, etc.

* clean

* Cleanups per thinkyhead

* a few more cleanups

* cleanups, bugfixes, etc.

* remove unnecessary passes_test(), additional cleanups/optimizations

* cleanups

* misc.

* Fix up I2CPEM.init() and a few other things.

* organize, fix, rename, etc.

* more optimization

* a few more tweaks
 2017-06-09 08:06:23 -04:00
Bob-the-Kuhn
f7dacd1f50 Merge pull request #6996 from Bob-the-Kuhn/change-to-DWORD 
Fix type for max_acceleration_mm_per_s2 in configuration_store.cpp
 2017-06-08 16:32:40 -05:00
Bob-the-Kuhn
28d72f48f1 change to DWORD 2017-06-08 16:15:02 -05:00
Bob-the-Kuhn
76a610cf81 Merge pull request #6995 from Bob-the-Kuhn/add-static 
Add "static"
 2017-06-08 15:01:00 -05:00
Bob-the-Kuhn
8d1d9040b6 add static 2017-06-08 14:59:21 -05:00
Bob-the-Kuhn
a17ffe1ece Merge pull request #6985 from Kaibob2/patch-1 
Fix for #6980 (case_light compile problem when EXTENDED_CAPABILITIES_REPORT is enabled)
 2017-06-08 11:18:56 -05:00
Tannoo
731c8e6372 Translatable Strings for ubl_G29 (#6990) 2017-06-08 10:09:39 -05:00
Kai
abb6b8ad54 update language_de.h (#6986) 
There was quite a lot to translate this time. I'm not absolutely confident with the whole UBL stuff and it's a PITA to translate. I don't use any kind of levelling myself as i just have a perfectly level cast aluminium plate as bed.
So maybe someone who really uses it might take a closer look at it after it's merged.
 2017-06-08 10:04:52 -05:00
Kai
c2eff60d3f Fix for #6980 
Line 7830 prevented successfull compilation when #define CASE_LIGHT_ENABLE is uncommented
 2017-06-08 09:19:04 +02:00
Scott Lahteine
1419126721 Merge pull request #6965 from thinkyhead/bf_save_more_sram 
Use createChar_P to save SRAM in bootscreen
 2017-06-07 17:34:19 -05:00
Scott Lahteine
a453be7357 Merge pull request #6973 from bgort/autoreportT 
Enable AUTO_REPORT_TEMPERATURES by default
 2017-06-07 17:33:40 -05:00
Scott Lahteine
1d615e0a67 Merge pull request #6976 from Tannoo/Leveling_in_About_Printer 
Leveling type in About Printer
 2017-06-07 17:26:21 -05:00
Scott Lahteine
707707d71a Fix LCD status message padding 2017-06-07 16:07:38 -05:00
Scott Lahteine
e556ab1dff Find three-point leveling points on Delta 2017-06-07 16:07:38 -05:00
Scott Lahteine
a27b08e6af Various code style tweaks 2017-06-07 16:07:38 -05:00