Commit Graph

10136 Commits

Author SHA1 Message Date
Scott Lahteine
097a26007f Fix SDSUPPORT for MKS SBASE
Fix supplied by @cjsoong in https://github.com/MarlinFirmware/Marlin/issues/8750#issuecomment-350779983
2017-12-17 03:05:33 -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
Scott Lahteine
957bbab57f Update inc files for parity with 1.1.x 2017-12-16 20:20:06 -06:00
Scott Lahteine
f79026acc1 Apply MKS_12864OLED_SSD1306 to examples
Followup to #8814
2017-12-16 20:15:36 -06:00
Unknown
502258aa5f Validate example configs with CircleCI
Runs in parallel to TravisCI and runs *much* faster on same jobs.  Finishes all examples configs in <8 min on cache hit; <10 min on cache miss.  Cache miss is triggered on platformio.ini change. I'd suggest move to it entirely, but it is limited to just 1500 min of runtime per month and it isn't clear yet how much Marlin would need so suggest we implement in parallel like this, then observe.  If the example builds don't catch issues, and 1500 min turns out to be plenty, we can switch to implimenting standard arsenal of tests in CircleCI and ditch TravisCI to gain speed improvement (although I do like seeing the varied Travis avatars staring at me ;).

I agree that hand-crafted tests would be better, but until we have that, this can't hurt.

