CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,181 Commits 1 Branch 0 Tags 107 MiB
82b0014f5e
Commit Graph

6181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnHardt
02b3d6b8d3 Custom Splash Screen 
Custom Splash Screen for full graphic displays.

Too complicated for the hitachis without knowing what exactly to display.

On top of #4032
Realisation of an idea from #3996
 2016-06-14 09:39:28 +02:00
Scott Lahteine
78a48d7e3c Merge pull request #4038 from thinkyhead/rc_fix_heater_off 
Fix broken DISABLE_HEATER macro
 2016-06-13 20:58:34 -07:00
Scott Lahteine
ee5be92206 Fix broken DISABLE_HEATER macro 2016-06-13 20:57:58 -07:00
Scott Lahteine
fc4fb9eba1 Merge pull request #4036 from thinkyhead/rc_lin_advance_feature 
Parse M905 args in Marlin_main.cpp
 2016-06-13 19:26:29 -07:00
Scott Lahteine
8d8180e028 Parse M905 args in Marlin_main.cpp 2016-06-13 19:25:28 -07:00
Scott Lahteine
e7e57f0eb4 Merge pull request #4035 from thinkyhead/rc_lin_advance_feature 
Patch LIN_ADVANCE to use code_value_float
 2016-06-13 18:55:14 -07:00
Scott Lahteine
2b340f5acb patch LIN_ADVANCE to use code_value_float 2016-06-13 18:54:25 -07:00
Scott Lahteine
b708196770 Merge pull request #4032 from AnHardt/bootscreen-delay 
Show bootscreen later
 2016-06-13 18:27:05 -07:00
Scott Lahteine
587de1b6b6 Merge pull request #3676 from thinkyhead/rc_lin_advance_feature 
Advance extrusion algorithm – LIN_ADVANCE
 2016-06-13 18:04:58 -07:00
Scott Lahteine
738f414d2b Merge pull request #4029 from tnw513/FixLangIt 
Update to language_it.h
 2016-06-13 18:01:51 -07:00
AnHardt
b4fedec0d1 Show bootscreen later 
Init display and show bootscreen later, but init display in `kill()`
to init outputs before the bootscreen delays but being able to display
kill errors.
 2016-06-14 01:59:50 +02:00
Silvio Didonna
08e2c5a6ea Added and translated some strings from language_en 2016-06-13 13:04:09 +02:00
Silvio
29337db206 Merge pull request #3 from MarlinFirmware/RCBugFix 
update to latest rcbugfix
 2016-06-13 12:47:42 +02:00
Scott Lahteine
17c86349c0 Merge pull request #4020 from thinkyhead/rc_test_M600 
Fix Travis test for FILAMENTCHANGEENABLE
 2016-06-12 18:50:26 -07:00
Scott Lahteine
b4c37a676f Merge pull request #4025 from thinkyhead/rc_fix_ultralcd_move_e 
Fix manual move for multiple extruders
 2016-06-12 17:27:36 -07:00
Scott Lahteine
4d2119f83a _lcd_move => _lcd_move_xyz 2016-06-12 17:14:19 -07:00
Scott Lahteine
811967923a Fix manual_move to move the correct E stepper 2016-06-12 17:14:19 -07:00
Scott Lahteine
0d0b751498 Merge pull request #4023 from thinkyhead/rc_servo_macros 
Add macros to move servos
 2016-06-12 15:45:39 -07:00
Scott Lahteine
4fbe818163 Add macros to move servos 2016-06-12 15:38:30 -07:00
Scott Lahteine
9a1dfd0f5f Fix Travis test for FILAMENTCHANGEENABLE 2016-06-12 14:24:56 -07:00
Scott Lahteine
e51f8df097 Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond 
No need to check ULTIPANEL with DOGLCD
 2016-06-11 17:39:42 -07:00
Scott Lahteine
b322ac4417 No need to check ULTIPANEL with DOGLCD 2016-06-11 16:50:06 -07:00
João Brázio
8ccd97e7cc
Updated all example configuration files 2016-06-12 00:36:15 +01:00
Scott Lahteine
c7eeb09e8f Merge pull request #4012 from Blue-Marlin/watchdoghealing 
Heal the watchdog
 2016-06-11 16:18:22 -07:00
