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

5956 commits

Author SHA1 Message Date
Scott Lahteine 26473cab6d Add PARK_HEAD_ON_PAUSE feature 2017-03-19 05:06:55 -05:00
Scott Lahteine 4cf51157b3 Use XYZE rather than NUM_AXIS 2017-03-19 01:14:39 -05:00
Scott Lahteine 4c7f14752a Add disable_e_steppers function 2017-03-19 01:14:39 -05:00
Scott Lahteine 8eb29f91e6 Patch filament change options and beep code 2017-03-19 01:14:39 -05:00
Scott Lahteine 56c9dfc83b Merge pull request #6066 from thinkyhead/rc_felix_fix 
Update Felix config for UBL
 2017-03-19 01:11:02 -05:00
Scott Lahteine 9b2b53f63a Merge pull request #6042 from thinkyhead/rc_fix_toolchange_z 
Move Z last in tool-change for SWITCHING_EXTRUDER
 2017-03-19 00:34:41 -05:00
Scott Lahteine f98fb6b38e Update Felix config for UBL 2017-03-19 00:28:48 -05:00
Scott Lahteine 7cabe81373 Merge pull request #6057 from thinkyhead/rc_followup_6054 
Followup 6054 with some cleanup
 2017-03-18 13:49:20 -05:00
Scott Lahteine 4bca27ab89 Fix Kelvin conversion 
Thanks to @ospalh -- #6056
 2017-03-18 13:23:08 -05:00
Scott Lahteine 143ab8f329 Remove Roxy's personal configurations 2017-03-18 12:35:02 -05:00
Scott Lahteine 2512871a36 Patch configs UBL followup 2017-03-18 12:32:03 -05:00
Scott Lahteine 27b5666e15 Move Allen Key probe definition to the top 2017-03-18 12:27:37 -05:00
Scott Lahteine 77cf648ed3 Move menu selection past static items in 1 screen 2017-03-18 12:26:21 -05:00
Scott Lahteine 2c630a1b5c Merge pull request #6054 from thinkyhead/rc_ubl_renewal 
UBL for RCBugFix — cleanup, rebase, patch
 2017-03-18 12:07:57 -05:00
Scott Lahteine 0492a3a8f1 Merge pull request #6027 from Bob-the-Kuhn/add_kill_info 
Message for every KILL and STOP
 2017-03-18 11:49:35 -05:00
Scott Lahteine 6618346148 Patches to work around "register spill" compiler bug 2017-03-18 11:35:21 -05:00
Scott Lahteine be7dd90382 Add Thermistor 75: MGB18 silicon pad 2017-03-18 11:35:20 -05:00
Scott Lahteine b0a9c82c31 Fix single-char echo and pinMode usage 2017-03-18 11:35:20 -05:00
Scott Lahteine fb60aa3736 UBL implementation 2017-03-18 11:35:20 -05:00
Scott Lahteine 238b8fd2a3 UBL core and support files 2017-03-18 11:35:19 -05:00
Scott Lahteine cf94688925 Univeral Bed Leveling - configuration 2017-03-18 11:35:19 -05:00
Scott Lahteine 03aa424ccb Merge pull request #6053 from thinkyhead/rc_clean 
Remove extraneous whitespace
 2017-03-18 03:26:45 -05:00
Scott Lahteine af644871bf Merge pull request #6045 from thinkyhead/rc_remove_raw_kinematics 
Remove delta optimization concepts… for now
 2017-03-18 03:26:24 -05:00
