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

4223 commits

Author SHA1 Message Date
esenapaj
106227540e Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support) 
・Add implimantation of PR #3609 to configuration files of Cartesio
・Standardize macro names
 2016-06-16 19:22:31 +09:00
MagoKimbra
008d0637dd Fix gcode_T 2016-06-16 09:05:36 +02:00
edwilliams16
114d9db7d0 Show babysteps on the LCD in mm, not steps 2016-06-15 23:03:24 -07:00
Scott Lahteine
b410bf933b Merge pull request #4053 from thinkyhead/rc_cartesio_redo 
CNControls Cartesio UI Support
 2016-06-15 22:33:45 -07:00
Scott Lahteine
f639044c24 Merge pull request #3609 from jbrazio/feature/config-version 
Adds versioning for Configuration.h & Configuration_adv.h
 2016-06-15 22:09:47 -07:00
Scott Lahteine
4d2cb70152 Cartesio UI Support 2016-06-15 21:46:54 -07:00
Scott Lahteine
da90bbe0eb Merge pull request #4010 from thinkyhead/rc_toolchange_adjust 
Fixup position adjustment on toolchange
 2016-06-15 21:10:33 -07:00
Scott Lahteine
948c467e16 Merge pull request #4043 from AnHardt/save_delay 
Introduce save_delay()
 2016-06-15 21:06:43 -07:00
Scott Lahteine
4b93989a77 MBL Z adjustment on toolchange 2016-06-15 20:49:36 -07:00
Scott Lahteine
9c800d1f8c Position adjustment for bed leveling 2016-06-15 20:49:36 -07:00
Scott Lahteine
8c7babb70f Merge pull request #4049 from esenapaj/Fix-for-the-PR-#4023 
Fix for the PR #4023(Add macros to move servos)
 2016-06-15 20:39:46 -07:00
AnHardt
1219310622 Introduce save_delay() 
Introduce save_delay() for long delays what otherwise would cause
watchdog resets

Explizit lcd_set_custom_characters(false) at the end of bootscreen().
Else the charset is not proper set in case of LCD_PROGRESS_BAR.
 2016-06-15 18:11:55 +02:00
esenapaj
44f091a413 Fix for the PR #4023(Add macros to move servos) 
・Add missing ')'
 2016-06-15 22:34:55 +09:00
Alexander Leisentritt
c2b7ef1e7e "e" was renamed to "eindex" in a previous commit 2016-06-15 11:11:16 +02:00
Scott Lahteine
52ac2a62ee Merge pull request #4013 from thinkyhead/rc_toolchange_no_move 
Use "Tn S1" to change tools without moving
 2016-06-14 20:13:01 -07:00
Scott Lahteine
d2a00b74e3 Merge pull request #4004 from thinkyhead/rc_feedrate_in_gcode_T 
Use linear feedrate in gcode_T, not volumetric
 2016-06-14 20:10:08 -07:00
Scott Lahteine
0ad26d0de8 Merge pull request #4034 from AnHardt/custom-splash-screen 
Custom Splash Screen
 2016-06-14 18:51:39 -07:00
esenapaj
741cda0e47 Follow-up the PR #3676(Advance extrusion algorithm – LIN_ADVANCE) 
・Update forgotten example configurations
 2016-06-15 00:10:15 +09:00
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
8d8180e028 Parse M905 args in Marlin_main.cpp 2016-06-13 19:25:28 -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
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
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
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
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
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
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
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
74060f17b7 Merge pull request #3995 from thinkyhead/rc_nonblocking_buzzer 
New feature: Non blocking tone queue
 2016-06-09 20:55:29 -07:00
Scott Lahteine
a82c755a35 Fix BQ_LCD_SMART_CONTROLLER pin compiler warnings 2016-06-09 20:38:23 -07:00
João Brázio
5b5aa1572b Non-blocking buzzer 2016-06-09 20:20:05 -07:00
Scott Lahteine
72c6f2923f axis_steps_per_unit => axis_steps_per_mm 2016-06-09 17:04:51 -07:00
Scott Lahteine
446515ab79 Adjust spacing in block_t 2016-06-09 17:04:51 -07:00
Scott Lahteine
80ab749563 Rename acceleration locals for clarity 2016-06-09 17:04:51 -07:00
Scott Lahteine
3b08eb1eeb acceleration_st => acceleration_steps_per_s2 2016-06-09 17:04:51 -07:00
Scott Lahteine
cb4704e07a Rename some planner acceleration vars 
- `per_sq_second` => `per_s2`
- `per_sqr_second` => `per_s2`
- `axis_steps_per_sqr_second` => `max_acceleration_steps_per_s2`
 2016-06-09 17:04:50 -07:00
