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

4884 commits

Author SHA1 Message Date
Scott Lahteine
d29a64d4b3 Merge pull request #4603 from thinkyhead/rc_less_MSG_MOVE 
Strip never-translated strings from language files
 2016-08-11 14:21:58 -07:00
Scott Lahteine
d6a7ca6553 Merge pull request #4584 from thinkyhead/rc_delta_cal_more 
Use configured feedrates, center in DELTA_CALIBRATION_MENU
 2016-08-11 14:04:05 -07:00
Scott Lahteine
d3b432adca Strip never-translated strings from language files 2016-08-11 13:41:07 -07:00
Scott Lahteine
1a558ef486 Tweak MarlinSerial precursor 2016-08-11 12:47:06 -07:00
Scott Lahteine
802818f7ab Cleanup SdFatUtil.h 2016-08-11 12:47:06 -07:00
Scott Lahteine
52560e257f Merge pull request #4595 from thinkyhead/rc_i2c_slave 
Add support for i2c slave address
 2016-08-11 12:39:26 -07:00
Scott Lahteine
432e9a1f50 Use configured feedrates, center for DELTA_CALIBRATION_MENU 2016-08-11 12:05:55 -07:00
Scott Lahteine
cd496dd9bd do_blocking_move_to can't be 'inline', takes const ref args 2016-08-11 12:05:55 -07:00
Scott Lahteine
dd75fca4d9 Make M155 / M156 a bit more flexible 2016-08-11 00:52:01 -07:00
Scott Lahteine
a99ecf71d8 Add support for i2c slave address 2016-08-10 23:30:35 -07:00
Scott Lahteine
b63d70b186 Fix serial output for MBL, M303 2016-08-10 18:49:52 -07:00
Scott Lahteine
a36a168af2 Use the truly configured middle on Delta 2016-08-10 00:03:22 -07:00
Scott Lahteine
58c8e6cef2 Fixes #4576: Convert filamentUsed to long for display 2016-08-09 23:57:28 -07:00
Scott Lahteine
01f1f779a5 Followup to #4574, specify L for long 2016-08-09 23:43:37 -07:00
Kaibob2
1c7bd17e60 Update language_de.h with MSG_MOVE_E1 - E4 
MSG_MOVE_E1 was missing
MSG_MOVE_E2 was missing
MSG_MOVE_E3 was missing
MSG_MOVE_E4 was missing

