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

5017 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
09ef955191 Merge pull request #3086 from thinkyhead/rc_two_fans 
Support for multiple PWM fans
 2016-03-19 03:19:18 -07:00
Scott Lahteine
38b0082bf2 Additional tweaks to M42 exit conditions 2016-03-19 03:10:18 -07:00
Scott Lahteine
4bbea5124d Support for multiple PWM fans 2016-03-19 03:10:18 -07:00
Scott Lahteine
637cc03686 Fix M109 so it won't wait for cooling 
Addressing issue #2767
 2016-03-19 03:00:58 -07:00
AnHardt
3f45a1acf9 Check probes only when deployed 
Aim: Test probes in update_endstops only when activated

Changes:
Configurations
 Add define for FIX_MOUNTED_PROBE to handle the situation where formerly ENDSTOPS_ONLY_FOR_HOMING had to be set, or lowering the nozzle below Z_PROBE_OFFSET_FROM_EXTRUDER could give an "endstop hit" message.
 Add define for Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to indicate a common situation, that we have a probe but it is connected to an endstop pin
 Add some comments
 Shift some entries to have related things together.

Conditionals.h
 We have a probe (HAS_Z_MIN_PROBE) if one of the pins is defined AND one of the probes is defined.

SanityCheck.h
 Add some tests if the probe is connected and if we have defined a probe.

stepper.cpp
 Changes to test the probe only when it is deployed (z_probe_is_active).
 Test update_endstops() when the probe is deployed.

MarlinMain.cpp
 a. set and reset z_probe_is_active in deploy_z_probe(), stow_z_probe() and dock_sled()
 b. set and reset z_probe_is_active in the case a z-servo is moved to a defined position. The only remaining unhandled servo move is in M280 where we do not end in a defined position. If you want to handle a probe use M401/402
 c. skip deploying/stowing when already deployed/stowed in the dedicated deploy/stow functions.
 d. Handle the new FIX_MOUNTED_PROBE in parallel to a servo driven probe/endstop.

 To do: In another PR. handle all probes in deploy/stow_z_probe.
 Sort out SERVO_LEVELING vs. HAS_SERVO_ENDSTOPS.
 2016-03-19 02:00:08 -07:00
Scott Lahteine
4634feaeab Merge pull request #3012 from thinkyhead/fix_command_injection 
Use a serial line buffer to prevent queue corruption
 2016-03-19 01:43:54 -07:00
Scott Lahteine
9bf87aac6a Merge pull request #3127 from thinkyhead/rc_core_babystepping 
Implement BABYSTEPPING for COREXY and COREXZ
 2016-03-18 23:25:26 -07:00
Scott Lahteine
4ae03df5c2 Merge pull request #3109 from thinkyhead/rc_host_keepalive 
Provide feedback to hosts when busy
 2016-03-18 23:22:29 -07:00
Scott Lahteine
963a92ceda Patch idle forevermore 2016-03-18 22:38:35 -07:00
Scott Lahteine
7ec7bb31c4 Send a Busy signal to hosts during long processes, wait for input, etc 
If Marlin is blocking the serial input or command queue for any length
of time (for example more than 2 seconds), it needs to send a message
to serial out to inform the host that it is busy. Marlin should only
send these messages out when busy, and preferably not when trying to
print formatted output.
 2016-03-18 22:38:35 -07:00
Scott Lahteine
861391d530 Merge pull request #3175 from esenapaj/patch-2 
follow-up the PR #3114
 2016-03-18 22:10:50 -07:00
esenapaj
8d580ea7e8 follow-up the PR #3114 
follow-up the commit d56c6af24e
 2016-03-19 13:17:34 +09:00
Scott Lahteine
d9e1f22682 BABYSTEPPING requires ULTRA_LCD 2016-03-18 18:22:53 -07:00
Scott Lahteine
e5fd43f343 Implement BABYSTEPPING for COREXY and COREXZ 2016-03-18 18:22:53 -07:00
Scott Lahteine
80277cc9c8 drain_queued_commands_P now returns true if there are more 2016-03-18 17:56:48 -07:00
Scott Lahteine
8fe7420310 Use a separate serial line buffer 2016-03-18 16:46:20 -07:00
Scott Lahteine
7d25c107a8 Merge pull request #3149 from esenapaj/patch-1 
suppress warnings
 2016-03-18 15:40:14 -07:00
Scott Lahteine
d56c6af24e Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu 
Option to reverse the click-wheel direction in menus
 2016-03-18 15:39:29 -07:00
Scott Lahteine
cc291aeb3c Move definition of "blink" to main ultralcd file 2016-03-17 18:19:05 -07:00
Scott Lahteine
e7e1866589 Merge pull request #3161 from Alex9779/fix_InitialExtruderDirection 
Fix initial extruder direction for second/third/fourth extruder if they run inverted to the first
 2016-03-16 12:58:10 -07:00