After merging, you'll need to add Marlin project to CircleCI at: https://circleci.com
Example results at: https://github.com/fiveangle/Marlin/commits/bf-circleci_config
2017-12-16 19:32:50 -06:00
Dan Delaney
b055d8c39c [2.0.x] Adding support for using the MKS_12864OLED with the SSD1306 controller (#8814)
* Adding support for using the MKS_12864OLED with the SSD1306 controller

* Update comment for correct controller type
2017-12-16 18:47:04 -06:00
Scott Lahteine
2690ce7a96 Fix use_example_configs to handle spaces in path 2017-12-16 17:29:35 -06:00
Scott Lahteine
1de7c75590
Merge pull request #8799 from thinkyhead/bf2_zonestar_tronxy
[2.0.x] Support for Tronxy and Zonestar LCD
2017-12-15 19:55:36 -06:00
Scott Lahteine
15d05748df Adding support for the Tronxy and Zonestar LCD 2017-12-15 19:13:52 -06:00
Scott Lahteine
9abbcc3ee0 Apply ZONESTAR_LCD to example configs 2017-12-15 19:11:02 -06:00
Scott Lahteine
20008b72a8
Merge pull request #8784 from fiveangle/bf2-travis_examples_squashed
[2.0.x] Fix example configs and add to TravisCI tests - squashed
2017-12-15 17:34:34 -06:00
Dave Johnson
aed0cfa3d1 Various fixes for 2.0.x configs 2017-12-15 17:09:46 -06:00
Scott Lahteine
f9aa1daa0d
Merge pull request #8793 from robpower/NanoDLP_Sync_improvement_2
[2.0.x] V2 Extended NanoDLP_Z_Move_Sync to G4 & G28,Added all axis option.
2017-12-15 16:42:29 -06:00
Scott Lahteine
674deaf223 Add NANODLP_ALL_AXIS to config examples 2017-12-15 16:22:56 -06:00
robpower
5595098063 V2 Extended NanoDLP_Z_Move_Sync to G4 & G28,Added all axis option. 2017-12-15 16:22:55 -06:00
Scott Lahteine
2b7db90340 Bring Malyan M200 config up to date 2017-12-15 15:47:22 -06:00
Scott Lahteine
8b12371e45 Change some hex case 2017-12-15 15:47:22 -06:00
Scott Lahteine
4782acf60e
Merge pull request #8780 from fiveangle/bf2-typo
[2.0.x] typo in Marlin.cpp
2017-12-15 15:25:41 -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
Scott Lahteine
c5632bb91b
Merge pull request #8792 from fiveangle/bf2-HAS_HEAT_BED_conditional
[2.0.x] Missing HAS_HEAT_BED conditional
2017-12-15 14:18:48 -06:00
Dave Johnson
0d531d9655 Missing HAS_HEAT_BED conditional
Fixes issue found in #8779
2017-12-15 11:33:37 -08:00
Dave Johnson
69efb87d19 typo in Marlin.cpp 2017-12-14 08:20:45 -08:00
Scott Lahteine
368c124de8 Fix Planner::unskew parity with skew 2017-12-13 17:46:48 -06:00
Scott Lahteine
21a7b4f26d
Merge pull request #8773 from thinkyhead/bf2_filwidth_refinement
[2.0.x] Comment, fix filament width sensor
2017-12-13 16:26:11 -06:00
Scott Lahteine
cf2193c07f Comment, fix filament width sensor 2017-12-13 02:32:34 -06:00
Scott Lahteine
a641992c1d
Merge pull request #8762 from victorpv/patch-2
[2.0.x] STM32F1 HAL: Fix issue #8585. Updates to readme.
2017-12-12 18:28:18 -06:00
Eduardo José Tagle
ac168a03c8 Fixes for the Arduino DUE HAL (Serial Port, Graphics Display, EEPROM emulation) (#8651)
* Fixing the DUE serial port assignments: Now -1 means the SAM3x USB Device emulating a serial port, and 0 means the USB to serial adapter included as a programming port

* Improving the Fast IO port access implementation on Arduino DUE

* Implemented EEPROM emulation on Due by storing data on the internal FLASH (with wear leveling)

* Implemented a Software SPI for the ST7920 graphics display for the Arduino RAMPS for DUE, as the default one in u8glib is clocking data too fast on ARM, and the display does not understand it.

* Fixing the case where the serial port selected is the USB device

* Adding configuration for the Makerparts 3D printer (www.makerparts.net)

* Tuned MakerParts acceleration on X and Y axis so it never loses steps. Also adjusted pulses per mm to match default hw configuration

* Fine tuned Maximum acceleration for MakerParts printer

* Style cleanup

* Style cleanup (2)

* Style fixes (3)

* Fixing the DUE serial port assignments: Now -1 means the SAM3x USB Device emulating a serial port, and 0 means the USB to serial adapter included as a programming port

* Improving the Fast IO port access implementation on Arduino DUE

* Implemented EEPROM emulation on Due by storing data on the internal FLASH (with wear leveling)

* Implemented a Software SPI for the ST7920 graphics display for the Arduino RAMPS for DUE, as the default one in u8glib is clocking data too fast on ARM, and the display does not understand it.

* Fixing the case where the serial port selected is the USB device

* Adding configuration for the Makerparts 3D printer (www.makerparts.net)

* Tuned MakerParts acceleration on X and Y axis so it never loses steps. Also adjusted pulses per mm to match default hw configuration

* Fine tuned Maximum acceleration for MakerParts printer

* Style cleanup

* Style changes to u8g_dev_st7920_128_64_sw_spi.cpp

* Even more improvements to the FastIO HAL for DUE. Now WRITE() is 2 ASM instructions, if value is constant, and 5 cycles if value is not constant. Previously, it was 7..8 cycles

* After some problems and debugging, seems we need to align the interrupt vector table to 256 bytes, otherwise, the program sometimes stops working

* Moved comments out of macro, otherwise, token pasting does not properly work sometimes

* Improved Software SPI implementation on DUE: Now it honors the selected speed passed to spiInit(). This allows much faster SDCARD access, improving SDCARD menus and reducing latency

* Update u8g_dev_st7920_128_64_sw_spi.cpp

* Disabling EEPROM over FLASH emulatiion if an I2C or SPI EEPROM is present
2017-12-12 17:51:36 -06:00
victorpv
084f2434a7
Update readme.md 2017-12-11 23:14:13 -06:00
victorpv
7c7ae5ebef
Delete duplicated file. 2017-12-11 23:10:44 -06:00
victorpv
4feffca178
fix for issue #8585
As reported in this issue:
https://github.com/MarlinFirmware/Marlin/issues/8585
I have it working fine in my local copy like that change.
2017-12-11 23:07:39 -06:00
Scott Lahteine
c555a214d2
Merge pull request #8730 from thinkyhead/bf2_fixup_ubl
[2.0.x] UBL - Skew and Dual X Carriage
2017-12-11 03:37:13 -06:00
Scott Lahteine
d568e586b7 Fix up ubl_motion indentation 2017-12-11 03:08:45 -06:00
Scott Lahteine
24f9bec6f4 UBL + DUAL_X_CARRIAGE compatibility 2017-12-11 03:08:18 -06:00
Scott Lahteine
6d0678d963 Omit unused UBL motion code 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
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