zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
4126 commits 1 branch 0 tags 156 MiB
Commit graph

4126 commits

This branch
This branch
All branches
Author SHA1 Message Date
AnHardt b39b54031b Fix KEEPALIVE_STATE 
Add return to NOT_BUSY for M105
Replace WAIT_FOR_USER with PAUSED_FOR_USER

Add Travis test for FILAMENTCHANGEENABLE
 2016-03-20 10:41:56 +01:00
Scott Lahteine 32f75749e4 Merge pull request #3117 from Blue-Marlin/thermal-protection 
Improve the descriptions for THERMAL_PROTECTION
 2016-03-19 23:41:05 -07:00
Scott Lahteine 7aafee3003 Merge pull request #3185 from esenapaj/patch-1 
follow-up the PR #3180, #3183
 2016-03-19 23:36:55 -07:00
esenapaj 37eaa1406b follow-up the PR #3180 2016-03-20 15:33:02 +09:00
esenapaj 198d5d56fd follow-up the PR #3183 2016-03-20 13:58:05 +09:00
Scott Lahteine 4119cef32f Merge pull request #3180 from clexpert/RCBugFix 
Czech language specific changes
 2016-03-19 20:18:05 -07:00
Scott Lahteine da94bcfebb Merge pull request #3184 from thinkyhead/fix_command_injection 
Patch drain_queued_commands_P
 2016-03-19 20:12:16 -07:00
Scott Lahteine 41145e6e81 Patch drain_queued_commands_P 
Fix a SNAFU that should have been caught in #3012
 2016-03-19 20:10:41 -07:00
Scott Lahteine 3ce0c5063f Merge pull request #3183 from thinkyhead/rc_lcm1602_support 
Also closes #3181.
 2016-03-19 19:28:50 -07:00
CoderSquirrel eda95d8bed Add support for LCM1602 16x2 I2C LCD adapter 2016-03-19 19:26:44 -07:00
Scott Lahteine 8d9cf72db0 Merge pull request #3177 from thinkyhead/rc_finish_M665 
Include M665 "ABC" parameters in EEPROM
 2016-03-19 18:08:33 -07:00
Petr Zahradnik 98392782ea Update Configuration.h 2016-03-19 20:45:13 +01:00
Petr Zahradnik daa52124b0 Update language_cz.h 2016-03-19 20:43:28 +01:00
Blue-Marlin 3166aed087 Improve the descriptions for THERMAL_PROTECTION 2016-03-19 14:08:59 +01:00
Scott Lahteine a02ae36ae8 Include M65 "ABC" parameters in EEPROM 
Addressing #2773
 2016-03-19 05:52:20 -07:00
Scott Lahteine 7f2375ab46 Merge pull request #3176 from thinkyhead/rc_patch_3149_part_ii 
Use const parameters in lcd_implementation_drawedit (etc.)
 2016-03-19 05:18:25 -07:00
Scott Lahteine 6a3529247f "Homing" as a translatable string 2016-03-19 04:41:03 -07:00
Scott Lahteine c97c2dcaf7 Use const parameters instead of static casting 
Alternative fix to #3149
 2016-03-19 03:36:53 -07:00
Scott Lahteine 09ef955191 Merge pull request #3086 from thinkyhead/rc_two_fans 
Support for multiple PWM fans
 2016-03-19 03:19:18 -07:00
Scott Lahteine 38b0082bf2 Additional tweaks to M42 exit conditions 2016-03-19 03:10:18 -07:00
Scott Lahteine 4bbea5124d Support for multiple PWM fans 2016-03-19 03:10:18 -07:00
Scott Lahteine 637cc03686 Fix M109 so it won't wait for cooling 
Addressing issue #2767
 2016-03-19 03:00:58 -07:00
Scott Lahteine 4634feaeab Merge pull request #3012 from thinkyhead/fix_command_injection 
Use a serial line buffer to prevent queue corruption
 2016-03-19 01:43:54 -07:00
Scott Lahteine 9bf87aac6a Merge pull request #3127 from thinkyhead/rc_core_babystepping 
Implement BABYSTEPPING for COREXY and COREXZ
 2016-03-18 23:25:26 -07:00
Scott Lahteine 4ae03df5c2 Merge pull request #3109 from thinkyhead/rc_host_keepalive 
Provide feedback to hosts when busy
 2016-03-18 23:22:29 -07:00
