melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,190 Commits 2 Branches 0 Tags 2 GiB
9d3ac66f73
Commit Graph

7190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
7743849608 Merge pull request #5680 from thinkyhead/rc_configs_puhlease 
code_value_float tweak
 2017-01-12 05:22:47 -08:00
Scott Lahteine
16357fbfdf Merge pull request #5619 from Ocarthon/RCBugFix 
Disable SD Detect for K8400
 2017-01-12 05:22:03 -08:00
Scott Lahteine
e57c0fce66 Move MOSFET changes above #include for RIGIDBOARD 
Correction to #5629
 2017-01-12 04:46:49 -08:00
Scott Lahteine
c376f6a2cb code_value_float tweak 2017-01-12 04:38:09 -08:00
Scott Lahteine
fb3c30e24c Fix lcd_wait_for_homing causing menu to block 
As a showcase function for how to do waiting in the lcd menu, this function should be preserved.
 2017-01-12 04:37:23 -08:00
Scott Lahteine
f8ae0fd29f Merge pull request #5647 from manianac/RCBugFix-PrepareMenuFix 
Fix empty Prepare menu
 2017-01-12 04:20:18 -08:00
Robert Kirk
aab5118c6a Remove error causing break command 
Use index macro instead of e
 2017-01-01 17:47:01 -05:00
esenapaj
d38e335272 From "microseconds" to "milliseconds" 
delay() is milliseconds
 2017-01-02 01:19:33 +09:00
Scott Lahteine
34d5eb5201 Merge pull request #5589 from thinkyhead/rc_configs_puhlease 
Better sanity check for FILAMENT_CHANGE_FEATURE, FILAMENT_RUNOUT_SCRIPT
 2016-12-30 04:56:30 -08:00
emartinez167
a2fe24f319 Fix some errors and update a message 2016-12-29 23:34:42 +08:00
Philip Standt
8ae2bc7e2e Disable SD Detect for K8400 2016-12-28 23:21:18 +01:00
emartinez167
0844da794d Updates to Spanish language 
Add missing Spanish language definitions.
 2016-12-24 22:11:14 +08:00
Scott Lahteine
4061fca1ad Sanity checks for FILAMENT_CHANGE_FEATURE and FILAMENT_RUNOUT_SCRIPT 2016-12-23 19:55:12 -08:00
Scott Lahteine
5ab7b91615 Comment on filament runout sensor config 2016-12-23 19:50:27 -08:00
Scott Lahteine
922c67f17d Merge pull request #5588 from thinkyhead/rc_remove_biv25 
Drop biv2.5 delta configurations
 2016-12-23 19:14:50 -08:00
Scott Lahteine
78459d5de1 Merge pull request #5587 from thinkyhead/rc_never 
Define ADV_NEVER, ADV_RATE
 2016-12-23 19:00:57 -08:00
Scott Lahteine
8c6c048551 drop biv2.5 delta configurations 2016-12-23 18:56:07 -08:00
Scott Lahteine
92dbeebf40 Define ADV_NEVER, ADV_RATE 2016-12-23 18:43:23 -08:00
Scott Lahteine
71378f72af Merge pull request #5577 from manianac/RCBugFix-M600Dryrun 
Allow M600 when dryrun debugging
 2016-12-22 19:07:05 -08:00
Robert Kirk
306c184b1a Allow M600 when dryrun debugging 2016-12-21 20:30:51 -05:00
Scott Lahteine
fe2ea2906f Merge pull request #5573 from thinkyhead/rc_unify_stepper_isr 
LIN_ADVANCE with unified stepper ISR
 2016-12-21 02:53:32 -08:00
Sebastianv650
84c685f8b5 First draft of Unified Stepper / E Advance ISR 2016-12-21 01:34:39 -08:00
Scott Lahteine
83021d82c6 Merge pull request #5502 from AnHardt/symbol-strings 
Add symbol-strings
 2016-12-21 00:51:59 -08:00
Scott Lahteine
036eccfd6e Merge pull request #5572 from Kaibob2/patch-5 
Update language_de.h
 2016-12-21 00:50:40 -08:00
