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

381 commits

Author SHA1 Message Date
Scott Lahteine
a8aa43ce2d
Merge pull request #8587 from AnHardt/2_Fix_WDTO_during_long_DELTA_moves 
[2.0.x] Fix WDTO during long delta moves
 2017-11-28 17:29:18 -06:00
Scott Lahteine
16baa48699 Fix #8579 
Fan speed code fell into a curly brace
 2017-11-28 16:12:14 -06:00
AnHardt
02aa93a6ad Fix Watchdog time out during long lasting DELTA moves 
During long lasting moves of a delta machine neither the temperatures are maintained nor buttons checked nor ... .
The fix is to call 'manage_heater()' and 'idle()' every now and then in the loop where the move is segmented. 
The code is abot the same as in G2_G3 wher we had the same problem with too large circles lasting too long.
Fixing #7510
 2017-11-28 17:03:51 +01:00
Scott Lahteine
fadf9eb2d7 Simplify midpos calculation 2017-11-27 14:00:35 -06:00
Scott Lahteine
a67cf78c6b Clean up whitespace, spacing 2017-11-26 20:18:52 -06:00
Scott Lahteine
25674da90c Tweaks to do_blocking_move 2017-11-25 23:31:16 -06:00
Scott Lahteine
27c5692b13 Syntax tweaks 2017-11-25 18:13:36 -06:00
LVD-AC
65f365333f [2.0.x] G33 probe error handling 2017-11-25 16:19:10 -06:00
Roxy-3D
d29cb646e3
Fix erroneous reference to temperature in time calculations 
Travis is having problems at:  https://github.com/MarlinFirmware/Marlin/pull/8560   

So...   doing a direct commit to get things correct.   Bugfix_v1.1.x does not have this bug.  Nothing needs to be done to that branch.
 2017-11-25 10:40:56 -06:00
Scott Lahteine
a9ecb975b2 Apply LINEAR_UNIT to M503 output for M200 2017-11-24 17:32:48 -06:00
Scott Lahteine
80ada58818 One fewer function call in probe_pt 2017-11-24 17:10:38 -06:00
Scott Lahteine
01e207213f Fix MK2_MULTIPLEXER stepper indirection 2017-11-24 12:49:28 -06:00
Scott Lahteine
a03f93bab4 Fix fan kickstart 2017-11-23 21:42:45 -06:00
Scott Lahteine
9e3c41f9e8 Tweak fan kickstart / speed code 2017-11-23 15:20:35 -06:00
GMagician
118ac61e59 [2.0.x] Tool change bad behaviour fix 
Previous fix did not work as expected when axeis not homed. It raise Z but never return to original position
 2017-11-22 20:24:03 -06:00
Scott Lahteine
617993d0ea Patch for !!TEST (was _BV once?) 2017-11-21 16:12:08 -06:00
GMagician
a61127a421 [2.0.x] tool change bad behaviours 
This will solve 2 issues on tool change.
1) when no home is done ("no_move" is set) tool change should never move X & Y because... I don't know where I am...only Z should be adjusted to avoid bed collision if other nozzle is lower than current.
Since no move no bed level matrix should be applied
2) When SWITCHING_NOZZLE is enabled and system is homed there are two movements to go to destination, but first can move Z to older position and then crash on the bed
 2017-11-20 16:34:55 -06:00
Vitaliy Sapyanov
e2724c68ab Update pins_RURAMPS4D.h 
Add and bugfix pins
 2017-11-20 15:36:13 -06:00
Unknown
33912fa7e8 Update Temperature::setPwmFrequency prototype to match source 
Introduced with #8446
 2017-11-20 01:50:41 -08:00
Scott Lahteine
25af9decfe Remove enum.h include of MarlinConfig.h 2017-11-19 15:43:38 -06:00
Scott Lahteine
1d4571b88d Dependency adjustments 2017-11-19 15:43:38 -06:00
Scott Lahteine
c0000a0cdc Move servo code to modules/servo.* 2017-11-19 14:23:02 -06:00
Bob-the-Kuhn
c14000775b PWM fixes, slow down fan update 
include LPC1768 syntax for M42

couple more pin_t changes

consistency

change M42 to R, P format

Revert "change M42 to R, P format"

This reverts commit 01f12f579ec9ccc1bb9126e68d2c86449e9b7edf.
 2017-11-18 07:05:50 -06:00
Scott Lahteine
60adc6ff02 Display filwidth ratio in terms of E mm 2017-11-18 07:01:49 -06:00
Scott Lahteine
485abb023b
Merge pull request #8456 from thinkyhead/bf2_wednesday_tweaks 
[2.0] No retroactive adjustment with M851 Z
 2017-11-18 04:49:53 -06:00