Scott Lahteine
7fb69e24fb Use "Tn S1" to change tools without moving 2016-06-11 15:58:45 -07:00
Scott Lahteine
2f1bf8373b Merge pull request #4005 from thinkyhead/rc_prepare_move_destination 
Clarify names of prepare_move functions
 2016-06-11 15:51:58 -07:00
João Brázio
de8108648f
Added a versioning system to the config files 2016-06-11 23:48:10 +01:00
Blue-Marlin
efe719f898 Heal the watchgog 2016-06-12 00:34:31 +02:00
Scott Lahteine
b75e648f2c Clarify names of prepare_move functions 2016-06-11 15:32:49 -07:00
Scott Lahteine
d50ba08246 Merge pull request #4011 from thinkyhead/rc_manual_move_cond 
Wrap all items depending on ULTIPANEL
 2016-06-11 15:26:52 -07:00
Scott Lahteine
ae9b09fe94 menu => screen 2016-06-11 14:53:39 -07:00
Scott Lahteine
45ea8749d3 Wrap all items depending on ULTIPANEL 2016-06-11 14:27:34 -07:00
Scott Lahteine
ddbb05fd8d Merge pull request #3998 from jbrazio/bugfix/better-regex 
Improves travis buildroot regexp
 2016-06-11 13:40:58 -07:00
João Brázio
9b3a0895fd
Upgrades travis Arduino IDE version to 1.6.9 2016-06-11 02:55:09 +01:00
João Brázio
280af07b4c
Improves travis buildroot regexp 2016-06-11 02:55:09 +01:00
Scott Lahteine
0e2bfd0769 Use linear feedrate in gcode_T, not volumetric 2016-06-10 18:27:01 -07:00
Scott Lahteine
bf8710d522 Merge pull request #4001 from Blue-Marlin/manage_manual_move-ULTIPANEL 
manage_manual_move(); -> ULTIPANEL
 2016-06-10 17:17:57 -07:00
Scott Lahteine
93ffa0288c Merge pull request #4003 from jbrazio/bugfix/3999 
Closes #3999: Compilation error with BEEPER_PIN -1
 2016-06-10 17:15:23 -07:00
João Brázio
2c34ec2bac
Closes #3999: Compilation error with BEEPER_PIN -1 2016-06-11 00:12:49 +01:00
Blue-Marlin
378ff92e98 manage_manual_move(); -> ULTIPANEL 
Makr the call of   `manage_manual_move() ` depandent of `ULTIPANEL`
 2016-06-10 23:36:57 +02:00
Scott Lahteine
45b701d38c Travis test for LIN_ADVANCE 2016-06-09 21:03:27 -07:00
Scott Lahteine
aad9c0ed8d Apply updated ISR timing code 2016-06-09 21:03:27 -07:00
Scott Lahteine
506d78b2f8 Run the advance_isr faster instead of doing multiple e-steps per interrupt 2016-06-09 21:03:27 -07:00
Scott Lahteine
6d62a4ffc8 Patch LIN_ADVANCE for style and forward-compatibility 2016-06-09 21:03:27 -07:00
Sebastianv650
fb8e880734 Add LIN_ADVANCE 2016-06-09 21:03:27 -07:00
Scott Lahteine
e2d4919c01 Merge pull request #3991 from thinkyhead/rc_axis_units 
Rename some vars to clarify their relationship to acceleration
 2016-06-09 20:57:01 -07:00
Scott Lahteine
4a212f707b Merge pull request #3993 from jbrazio/feature/update-travis 
Update travis to test for ULTRA and DOG LCD options
 2016-06-09 20:56:07 -07:00
Scott Lahteine
74060f17b7 Merge pull request #3995 from thinkyhead/rc_nonblocking_buzzer 
New feature: Non blocking tone queue
 2016-06-09 20:55:29 -07:00
João Brázio
d13c86f6f6 Adds travis test for SPEAKER 2016-06-09 20:38:23 -07:00
Scott Lahteine
a82c755a35 Fix BQ_LCD_SMART_CONTROLLER pin compiler warnings 2016-06-09 20:38:23 -07:00