Commit graph

9251 commits

Author SHA1 Message Date
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 3d796d8040 Move debug code 2017-12-11 00:27:06 -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
Scott Lahteine 125c572d97 Tweak M114 detail 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 f53e0702fc
Merge pull request #8747 from thinkyhead/bf2_sync_M420_M852
[2.0.x] M852 changes position. Position change reporting.
2017-12-10 22:40:32 -06:00
Scott Lahteine 6686d937fb Always report position on config load/reset 2017-12-10 21:47:14 -06:00
Scott Lahteine 117fc872a7 Update current position in M852 2017-12-10 21:39:49 -06:00
Scott Lahteine 7d2e850577 Have M420 report a changed position 2017-12-10 21:39:49 -06:00
Scott Lahteine 03ba79f144 Sync and report changed position 2017-12-10 21:39:49 -06:00
Scott Lahteine 11f9c253e0
Merge pull request #8736 from thinkyhead/bf2_first_step_fix
[2.0.x] Reset timer count before first block step
2017-12-10 19:02:22 -06:00
Scott Lahteine 5cf6a062e3 Reset timer count before first block step 2017-12-10 18:38:53 -06:00
Scott Lahteine 6149b82119 Allow setting current timer counter 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 b8bc965414 General cleanup HAL timers 2017-12-10 18:38:52 -06:00
Scott Lahteine 69d49a2438 Shorter segments may be better 2017-12-09 06:29:14 -06:00
Scott Lahteine 9b800b7fbe
Merge pull request #8726 from thinkyhead/bf2_minirambo_10a
[2.0.x] Add board Mini RAMBo 1.0a
2017-12-09 00:06:05 -06:00
Scott Lahteine d576f5408e Add MiniRAMBo 1.0a board 2017-12-08 23:42:16 -06:00
Scott Lahteine c40cb52342 Use MB() for Megatronics 3.1 2017-12-08 23:42:16 -06:00
Scott Lahteine a2ac452ef9
Merge pull request #8725 from thinkyhead/bf2_hal_timer_for_advance
[2.0.x] TCNT0 => HAL_timer_get_current_count
2017-12-08 23:05:06 -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
Roxy-3D f58eb391aa [2.0.0] Better off mesh behavior for UBL (#8714)
* Better off mesh behaviour for UBL

* Suggested ubl.h changes
2017-12-08 19:00:59 -06:00
Jonathan Barchi cffd052fee [2.0.x] Fix for #8604 (#8717)
* Nozzle.cpp: replace incorrect M_2_PI (2/pi) with 2.0 * M_PI

* Use RADIANS(360) instead of 2 * M_PI
2017-12-08 18:50:05 -06:00
Bob-the-Kuhn 79c402b052
Merge pull request #8719 from Bob-the-Kuhn/2.0.x-planner-speed-improvement
[bugfix-2.0.x] minor planner.cpp speed improvement (follow up to COREXY stutter changes PR #8698)
2017-12-08 18:40:36 -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 206866ebb3
Merge pull request #8708 from thinkyhead/bf2_splits_are_expendable
[2.0.x] Discard "continued" blocks on interrupted move
2017-12-08 03:35:09 -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 43ea265b78
Merge pull request #8685 from MateuszKrawczuk/patch-3
Update TEMP_BED_PIN in MIGHTYBOARD_REVE
2017-12-07 21:50:35 -06:00
Scott Lahteine 9d65e61f39
Merge pull request #8706 from thinkyhead/bf2_multi_probe
[2.0.x] MULTIPLE_PROBING — Why stop at 2?
2017-12-07 21:21:38 -06:00
Scott Lahteine ae663a4198 PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING 2017-12-07 16:44:13 -06:00
Scott Lahteine d7800e7975 Apply MULTIPLE_PROBING to example configs 2017-12-07 16:44:12 -06:00
Scott Lahteine 542efda7db
Merge pull request #8698 from thinkyhead/bf2_replace_jerk_code
[2.0.x] Improved Core-compatible jerk code
2017-12-07 00:17:00 -06:00
Scott Lahteine 438c21ad5c
Merge pull request #8693 from GMagician/2.x-address-#8644
[2.x] Address #8644
2017-12-07 00:05:02 -06:00
Scott Lahteine 3cd7659924 Improved Core-compatible jerk code 2017-12-06 23:57:57 -06:00
GMagician 99fcf60977 [2.x] addressing #8644
Removed missing include file
2017-12-06 23:49:30 -06:00
Scott Lahteine 81c0a918af feed_factor => inverse_secs 2017-12-06 23:03:33 -06:00
Scott Lahteine f206b81cf7 Sanity check skew+UBL 2017-12-06 22:56:58 -06:00
Scott Lahteine 60e7951312
Merge pull request #8691 from thinkyhead/bf2_clean_blocks_on_trigger
[2.0.x] Purge blocks on endstop/probe hit
2017-12-06 22:39:43 -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 d163c4b530
Merge pull request #8695 from thinkyhead/bf2_fixes_DEC6
[2.0.x] Cleanup, bugfixes, parity with 1.1.x
2017-12-06 22:22:35 -06:00
Scott Lahteine 90cf6a06be Simplify G26 user_canceled 2017-12-06 22:02:54 -06:00
Scott Lahteine cdfabbc507 Shorten error text in G29 2017-12-06 21:50:54 -06:00