Scott Lahteine 77491dd924 Remove extraneous whitespace 2017-03-18 03:17:39 -05:00
Scott Lahteine b865b21d32 Can't use Z fade height with DELTA 2017-03-17 08:34:47 -05:00
Scott Lahteine 1e57b0c269 Remove delta interpolation concept 2017-03-17 06:32:11 -05:00
Scott Lahteine e46898f8e5 Remove kinematic optimizations 2017-03-17 06:30:22 -05:00
Scott Lahteine 11f1fdfab4 _lcd_level_bed_position => manual_probe_index 2017-03-17 06:05:17 -05:00
Scott Lahteine 0e410c9dfd Software endstop options as simple switches 2017-03-17 06:05:17 -05:00
Scott Lahteine d01b915085 Implement soft_endstops_enabled for clamping 2017-03-17 06:05:17 -05:00
Scott Lahteine e4649c9044 Add HAS_SOFTWARE_ENDSTOPS macro 2017-03-17 06:05:17 -05:00
Scott Lahteine 3e927ff204 Replace MBL Z hacking 2017-03-17 06:05:17 -05:00
Scott Lahteine 4e53124681 Merge pull request #6039 from Bob-the-Kuhn/M114-sync-with-stepper 
M114 - wait for move completion before reporting position
 2017-03-17 05:22:46 -05:00
Scott Lahteine 734f9ea133 Merge pull request #6040 from thinkyhead/rc_sanity_use_assert 
Simplify some sanity checks with static_assert
 2017-03-17 05:22:17 -05:00
Scott Lahteine f02af83d42 Remove some extraneous spaces 2017-03-16 23:59:11 -05:00
Scott Lahteine 672e45652e Improved solution to tool-change bug 2017-03-16 23:59:10 -05:00
Scott Lahteine 23f1cfb46f Fix stuck CHDK pin as suggested in #6041 2017-03-16 21:49:39 -05:00
Scott Lahteine 0b22069e82 Merge pull request #6021 from Bob-the-Kuhn/BUG-FIX--Switching-extruder-tool-change-Z-height 
Bug Fix: Switching extruder tool change leaves Z in wrong position
 2017-03-16 21:15:20 -05:00
Scott Lahteine e7e4500629 Simplify some sanity checks with static_assert 2017-03-16 16:31:34 -05:00
Bob-the-Kuhn 34ff0c3439 M114 - wait for move completion before reporting position 2017-03-16 15:10:45 -05:00
Bob-the-Kuhn b31604a492 Message for every KILL and STOP 
No more mystery halts & resets

Moved messages to language.h

Added current command to inactive timeout message
 2017-03-15 21:05:11 -05:00
Kai 13b44d019b Update language_de.h 
Addition of missing strings to match language_en.h
 2017-03-15 16:06:52 +01:00
Bob-the-Kuhn 685ed5393a Bug Fix: Switching extruder tool change leaves Z in wrong position 
The tool_change function saves the current_position to the destination
array soon after starting.  Later in the switching extruder section, the
destination array is modified when moving the Z axis up & down.  A later
section of tool_change moves the head back to the “original location”
using the destination array.  This later section assumes that the
destination array hasn’t been modified.

The fix is to save the destination Z position and then restore it after
the Z movements have completed.

Going back to using the current_position array for the switching
extruder Z axis moves (and  leaving the destination array untouched)
doesn’t fix the problem.

This bug was introduced by the “Make tool_change kinematic compatible”
commit # 847429eff4 which was merged on 10
Oct 2016 as part of PR 4982.

This bug was discovered in Issue 5966.
 2017-03-14 02:36:24 -05:00
Scott Lahteine 51353f8fea Merge pull request #6000 from trivalik/NoWorkspaceWarning 
prevent warning with define of NO_WORKSPACE_OFFSETS
 2017-03-12 00:00:51 -06:00
MagoKimbra a4a9bd8bc9 Fix BUG set_position_mm 
Set postion must have axis and not E_AXIS + active_extruder.
 2017-03-11 14:13:39 +01:00
Trivalik 71ac6f9d42 prevent warning with define of NO_WORKSPACE_OFFSETS 2017-03-09 23:49:57 +01:00
Stefan Brüns 9ba6c051a1 Makefile: add nozzle.cpp too CXXSRC list 
The file is required by the optional NOZZLE_PARK_FEATURE.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
 2017-03-09 03:08:49 +01:00
Stefan Brüns 9cc8d495b8 Makefile: remove no longer existing search paths 
ArduinoAddons has been removed from Marlin, remove any references to it.
Replace HARDWARE_SRC and HARDWARE_DIR with its expanded equivalents.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
 2017-03-09 01:46:47 +01:00