Scott Lahteine
3c68be79dc Throw an error in PID_autotune for E < -1 2016-06-09 16:41:53 -07:00
Scott Lahteine
26f8f54c56 Merge pull request #3985 from thinkyhead/rc_inch_fahrenheit_kelvin 
Support inches, fahrenheit, and kelvin
 2016-06-08 20:10:33 -07:00
Scott Lahteine
f0a5b7f0bc Merge pull request #3986 from thinkyhead/rc_mbl_forward_iteration 
Use memset in mbl.reset to save 58 bytes
 2016-06-08 17:33:41 -07:00
Scott Lahteine
0b3142b45b Remove redundant declarations from M100 code 2016-06-08 17:09:34 -07:00
Scott Lahteine
4980ecc1f7 Smaller binary using inline gcode argument getters 2016-06-08 17:03:28 -07:00
Reid Rankin
16212432c9 G20/21 and M149 support, and code_value() refactor 
This is an update of MarlinDev PR #196.

G20/21: support for switching input units between millimeters and
inches.
M149: support for changing input temperature units.

In support of these changes, code_value() and code_value_short() are
replaced with an array of functions which handle converting to the
proper types and/or units.
 2016-06-08 16:51:10 -07:00
Scott Lahteine
a569e89775 Merge pull request #3978 from thinkyhead/rc_planner_local_rename 
Rename some auto/locals to avoid name conflict
 2016-06-08 16:41:57 -07:00
Scott Lahteine
2d55862499 Use memset in mbl.reset to save 58 bytes 2016-06-08 16:05:18 -07:00
Scott Lahteine
b23f710034 Cleanup and naming for num-to-string functions 2016-06-08 13:12:27 -07:00
Scott Lahteine
3d56b9d127 Merge pull request #3979 from thinkyhead/mbl_cell 
MBL: cel => cell
 2016-06-07 19:12:46 -07:00
Scott Lahteine
cca047424d MBL: cel => cell 2016-06-07 19:10:39 -07:00
Scott Lahteine
49ecaf774d Rename some auto/locals to avoid name conflict 2016-06-07 15:38:45 -07:00
petrzjunior
9171a3d94f Update Czech language 2016/06/07 2016-06-07 19:25:15 +02:00
Scott Lahteine
5e6fdbb4cb Merge pull request #3963 from thinkyhead/rc_advance_steppers 
Use e_steps[EXTRUDERS] instead of e_steps[4]
 2016-06-05 02:46:06 -07:00
Scott Lahteine
47b5c55c29 Implement the delayed-move technique 2016-06-05 02:29:49 -07:00
Scott Lahteine
a3e25a0fca Instead of trying to move now, set a flag to move asap 2016-06-05 02:29:48 -07:00
Scott Lahteine
e2a8961635 Use e_steps[EXTRUDERS] instead of e_steps[4] 2016-06-05 01:44:53 -07:00
Scott Lahteine
43947072d5 Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2 
SINGLENOZZLE: EXTRUDERS versus HOTENDS
 2016-06-04 15:23:17 -07:00
Scott Lahteine
d7e4e8e9be Fix a typo in #3955 2016-06-04 02:09:58 -07:00
Scott Lahteine
c2362c1b3c Apply Marlin coding standards to MBL class 2016-06-03 21:43:32 -07:00
Edward Patel
c06de0f097 MBL: Added keeping MBL active when homing single axises for #3750 2016-06-03 21:42:29 -07:00
Scott Lahteine
f2fb66c00d With SINGLENOZZLE only set temperature for the active tool 2016-06-03 17:38:03 -07:00
Scott Lahteine
cd441ce652 SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
Scott Lahteine
32f8300cc6 Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast 
Improved LCD contrast handling
 2016-06-03 17:08:41 -07:00
Scott Lahteine
9c87bf835c Merge pull request #3947 from thinkyhead/rc_statics_stepper 
Apply static to remaining Stepper methods
 2016-06-03 17:08:15 -07:00
Scott Lahteine
08871d4d6e Merge pull request #3950 from boelle/patch-3 
last of missing defines added
 2016-06-03 17:07:02 -07:00
Scott Lahteine
4e13cd3f35 Merge pull request #3955 from MagoKimbra/RCBugFix 
Fix M428 width DELTA & SCARA
 2016-06-03 15:50:37 -07:00
Scott Lahteine
2403a1cf9c Merge pull request #3952 from rafacouto/RCBugFix 
Galician language update.
 2016-06-03 15:46:03 -07:00
Scott Lahteine
8529122af1 Merge pull request #3946 from thinkyhead/rc_g28_servo_raise_before_stow 
Raise the servo probe before stow outside ABL context
 2016-06-03 15:45:36 -07:00
MagoKimbra
f499be084a Fix M428 width DELTA & SCARA 2016-06-03 23:23:23 +02:00
Rafa Couto
5f8db3f574 Galician language update. 2016-06-03 18:24:53 +02:00
Bo Herrmannsen
8532bf4087 last of missing defines added 
need to check line 101-103
 2016-06-03 11:20:46 +02:00