Scott Lahteine 963a92ceda Patch idle forevermore 2016-03-18 22:38:35 -07:00
Scott Lahteine 7ec7bb31c4 Send a Busy signal to hosts during long processes, wait for input, etc 
If Marlin is blocking the serial input or command queue for any length
of time (for example more than 2 seconds), it needs to send a message
to serial out to inform the host that it is busy. Marlin should only
send these messages out when busy, and preferably not when trying to
print formatted output.
 2016-03-18 22:38:35 -07:00
Scott Lahteine 861391d530 Merge pull request #3175 from esenapaj/patch-2 
follow-up the PR #3114
 2016-03-18 22:10:50 -07:00
esenapaj 8d580ea7e8 follow-up the PR #3114 
follow-up the commit d56c6af24e
 2016-03-19 13:17:34 +09:00
Scott Lahteine d9e1f22682 BABYSTEPPING requires ULTRA_LCD 2016-03-18 18:22:53 -07:00
Scott Lahteine e5fd43f343 Implement BABYSTEPPING for COREXY and COREXZ 2016-03-18 18:22:53 -07:00
Scott Lahteine 80277cc9c8 drain_queued_commands_P now returns true if there are more 2016-03-18 17:56:48 -07:00
Scott Lahteine 8fe7420310 Use a separate serial line buffer 2016-03-18 16:46:20 -07:00
Scott Lahteine 7d25c107a8 Merge pull request #3149 from esenapaj/patch-1 
suppress warnings
 2016-03-18 15:40:14 -07:00
Scott Lahteine d56c6af24e Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu 
Option to reverse the click-wheel direction in menus
 2016-03-18 15:39:29 -07:00
Scott Lahteine cc291aeb3c Move definition of "blink" to main ultralcd file 2016-03-17 18:19:05 -07:00
Scott Lahteine e7e1866589 Merge pull request #3161 from Alex9779/fix_InitialExtruderDirection 
Fix initial extruder direction for second/third/fourth extruder if they run inverted to the first
 2016-03-16 12:58:10 -07:00
Scott Lahteine 57e82cacc9 Merge pull request #3156 from esenapaj/patch-3 
Fix CardReader::lsDive()
 2016-03-16 12:48:22 -07:00
Alexander Leisentritt 4338813814 save last extruder and set stepper directions too in case the extruder changed 
fixes MarlinFirmware/Marlin#3144 and MarlinFirmware/Marlin#3083
 2016-03-16 20:20:34 +01:00
Scott Lahteine 8f24475e02 Simplify limiting encoderLine in END_MENU 2016-03-16 04:05:41 -07:00
Scott Lahteine fbef2f5b61 Implement reverse menu direction in ultralcd.cpp 2016-03-16 04:03:49 -07:00
Scott Lahteine b8b51d8da8 Add the REVERSE_MENU_DIRECTION option 2016-03-16 04:02:40 -07:00
Scott Lahteine 999a76dbdf Merge pull request #3157 from esenapaj/patch-4 
Use variable in lcd_erase_line()
 2016-03-16 02:46:42 -07:00
Scott Lahteine e8fa843c2d Merge pull request #3164 from epatel/epatel/RCBugFix 
Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z
 2016-03-16 02:40:54 -07:00
Scott Lahteine fc04b587cf Merge pull request #3147 from thinkyhead/rc_stringify_macro 
Promote STRINGIFY to macros.h
 2016-03-15 17:37:03 -07:00
Scott Lahteine d7c6fd5c2f Merge pull request #3146 from thinkyhead/rc_enabled_true_false 
Support "true" and "false" in the ENABLED macro
 2016-03-15 17:35:55 -07:00
Edward Patel cb0dbfa3b5 Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z 2016-03-16 01:26:00 +01:00
esenapaj a15c5d222a Use variable in lcd_erase_line() 
lcd_erase_line() is called with argument, but the argument is ignored by lcd_erase_line().
 2016-03-16 02:59:06 +09:00
esenapaj 609c0d46d9 Fix CardReader::lsDive() 
If comparison between signed char(-128 ~ +127) and DIR_NAME_DELETED(uint8_t const 0XE5, it's +229),
it makes incorrect result.
 2016-03-16 02:47:58 +09:00
Scott Lahteine 2ef49a9d53 Wrap DEFAULT_Ki, DEFAULT_Kd, PID_dT 
Addition to #3140
 2016-03-15 03:49:44 -07:00