Scott Lahteine
57e82cacc9 Merge pull request #3156 from esenapaj/patch-3 
Fix CardReader::lsDive()
 2016-03-16 12:48:22 -07:00
Alexander Leisentritt
4338813814 save last extruder and set stepper directions too in case the extruder changed 
fixes MarlinFirmware/Marlin#3144 and MarlinFirmware/Marlin#3083
 2016-03-16 20:20:34 +01:00
Scott Lahteine
8f24475e02 Simplify limiting encoderLine in END_MENU 2016-03-16 04:05:41 -07:00
Scott Lahteine
fbef2f5b61 Implement reverse menu direction in ultralcd.cpp 2016-03-16 04:03:49 -07:00
Scott Lahteine
b8b51d8da8 Add the REVERSE_MENU_DIRECTION option 2016-03-16 04:02:40 -07:00
Scott Lahteine
999a76dbdf Merge pull request #3157 from esenapaj/patch-4 
Use variable in lcd_erase_line()
 2016-03-16 02:46:42 -07:00
Scott Lahteine
e8fa843c2d Merge pull request #3164 from epatel/epatel/RCBugFix 
Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z
 2016-03-16 02:40:54 -07:00
Scott Lahteine
fc04b587cf Merge pull request #3147 from thinkyhead/rc_stringify_macro 
Promote STRINGIFY to macros.h
 2016-03-15 17:37:03 -07:00
Scott Lahteine
d7c6fd5c2f Merge pull request #3146 from thinkyhead/rc_enabled_true_false 
Support "true" and "false" in the ENABLED macro
 2016-03-15 17:35:55 -07:00
Edward Patel
cb0dbfa3b5 Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z 2016-03-16 01:26:00 +01:00
esenapaj
a15c5d222a Use variable in lcd_erase_line() 
lcd_erase_line() is called with argument, but the argument is ignored by lcd_erase_line().
 2016-03-16 02:59:06 +09:00
esenapaj
609c0d46d9 Fix CardReader::lsDive() 
If comparison between signed char(-128 ~ +127) and DIR_NAME_DELETED(uint8_t const 0XE5, it's +229),
it makes incorrect result.
 2016-03-16 02:47:58 +09:00
Roxy-3DPrintBoard
3ba9b06b79 Update README.md 2016-03-15 09:12:06 -05:00
Roxy-3DPrintBoard
5286e73f29 Update README.md 2016-03-15 09:10:57 -05:00
Scott Lahteine
2ef49a9d53 Wrap DEFAULT_Ki, DEFAULT_Kd, PID_dT 
Addition to #3140
 2016-03-15 03:49:44 -07:00
Scott Lahteine
eb8cf29464 Merge pull request #3151 from hydrocat/RCBugFix 
Uptades the pt-br translation
 2016-03-15 02:46:46 -07:00
Scott Lahteine
91cdea4022 Merge pull request #3153 from thinkyhead/rc_fix_macro_expansion 
Additional macro wrapping, patches for #3140
 2016-03-15 01:37:28 -07:00
Scott Lahteine
6e1bc03d3b Additional wrapping for #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine
cc9968f893 Patch spacing in #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine
1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion 
Wrap macros to prevent bad expansions
 2016-03-15 00:25:34 -07:00
Scott Lahteine
ff30a18d9c Merge pull request #3150 from esenapaj/patch-2 
Use local variable in recalc_delta_settings()
 2016-03-14 18:55:57 -07:00
VITORIO MIGUEL PRIETO CILIA
de2cca73ac Uptades the pt-br translation 2016-03-14 21:16:57 -03:00
esenapaj
a4314c4907 Use local variable in recalc_delta_settings() 
diagonal_rod hadn't been used anywhere.
 2016-03-15 06:47:27 +09:00
esenapaj
8de7a6f9b1 suppress warnings 2016-03-15 06:34:02 +09:00
Scott Lahteine
21be07a6f6 Merge pull request #3126 from Blue-Marlin/stackoverflow-with-e 
Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed
 2016-03-14 00:04:13 -07:00
Scott Lahteine
9418b4f2f3 Promote STRINGIFY to macros.h 2016-03-13 23:15:17 -07:00
Scott Lahteine
4b648793f2 Use ENABLED with DISABLE_[INACTIVE_][XYZ] 2016-03-13 22:15:45 -07:00
Scott Lahteine
73a59a4e45 Allow ENABLED(b) to work with "true" and "false" 2016-03-13 22:15:01 -07:00
Blue-Marlin
c73f1b2471 Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed 
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of 3050.
 2016-03-13 13:59:44 +01:00
Scott Lahteine
f4a3efd35e Merge pull request #3116 from thinkyhead/rc_fix_value_edit_bug 
Fix value edit click bug
 2016-03-13 04:08:43 -07:00