Scott Lahteine
81384dfd36 Apply static to remaining stepper methods 2016-06-02 18:00:31 -07:00
Scott Lahteine
664b299a51 This fix is not DELTA compatible 2016-06-02 17:16:19 -07:00
Scott Lahteine
064efb20e0 Also call clear_command_queue for lcd_sdcard_stop 2016-06-02 17:16:19 -07:00
Scott Lahteine
6277395e1e set_current_position_from_planner() after stepper.quick_stop() 2016-06-02 17:16:19 -07:00
Scott Lahteine
381bc6f0b0 set_position => set_position_mm 2016-06-02 17:16:19 -07:00
Scott Lahteine
663d2463dc Merge pull request #3922 from thinkyhead/rc_statics_stepper 
Apply static to Stepper class
 2016-06-02 17:14:24 -07:00
Scott Lahteine
194185539d Merge pull request #3925 from thinkyhead/rc_statics_planner 
Apply static to Planner class
 2016-06-02 17:14:04 -07:00
Scott Lahteine
3fd9b331f0 Merge pull request #3924 from thinkyhead/rc_statics_temperature 
Apply static to Temperature class
 2016-06-02 17:13:17 -07:00
Scott Lahteine
db0fd021d0 Z raise options independent of ABL so G28 can use them 2016-06-02 16:56:49 -07:00
Scott Lahteine
9eecb4404b Make raise_z_after_probing null sometimes 2016-06-02 16:56:49 -07:00
Scott Lahteine
28fb1f8994 Tweak #endif comment for ABL GRID 2016-06-02 16:56:49 -07:00
Scott Lahteine
b3a37b493d Patch G28 servo stow to use Conditionals, raise_z_after_probing 2016-06-02 16:56:49 -07:00
Scott Lahteine
5390c846a5 Positive conditions for HAS_LCD_CONTRAST 2016-06-02 16:17:34 -07:00
Scott Lahteine
efa7209acf Improved LCD contrast handling 
Based on MarlinFirmware/MarlinDev#200 from @eboston
 2016-06-02 16:17:34 -07:00
Scott Lahteine
b703fa9538 Add sanity check for SAV_3DGLCD display types 2016-06-02 15:21:17 -07:00
lrpirlet
3aefa04386 Raise the servo probe before stow outside ABL context 2016-06-01 21:53:45 +02:00
Scott Lahteine
9729e9c450 Combine ST7565 / U8GLIB_NHD_C12864 items in dogm 2016-06-01 01:42:14 -07:00
Scott Lahteine
f331763eca Merge pull request #3829 from thinkyhead/rc_fix_T_command 
Fix bad movement in gcode_T when switching extruders
 2016-05-31 19:36:18 -07:00
Scott Lahteine
67f816ff79 Merge pull request #3926 from thinkyhead/rc_statics_endstops 
Drop FORCE_INLINE from endstops.h
 2016-05-31 19:35:41 -07:00
Scott Lahteine
2bd4f33369 Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup 
Remove excess allen key probe examples from configs
 2016-05-31 19:18:21 -07:00
Scott Lahteine
d698c89971 Fix bad movement in gcode_T when switching 2016-05-31 19:14:33 -07:00
Scott Lahteine
1a01a44a94 Merge pull request #3936 from thinkyhead/rc_sav_mk1 
Support for SAV_3DGLCD OLED LCD controller
 2016-05-31 18:46:25 -07:00
Scott Lahteine
4770d7c346 Merge pull request #3933 from boelle/patch-2 
added defines present in en but not in da
 2016-05-31 18:42:38 -07:00
Scott Lahteine
c6c01eaaac Merge pull request #3888 from thinkyhead/rc_slower_max31855 
Slower SPI speed for MAX31855
 2016-05-31 18:40:38 -07:00
Scott Lahteine
a0b000d752 Support for SAV_3DGLCD OLED LCD controller 2016-05-31 14:41:16 -07:00
Scott Lahteine
bd97bbc52a Make HAS_LCD_CONTRAST a boolean flag 2016-05-31 11:47:02 -07:00
Scott Lahteine
bc77670673 Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac 
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
 2016-05-31 10:29:37 -07:00
Bo Herrmannsen
a1a8240606 added defines present in en but not in da 2016-05-31 14:57:52 +02:00
Bo Herrmannsen
5eb7a79d93 initial changes to DA 2016-05-31 14:24:33 +02:00
Scott Lahteine
55ef04a566 Need to call dac_init() in setup() for DAC_STEPPER_CURRENT 
As reported by https://github.com/MarlinFirmware/Marlin/pull/3182#issuecomment-222595488
 2016-05-30 23:35:06 -07:00