Scott Lahteine
b794b76836 Merge pull request #5567 from AnHardt/fix5194 
Fix 5194
 2016-12-21 00:49:52 -08:00
Scott Lahteine
451ba5df01 Merge pull request #5516 from esenapaj/Suppress-warning 
Suppress warning
 2016-12-21 00:00:35 -08:00
Scott Lahteine
92dbc63949 Merge pull request #5571 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-12-20 23:59:55 -08:00
Kai
ade72535c4 Update language_de.h 
Added tarnslation for
```
#define MSG_DEBUG_MENU 
#define MSG_PROGRESS_BAR_TEST
```
 2016-12-21 08:57:39 +01:00
Scott Lahteine
06153add6b Merge pull request #5565 from thinkyhead/rc_negative_retract_in_menu 
Followup to #5550 - spacing before "mm"
 2016-12-20 18:42:37 -08:00
esenapaj
ab6b005867 Suppress warning 2016-12-21 09:13:03 +09:00
AnHardt
61f15ef7e7 Fix 5194 
I have been a bit too radical in cleaning up this section.
 2016-12-21 00:45:29 +01:00
esenapaj
60515ff700 Update Japanese translation 
・Add new translation
 2016-12-21 08:44:07 +09:00
Scott Lahteine
1e419655f3 Followup to #5550 - spacing before "mm" 2016-12-20 02:27:54 -08:00
Scott Lahteine
1a26ce1cdc Merge pull request #5550 from FHeilmann/patch-2 
Allow negative retract values in the LCD
 2016-12-20 02:10:22 -08:00
Scott Lahteine
bec30c89e7 Merge pull request #5522 from esenapaj/Add-description-for-dual-x 
Add description for choice of DEFAULT_DUAL_X_CARRIAGE_MODE
 2016-12-20 01:31:53 -08:00
Florian Heilmann
780dabf32b Merge pull request #8 from thinkyhead/rc_negative_retract_in_menu 
Replace "+mm" with "mm." Allow negative recover-swap length.
 2016-12-20 10:31:07 +01:00
Scott Lahteine
7739c0affa Change "+mm" to "mm" in most languages 
- Japanese and Chinese still need update
 2016-12-20 01:16:51 -08:00
Scott Lahteine
1cba425308 Allow negative recover-swap length from LCD 2016-12-20 01:16:08 -08:00
Scott Lahteine
298a8c6a3c Merge pull request #5561 from thinkyhead/rc_no_case_light 
Support for M335 case light "no case light"
 2016-12-20 01:06:59 -08:00
Scott Lahteine
644f45cbd8 Merge pull request #5563 from akaJes/m600 
FILAMENT_CHANGE_FEATURE allowed in idle mode
 2016-12-20 01:06:10 -08:00
Scott Lahteine
4213330d22 Merge pull request #5562 from thinkyhead/rc_char_lcd_tweaks 
Fix various LCD-related issues
 2016-12-20 01:03:38 -08:00
Scott Lahteine
0d2fc13516 Place "Level Bed" closer to "Auto Home" 2016-12-20 00:51:03 -08:00
Scott Lahteine
b031d28ebf Encoder events should not skip stripes 2016-12-20 00:21:51 -08:00
Scott Lahteine
22881f38b9 Fix updating of "bool" menu items 2016-12-20 00:21:51 -08:00
Scott Lahteine
eb68715b94 No "Cooldown" menu if heaters are off 2016-12-20 00:21:51 -08:00
Jesus
4ed976b5ff m600 fixes 2016-12-20 09:47:46 +02:00
Damien
4e2639942b Support for M335 case light "no case light" 2016-12-19 23:23:08 -08:00
Scott Lahteine
18ba31e9b5 Add Debug Menu with LCD_PROGRESS_BAR_TEST as an example 2016-12-19 22:57:14 -08:00
Scott Lahteine
03af5961b0 Hide (or remove) custom character change on boot screen 2016-12-19 22:27:28 -08:00
Scott Lahteine
1642f5ed31 Add macro to some en strings 2016-12-19 22:27:28 -08:00