Scott Lahteine
3bba7d60f3 No retroactive changes with M851 Z 
If using babystep to adjust the Z probe offset, the axis will move and the mesh will be updated at the same time, causing a doubling of the Z offset over the rest of the print.

To correct for this, the current Z position would need to be modified in the opposite direction, canceling out the additional Z offset added to the mesh. This would be confusing to users, and moreover it would not be accurate without also taking the current Z fade level and current Z height into account.

It might make sense to change the mesh in the case where no babystepping is taking place, but this could be considered an undesirable side-effect of changing the `zprobe_zoffset`.

One way to remedy this would be to return to storing the mesh with `zprobe_zoffset` included, then subtracting `zprobe_zoffset` from the returned Z value. Thus, a babystep moving the Z axis up 1mm would subtract 1 from `zprobe_zoffset` while adding 1 to all mesh Z values.

Without including the `zprobe_zoffset` in the `z_values` there is no safe way to alter the mesh in conjunction with babystepping, although it's fine without it.
 2017-11-18 03:36:39 -06:00
Scott Lahteine
32512332df Apply some formatting 2017-11-18 03:12:30 -06:00
Bob-the-Kuhn
7eea000f4b E0 auto fan fixes 2017-11-16 18:42:56 -06:00
Scott Lahteine
b2dda096fe Fix FILAMENT_LCD_DISPLAY for disabled state 2017-11-16 16:57:48 -06:00
Scott Lahteine
1e8afb66b7 Fix a planner comment 2017-11-16 16:57:47 -06:00
Scott Lahteine
50f09cc029 Miscellaneous cleanup 2017-11-16 00:47:16 -06:00
Scott Lahteine
63257dc083 Fix M503 output for M145 
Fixes #7978
 2017-11-15 04:00:18 -06:00
Scott Lahteine
0918dae66e Add OV() macro for use in thermistor tables 2017-11-15 03:15:18 -06:00
RowanMeara
6131533157 Change dithering behavior to intended. 2017-11-14 00:47:07 -08:00
Scott Lahteine
91baca6abb Patches for compiler warnings/errors 2017-11-13 04:43:47 -06:00
Scott Lahteine
04abd8d459 Improve and clarify M428 code 2017-11-13 02:09:11 -06:00
Scott Lahteine
f5d210c35c Fix report_current_position 2017-11-12 23:02:53 -06:00
Scott Lahteine
06ee6584fd Remove offsets from soft endstops, tool change 2017-11-11 22:47:38 -06:00
Scott Lahteine
d4a1154c25 Use do_blocking_move_to where possible 2017-11-10 20:55:23 -06:00
Scott Lahteine
36426af564
Merge pull request #8356 from tcm0116/2.0.x-M600 
[2.0.x] Normalize load/unload length in M600
 2017-11-10 19:44:08 -06:00
Scott Lahteine
1ed86adf9c Cleanup around updatePID 2017-11-10 19:27:34 -06:00
Scott Lahteine
75a58ee4b8 Fix position_is_reachable bug in waiting 2017-11-10 19:27:33 -06:00
LVD-AC
e334efb2a7 PROBE_MANUALLY etc. 2017-11-10 19:27:33 -06:00
Scott Lahteine
cba9c1cf9e Add pre-calculated planner.e_factor 2017-11-10 03:14:24 -06:00
Thomas Moore
600c85226e Normalize load/unload length in M600 2017-11-10 02:31:46 -06:00
Scott Lahteine
c66696c507
Merge pull request #8344 from tcm0116/2.0.x-delta_height 
[2.0.x] Add delta_height variable in lieu of using home_offset
 2017-11-09 01:21:53 -06:00