Stefan Brüns bf563e62c1 Makefile: add printcounter.cpp too CXXSRC list 
The file is required by the optional PRINTCOUNTER feature.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
 2017-03-09 01:45:54 +01:00
Stefan Brüns ddecc1441d Makefile: Fix linker error 
Instantiation of the static singleton instance thermalManager in general
requires locking, but we know its safe to do without.

Add -fno-threadsafe-statics to avoid using locking primitives, which
result in linking errors:
	undefined reference to `__cxa_guard_acquire'
	undefined reference to `__cxa_guard_release'

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
 2017-03-09 01:45:38 +01:00
MagoKimbra 37a26dfc09 Fix delta_angles 2017-03-08 09:23:30 +01:00
Scott Lahteine 2defb1d748 Use SET_INPUT_PULLUP where appropriate 2017-03-07 23:43:33 -06:00
Scott Lahteine 58b3e98878 Use arrays for delta tower parameters 2017-03-07 19:00:22 -06:00
Scott Lahteine 47242a40bb Apply updated changes for delta_tower_angle_trim 2017-03-07 18:15:11 -06:00
Jimmy Envall 00b6b3da79 Added support for delta tower angle corrections. 2017-03-07 16:35:58 -06:00
Scott Lahteine 5a456c832a Apply TMC2130 to example configurations 2017-03-07 04:22:06 -06:00
Scott Lahteine 45f949d833 TMC2130 Library: @teemuatlut replaces @makertum 2017-03-07 04:22:06 -06:00
Scott Lahteine 33f8a8a344 Merge pull request #5973 from thinkyhead/rc_circle_pattern 
Add circle pattern to nozzle clean
 2017-03-06 04:47:01 -06:00
Scott Lahteine 94b3e0a483 Merge pull request #5959 from benlye/benlye-fixm48 
Remove extra carriage return in M48 V1 output
 2017-03-06 04:24:28 -06:00
Scott Lahteine a9a1971295 Merge pull request #5972 from thinkyhead/rc_cooldown_before 
Fix preheat menu formatting
 2017-03-06 03:21:29 -06:00
Scott Lahteine 6aa81255a9 Patch and clean up "flsun" kossel. Followup to #5911. 2017-03-06 03:15:00 -06:00
Scott Lahteine b2270b3f3e Apply prior nozzle clean update 2017-03-06 03:14:59 -06:00
Marek Pikuła 7698c5617a Added circle nozzle cleaning parameters to example configurations 2017-03-06 03:04:58 -06:00
Marek Pikuła 6836b94eea Added circle pattern for nozzle cleaning feature 2017-03-06 03:03:00 -06:00
Scott Lahteine 3b75518ef6 Merge pull request #5911 from aphex3k/flsun_kossel_mini 
Configuration.h and Configuration_adv.h for the kossel mini by flsun
 2017-03-06 02:26:01 -06:00
Scott Lahteine 3830778852 Apply NO_WORKSPACE_OFFSETS to lcd menu 2017-03-06 02:21:42 -06:00
Scott Lahteine 7e3aab889d Fix preheat menu formatting 2017-03-06 02:07:07 -06:00
Scott Lahteine fea0d3f20f Endstop and temp-isr general cleanup 2017-03-06 02:07:07 -06:00
Scott Lahteine aef08e8780 Compact some macro substitutions 2017-03-06 02:07:07 -06:00
Scott Lahteine 2f620f86d9 Merge pull request #5970 from thinkyhead/rc_cooldown_before 
Preheat Hotend Only menu items
 2017-03-06 01:56:05 -06:00
Scott Lahteine 02de8e6f18 Merge pull request #5957 from MagoKimbra/rc_stepper_indirection_fix 
Stepper indirection fix tmc driver
 2017-03-06 01:16:40 -06:00
Scott Lahteine 6c5312559c Menu item to preheat only the hotend 2017-03-06 01:14:54 -06:00
Scott Lahteine 9d0142e8ae Move Change Filament above Cooldown 2017-03-06 01:13:12 -06:00
Scott Lahteine 0c55095c5e Move Cooldown above Preheat 2017-03-06 01:13:12 -06:00
Scott Lahteine c15c65f18a Merge pull request #5971 from thinkyhead/rc_fix_e_factors 
Patch DISTINCT_E_FACTORS bug
 2017-03-06 01:11:17 -06:00
