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

5966 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 31cad77ba9 Chmod a+x opt_disable_adv 2016-08-06 17:19:11 -07:00
AnHardt 020cd32d28 Update restore_configs 
for travis builds.
 2016-08-06 17:19:11 -07:00
AnHardt 98e96feee9 Repair SPI-pins 
SCK_PIN can't be defined as DIO[number] they mus be defined as pure number.
So rebuilding the structure of fastio.h in pins.h.
 2016-08-06 17:19:11 -07:00
Scott Lahteine 7145bd085d Merge pull request #4551 from thinkyhead/rc_anhardt_rep_stow_allen 
Make Allen Key Probe stow
 2016-08-06 16:31:51 -07:00
Scott Lahteine a00783c41f Format probe stowed test code 2016-08-06 14:31:07 -07:00
AnHardt f37e8a31d7 Make Allen Key Probe stow 
by switching off the tests for the probe before the stow move.
 2016-08-06 14:30:38 -07:00
Scott Lahteine 5347f39fce Merge pull request #4542 from AnHardt/rep-de 
Repair-language.de
 2016-08-05 23:50:35 -07:00
Scott Lahteine 5ef4a5577c Merge pull request #4537 from thinkyhead/rc_fix_some_flaws 
Patch up some flaws here and there
 2016-08-05 23:49:57 -07:00
AnHardt 0d3b67a580 Repair-language.de 2016-08-06 01:00:40 +02:00
Scott Lahteine 938e6d15c4 Patch up some flaws, here and there 2016-08-05 08:17:37 -07:00
Scott Lahteine 3a3984e67a Merge pull request #4535 from thinkyhead/rc_old_symbols_first 
Move tests for old symbols to the top of sanity check
 2016-08-04 21:24:02 -07:00
Scott Lahteine d7b882e430 Move tests for old symbols to the top of sanity check 2016-08-04 21:03:55 -07:00
Scott Lahteine 479107d04f Merge pull request #4530 from Kaibob2/patch-1 
Added / Update language_de.h
 2016-08-04 16:58:50 -07:00
Scott Lahteine dddaeb3f8c Merge pull request #4528 from thinkyhead/rc_make_it_so 
Z-Height options replace Z-Raise options
 2016-08-04 13:46:44 -07:00
Kaibob2 1abd7fa670 Update language_de.h 
Added german translation for MSG_INFO_PRINT_LONGEST and  MSG_INFO_PRINT_FILAMENT.
MSG_HEATING_COMPLETE changed from "Aufgeheizt" to "Extr. aufgeheizt"
MSG_HEATING changed from "Aufheizen" to "Extr. aufheizen"
 2016-08-04 09:40:38 +02:00
Scott Lahteine 7e2bd9a233 Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT 2016-08-03 21:18:38 -07:00
Scott Lahteine 445458c221 Don't include zprobe_zoffset in do_probe_raise 2016-08-03 21:12:02 -07:00
Scott Lahteine 4cf66cfa62 Merge pull request #4522 from rafacouto/RCBugFix 
Update of Galician language
 2016-08-03 14:41:33 -07:00
Rafa Couto 0114676953 Update of Galician language 2016-08-03 2016-08-03 15:00:18 +02:00
Rafa Couto 433a22189b Merge pull request #1 from MarlinFirmware/RCBugFix 
Update August
 2016-08-03 08:43:22 +02:00
Scott Lahteine bd7a96ed42 Merge pull request #4517 from thinkyhead/rc_min_probe_pin 
Define Z_MIN_PROBE_PIN always, allowing override
 2016-08-02 21:35:59 -07:00
Scott Lahteine 704ae1b737 Merge pull request #4516 from thinkyhead/rc_short_prints_quiet 
Only report finished prints longer than 1 min
 2016-08-02 21:14:30 -07:00
Scott Lahteine 7ed70305df Merge pull request #4515 from thinkyhead/rc_fix_speaker_tone 
Prevent the 'tone(f,d)' function from being interrupted
 2016-08-02 21:13:47 -07:00