Scott Lahteine
43a71ef226 Remove excess allen key probe examples from configs 2016-05-30 18:26:53 -07:00
Scott Lahteine
1582ed43bf Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv 
MBL: Move border macros to Configuration_adv.h
 2016-05-30 18:15:50 -07:00
Scott Lahteine
ff53819856 Drop FORCE_INLINE in planner.h 
This change actually does increase the binary size by about 12 bytes,
but how does it affect performance?
 2016-05-30 17:18:28 -07:00
Scott Lahteine
e60224a943 Drop FORCE_INLINE from endstops.h 
`FORCE_INLINE` seems to have no effect with standard optimization.
 2016-05-30 17:08:56 -07:00
Scott Lahteine
85512e9372 Drop FORCE_INLINE from temperature.h 
`FORCE_INLINE` seems to have no effect on code generation with standard
optimization.
 2016-05-30 17:06:50 -07:00
Scott Lahteine
78fb02a5ad Apply static to Temperature class 2016-05-30 16:50:51 -07:00
Scott Lahteine
c3df293fc6 Merge pull request #3923 from thinkyhead/rc_statics_endstops 
Apply static to Endstops class
 2016-05-30 16:48:23 -07:00
Scott Lahteine
02735fd500 Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak 
Tiny calc_timer speedup
 2016-05-30 16:47:03 -07:00
Scott Lahteine
668d50f68e Keep Stepper encapsulation, use static data and methods 2016-05-30 16:24:04 -07:00
Scott Lahteine
26f866b908 Apply static to Endstops class 2016-05-30 16:23:43 -07:00
Scott Lahteine
470d5ac09f Apply static to Planner class 2016-05-30 16:22:41 -07:00
Scott Lahteine
ecfdcf7250 Tiny calc_timer speedup 2016-05-30 16:17:02 -07:00
Edward Patel
06593833ff MBL: Move border macros to Configuration_adv.h 2016-05-30 20:50:16 +02:00
Scott Lahteine
ffe55c230d Merge pull request #3914 from thinkyhead/rc_fix_lcd_contrast 
Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
 2016-05-30 11:20:14 -07:00
Scott Lahteine
d3efc96289 Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL 
- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD`
- `MINIPANEL` conditionals are identical to `MAKRPANEL`
 2016-05-30 01:10:47 -07:00
Edward Patel
92a27c37b3 MBL: Apply https://github.com/MarlinFirmware/Marlin/pull/3903 to example_configurations 2016-05-30 09:50:11 +02:00
Scott Lahteine
3861f1e0da Merge pull request #3908 from jbrazio/bugfix/3826 
Closes #3826: SD printing will now pause and stop the print counter
 2016-05-30 00:08:57 -07:00
Scott Lahteine
8806c7bbcc Merge pull request #3903 from epatel/marlin/mbl_negative_xy 
MBL: Fix for negative x/y positions
 2016-05-29 22:07:35 -07:00
Scott Lahteine
dc22097b3a Fix some of array initializations 
- In `stepper.h` init `count_direction` array
- In `ultralcd.cpp` init `autotune_temp` array
 2016-05-29 20:55:13 -07:00
João Brázio
40e64b36de
Closes #3826: SD printing will now pause and stop the print counter 
The LCD menu items for SD printing pause/stop have been updated to control
also the print job timer. This commit also fixes a small output bug with
M78, the failed print counter was displaying the wrong value.
 2016-05-30 00:56:39 +01:00
Edward Patel
eb2746a34f MBL: Fix for negative x/y positions 2016-05-28 21:05:43 +02:00
Scott Lahteine
fe3122774a Merge pull request #3806 from thinkyhead/rc_coreyz_support 
Support for COREYZ. Fixes for COREXY, COREXZ
 2016-05-26 18:50:43 -07:00
Scott Lahteine
fad7680605 Slower SPI speed for MAX31855 2016-05-25 18:15:36 -07:00
Scott Lahteine
30f6b84561 Merge pull request #3812 from thinkyhead/rc_mbl_index_finders 
Two index finding functions for MBL
 2016-05-23 15:54:37 -07:00
Scott Lahteine
89e630b2fb Merge pull request #3808 from thinkyhead/rc_singlenozzle 
SINGLENOZZLE
 2016-05-23 15:52:19 -07:00
Scott Lahteine
827738a790 set_z parameters marked const 2016-05-23 14:25:43 -07:00
Scott Lahteine
9049f4084b EEPROM report uses G29 S3 2016-05-23 14:25:43 -07:00
Scott Lahteine
4955163959 Propose simpler probe index methods 2016-05-23 14:25:43 -07:00
Scott Lahteine
a1a5cb5393 Propose simpler cel index methods 2016-05-23 14:25:42 -07:00
Scott Lahteine
360adc6a3b Small reduction in M421 code 2016-05-23 14:25:42 -07:00