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

395 commits

Author SHA1 Message Date
Scott Lahteine
91db7930dc Drop SCARA_FEEDRATE_SCALING 
The updated planner takes the length of the move, so this pre-calculation is no longer needed.
 2018-03-01 04:30:41 -06:00
Scott Lahteine
1746749361 Followup to #9868 2018-03-01 01:53:12 -06:00
Scott Lahteine
a446433c87
Fix SENSORLESS_HOMING for Core Kinematics (#9868) 2018-03-01 01:37:31 -06:00
Zachary Hill
c22f8dd660 Get duration_t in printcounter.h for its clients (#9843) 2018-02-28 04:15:29 -06:00
Scott Lahteine
966d9af98a Mesh export in Bilinear + UBL M503 2018-02-25 23:25:39 -06:00
Scott Lahteine
8d5a77001e EEPROM parity with 1.1.x 2018-02-25 23:03:09 -06:00
Sebastianv650
cb4cb86d80 Useless line removed (#9814) 
nextAdvanceISR is set in the next if structure in every possible
situation, so it's useless to set it once more before.
 2018-02-25 21:20:37 -06:00
Scott Lahteine
0557ab5780 Fix CONFIG_ECHO_START bug 
In reference to #9633
 2018-02-25 05:34:52 -06:00
UtterlyD
813f9f3082 [bugfix_2.0.x] - LIN_ADVANCE V1.5 stepper.cpp (#9797) 
Removal of obsolete (i) from port of LIN_ADVANCE from V1.1.x to V2..0.x.
 2018-02-24 16:37:23 -06:00
Scott Lahteine
3f89bbeab5 Drop a conditional only used once 2018-02-24 16:35:31 -06:00
Scott Lahteine
689bc99402 Correction to acceleration 2018-02-24 11:09:36 -06:00
Scott Lahteine
2bd252b501
[2.0.x] LIN_ADVANCE v1.5 (#9712) 2018-02-23 00:53:29 -06:00
Scott Lahteine
2c9775313a Fix Z position on HD44780 
Fix #9732
 2018-02-23 00:42:42 -06:00
teemuatlut
5968a3e60e Add ADVANCED_PAUSE_FEATURE include 2018-02-22 20:28:46 +02:00
Scott Lahteine
73cd34b121 Finish AUTO_POWER_CONTROL implementation 
Followup to #9503
 2018-02-19 16:12:04 -06:00
Scott Lahteine
b3deadd898 Don't raise FIX_MOUNTED_PROBE on stow 
Reference #9336
 2018-02-19 08:36:43 -06:00
Scott Lahteine
3d1692d1fd Fix X2 enable with X_DUAL_STEPPER_DRIVERS 
From #9286
 2018-02-18 22:50:47 -06:00
Scott Lahteine
c241da32e8 stepper.h parity with 1.1.x 2018-02-18 22:50:38 -06:00
Scott Lahteine
ca55f2927a
Pulldown pin mode support (#9701) 
Implemented for LPC1768.
 2018-02-18 19:26:23 -06:00
Scott Lahteine
83d7e95de0
Add MSG_THERMAL_RUNAWAY_BED (#9691) 2018-02-18 02:23:55 -06:00
Scott Lahteine
472229b974 Fix #9681 2018-02-17 08:28:12 -06:00
Scott Lahteine
03d790451f
[2.0.x] HAL timer set/get count => set/get compare (#9581) 
To reduce confusion over the current timer count vs. the compare (aka "top") value. Caution: this re-uses the function name, changing its meaning.
 2018-02-10 20:42:00 -06:00
Scott Lahteine
7280fa1e31 Patch Power class 2018-02-10 15:41:18 -06:00
Scott Lahteine
e698998343 More reliable PROBING_HEATERS_OFF with BED_LIMIT_SWITCHING 2018-02-08 21:10:11 -06:00
Thomas Moore
1541224a81 Enable Z axis and delta sensorless homing (#9516) 2018-02-08 04:20:44 -06:00
Scott Lahteine
d168ee9bed Drop leveling include from steppers.cpp 2018-02-08 01:32:19 -06:00
Scott Lahteine
b5e92f4f90
[2.0.x] Enable / disable PSU automatically (#9503) 2018-02-06 00:22:30 -06:00
ABH10
ac6bf7226a Update of comments in thermistor files. No functional changes. (#8986) 2018-02-04 06:06:21 -06:00
Thomas Moore
786746404b [2.0.x] Apply feedrate to nozzle movement for kinematic machines (#8778) 2018-02-04 00:26:05 -06:00
Thomas Moore
e1fd9c08b3 [2.0.x] Add support for LPC1769 at 120 MHz (#9423) 2018-02-03 19:33:26 -06:00
Scott Lahteine
9b9350e010 Fix jerky Z motion between probes 
Suggested by #9375
 2018-02-02 02:32:11 -06:00
GMagician
ea9ad4e46d [2.0.x] Fix compile error on delta when NO_WORKSPACE_OFFSETS (#9388) 2018-02-02 01:44:48 -06:00
Scott Lahteine
c251601916 Simplified SET_BIT, moved to endstops.cpp 2018-02-02 00:34:23 -06:00
Scott Lahteine
f8227abf1c
Merge pull request #9384 from tcm0116/2.0.x-retract 
[2.0.x] Clear retracted status when homing the Z axis
 2018-02-01 23:36:36 -06:00
teemuatlut
5c69d45f5b [2.0.x] TMC2130 support for LPC platform (#9114) 2018-02-01 21:49:40 -06:00
Thomas Moore
7035471982 Clear retracted status when homing the Z axis 2018-01-29 19:40:04 +00:00
Scott Lahteine
2bea1bda56 Move more strings to PROGMEM 2018-01-24 00:06:06 -06:00
Scott Lahteine
1dcfe193ac Optimize some serial strings 2018-01-23 19:14:00 -06:00
Scott Lahteine
9644fe1839 Lightly optimize arc length calculation 2018-01-23 19:13:59 -06:00
Scott Lahteine
3217da6fa5 Followup patch for TMC stepper init 2018-01-23 14:00:06 -06:00
Scott Lahteine
db031d5d76 Add missing SoftwareSerial begin for TMC2208 
Based on #9299
 2018-01-22 10:43:24 -06:00
Scott Lahteine
f7f8569bbf Fix skew settings report precision 
Followup to changes from #8843
 2018-01-22 08:32:47 -06:00
Scott Lahteine
205c5fa078
Merge pull request #9277 from oysteinkrog/fix/DualX_Endstops 
[2.0.x] Fix DUAL_X_CARRIAGE endstop tests
 2018-01-22 07:42:49 -06:00
Scott Lahteine
90d011cc48 Use ADD_PORT_ARG for all cases 2018-01-22 06:27:22 -06:00
Scott Lahteine
51c7b5d46f Fix set_home_offset bug from bad porting 2018-01-22 06:16:21 -06:00
Scott Lahteine
61bf8478a2 Add hotEnough methods 2018-01-22 04:38:37 -06:00
Scott Lahteine
7d6c009104 Add thermistor 15 tuned for JGAurora A5 2018-01-22 01:27:11 -06:00
Scott Lahteine
382a5e3318 Clean up trailing whitespace 2018-01-21 17:19:38 -06:00
Øystein Krog
441517bbe1 Fix DUAL_X_CARRIAGE endstops 
\#8170 fixed
 2018-01-21 15:32:19 +01:00
Scott Lahteine
887664aa61 Restore broken Dual X Carriage 2018-01-20 15:08:50 -06:00
Scott Lahteine
2e2fd8fd79
Merge pull request #9261 from tcm0116/2.0.x-delta_softstops 
[2.0.x] Allow DELTA to compile with soft endstops disabled
 2018-01-20 14:16:30 -06:00
Scott Lahteine
750cc02b3a
Use delay() in serial temp report 2018-01-20 14:13:17 -06:00
Thomas Moore
44239b1062 Allow DELTA to compile with soft endstops disabled 2018-01-20 09:40:36 -06:00
Scott Lahteine
afec16e644
Merge pull request #9240 from tcm0116/2.0.x-eeprom 
[2.0.x] Follow-on to #9161
 2018-01-19 22:36:24 -06:00
Thomas Moore
429e6ba8a6 Fix lcd_preheat dummy variable types 2018-01-19 15:24:13 -06:00
Scott Lahteine
d5bf9e74c4
Merge pull request #8996 from p3p/pr_bf2_more_adc_filter 
[2.0.x] PID control fix and more LPC1768 ADC filtering
 2018-01-15 05:14:25 -06:00
Scott Lahteine
42933c804a Cleanups for STM32F7 2018-01-15 02:46:37 -06:00
Morten
a0246c5c96 Add support for STM32F7 MCU 2018-01-15 01:13:03 -06:00
Scott Lahteine
a408209d24 More reliable temperature serial report? 2018-01-15 00:43:51 -06:00
Scott Lahteine
4f5e087ff4 Planner anti-stutter by Sebastian Popp 2018-01-14 21:07:10 -06:00
Thomas Moore
cfd989d7c5 Fix EEPROM SettingsData for 32-bit architectures 2018-01-12 19:38:23 -06:00
Bob-the-Kuhn
da600e5fbe
Merge pull request #9132 from Bob-the-Kuhn/add-VIKI2-to-Travis 
[2.0.x] add VIKI2 test to Travis & fix LCD contrast (again)
 2018-01-12 00:42:04 -06:00
Thomas Moore
84de428d30 [2.0.x] Fix compile errors (#9141) 
* Update persistent_store_impl.cpp
* Remove define BYTE from serial functions since Arduino docs typically show 0 for the normal case.
 2018-01-11 21:43:26 -06:00
Bob-the-Kuhn
e633ce06c7 LCD contrast type mismatch is back 
WORKS!
 2018-01-11 10:32:58 -06:00
Thomas Moore
f7efac57b7 Multi-host support 2018-01-10 00:14:47 -06:00
Scott Lahteine
7e000e6af4
More EEPROM field debugging (#9123) 2018-01-09 18:33:44 -06:00
GMagician
5295b4713d [2.0.x] add semitec 104NT-4 (#9119) 
Table is very very similar to old 104-GT2 so I added only the name and recycled old ID
 2018-01-09 16:53:12 -06:00
Scott Lahteine
99516572b1 Fix TMC current read from EEPROM 2018-01-07 20:48:46 -06:00
Christopher Pepper
14dcad6bbc LPC1768: Increase ADC median filter from 3 values to 23 
Clarify the HAL_adc_get_result method to make sure correct values enter the filters

HAL: Fix the PID control loop for non-AVR platforms
 2018-01-07 22:15:20 +00:00
Scott Lahteine
60d07f20e7 Make mbl.has_mesh() a method 2018-01-07 00:13:36 -06:00
Scott Lahteine
2b5a9be49c
Fix M503 skew output 
Followup to 19e75ccf86
 2018-01-06 20:55:57 -06:00
Scott Lahteine
702c8acdd5 Settings FIELD_TEST fix 2018-01-05 19:13:30 -06:00
Scott Lahteine
e89f1453ab UBL G29 works without settings.load() 2018-01-05 15:48:34 -06:00
Scott Lahteine
950be70a33 Add FIELD_TEST to validate storage 2018-01-05 15:48:34 -06:00
Scott Lahteine
760c912ab9 Add data size validation 2018-01-05 15:48:34 -06:00
Scott Lahteine
b91ca168fb Add a struct defining EEPROM storage 2018-01-05 15:48:34 -06:00
Scott Lahteine
51e0f2bee3 Add MarlinSettings::validate() 2018-01-05 14:35:24 -06:00
Scott Lahteine
878f54c27b Write filler with NO_VOLUMETRICS 2018-01-05 10:29:49 -06:00
Scott Lahteine
3ea6745b36 Pretty up TMC current write 2018-01-05 10:29:49 -06:00
Scott Lahteine
1c41de16d4 Trailing whitespace clean 2018-01-05 10:11:31 -06:00
Scott Lahteine
1746a7352e
Merge pull request #9042 from thinkyhead/bf2_M701_M702 
[2.0.x] Improved Pause/Load/Unload, M701-M702
 2018-01-04 19:41:58 -06:00
Roxy-3D
3a4e107b6b
use SERIAL_EOL(); instead of new line string 2018-01-04 16:20:18 -06:00
Roxy-3D
19e75ccf86
Add enough precision so planner.xy_skew_factor doesn't print as 0.00 2018-01-04 16:02:22 -06:00
Scott Lahteine
7541316bb4 Add M701/M702 Filament Load/Unload, M603 2018-01-04 15:07:37 -06:00
Scott Lahteine
a80f2eea23 Group leveling reports for folding 2018-01-04 03:56:36 -06:00
revilor
0e93506985 Fix for issue #9005, #8942 - Bed PID autotuning (#9036) 2018-01-04 03:26:14 -06:00
Scott Lahteine
4af3d436b2 M303 pid autotune cleanup, commentary 2018-01-03 21:30:45 -06:00
Tannoo
e43f3ac989 EEPROM init fix 2018-01-03 04:31:01 -06:00
Scott Lahteine
fc67c64b8f
Merge pull request #8989 from tcm0116/2.0.x_ubl 
[2.0.x] Fix UBL compilation warnings
 2018-01-02 21:38:45 -06:00
Thomas Moore
8afc4f8d9d Fix UBL compilation warnings 2018-01-02 21:00:06 -06:00
Scott Lahteine
5e01ee8adf Temperature updates for parity with 1.1.x 2018-01-01 18:29:08 -06:00
Scott Lahteine
d80c4f1a6e Fix typo in delta call to buffer_line 
Fix #8901
 2017-12-31 01:40:07 -06:00
Scott Lahteine
5effe1590c Fix NO_VOLUMETRICS bug 2017-12-26 20:04:44 -06:00
Scott Lahteine
4b49ea1e92 General cleanup of config-store, reset_bed_level 2017-12-25 05:16:01 -06:00
Scott Lahteine
705ea98fd3 Comment return false in motion functions 2017-12-24 22:57:15 -06:00
Scott Lahteine
50366b00d5 Tweak cleaning buffer / SD finished command 2017-12-24 20:35:05 -06:00
Scott Lahteine
869c89d83f
Merge pull request #8865 from thinkyhead/bf2_more_scara_scaling 
[2.0.x] SCARA Feedrate Scaling for G2/G3 - using HYPOT
 2017-12-24 19:18:13 -06:00
Thomas Moore
2917d1217d Revert "Followup to #8698" 
This reverts commit 4e891e9fb7.
 2017-12-23 17:00:33 -06:00
Scott Lahteine
caa5093498 General DELTA_IK macro 2017-12-21 22:41:57 -06:00
Scott Lahteine
c694608450 Apply SCARA_FEEDRATE_SCALING to G2/G3 2017-12-21 22:33:27 -06:00
Scott Lahteine
97d509d4d2 Revert "Improved Core-compatible jerk code" 
Reverting commit 3cd7659
 2017-12-21 16:54:30 -06:00
Scott Lahteine
5bc2acc072 Restore position_float to fix LIN_ADVANCE 2017-12-21 16:45:46 -06:00
Scott Lahteine
913d9e9a59 Matching sign across filwidth vars 2017-12-20 00:17:19 -06:00
Scott Lahteine
fdc5e72720 A single setting to validate filament width 2017-12-19 21:33:25 -06:00
Scott Lahteine
933f76fda3 Option to disable all volumetric extrusion 2017-12-19 19:51:25 -06:00
Scott Lahteine
fc9ee1a4de Fix up serial sanity check 2017-12-19 19:11:43 -06:00
Scott Lahteine
de5ca96654 More parity with 1.1.x, plus whitespace 2017-12-19 18:36:16 -06:00
Scott Lahteine
8df5955da4 Revert "Reset timer count before first block step" 
This reverts commit 5cf6a062e3.
 2017-12-17 02:37:35 -06:00
teemuatlut
0cd1e91056 [2.0.x] TMC driver update (#8769) 2017-12-15 15:03:14 -06:00
Scott Lahteine
09d13f186f
Correct unskew, after all 2017-12-15 14:24:20 -06:00
Dave Johnson
0d531d9655 Missing HAS_HEAT_BED conditional 
Fixes issue found in #8779
 2017-12-15 11:33:37 -08:00
Scott Lahteine
368c124de8 Fix Planner::unskew parity with skew 2017-12-13 17:46:48 -06:00
Scott Lahteine
cf2193c07f Comment, fix filament width sensor 2017-12-13 02:32:34 -06:00
Scott Lahteine
24f9bec6f4 UBL + DUAL_X_CARRIAGE compatibility 2017-12-11 03:08:18 -06:00
Scott Lahteine
3255712343 Skew Correction for UBL 
Also remove unused grid slicing function when using UBL segmented.
 2017-12-11 03:08:15 -06:00
Scott Lahteine
3db5303bfe _buffer_line => buffer_segment 2017-12-11 00:27:06 -06:00
Scott Lahteine
a71d2f3f40 UBL_DELTA => UBL_SEGMENTED 2017-12-11 00:27:06 -06:00
Scott Lahteine
73e32925e4 References are better for array args 2017-12-11 00:27:06 -06:00
victorpv
a5150c83a2 [2.0.x] Multiple updates to STM32F1 HAL (#8733) 
* STM32F1 HAL

Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.

* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards

On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.

* Add support for EEPROM emulation using Flash

Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.

* Basic Pins for a malyan M200

This is a work in progress to go hand in hand with the STM32 work.

* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.

* Missing file - change HAL_adc_init to actually do something

We have an actual ADC init function now.

* Remove pinmode hack

Remove the pin mode hack that I was using to init PA0.

Updated Readme.md

* Several changes to timers and GPIO

Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.

Switch all enums to be within #defines

This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.

* Update Malyan M200 pins

Update Malyan M200 pins with correct fan values.

* Test all pins on actual hardware, update definitions

Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.

* Update HAL_timers_Stm32f1.cpp

* Add sample configurations for Malyan M200

Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.


Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.


readme.md update

* Updates to timers, and some stm32 boards definitiions

* Correct pin toggle macro.

* Remove duplicated Malyan M200 entry from pins.h

* Update configuration_store.cpp

* Formatting, indentation

* Formatting in HAL_Stm32f1.cpp
 2017-12-10 23:12:45 -06:00
Scott Lahteine
204199e1ce Only compare XYZ to check motion 2017-12-10 23:00:00 -06:00
Scott Lahteine
6686d937fb Always report position on config load/reset 2017-12-10 21:47:14 -06:00
Scott Lahteine
03ba79f144 Sync and report changed position 2017-12-10 21:39:49 -06:00
Scott Lahteine
5cf6a062e3 Reset timer count before first block step 2017-12-10 18:38:53 -06:00
Scott Lahteine
82ef6b5242 Add an option to specify "pulse" timer 2017-12-10 18:38:53 -06:00
Scott Lahteine
4fa65a5c25 TCNT0 => HAL_timer_get_current_count 
Fix #8710
 2017-12-08 22:35:28 -06:00
AnHardt
b3daf6b5db [2.0.x] better reverse pass (#8722) 
* repair reverse_pass()

And make it readeble.
This was broken a long time ago.
Not competely unfunctional but far from optimal.

* Minor speedup when calling calculate_trapezoid_for_block

2 float / to 1 foat / and 2 float *

* Various style changes
 2017-12-08 21:38:45 -06:00
Bob-the-Kuhn
65d0f32f82 divide only when required 2017-12-08 18:14:27 -06:00
Scott Lahteine
728acf521c Followup to #8706 2017-12-08 03:49:33 -06:00
Scott Lahteine
85c6ffbe0d Discard all "continued" blocks on interrupted move 2017-12-08 02:32:58 -06:00
Scott Lahteine
4e891e9fb7 Followup to #8698 2017-12-08 01:01:12 -06:00
Scott Lahteine
de3d3b9cb1 Put FORCE_INLINE before static 2017-12-08 00:46:22 -06:00
Scott Lahteine
ae663a4198 PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING 2017-12-07 16:44:13 -06:00
Scott Lahteine
3cd7659924 Improved Core-compatible jerk code 2017-12-06 23:57:57 -06:00
Scott Lahteine
81c0a918af feed_factor => inverse_secs 2017-12-06 23:03:33 -06:00
Scott Lahteine
9898b96992 No lcd_map_control flag in quick_stop 2017-12-06 22:23:34 -06:00
Scott Lahteine
840289e7cc Use block cleaning instead of split flag 2017-12-06 22:22:58 -06:00
Scott Lahteine
2fde60da12 Changes for parity with 1.1.x 2017-12-06 21:50:54 -06:00
Scott Lahteine
6040d4080e Cleanup stepper ISR. Allow cleaning for endstops. 2017-12-06 21:23:37 -06:00
Scott Lahteine
a4e1d83599 Fix M503 S parameter 2017-12-06 21:23:37 -06:00
AnHardt
a993c5227d Don't split first_move while homing or probing 
While homing or probing it might be bad if the stop/trobe triggers during the first part and the second is still in the buffer.
 2017-12-06 14:13:05 +01:00
Scott Lahteine
5fbb2f121e Remove skew warning that could crash the planner 2017-12-05 20:27:20 -06:00
Richard Wackerbarth
c1184552ac Change K1 to required option PID_K1 2017-12-05 19:59:59 -06:00
Scott Lahteine
d8b444c144 Cleanup constextpr in planner.cpp 2017-12-05 18:55:57 -06:00
Scott Lahteine
a2372cfab5 Fix SKEW_CORRECTION without leveling 2017-12-05 18:48:34 -06:00
Scott Lahteine
b27bc67271 Set initial endstops state 2017-12-05 01:10:31 -06:00
Scott Lahteine
53694ebaa1 Folllwup to planner splitting 2017-12-04 18:55:23 -06:00
Scott Lahteine
4b612f590c Split first move to planner for better chaining 2017-12-04 15:27:47 -06:00
Scott Lahteine
dd8febca1a Revert "Merge pull request #8611 from thinkyhead/bf2_planner_split_first" 
This reverts commit 824980e70e, reversing
changes made to aa7efb96bf.
 2017-12-03 17:50:19 -06:00
Scott Lahteine
3a97de52ef Split first move to planner for better chaining 
Address #8573, #8595
 2017-12-03 01:27:14 -06:00
Scott Lahteine
63a91cd37a Fix a homing comment 2017-12-02 21:02:37 -06:00