Scott Lahteine f1be87a85c Move probe pin sanity checks out of ABL block 2016-08-02 20:55:17 -07:00
Scott Lahteine 9cb596e88c Define Z_MIN_PROBE_PIN always, allowing override 2016-08-02 20:31:44 -07:00
Scott Lahteine 229f70f194 Only report finished prints longer than 1 min 2016-08-02 19:58:12 -07:00
Scott Lahteine e040e00ae9 Merge pull request #4514 from thinkyhead/rc_cleanup_circularqueue 
Patch up CircularQueue
 2016-08-02 19:42:38 -07:00
Scott Lahteine 6110d57c16 Prevent the 'tone(f,d)' function from being interrupted 2016-08-02 19:37:47 -07:00
Scott Lahteine b73203a0b7 Move some includes around to uncover missing deps 2016-08-02 19:37:46 -07:00
Scott Lahteine 52b6b8e36b Merge pull request #4512 from thinkyhead/rc_encoder_flex 
Improved SCREEN / MENU macros
 2016-08-02 18:59:42 -07:00
Scott Lahteine f26d5425bf Patch up CircularQueue 
- Use `size` and `count` instead of `length` and `size`
- Fix bug: `peek` should return the item
- Clean up comments, spacing, spelling
 2016-08-02 18:57:15 -07:00
Scott Lahteine c9123adc59 Improved SCREEN / MENU macros 2016-08-02 18:05:34 -07:00
Scott Lahteine cebeb48005 Merge pull request #4511 from thinkyhead/rc_encoder_flex 
Allow encoder pulse/step override for more LCDs
 2016-08-02 16:50:50 -07:00
Scott Lahteine 3cccaa9885 Allow encoder pulse/step override for more LCDs 2016-08-02 15:57:26 -07:00
Scott Lahteine 58749cae94 Merge pull request #4510 from thinkyhead/rc_buzzer_needs_beeper 
Patch for COREYZ, tweak to scaled feedrate macro
 2016-08-02 15:55:06 -07:00
Scott Lahteine 14c5a46ee9 Use multiplication for MMM_SCALED 2016-08-02 15:05:17 -07:00
Scott Lahteine d8945e8464 Fix Z_HEAD index for COREYZ 2016-08-02 15:05:17 -07:00
Scott Lahteine 0f030aface Merge pull request #4503 from AnHardt/fix-retract 
Correct typo in retract()
 2016-08-02 15:04:55 -07:00
Scott Lahteine fbd8f06951 Merge pull request #4506 from thinkyhead/rc_buzzer_needs_beeper 
Buzzer requires BEEPER_PIN
 2016-08-02 14:40:43 -07:00
Scott Lahteine 330f82971b Buzzer requires BEEPER_PIN 2016-08-02 14:05:37 -07:00
Scott Lahteine e0d7b8bf27 Fix Azteeg X3 servo pin / Viki i2c 2016-08-02 14:05:37 -07:00
Scott Lahteine 7cceb15925 Merge pull request #4505 from thinkyhead/rc_auto_select_dplugs 
Auto-select power plugs for RAMPS derivatives
 2016-08-02 12:56:52 -07:00
Scott Lahteine 1967e4216e Merge pull request #4504 from AnHardt/fix-baybystepping 
Fix babystepping dependency
 2016-08-02 12:46:50 -07:00
Scott Lahteine 593b37519a Boards with 4 power outputs are EFBF or EFBE 2016-08-02 12:34:28 -07:00
AnHardt 9ab94bd2c1 fix-babysrepping 2016-08-02 21:06:42 +02:00
AnHardt 39c4603598 Correct typo in retract. 2016-08-02 21:06:08 +02:00
Scott Lahteine cebd2bfff0 Auto-select power plugs for RAMPS derivatives 2016-08-02 11:59:25 -07:00
Scott Lahteine 34c60f1b55 Merge pull request #4491 from thinkyhead/rc_fix_lcd_move_e 
Use a default argument in _lcd_move_e
 2016-08-01 16:45:25 -07:00
Scott Lahteine 38af251b91 Use a default argument in _lcd_move_e 2016-08-01 16:09:26 -07:00
Scott Lahteine 374ae6c099 Fix pins for RAMBO plus VIKI 2016-08-01 16:09:26 -07:00