Scott Lahteine
0cfb936dd1 Clarify some motion code 2017-11-08 22:15:55 -06:00
Thomas Moore
f34c3597dc Add delta_height variable in lieu of using home_offset 2017-11-08 22:10:08 -06:00
Scott Lahteine
b0b4a20930 Tweaks to core motion code 2017-11-08 20:09:09 -06:00
Roxy-3D
1c6e83c137
if !HAS_MESH we still need to do some motion! (#8328) 
* if !HAS_MESH we still need to do some motion!

Thank You MagoKimbra !

* Ooops....   need #else and not #elif
 2017-11-08 09:42:21 -06:00
Roxy-3D
ed62c621d7
Fix G26 Circle Drawing. Add Default Extrusion Settings (#8313) 
- Fix G26 Circle Drawing.
- Add default extrusion settings so machine can print lines on print bed
- Yet to be done: Get LCD Menu's to use these settings.
 2017-11-07 17:13:53 -06:00
Scott Lahteine
8fea26aa9d Fix PID_autotune watch temp increase value 2017-11-07 15:51:48 -06:00
Thomas Moore
73ca5345e1 Fix Delta EEPROM 2017-11-07 16:48:21 +00:00
Scott Lahteine
85a62bbf46 Misc. fixes to compiler warnings, etc. 2017-11-06 22:57:05 -06:00
Roxy-3D
6324b09934
Revert "Fix EEPROM crc (#8284)" (#8292) 
This reverts commit 172c36f517.
 2017-11-06 19:52:05 -06:00
Rowan Meara
172c36f517 Fix EEPROM crc (#8284) 2017-11-06 19:19:30 -06:00
Scott Lahteine
2246316605 Fix name collision. timer_t => hal_timer_t 2017-11-05 19:31:07 -06:00
Scott Lahteine
1b40e9c464 Implement CNC_COORDINATE_SYSTEMS 2017-11-04 22:28:46 -05:00
Scott Lahteine
c07bbd4154 Prettify some EEPROM code 2017-11-04 22:28:46 -05:00
Scott Lahteine
79772219ae Fix Fan Multiplexer init 2017-11-04 22:28:46 -05:00
Scott Lahteine
dac1f6fe74 Tweaks to cubic_b_spline code style 2017-11-04 14:46:10 -05:00
Scott Lahteine
4df024d7b9
Merge pull request #8234 from thinkyhead/bf2_native_operation 
[2.0.x] Operate in Native Machine Space
 2017-11-04 14:31:44 -05:00
Scott Lahteine
f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -05:00
teemuatlut
70be4d206e [2.0.x] UltiMachine Archim2 (#8190) 
* UltiMachine Archim2 support

* SPI gets included by the library

* Invert TMC2130 diag pin state

* Clean up Archim2 pins

* Update Archim2 config

* FAN2 -> FAN1

* Cleanup

* Add brief Archim installation instructions

* Bring pins into compliance

* Update 1.0 SD Detect pin for 1.1

* Update Configuration.h

* Update pins_ARCHIM2.h
 2017-11-03 04:48:15 -05:00
Scott Lahteine
2f9e42feb9 M303 thermal runaway protection 2017-11-03 03:57:46 -05:00
Scott Lahteine
04c0d9f3c3 Implement kinematic software endstops 2017-10-30 15:16:30 -05:00
Scott Lahteine
817175613a
Merge pull request #8157 from thinkyhead/bf2_anet_10_servo 
[2.0.x] Define a default SERVO0_PIN for Anet 1.0
 2017-10-29 19:55:00 -05:00
Scott Lahteine
723f2a77f6 Implement support for Dual X and Y endstops 2017-10-29 18:56:04 -05:00
Scott Lahteine
3e8754a38a Add/correct time units on planner vars / M205 B 2017-10-29 18:47:21 -05:00
Scott Lahteine
eae0aea1e0 Fix M303 thermal protection 2017-10-29 04:30:50 -05:00
Thomas Moore
325233b454 Fix automatic stepper assignment for X/Y/Z dual stepper drivers (#8130) 2017-10-28 19:45:07 -05:00
Scott Lahteine
0ceec1f166 Fix leveling_active_at_z warning 2017-10-26 22:22:54 -05:00
Thomas Moore
9e699811d2 Make LPC1768 pinmapping not specific to Re-ARM (#8063) 
* Merging early because of build failures.  See #8105

* Make LPC1768 pinmapping not specific to Re-ARM

* Add HAL_PIN_TYPE and LPC1768 pin features

* M43 Updates

* Move pin map into pinsDebug_LPC1768.h

* Incorporate comments and M226

* Fix persistent store compilation issues

* Update pin features

* Update MKS SBASE pins

* Use native LPC1768 pin numbers in M42, M43, and M226
 2017-10-26 13:37:26 -05:00
Roxy-3D
72156a2029 change to better (more clear) names (#8050) 
set_destination_to_current() changed to set_destination_from_current()

set_current_to_destination() changed to set_current_from_destination()
 2017-10-21 11:42:26 -05:00
Roxy-3D
572cf0ec95 UBL able to generate mesh and save and load it on 32-bit platforms (#8015) 
* Get UBL Mesh Generation, Mesh Save & Mesh Load working with 32-Bit platforms

* clean up read_data() and write_data() for non-LPC1768 HAL's

* Get read_data() and write_data() return codes consistent

All HAL's read_data() and write_data() return false if they succeed.

* Get read_data() and write_data() return codes to be consistent

Make read_data() and write_data() return true if an error happens.

* Say UBL is now checked out on machine types in default Configuration.h file.
 2017-10-18 14:00:29 -05:00
Roxy-3D
6cb26c98c8 Fix Baby Stepping on 32-Bit platforms (#8001) 
Also, Max7219 debug code was used for this effort.   It has been
improved and hardened.
 2017-10-16 16:29:37 -05:00
Scott Lahteine
c46189e429 Fix UBL+Delta segmented feedrate 
Based on #7948
 2017-10-15 16:31:09 -05:00
Jeff Eberl
b206f70693 Split the software endstop capability by axis. 2017-10-14 18:44:20 -05:00
Scott Lahteine
c0dddd4233 Tweaks to tool_change, GcodeSuite::T() 2017-10-14 02:53:19 -05:00
Scott Lahteine
ca66574062 ADC sensor fix inspired by 'Evgen2' on Twitter 2017-10-14 02:28:13 -05:00
Scott Lahteine
1344ca4b2f UBL no longer needs ubl_state 2017-10-14 02:18:32 -05:00
Scott Lahteine
3e3911fb81 Use planner.leveling_active for all leveling systems 2017-10-14 02:18:31 -05:00
Scott Lahteine
32c607ffe2 Ensure fade factor is recalculated if fade height changes 2017-10-14 02:18:31 -05:00
Scott Lahteine
ca1e47375c Move fade_scaling_factor_for_z to Planner 2017-10-14 02:18:31 -05:00
Scott Lahteine
9a930ebec2 Make leveling_is_active a macro 2017-10-14 02:18:31 -05:00
Scott Lahteine
1adb5a6a48 Remove obsolete UBL z_offset 2017-10-13 08:22:46 -05:00
Bob-the-Kuhn
26bfae58d4 MPC4451 I2C support 2017-10-11 00:30:41 -05:00
Scott Lahteine
03f4891fb9 Remove legacy ADVANCE feature 2017-10-09 04:25:18 -05:00
Scott Lahteine
8315a8a716 Apply fixes for DUE 
Alternative to #7882. If F_CPU is greater than 1000 it can be evenly divided by 8. Over 10000, 16; over 100000, 32; over 1 million, 64; etc.
 2017-10-07 14:31:18 -05:00
Chris Pepper
46b2773e13 General fixes for LPC1768 (#7834) 
* fixed some include paths

* LPC1768: Fix Serial API

Add missing serial methods used if TX_BUFFER_SIZE is set
Change return value of HalSerial:read to match Arduino API

* LPC1768: add filters to ADC

This is to try and compensate for hardware issue and oversensitivity to noise

* LPC1768: remove the polling section of delayMicroseconds

* LPC1768: lock usb mass storage device while device accesses it.

Currently only applicable to persistent store,
The device always has priority and will unmount the sd card from the host, Windows then tries to automount again so it can look like the explorer window freezes. Linux Mint, by default, just closes the Nemo window.

* Add timeout to make sure if Serial never connects that Marlin still boots

* Remove unneeded ifdef CPU_32_BIT

In general the need for ifdef CPU_32_BIT blocks means that something is missing from the HAL API or a Platform, in this case HAL_TICKS_PER_US was missing from the AVR Platform

* LPC1768: relocate RE-ARM debug_extra_script.py
 2017-10-04 15:40:54 -05:00
Scott Lahteine
6ea2cc0293 Make prepare_move_to_destination_dualx a proper move function 2017-10-02 23:32:28 -05:00
Scott Lahteine
90af1fe5ee Implement NO_MOTION_BEFORE_HOMING option 2017-10-01 21:58:50 -05:00
Scott Lahteine
965b0ab53e Spacing adjustments 2017-10-01 21:58:50 -05:00
Scott Lahteine
ac41eb5871 Merge pull request #7722 from tcm0116/2.0.x-warnings 
Cleanup 2.0.x compiler warnings
 2017-10-01 21:56:54 -05:00
Thomas Moore
ae2173cd52 Synchronize retractions 2017-09-30 17:28:46 -05:00
Thomas Moore
0cb00f52d9 Cleanup warnings 2017-09-30 16:47:17 -05:00
Bob-the-Kuhn
1beaef0452 fix 3S hang & enable SPLIT 2017-09-30 10:27:41 -05:00
Scott Lahteine
2ee4eef25c Merge pull request #7748 from GMagician/Addressing-#7730 
[bugfix-2.0.x] Fix compiler error (issue #7730)
 2017-09-27 12:06:55 -05:00
Scott Lahteine
dff2904c0f Marlin code whitespace cleanup 2017-09-27 10:55:36 -05:00
Phr3d13
10c1b442ca Fixes for Anet10 and gt2560 
Fixes for 2 "... not declared in this scope" compiler errors.
 2017-09-27 07:34:02 -05:00
Scott Lahteine
37eb6d1732 Babystepping code tweak 2017-09-26 23:43:05 -05:00
GMagician
c508e9adec Fix compiler error 
Added missing include file,
called 'leveling_is_active()' with no prototipe defined.
 2017-09-25 23:18:26 +02:00
Scott Lahteine
6d5fcac54a G33 changes from 1.1.x 2017-09-24 14:16:23 -05:00
Dave Johnson
f58ba3a64e Improve AVR arch detection 
Replace ARDUINO_ARCH_AVR with __AVR__ to better detect architecture for non-Arduino dev environments.  Resolves compile failure in PIO for 8-bit Teensduino targets

More info:
https://forum.pjrc.com/threads/33234-Using-Teensyduino-Selecting-Teensy-3-2-3-1-board-has-incorrect-platform-define
http://www.atmel.com/webdoc/avrlibcreferencemanual/using_tools_1using_avr_gcc_mach_opt.html
 2017-09-23 21:36:40 -07:00
Scott Lahteine
ff1f211eb4 Merge pull request #7695 from tcm0116/move_framework 
Move LPC1768 framework out of Marlin source folder
 2017-09-23 17:12:48 -05:00
Thomas Moore
ddbd4b73e0 Move LPC1768 framework out of Marlin source folder 2017-09-23 16:59:31 -05:00
GMagician
00b1b33816 Fix compiler warning 2017-09-23 15:31:51 +02:00
Scott Lahteine
64dfb46461 Move z_endstop_adj to Endstops 2017-09-21 16:27:11 -05:00
Scott Lahteine
2e20c53c9d Move endstop debug to Endstops 2017-09-21 16:27:11 -05:00
Scott Lahteine
a10451ceed Move Volumetric methods to Planner 2017-09-21 16:27:11 -05:00
Scott Lahteine
07cf75883f Move T (tool change) to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
1a37ebc76d Move M163-M165 MIXING_EXTRUDER to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
75cf17d816 Move M702 MK2_MULTIPLEXER to cpp 2017-09-21 16:27:08 -05:00
Scott Lahteine
4a220a8b79 Move M380_M381 to cpp, solenoid feature 2017-09-21 16:27:06 -05:00
Scott Lahteine
b464887ea1 Make BARICUDA a feature 2017-09-21 16:26:57 -05:00
Scott Lahteine
df0432c7c8 Move M155 to cpp, auto-report to Temperature 2017-09-21 16:26:56 -05:00
Scott Lahteine
9c21191f74 Rename SPI class to avoid conflict (good?) 2017-09-21 16:26:49 -05:00
Scott Lahteine
51f195e698 Move dwell to gcode 2017-09-21 16:26:48 -05:00
Scott Lahteine
4f1eadf41f FILAMENT_WIDTH_SENSOR feature 2017-09-21 16:26:48 -05:00
Scott Lahteine
d5fe0fb02b Consolidate PrintCounter 2017-09-21 16:26:48 -05:00
Scott Lahteine
551752eac7 Consolidate "bedlevel" code 2017-09-21 16:26:47 -05:00
Scott Lahteine
71aefc2e22 Move heater output to Temperature class 2017-09-21 16:26:47 -05:00
Scott Lahteine
63228fc453 Move volumetric flag to GCodeParser 2017-09-21 16:26:47 -05:00
Scott Lahteine
bf7af95db3 Move flow_percentage to Planner 2017-09-21 16:26:46 -05:00
Scott Lahteine
a98e9874db FWRETRACT as a feature 2017-09-21 16:26:46 -05:00
Scott Lahteine
722786966a Add gcode.cpp, motion.*, queue.* - Apply to some G-codes. 2017-09-21 16:26:45 -05:00
Scott Lahteine
4231faf779 Initial split-up of G-code handlers by category 2017-09-21 16:26:45 -05:00
Scott Lahteine
038f82cc38 Fix L6470 init and options 2017-09-21 16:26:43 -05:00
Scott Lahteine
3d8a0ab4b2 Module updates 2017-09-21 16:26:42 -05:00
Scott Lahteine
2b3b7d5d7f Move 'thermistor' files 2017-09-12 14:51:05 -05:00
Scott Lahteine
0c9231fd04 Move 'module' files 2017-09-12 14:51:05 -05:00