I assigned "0" to "MSG_MOVE_E1", "1" to "MSG_MOVE_E2" and so on, as this is what i assume to be the standard naming for the first (E0) and second (E1) extruder. This would have to be changed inthe other languages too :(
 2016-08-09 20:49:26 +02:00
Scott Lahteine
880cdb553b Include days in Graphical LCD print timer 2016-08-08 23:21:36 -07:00
Scott Lahteine
f4ac8c15e3 Merge pull request #4573 from thinkyhead/rc_mintemp_bed_later 
Throw MINTEMP BED error only if heating
 2016-08-08 23:02:42 -07:00
Scott Lahteine
b7b5b50a84 Throw bed min temp error only if heating 2016-08-08 22:49:22 -07:00
Scott Lahteine
d3ba878f70 Drop intermediate float in HEATER_0_USES_MAX6675 test 2016-08-08 22:49:22 -07:00
Scott Lahteine
3e8f9ecd1c Extend min/max_temp_error for the bed 2016-08-08 22:49:21 -07:00
Scott Lahteine
1f15f0df5f Merge pull request #4572 from thinkyhead/rc_digital_clock_100h 
Show up to 99:59 in digital time
 2016-08-08 22:28:29 -07:00
Scott Lahteine
8100a4dace Fix a compile error in EMERGENCY_PARSER sanity check 2016-08-08 21:49:57 -07:00
Scott Lahteine
45f67164b6 Simplify the delay in kill() 2016-08-08 21:49:34 -07:00
Scott Lahteine
30b1c731b5 Show up to 99:59 in digital time 2016-08-08 21:26:34 -07:00
Scott Lahteine
3be4511230 Patch command order in delta calibration menu 2016-08-08 21:15:25 -07:00
Scott Lahteine
9afa060ed6 Merge pull request #4570 from thinkyhead/rc_proper_delta_calibration 
Make DELTA_CALIBRATION_MENU more universal
 2016-08-08 21:11:40 -07:00
Scott Lahteine
46c8862635 Merge pull request #4564 from AnHardt/max-spi-setup 
MISO is an input
 2016-08-08 21:01:15 -07:00
Scott Lahteine
88540d8ecf Fix: LCD displays SD status at startup 2016-08-08 20:53:18 -07:00
Scott Lahteine
b16ea09498 Make DELTA_CALIBRATION_MENU more universal 2016-08-08 20:42:58 -07:00
Scott Lahteine
3a56836ead Always disable SLOWDOWN for DELTA/SCARA 2016-08-08 18:06:46 -07:00
AnHardt
aa9b52b2e7 MISO is an input 2016-08-08 20:09:57 +02:00
Scott Lahteine
67c4acf750 Merge pull request #4562 from thinkyhead/rc_fix_z_dual_endstops 
Fix Z_DUAL_ENDSTOPS with Z MIN Homing
 2016-08-07 19:23:09 -07:00
Scott Lahteine
e113740fa3 Specify that Z_PROBE_*_HEIGHT is nozzle-relative 2016-08-07 17:54:17 -07:00
Scott Lahteine
462e189edd Move pullups after Z_DUAL_ENDSTOPS block 2016-08-07 17:43:02 -07:00
Scott Lahteine
367dad5902 Sanity check Z_DUAL_ENDSTOPS with DELTA 2016-08-07 17:08:41 -07:00
Scott Lahteine
5fca110e0d Fix Z_DUAL_ENDSTOPS with MIN homing 2016-08-07 17:08:41 -07:00
Scott Lahteine
fc11f05c11 Merge pull request #4556 from thinkyhead/rc_all_feedrates_mm_s 
Within Marlin, maintain most feed rates in mm/s
 2016-08-07 16:14:16 -07:00
Scott Lahteine
7b2abe6fc8 Use steps_to_mm in extruder runout prevent 2016-08-07 00:28:52 -07:00
Scott Lahteine
d320065320 Within Marlin, maintain most feed rates in mm/s 2016-08-07 00:28:52 -07:00
Scott Lahteine
ed0b50ebee Merge pull request #4555 from thinkyhead/rc_mbl_index_rounding 
Remove premature int-cast from MBL cell index methods
 2016-08-06 23:34:01 -07:00
Scott Lahteine
bad286d52f Save CPU by multiplying by pre-compiled values 2016-08-06 23:24:07 -07:00
Scott Lahteine
dce6026e0e Remove premature cast to int 2016-08-06 23:01:29 -07:00
Scott Lahteine
cffe77c537 Merge pull request #4553 from thinkyhead/rc_lcd_chars_save_ram 
Save bytes for custom chars (Hitachi LCD)
 2016-08-06 18:29:16 -07:00
Scott Lahteine
42927530fe Explicitly clear the screen in lcd_goto_screen 2016-08-06 18:10:39 -07:00
Scott Lahteine
a6d2c2479f Minor cleanup of lcd_goto_screen calls 2016-08-06 18:10:39 -07:00
Scott Lahteine
e47c8b9829 Save bytes for custom chars (Hitachi LCD) 2016-08-06 18:10:39 -07:00
Scott Lahteine
0ff5005c9b Allow connector flexibility for BQ ZUM Mega 2016-08-06 17:19:12 -07:00
Scott Lahteine
98437bd488 Allow override of CONTROLLERFAN_PIN with RAMPS EFF 2016-08-06 17:19:12 -07:00
Scott Lahteine
93eafa1785 Use DISABLED to check TEENSY pin option 2016-08-06 17:19:12 -07:00
AnHardt
98392abb78 Clean warnings for pins_BQ_ZUM_MEGA_3D.h 2016-08-06 17:19:12 -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
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
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
Rafa Couto
0114676953 Update of Galician language 2016-08-03 2016-08-03 15:00:18 +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
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
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
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
Scott Lahteine
7594138740 Merge pull request #4493 from jbrazio/buildroot-cleanup 
Move font folder
 2016-08-01 15:57:23 -07:00
Scott Lahteine
6eed37aafb Merge pull request #4486 from thinkyhead/rc_pid_add_extrusion_rate_off 
PID_EXTRUSION_SCALING, disabled by default
 2016-07-31 18:23:51 -07:00
Scott Lahteine
4bf3526d00 Merge pull request #4463 from thinkyhead/rc_azteeg_x3_eeb 
Wrangle RAMPS variants and derivatives
 2016-07-31 18:22:49 -07:00
Scott Lahteine
1993c45759 Merge pull request #4487 from thinkyhead/rc_refresh_pos_fix 
Update refresh_positioning - no need for obj ref
 2016-07-31 18:22:38 -07:00
Scott Lahteine
f83369b79c Update refresh_positioning - no need for obj ref 2016-07-31 18:01:13 -07:00
Scott Lahteine
63fd1f49a6 PID_EXTRUSION_SCALING, disabled by default 2016-07-31 17:49:34 -07:00
Scott Lahteine
49997e2e22 HI_VOLT_PIN => "RAMPS_Dn_PIN" 2016-07-31 15:42:52 -07:00
AnHardt
60ad365e21 repair-software-spi 2016-07-31 15:50:42 +02:00
Scott Lahteine
f388beafa1 Merge pull request #4476 from otvald/RCBugFix 
FIX for endstop adjustemt on delta is offset
 2016-07-31 01:09:54 -07:00