SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5241 commits 1 branch 0 tags 119 MiB
Commit graph

5241 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
02550af7c3 Merge pull request #3453 from thinkyhead/rc_jbrazio_m190 
ELAPSED / PENDING for rollover-safe time checking
 2016-04-10 20:25:02 -07:00
Scott Lahteine
7c770f039c Merge pull request #3456 from thinkyhead/rc_MSG_ERR_REDUNDANT_TEMP 
Remove redundant text from MSG_ERR_REDUNDANT_TEMP
 2016-04-10 20:23:55 -07:00
Scott Lahteine
925cc305ce Merge pull request #3455 from michos-conradt/RCBugFix 
Add missing translations for German
 2016-04-10 19:18:42 -07:00
Scott Lahteine
011f4736f1 Remove redundant text from MSG_ERR_REDUNDANT_TEMP 2016-04-10 19:14:46 -07:00
Scott Lahteine
906c1c066f Merge pull request #3423 from jbrazio/translate/pt_BR 
Added missing pt_BR translation
 2016-04-10 19:13:52 -07:00
Scott Lahteine
b30e4528f1 Merge pull request #3454 from thinkyhead/rc_host_timeout_mods 
Add a case for M113 to process_next_command
 2016-04-10 19:00:40 -07:00
Scott Lahteine
803845ec18 Add a case for M113 to process_next_command 2016-04-10 18:53:03 -07:00
Michael Conradt
f3a7a5c99b Merge branch 'RCBugFix' into translations 2016-04-11 03:50:23 +02:00
Michael Conradt
8b923039e2 Add missing german translations. 2016-04-11 03:20:21 +02:00
Scott Lahteine
386140f361 Test time difference in safe way 2016-04-10 18:09:31 -07:00
Scott Lahteine
1b7356b3a1 Account for home_offset in G29 handler 2016-04-10 15:35:02 -07:00
Scott Lahteine
f3562dd895 Have M206 alter current_position, M428 use new function 2016-04-10 15:35:01 -07:00
Scott Lahteine
562e281c73 Merge pull request #3443 from thinkyhead/rc_host_timeout_tweak 
Adjust timeout code in host_keepalive
 2016-04-09 17:45:36 -07:00
Scott Lahteine
2925eb0b59 Merge pull request #3440 from floyd871/patch-1 
Wrong Pin Assignment Megatronics 3
 2016-04-09 17:01:23 -07:00
Scott Lahteine
6d465321b5 Adjust timeout code in host_keepalive 2016-04-09 16:58:17 -07:00
Scott Lahteine
8198cc30b5 More bits when encoderPosition is cast as signed 2016-04-09 14:22:12 -07:00
Michael Neumann
95acba2cfa Wrong Pin Assignment Megatronics 3 
SERVO2 is doubled defined and causes compiler errors
 2016-04-09 11:23:22 +02:00
Scott Lahteine
50c3140040 Merge pull request #3414 from thinkyhead/rc_host_timeout_mods 
Host Keepalive configurable timeout with 2s default
 2016-04-08 21:45:45 -07:00
Scott Lahteine
6bd20371f0 Merge pull request #3438 from thinkyhead/rc_M109_residency_loop_fix 
Fix bug which can cause an infinite M109 loop
 2016-04-08 21:36:30 -07:00
Scott Lahteine
96e37bb70a Merge pull request #3419 from DavidBjerreBjoerklund/patch-2 
Update language_da.h
 2016-04-08 21:35:58 -07:00
Scott Lahteine
13d758c651 Merge pull request #3420 from DavidBjerreBjoerklund/patch-3 
Update language_da.h
 2016-04-08 21:31:14 -07:00
Scott Lahteine
518068a5a8 Merge pull request #3425 from tnw513/FixLangIt 
Optimized Italian strings to fit in 16 character display
 2016-04-08 21:29:28 -07:00
Scott Lahteine
1b81e5adc7 Merge pull request #3431 from AnHardt/lang-de 
de-language additions
 2016-04-08 21:25:00 -07:00
Scott Lahteine
1acf901b63 Adjustments to residency_start_ms handling 2016-04-08 21:20:23 -07:00
gralco
907aed57db Fix bug which can cause an infinite M109 loop 
Since residency_start_ms is -1 when entering the heatup while loop whilst the hotend temp is close to the target them already then it may not escape.