Scott Lahteine bfb0007573 Patch DISTINCT_E_FACTORS bug 2017-03-05 23:19:31 -06:00
Scott Lahteine be98016674 Merge pull request #5963 from thinkyhead/rc_no_offsets_optim 
New option: NO_WORKSPACE_OFFSETS
 2017-03-05 21:46:49 -06:00
Scott Lahteine 8e89a802f7 Document PROTOCOL_VERSION 2017-03-05 04:43:46 -06:00
Scott Lahteine 87b03b16bd Use a macro for array copies 2017-03-05 04:43:46 -06:00
Scott Lahteine e141f3a03f Optimize coordinate transformation 
Pre-compute the combined position shift and home offset to save a
single float fetch-and-add per conversion. Great for delta/scara and
bed leveling.
 2017-03-05 04:43:16 -06:00
Scott Lahteine 5f7e85398b Implement NO_WORKSPACE_OFFSETS 2017-03-05 04:43:15 -06:00
Scott Lahteine 05abe853f9 New option: NO_WORKSPACE_OFFSETS 2017-03-05 04:43:15 -06:00
Scott Lahteine 20addc6e32 Merge pull request #5955 from thinkyhead/rc_eeprom_fail_better 
Display a message for EEPROM version mismatch
 2017-03-04 17:15:07 -06:00
benlye dead89062a Update Marlin_main.cpp 
Remove unnecessary line break from M48 V1 output.
 2017-03-04 17:58:10 +00:00
MagoKimbra ae277aebc6 Stepper indirection fix tmc driver 2017-03-04 12:17:39 +01:00
Scott Lahteine 8f4e4b1995 Display a message for EEPROM version mismatch 2017-03-04 01:20:36 -06:00
Scott Lahteine 177ad245f6 Merge pull request #5953 from thinkyhead/fix_fc_e_index 
Fix submenu hotend status display
 2017-03-04 00:12:29 -06:00
Scott Lahteine cea3ea772c Fix submenu hotend status display 2017-03-03 22:12:22 -06:00
Scott Lahteine b27f69ba51 Merge pull request #5813 from thinkyhead/rc_fix_makrpanel 
Fix MAKRPANEL assignments
 2017-03-03 21:40:49 -06:00
Scott Lahteine 1ef6ccd919 Merge pull request #5951 from thinkyhead/rc_print_2d_array 
Reduce code size (40b, or 166b with bilinear subdivision)
 2017-03-03 21:27:44 -06:00
Scott Lahteine 53f5086905 Fix MAKRPANEL assignments 
MAKRPANEL is a DOGLCD+ULTRA_LCD+NEWPANEL so customize its pins within
that block.
 2017-03-03 21:22:21 -06:00
Scott Lahteine 98c7b682ca General cleanup, const usage, var naming 2017-03-03 20:57:49 -06:00
jes 369bfc8a1e Reduce code size (40b, or 166b with bilinear subdivision) 2017-03-03 20:36:32 -06:00
Scott Lahteine 0d13412105 Fix "Heating..." message 2017-03-03 12:12:51 -06:00
Scott Lahteine 5065636023 Merge pull request #5934 from thinkyhead/rc_advance_ed_ratio 
LIN_ADVANCE: Fixed E/D ratio option
 2017-03-03 03:24:41 -06:00
divendres 75ad82baab Update Catalan language 2017-03-02 20:40:06 -06:00
Scott Lahteine 34253497d4 Babysteps code tweak 
As suggested by https://github.com/MarlinFirmware/Marlin/pull/5887#issuecomment-283832163
 2017-03-02 20:35:45 -06:00
Scott Lahteine fb4aead2b1 Clean up and finish #5887 2017-03-02 20:16:29 -06:00
Scott Lahteine b3e2bd6f29 Reduce E_D_ratio code 2017-03-02 01:00:37 -06:00
Sebastianv650 de6c40ed8f Add option to fix E/D ratio 
Work around for slicers producing buggy gcode.
 2017-03-02 01:00:37 -06:00