Skip to content

Commit

Permalink
Update bug fixes (#4)
Browse files Browse the repository at this point in the history
* MKS WiFi preliminary changes

* More MKS WiFi

* MKS WiFi strings

* Fix Z label

* Windows LPC Upload for non-admins (MarlinFirmware#20208)

Co-authored-by: Victor Mateus Oliveira <[email protected]>
Co-authored-by: Scott Lahteine <[email protected]>

* Fix DAC setDrvPct (MarlinFirmware#20205)

* [cron] Bump distribution date (2020-11-20)

* Longer LK Pro / Alfawise PRO board (MarlinFirmware#20185)

* Missing header to use suicide() on LVGL UI (MarlinFirmware#20214)

* SINGLE_TOUCH_NAVIGATION Follow Up (MarlinFirmware#20213)

* Printrboard labels

* [cron] Bump distribution date (2020-11-21)

* Fix backward Filament (Presence) Sensor pulls (MarlinFirmware#20228)

Co-authored-by: Kurt Haenen <[email protected]>
Co-authored-by: Scott Lahteine <[email protected]>

* Fix bad SET_FAST_PWM_FREQ calls (MarlinFirmware#20227)

* Superscript substitution (MarlinFirmware#20219)

Co-authored-by: Scott Lahteine <[email protected]>

* Power-Loss cleanup

* BTN_ENC_EN for many boards (MarlinFirmware#19890)

Enables CHECK_ENCODER_ACTIVE_SIGNAL for many more boards.

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Jason Smith <[email protected]>

* Skip unnecessary (costly) SW Stepper Enable (MarlinFirmware#20218)

Co-authored-by: Jason Smith <[email protected]>
Co-authored-by: Scott Lahteine <[email protected]>

* Fix Load Filament wait (MarlinFirmware#20243)

* Proper pullup/pulldown configurability (MarlinFirmware#20242)

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2020-11-22)

* Clear menu history for browse media on insert (MarlinFirmware#20236)

Co-authored-by: Scott Lahteine <[email protected]>

* Put "$3" on all tests

* Move core conditionals earlier

* Hide docker droppings

* [cron] Bump distribution date (2020-11-23)

* Fix UBL manual mesh adjust behavior (MarlinFirmware#20248)

* Allow Status Message without LCD (MarlinFirmware#20246)

* Fix dummy thermistors for Bed, Chamber, Probe (MarlinFirmware#20247)

* Fix Z4 in ENABLE/DISABLE_AXIS_Z (MarlinFirmware#20256)

This was accidentally broken in PR MarlinFirmware#20218

* [cron] Bump distribution date (2020-11-24)

* LCD position in current units (MarlinFirmware#20145)

* Set "lcd_move_e" index to fix the label (MarlinFirmware#20263)

* Allow cold Filament Load/Unload with M302 P1 (MarlinFirmware#20262)

Co-authored-by: Scott Lahteine <[email protected]>

* No Z_MULTI_ENDSTOPS when HOMING_Z_WITH_PROBE (MarlinFirmware#20254)

* Consistent Probe XY offset type

* Cosmetic G29 ABL tweak

* [cron] Bump distribution date (2020-11-25)

* Update TOUCH_UI_LULZBOT_BIO wrappers

* add missing header to use HAS_SD_HOST_DRIVE (MarlinFirmware#20270)

* Fix COLOR_UI without TOUCH_SCREEN_CALIBRATION (MarlinFirmware#20269)

* [cron] Bump distribution date (2020-11-26)

* Probe Offset Wizard improvements (MarlinFirmware#20239)

* Reduce warnings, extern "C" cleanup (MarlinFirmware#20279)

* Retire HAL for STM32F4 / F7 (MarlinFirmware#20153)

* Tweak some pin errors

* MKS Robin E3 / E3D v1.1 (MarlinFirmware#20216)

* Finish HAL/STM32 cpp wrappers

* No auto debug for EEPROM_CHITCHAT

* Optimize emergency parser check

* Level Corners with Probe option (MarlinFirmware#20241)

* [WIP] Fix Probe::offset_xy (MarlinFirmware#20290)

Co-authored-by: Jason Smith <[email protected]>

* [cron] Bump distribution date (2020-11-27)

* M808 Repeat Markers (MarlinFirmware#20084)

* FIX TMC menu message (MarlinFirmware#20294)

* Fix BTT GTR 1.0 endstop/DIAG pins (MarlinFirmware#20296)

* Fix G2/G3 arcs > 180° (MarlinFirmware#20292)

* Group related homing options (MarlinFirmware#20283)

Co-authored-by: Scott Lahteine <[email protected]>

* Fix M73 LCD code typo (MarlinFirmware#20300)

* [cron] Bump distribution date (2020-11-28)

* [cron] Bump distribution date (2020-11-29)

* Arc Direction followup for circles (MarlinFirmware#20314)

* SKR E3 Turbo Controller Fan (MarlinFirmware#20320)

* Fix STM32F1 'freeMemory()' warnings (MarlinFirmware#20319)

* Leveling Fade Height default setting (MarlinFirmware#20316)

* [cron] Bump distribution date (2020-11-30)

* Adjust axis homed / trusted methods (MarlinFirmware#20323)

* General cleanup

* Increase E3V2 DWIN steps/mm range to 999.9 (MarlinFirmware#20324)

* [cron] Bump distribution date (2020-12-01)

* Prevent Watchdog reset writing Creality 4.x EEPROM (MarlinFirmware#20328)

* Fix E3V2 Control Menu when returning from Info (MarlinFirmware#20338)

* Tweak to EEPROM safe delay

* [cron] Bump distribution date (2020-12-02)

* Level Bed Corners is a sub-menu

* Update to STM32 v10, optimize build (MarlinFirmware#20325)

* Help hosts when password-locked (MarlinFirmware#20348)

* Fix E3V2 DWIN Jerk Menu (MarlinFirmware#20352)

* Fix E3V2 DWIN build without CLASSIC_JERK
* Fix jerk edits applying to wrong index

* Permit SD EEPROM emulation on E3V2 (MarlinFirmware#20353)

* [cron] Bump distribution date (2020-12-03)

* Fix circle arc condition (MarlinFirmware#20322)

* Fix up start, monitor baud (MarlinFirmware#20326)

* Consolidate common pin includes

* Require minimum PlatformIO version (MarlinFirmware#20361)

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Jason Smith <[email protected]>

* [cron] Bump distribution date (2020-12-04)

* Fix MESH_BED_LEVELING w/o SEGMENT_LEVELED_MOVES (MarlinFirmware#20363)

* Loosen E on pause for fila-manipulation (MarlinFirmware#20346)

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2020-12-05)

* Don’t use near keyword as variable name (MarlinFirmware#20374)

* Improved Longer3D LKx Pro board (MarlinFirmware#20372)

Co-authored-by: mrv96 <[email protected]>

* Fix TMC_HOME_PHASE divide by zero (MarlinFirmware#20368)

* Suspend Servos for STM32+NeoPixel (MarlinFirmware#19963)

* Add Creality 4.5.2 board (MarlinFirmware#20378)

Co-authored-by: Jason Smith <[email protected]>

* [cron] Bump distribution date (2020-12-06)

* Fix FYSETC S6 I2C EEPROM size (MarlinFirmware#20340)

Both V1.2 and V2.0 boards have a 24LC16, which is a 2kB EEPROM.

Co-authored-by: PingWin <[email protected]>
Co-authored-by: Jason Smith <[email protected]>

* Creality 4.5.2 format and fix

* Use 'nearby' for 'near'

* ExtUI homing / leveling additions

* Move G29 3-point startup earlier

* Fix STM32F1 SERIAL_GET_TX_BUFFER_FREE

* G28 tweaks

* G28 followup

* Avoid invalid memory optimizations (MarlinFirmware#20389)

When building for AVR, merge-all-constants can incorrectly combine constants stored in flash with constants stored in RAM. These have different access requirements, leading to undefined behavior during execution.
Co-authored-by: ellensp <[email protected]>

* [cron] Bump distribution date (2020-12-07)

* Fix fileExists, use openFailed

* Watch idle() depth over 5

* More LPC P-string macros

* Fix auto#.g file handling, add NO_SD_AUTOSTART (MarlinFirmware#20071)

* Shorten Filament Load/Unload Strings to Fit on Graphical Displays (MarlinFirmware#20369)

Co-authored-by: ellensp <[email protected]>
Co-authored-by: Victor Mateus Oliveira <[email protected]>

* Allow BTT EXP-MOT be used with Displays that needs only EXP 1 (MarlinFirmware#20396)

Co-authored-by: ellensp <[email protected]>
Co-authored-by: Victor Mateus Oliveira <[email protected]>

* [cron] Bump distribution date (2020-12-08)

* SPI TFT for STM32F4 boards (MarlinFirmware#20384)

* fix pinsDebug for F1 boards

* add MKS Robin PRO V2 board - development board

* tft spi working with F4 boards

* pins formating

* sanity check for TFT on supported cores in STM32

* Fix tabs/spaces in pins file

Co-authored-by: Jason Smith <[email protected]>

* [cron] Bump distribution date (2020-12-09)

* Style, spacing, typo cleanup for recent changes

* Clarify Delta & SCARA config location (MarlinFirmware#20403)

* Allow positive Z nozzle to probe offset (MarlinFirmware#20344)

* Allow a positive value for z offset from nozzle to probe without sanity checks
* Simplify menu_probe_offset.cpp (HOMING_Z_WITH_PROBE)
* Add some more explanation to Configuration Files
* Raise after probe_at_point as if homed

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Jason Smith <[email protected]>

* Fix Spindle/Laser Control menu (MarlinFirmware#20347)

* Fixes and additions to FTDI EVE Touch UI (MarlinFirmware#20393)

- Fixed name conflict with "SUBSCRIPT_TWO"
- Fixed rendering bugs in "Leveling Menu"
- Only show "Bed Mesh Screen" when UBL is enabled
- Removed CocoaPress code from generic "Main Menu"
- Removed CocoaPress code from LulzBot Bio "Status" screen
- Moved generic "Move Axis" functionality into a base class
- Added CocoaPress custom screens:
   - Status Screen
   - Unload Cartridge
   - Load Chocolate
   - Main Menu
   - Advanced Settings
   - XYZ Move (based on "Move Axis" base class)
   - Extrusion Move (based on "Move Axis" base class)
- CocoaPress tweaks to "Temperature" screen
- Fix FTDI EVE Touch UI compilation errors when not using leveling.

* Move ExtUI ABL mesh edit, limit to bilinear (MarlinFirmware#20381)

* Move ExtUI call

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Victor Mateus Oliveira <[email protected]>
Co-authored-by: Sebastiaan Dammann <[email protected]>

* MKS Robin Pins fixes for STM32 and STM32F1 (MarlinFirmware#20404)

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2020-12-10)

* Clarify "not Interrupt-capable" error message (MarlinFirmware#20419)

* Fix UBL Debug Messages (MarlinFirmware#20423)

Co-authored-by: ellensp <[email protected]>

* [cron] Bump distribution date (2020-12-11)

* Z_SENSORLESS sanity checks (MarlinFirmware#20421)

Co-authored-by: Jason Smith <[email protected]>

* Probe offset wizard fixes (MarlinFirmware#20414)

* STOW probe, reverting incorrect earlier change from MarlinFirmware#20344
* Adjust soft endstop disables, to ensure travel below bed functions properly

Co-authored-by: FanDjango <[email protected]>

* SENSORLESS_PROBING sanity check followup (MarlinFirmware#20438)

* [cron] Bump distribution date (2020-12-12)

* Better animated boot screen

* Fix SDCARD_SORT_ALPHA on Ender 3 V2 (MarlinFirmware#20443)

* Add HAS_PIN_27_BOARD for CREALITY_V4 (MarlinFirmware#20446)

Co-authored-by: ellensp <[email protected]>

* Improve ASSISTED_TRAMMING_WIZARD probe stowing (MarlinFirmware#20437)

* When BLTOUCH_HS_MODE enabled, stow pin before user interaction
* For all probes, ensure probe stows at end of wizard

* [cron] Bump distribution date (2020-12-13)

* Probe Offset Wizard followupBack to PROBE_PT_RAISE/separate STOW, make "PROBING" msg appear (MarlinFirmware#20439)

* Go back to always use PROBE_PT_RAISE with a discrete stow. This ensures a raise above the bed, while stowing prior to exiting the wizard.
* Fix issue preventing text while moving to X/Y position
Co-authored-by: FanDjango <[email protected]>

* Adjust planner debugging

* SHORT_MANUAL_Z_MOVE => FINE_MANUAL_MOVE

* [cron] Bump distribution date (2020-12-14)

* LPC176x framework update (MarlinFirmware#20469)

* [cron] Bump distribution date (2020-12-15)

* Fix formatting

* Preheat before leveling

* Always enable leveling after G28

* Trust that script -x flags will always be set (MarlinFirmware#20453)

* Fix M1001 auto-check logic (MarlinFirmware#20456)

* Auto-check followup

* Please install the EditorConfig plugin

* Fix RESTORE_LEVELING_AFTER_G28 (MarlinFirmware#20471)

* Creality v4.5.3 (CR-6 SE, CR-6 MAX) (MarlinFirmware#20468)

* Update some pins errors

* Update some LCD includes

* Trust STM32 gcc versions

* [cron] Bump distribution date (2020-12-16)

* Update Italian language (MarlinFirmware#20480)

* Update Hungarian language

Co-Authored-By: Zs.Antal <[email protected]>

* Update French language (MarlinFirmware#20472)

* [cron] Bump distribution date (2020-12-17)

* Use homing_feedrate function

* Homing feedrates as XYZ array (MarlinFirmware#20426)

Co-authored-by: Scott Lahteine <[email protected]>

* Fix ZoneStar LCD 2004 buttons (MarlinFirmware#20489)

* Make M220 B / R a standard feature (MarlinFirmware#20355)

* Balance CI tests (MarlinFirmware#20485)

* Fix and optimize MightyBoard (MarlinFirmware#20493)

* [cron] Bump distribution date (2020-12-18)

* MKS Robin Nano V3 and STM32F4x0Vx Variant (MarlinFirmware#20430)

* DOGM: Slow down touchscreen calibration (MarlinFirmware#20454)

* [cron] Bump distribution date (2020-12-19)

* Rename QUIET_PROBING

* Tweaks for pins_BTT_SKR_common.h

* [cron] Bump distribution date (2020-12-20)

* Let boards set Default TMC Slave Addresses (MarlinFirmware#20498)

Co-authored-by: Scott Lahteine <[email protected]>

* Minimum temp options for Probing and G12 Nozzle Clean (MarlinFirmware#20383)

Co-authored-by: Jason Smith <[email protected]>
Co-authored-by: Scott Lahteine <[email protected]>

* Probe Tare, Probe Activation Switch (MarlinFirmware#20379)

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Victor Mateus Oliveira <[email protected]>
Co-authored-by: Jason Smith <[email protected]>

* Fix Creality EEPROM watchdog freq. (MarlinFirmware#20510)

* Migrate Hispeedv1 (QQS-Pro) to HAL/STM32 (MarlinFirmware#20354)

* Languages cleanup

* Update Russian and Ukrainian languages (MarlinFirmware#20508)

* Fix PIO typo

* [cron] Bump distribution date (2020-12-21)

* Get E3V2 DWIN `MACHINE_SIZE` from config (MarlinFirmware#20526)

* Apply HOME_AFTER_DEACTIVATE for 'G28 O' (MarlinFirmware#20525)

* Clean up some pins

* Add BTT SKR CR6 board (MarlinFirmware#20522)

* Fix G34 compile with bed leveling disabled (MarlinFirmware#20537)

* Fix some Russian (MarlinFirmware#20529)

* Robin pins followup

* Tweak FTDI spacing

* Add Tune -> Advanced Settings to FTDI EVE (MarlinFirmware#20532)

* [cron] Bump distribution date (2020-12-22)

* 12-bit ADC resolution for STM32 (MarlinFirmware#20519)

* FTDI EVE custom user menus (MarlinFirmware#20518)

* Improve STM32 timer conflict messages (MarlinFirmware#20544)

* Fix UBL mesh inset Z position (MarlinFirmware#20538)

* Overrides to prevent STM32 timer conflicts (MarlinFirmware#20545)

* Improve Touch Calibration screen (MarlinFirmware#20524)

* Creality v4.3.1 (Ender 6) board (MarlinFirmware#20512)

* Anet ET4 / ET4P and Anet TFT28 / TFT35 (MarlinFirmware#20280)

* STM32F1xx support for TFTGLCD (MarlinFirmware#20515)

* Unify FYSETC F6 1.3 / 1.4 (MarlinFirmware#20507)

Co-authored-by: Scott Lahteine <[email protected]>

* Fix G28 leveling state, UBL compile (MarlinFirmware#20499)

* Support RGBW on PCA9632 (MarlinFirmware#20455)

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2020-12-23)

* Refactor 'Level Corners with Probe' (MarlinFirmware#20460)

Co-authored-by: Scott Lahteine <[email protected]>

* Improve plan_arc circle detection (MarlinFirmware#20440)

Co-authored-by: Scott Lahteine <[email protected]>

* FTDI EVE: Cyrillic font, some minor fixes (MarlinFirmware#20517)

* Enhanced Italian language (MarlinFirmware#20551)

* Probe Activation Switch followup (MarlinFirmware#20550)

* Support ANET_FULL_GRAPHICS_LCD_ALT_WIRING on BTT SKR 1.4 (MarlinFirmware#20427)

* Apply ENABLED in ExiUI / FTDI

* Remaining Time for FTDI EVE, bp for ExtUI (MarlinFirmware#20549)

Co-authored-by: Scott Lahteine <[email protected]>

* Add OPTIMIZED_MESH_STORAGE option (for UBL) (MarlinFirmware#20371)

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2020-12-24)

* Move BTT_SKR_CR6

* LVGL and Classic UI for STM32 (MarlinFirmware#20552)

* Add "End Repeat Loops" menu item

* Fix DOGM status message scrolling (MarlinFirmware#20557)

* Fix ST7920 timing for Rumba32, Fysetc S6 (MarlinFirmware#20556)

* Fix, clean up FTDI EVE Touch UI (MarlinFirmware#20466)

Co-Authored-By: Marcio T. <[email protected]>

* Apply NO_MOTION_BEFORE_HOMING to joystick motion (MarlinFirmware#20462)

Co-authored-by: Scott Lahteine <[email protected]>

* Cutter Power in percent format (MarlinFirmware#20410)

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Jason Smith <[email protected]>
Co-authored-by: Luu Lac <[email protected]>

* [cron] Bump distribution date (2020-12-25)

* [cron] Bump distribution date (2020-12-26)

* [cron] Bump distribution date (2020-12-27)

* Fix SPINDLE_LASER_FREQUENCY (MarlinFirmware#20509)

* Fix some comments

* Remove CREALITY_TOUCH

* Add probe_switch_activated

* Init tare pin once

* [cron] Bump distribution date (2020-12-28)

* Validate defined probe points (MarlinFirmware#20572)

* General cleanup

* Allow define HOMING_FEEDRATE_(XY|Z)

* Remove URL scheme

* Small / Large Boot Screen option for TFT_COLOR_UI (MarlinFirmware#20578)

* Better defaults, compatibility for SDIO + STM32 (MarlinFirmware#20570)

* Fix Menu Mixer for Color UI (MarlinFirmware#20566)

* Use ADC_RESOLUTION 12 for all STM32 (MarlinFirmware#20562)

* Fix LVGL_UI G-code preview (MarlinFirmware#20564)

* Fix Change Filament menu actions (MarlinFirmware#20565)

Co-authored-by: Scott Lahteine <[email protected]>

* Menu item index followup

* [cron] Bump distribution date (2020-12-29)

* Apply SHOW_BOOTSCREEN to TFT_COLOR_UI (MarlinFirmware#20586)

* LVGL G-code preview. Legacy MKS WiFi Cura plugin compatibility (MarlinFirmware#20589)

* Clarify sanity-check for custom status bitmap (MarlinFirmware#20588)

* Pins, comment cleanup

* USB FD via native USB Host + MSC (MarlinFirmware#20571)

* Support 4.3" (480x272) Color UI display (MarlinFirmware#20334)

* [cron] Bump distribution date (2020-12-30)

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Vitaliy <[email protected]>
Co-authored-by: Victor Mateus Oliveira <[email protected]>
Co-authored-by: Orel <[email protected]>
Co-authored-by: thinkyhead <[email protected]>
Co-authored-by: Ajtak <[email protected]>
Co-authored-by: Kurt Haenen <[email protected]>
Co-authored-by: Kurt Haenen <[email protected]>
Co-authored-by: Simone Primarosa <[email protected]>
Co-authored-by: Gurmeet Athwal <[email protected]>
Co-authored-by: Jason Smith <[email protected]>
Co-authored-by: qwewer0 <[email protected]>
Co-authored-by: rdhoggattjr <[email protected]>
Co-authored-by: ellensp <[email protected]>
Co-authored-by: pseudex <[email protected]>
Co-authored-by: swissnorp <[email protected]>
Co-authored-by: mks-viva <[email protected]>
Co-authored-by: wmariz <[email protected]>
Co-authored-by: Štěpán Dalecký <[email protected]>
Co-authored-by: BsCmOD <[email protected]>
Co-authored-by: yysh12 <[email protected]>
Co-authored-by: Sergey1560 <[email protected]>
Co-authored-by: Thomas Niccolo Reyes <[email protected]>
Co-authored-by: Alexander D. Kanevskiy <[email protected]>
Co-authored-by: Mathias Rasmussen <[email protected]>
Co-authored-by: Luu Lac <[email protected]>
Co-authored-by: Belin Fieldson <[email protected]>
Co-authored-by: Tanguy Pruvot <[email protected]>
Co-authored-by: mrv96 <[email protected]>
Co-authored-by: InsanityAutomation <[email protected]>
Co-authored-by: LinFor <[email protected]>
Co-authored-by: PingWin <[email protected]>
Co-authored-by: ellensp <[email protected]>
Co-authored-by: Keith Bennett <[email protected]>
Co-authored-by: Mike La Spina <[email protected]>
Co-authored-by: Marcio T <[email protected]>
Co-authored-by: Sebastiaan Dammann <[email protected]>
Co-authored-by: ellensp <[email protected]>
Co-authored-by: elasticdotventures <[email protected]>
Co-authored-by: FanDjango <[email protected]>
Co-authored-by: FanDjango <[email protected]>
Co-authored-by: leodoener <[email protected]>
Co-authored-by: Chris Pepper <[email protected]>
Co-authored-by: kisslorand <[email protected]>
Co-authored-by: JoAnn Manges <[email protected]>
Co-authored-by: Giuliano Zaro <[email protected]>
Co-authored-by: Zs.Antal <[email protected]>
Co-authored-by: rafaljot <[email protected]>
Co-authored-by: nb-rapidia <[email protected]>
Co-authored-by: grauerfuchs <[email protected]>
Co-authored-by: Foxies <[email protected]>
Co-authored-by: Serhiy-K <[email protected]>
Co-authored-by: Dick Streefland <[email protected]>
Co-authored-by: cr20-123 <[email protected]>
Co-authored-by: X-Ryl669 <[email protected]>
Co-authored-by: Sean McGroty <[email protected]>
Co-authored-by: Jan Krajdl <[email protected]>
Co-authored-by: Darren Peter <[email protected]>
Co-authored-by: ubik2 <[email protected]>
Co-authored-by: Vi B-P <[email protected]>
Co-authored-by: Ashammaru <[email protected]>
  • Loading branch information
Show file tree
Hide file tree
Showing 40 changed files with 608 additions and 164 deletions.
25 changes: 13 additions & 12 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
// @section info

// Author info of this build printed to the host during boot and M115
#define STRING_CONFIG_H_AUTHOR "(Michal Rábek, default config)" // Who made the changes.
#define STRING_CONFIG_H_AUTHOR "(Michalcin, default config)" // Who made the changes.
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)

/**
Expand Down Expand Up @@ -128,7 +128,7 @@

// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_RAMPS_14_EFB
#define MOTHERBOARD BOARD_RAMPS_S_12_EEFB
#endif

// Name displayed in the LCD "Ready" message and Info menu
Expand Down Expand Up @@ -445,15 +445,15 @@

// Below this temperature the heater will be switched off
// because it probably indicates a broken thermistor wire.
#define HEATER_0_MINTEMP 5
#define HEATER_0_MINTEMP 15
#define HEATER_1_MINTEMP 5
#define HEATER_2_MINTEMP 5
#define HEATER_3_MINTEMP 5
#define HEATER_4_MINTEMP 5
#define HEATER_5_MINTEMP 5
#define HEATER_6_MINTEMP 5
#define HEATER_7_MINTEMP 5
#define BED_MINTEMP 5
#define BED_MINTEMP 15

// Above this temperature the heater will be switched off.
// This can protect components from overheating, but NOT from shorts and failures.
Expand Down Expand Up @@ -745,7 +745,7 @@
* Override with M203
* X, Y, Z, E0 [, E1[, E2...]]
*/
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
#define DEFAULT_MAX_FEEDRATE { 100, 100, 30, 50 }

//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
#if ENABLED(LIMITED_MAX_FR_EDITING)
Expand All @@ -758,7 +758,7 @@
* Override with M201
* X, Y, Z, E0 [, E1[, E2...]]
*/
#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
#define DEFAULT_MAX_ACCELERATION { 1250, 1250, 100, 2000 }

//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
Expand All @@ -773,9 +773,9 @@
* M204 R Retract Acceleration
* M204 T Travel Acceleration
*/
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_ACCELERATION 400 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves

/**
* Default Jerk limits (mm/s)
Expand Down Expand Up @@ -1167,7 +1167,7 @@
#define Z_MIN_POS 0
#define X_MAX_POS X_BED_SIZE
#define Y_MAX_POS Y_BED_SIZE
#define Z_MAX_POS 200
#define Z_MAX_POS 135

/**
* Software Endstops
Expand Down Expand Up @@ -1431,7 +1431,7 @@
* Add a bed leveling sub-menu for ABL or MBL.
* Include a guided procedure if manual probing is enabled.
*/
//#define LCD_BED_LEVELING
#define LCD_BED_LEVELING

#if ENABLED(LCD_BED_LEVELING)
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
Expand Down Expand Up @@ -1721,7 +1721,7 @@
* M76 - Pause the print job timer
* M77 - Stop the print job timer
*/
#define PRINTJOB_TIMER_AUTOSTART
//#define PRINTJOB_TIMER_AUTOSTART

/**
* Print Counter
Expand Down Expand Up @@ -1888,7 +1888,7 @@
// If CLOCKWISE normally moves DOWN this makes it go UP.
// If CLOCKWISE normally moves UP this makes it go DOWN.
//
//#define REVERSE_MENU_DIRECTION
#define REVERSE_MENU_DIRECTION

//
// This option reverses the encoder direction for Select Screen.
Expand Down Expand Up @@ -2440,6 +2440,7 @@
//#define TOUCH_CALIBRATION_Y -8981
//#define TOUCH_OFFSET_X -43
//#define TOUCH_OFFSET_Y 257
//#define TOUCH_ORIENTATION TOUCH_LANDSCAPE

#if ENABLED(TFT_COLOR_UI)
//#define SINGLE_TOUCH_NAVIGATION
Expand Down
14 changes: 11 additions & 3 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1326,9 +1326,6 @@
*/
//#define USB_FLASH_DRIVE_SUPPORT
#if ENABLED(USB_FLASH_DRIVE_SUPPORT)
#define USB_CS_PIN SDSS
#define USB_INTR_PIN SD_DETECT_PIN

/**
* USB Host Shield Library
*
Expand All @@ -1339,7 +1336,18 @@
* is less tested and is known to interfere with Servos.
* [1] This requires USB_INTR_PIN to be interrupt-capable.
*/
//#define USE_UHS2_USB
//#define USE_UHS3_USB

/**
* Native USB Host supported by some boards (USB OTG)
*/
//#define USE_OTG_USB_HOST

#if DISABLED(USE_OTG_USB_HOST)
#define USB_CS_PIN SDSS
#define USB_INTR_PIN SD_DETECT_PIN
#endif
#endif

/**
Expand Down
117 changes: 117 additions & 0 deletions Marlin/src/HAL/STM32/usb_host.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)

#include "../../inc/MarlinConfig.h"

#if BOTH(USE_OTG_USB_HOST, USBHOST)

#include "usb_host.h"
#include "../shared/Marduino.h"
#include "usbh_core.h"
#include "usbh_msc.h"

USBH_HandleTypeDef hUsbHost;
USBHost usb;
BulkStorage bulk(&usb);

static void USBH_UserProcess(USBH_HandleTypeDef *phost, uint8_t id) {
switch(id) {
case HOST_USER_SELECT_CONFIGURATION:
//SERIAL_ECHOLNPGM("APPLICATION_SELECT_CONFIGURATION");
break;
case HOST_USER_DISCONNECTION:
//SERIAL_ECHOLNPGM("APPLICATION_DISCONNECT");
//usb.setUsbTaskState(USB_STATE_RUNNING);
break;
case HOST_USER_CLASS_ACTIVE:
//SERIAL_ECHOLNPGM("APPLICATION_READY");
usb.setUsbTaskState(USB_STATE_RUNNING);
break;
case HOST_USER_CONNECTION:
break;
default:
break;
}
}

bool USBHost::start() {
if (USBH_Init(&hUsbHost, USBH_UserProcess, TERN(USE_USB_HS_IN_FS, HOST_HS, HOST_FS)) != USBH_OK) {
SERIAL_ECHOLNPGM("Error: USBH_Init");
return false;
}
if (USBH_RegisterClass(&hUsbHost, USBH_MSC_CLASS) != USBH_OK) {
SERIAL_ECHOLNPGM("Error: USBH_RegisterClass");
return false;
}
if (USBH_Start(&hUsbHost) != USBH_OK) {
SERIAL_ECHOLNPGM("Error: USBH_Start");
return false;
}
return true;
}

void USBHost::Task() {
USBH_Process(&hUsbHost);
}

uint8_t USBHost::getUsbTaskState() {
return usb_task_state;
}

void USBHost::setUsbTaskState(uint8_t state) {
usb_task_state = state;
if (usb_task_state == USB_STATE_RUNNING) {
MSC_LUNTypeDef info;
USBH_MSC_GetLUNInfo(&hUsbHost, usb.lun, &info);
capacity = info.capacity.block_nbr / 2000;
block_size = info.capacity.block_size;
block_count = info.capacity.block_nbr;
// SERIAL_ECHOLNPAIR("info.capacity.block_nbr : %ld\n", info.capacity.block_nbr);
// SERIAL_ECHOLNPAIR("info.capacity.block_size: %d\n", info.capacity.block_size);
// SERIAL_ECHOLNPAIR("capacity : %d MB\n", capacity);
}
};

bool BulkStorage::LUNIsGood(uint8_t t) {
return USBH_MSC_IsReady(&hUsbHost) && USBH_MSC_UnitIsReady(&hUsbHost, t);
}

uint32_t BulkStorage::GetCapacity(uint8_t lun) {
return usb->block_count;
}

uint16_t BulkStorage::GetSectorSize(uint8_t lun) {
return usb->block_size;
}

uint8_t BulkStorage::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf) {
return USBH_MSC_Read(&hUsbHost, lun, addr, buf, blocks) != USBH_OK;
}

uint8_t BulkStorage::Write(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, const uint8_t * buf) {
return USBH_MSC_Write(&hUsbHost, lun, addr, const_cast <uint8_t*>(buf), blocks) != USBH_OK;
}

#endif // USE_OTG_USB_HOST && USBHOST
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
97 changes: 97 additions & 0 deletions Marlin/src/HAL/STM32/usb_host.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once

<<<<<<< HEAD:Marlin/src/module/thermistor/thermistor_503.h
// Zonestar (Z8XM2) Heated Bed thermistor. Added By AvanOsch
// These are taken from the Zonestar settings in original Repetier firmware: Z8XM2_ZRIB_LCD12864_V51.zip
const temp_entry_t temptable_503[] PROGMEM = {
{ OV( 12), 300 },
{ OV( 27), 270 },
{ OV( 47), 250 },
{ OV( 68), 230 },
{ OV( 99), 210 },
{ OV( 120), 200 },
{ OV( 141), 190 },
{ OV( 171), 180 },
{ OV( 201), 170 },
{ OV( 261), 160 },
{ OV( 321), 150 },
{ OV( 401), 140 },
{ OV( 451), 130 },
{ OV( 551), 120 },
{ OV( 596), 110 },
{ OV( 626), 105 },
{ OV( 666), 100 },
{ OV( 697), 90 },
{ OV( 717), 85 },
{ OV( 798), 69 },
{ OV( 819), 65 },
{ OV( 870), 55 },
{ OV( 891), 51 },
{ OV( 922), 39 },
{ OV( 968), 28 },
{ OV( 980), 23 },
{ OV( 991), 17 },
{ OV( 1001), 9 },
{ OV(1021), -27 },
{ OV(1023), -200}
};
=======
#include <stdint.h>

typedef enum {
USB_STATE_INIT,
USB_STATE_ERROR,
USB_STATE_RUNNING,
} usb_state_t;

class USBHost {
public:
bool start();
void Task();
uint8_t getUsbTaskState();
void setUsbTaskState(uint8_t state);
uint8_t regRd(uint8_t reg) { return 0x0; };
uint8_t usb_task_state = USB_STATE_INIT;
uint8_t lun = 0;
uint32_t capacity = 0;
uint16_t block_size = 0;
uint32_t block_count = 0;
};

class BulkStorage {
public:
BulkStorage(USBHost *usb) : usb(usb) {};

bool LUNIsGood(uint8_t t);
uint32_t GetCapacity(uint8_t lun);
uint16_t GetSectorSize(uint8_t lun);
uint8_t Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf);
uint8_t Write(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, const uint8_t * buf);

USBHost *usb;
};

extern USBHost usb;
extern BulkStorage bulk;
>>>>>>> 4ad633bae235f0a47972d6d7873e614b8286d914:Marlin/src/HAL/STM32/usb_host.h
1 change: 1 addition & 0 deletions Marlin/src/core/macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
#define ANY_BUTTON(V...) DO(BTNEX,||,V)

#define WITHIN(N,L,H) ((N) >= (L) && (N) <= (H))
#define ISEOL(C) ((C) == '\n' || (C) == '\r')
#define NUMERIC(a) WITHIN(a, '0', '9')
#define DECIMAL(a) (NUMERIC(a) || a == '.')
#define HEXCHR(a) (NUMERIC(a) ? (a) - '0' : WITHIN(a, 'a', 'f') ? ((a) - 'a' + 10) : WITHIN(a, 'A', 'F') ? ((a) - 'A' + 10) : -1)
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/feature/e_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ class EmergencyParser {
FORCE_INLINE static void disable() { enabled = false; }

FORCE_INLINE static void update(State &state, const uint8_t c) {
#define ISEOL(C) ((C) == '\n' || (C) == '\r')
switch (state) {
case EP_RESET:
switch (c) {
Expand Down
2 changes: 0 additions & 2 deletions Marlin/src/gcode/queue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
return true;
}

#define ISEOL(C) ((C) == '\n' || (C) == '\r')

/**
* Enqueue with Serial Echo
* Return true if the command was consumed
Expand Down
Loading

0 comments on commit 0ab0c4b

Please sign in to comment.