Hence "Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time."
 2016-04-08 21:20:23 -07:00
Scott Lahteine
3ecf38d32e Merge pull request #3436 from thinkyhead/rc_experimental_twibus 
M155 and M156, a generic TWI/I2C interface for Marlin
 2016-04-08 20:35:53 -07:00
jbrazio
dd3a06a95a Implemented M155 and M156, a generic TWI/I2C interface for Marlin 2016-04-08 20:14:37 -07:00
Scott Lahteine
843aa90b5a Merge pull request #3434 from thinkyhead/rc_more_debug_leveling 
Additional debug leveling output
 2016-04-08 18:57:18 -07:00
Scott Lahteine
a644ab1de4 Minor patch ups to G29 
This may fix a subtle bug caused by doing `G29` more than once without
`G28` between.
 2016-04-08 17:53:15 -07:00
Scott Lahteine
cba2698871 Additional DEBUG_LEVELING output 2016-04-08 17:53:15 -07:00
AnHardt
c3d1b7db2d de-language additions 2016-04-08 22:51:04 +02:00
Scott Lahteine
4e17187c96 Merge pull request #3426 from thinkyhead/rc_no_unhomed_lcd_move_on_delta_scara 
No LCD Move for unhomed Delta/SCARA
 2016-04-07 19:29:45 -07:00
Scott Lahteine
5e18d650c4 Merge pull request #3427 from thinkyhead/rc_better_SERIAL_ECHOPAIR 
No casting needed for SERIAL_ECHOPAIR
 2016-04-07 19:29:18 -07:00
Scott Lahteine
e0b0d1eb6b Add M113 to get/set Host Keepalive 2016-04-07 19:25:56 -07:00
Scott Lahteine
85883da90c Implement basic HOST_KEEPALIVE_INTERVAL 2016-04-07 19:25:56 -07:00
Scott Lahteine
2eca8d63b3 Add DEFAULT_KEEPALIVE_INTERVAL setting 2016-04-07 19:25:56 -07:00
Scott Lahteine
098fb8f8c9 Merge pull request #3413 from thinkyhead/rc_probe_G30_position 
Report the probe position in G30
 2016-04-07 19:25:33 -07:00
Scott Lahteine
3460d01441 Merge pull request #3422 from jbrazio/translate/pt_PT 
Update pt_PT translation
 2016-04-07 19:18:56 -07:00
Scott Lahteine
c9c7c66b95 Merge pull request #3421 from jbrazio/bugfix/m109-EXTRUDE_MINTEMP-expansion 
M109: Protect against EXTRUDE_MINTEMP expansion
 2016-04-07 19:18:34 -07:00
Scott Lahteine
d7cbb2eec9 Merge pull request #3403 from jbrazio/feature/stopwatch 
Print job timer rework
 2016-04-07 19:18:03 -07:00
Scott Lahteine
f834bcd43a Merge pull request #3415 from thinkyhead/rc_filwidth_issue 
Fix FILAMENT_WIDTH_SENSOR measurement
 2016-04-07 19:08:42 -07:00
Scott Lahteine
047c412df6 Merge pull request #3428 from thinkyhead/rc_consolidate_reprap_keypad 
Consolidate REPRAPWORLD_KEYPAD, disallow moves for unhomed Delta/SCARA
 2016-04-07 19:06:57 -07:00
Scott Lahteine
5fc6daba2b Disallow REPRAPWORLD_KEYPAD moves on Delta/SCARA until homed 2016-04-07 18:40:54 -07:00
Scott Lahteine
7bb15a1c57 Consolidate REPRAPWORLD_KEYPAD definitions 2016-04-07 18:40:54 -07:00
Scott Lahteine
dc19b69697 No casting needed for SERIAL_ECHOPAIR 2016-04-07 16:33:21 -07:00
Scott Lahteine
165e73794a Tweak encoderPosition non-zero test 2016-04-07 16:09:42 -07:00
Scott Lahteine
479d307a44 Disable LCD Move XYZ for unhomed Delta/SCARA 2016-04-07 16:09:42 -07:00
Silvio Didonna
9088802da1 Optimized Italian strings to fit in 16 character display 2016-04-07 19:18:22 +02:00
Silvio
cc4bb5aa09 Merge pull request #2 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-04-07 19:14:17 +02:00
João Brázio
801cd48a72
Added missing pt_BR translation 2016-04-07 13:07:57 +01:00