diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..a0fa3eff17
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# editorconfig.org
+root = true
+
+[{*.patch,syntax_test_*}]
+trim_trailing_whitespace = false
+
+[{*.c,*.cpp,*.h}]
+charset = utf-8
+
+[{*.c,*.cpp,*.h,Makefile}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+indent_size = 2
+
+[{*.py,*.conf,*.sublime-project}]
+indent_style = tab
+indent_size = 4
diff --git a/.gitignore b/.gitignore
index 5728e1f065..80c76ee1e4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
#
# Marlin 3D Printer Firmware
-# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -146,6 +146,9 @@ Marlin/*/*/readme.txt
Marlin/*/*/*/readme.txt
Marlin/*/*/*/*/readme.txt
+# Secure Credentials
+Configuration_Secure.h
+
#Visual Studio
*.sln
*.vcxproj
diff --git a/Configuration.h b/Configuration.h
new file mode 100644
index 0000000000..550ea35467
--- /dev/null
+++ b/Configuration.h
@@ -0,0 +1,2244 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 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 .
+ *
+ */
+#pragma once
+
+/**
+ * Configuration.h
+ *
+ * Basic settings such as:
+ *
+ * - Type of electronics
+ * - Type of temperature sensor
+ * - Printer geometry
+ * - Endstop configuration
+ * - LCD controller
+ * - Extra features
+ *
+ * Advanced settings can be found in Configuration_adv.h
+ *
+ */
+#define CONFIGURATION_H_VERSION 020000
+
+//===========================================================================
+//============================= Getting Started =============================
+//===========================================================================
+
+/**
+ * Here are some standard links for getting your machine calibrated:
+ *
+ * http://reprap.org/wiki/Calibration
+ * http://youtu.be/wAL9d7FgInk
+ * http://calculator.josefprusa.cz
+ * http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide
+ * http://www.thingiverse.com/thing:5573
+ * https://sites.google.com/site/repraplogphase/calibration-of-your-reprap
+ * http://www.thingiverse.com/thing:298812
+ */
+
+//===========================================================================
+//============================= DELTA Printer ===============================
+//===========================================================================
+// For a Delta printer start with one of the configuration files in the
+// config/examples/delta directory and customize for your machine.
+//
+
+//===========================================================================
+//============================= SCARA Printer ===============================
+//===========================================================================
+// For a SCARA printer start with the configuration files in
+// config/examples/SCARA and customize for your machine.
+//
+
+// @section info
+
+// Author info of this build printed to the host during boot and M115
+#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
+//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
+
+/**
+ * *** VENDORS PLEASE READ ***
+ *
+ * Marlin allows you to add a custom boot image for Graphical LCDs.
+ * With this option Marlin will first show your custom screen followed
+ * by the standard Marlin logo with version number and web URL.
+ *
+ * We encourage you to take advantage of this new feature and we also
+ * respectfully request that you retain the unmodified Marlin boot screen.
+ */
+
+// Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
+#define SHOW_BOOTSCREEN
+
+// Show the bitmap in Marlin/_Bootscreen.h on startup.
+//#define SHOW_CUSTOM_BOOTSCREEN
+
+// Show the bitmap in Marlin/_Statusscreen.h on the status screen.
+//#define CUSTOM_STATUS_SCREEN_IMAGE
+
+// @section machine
+
+/**
+ * Select the serial port on the board to use for communication with the host.
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
+ *
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
+ */
+#define SERIAL_PORT 0
+
+/**
+ * Select a secondary serial port on the board to use for communication with the host.
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
+ * Serial port -1 is the USB emulated serial port, if available.
+ *
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
+ */
+//#define SERIAL_PORT_2 -1
+
+/**
+ * This setting determines the communication speed of the printer.
+ *
+ * 250000 works in most cases, but you might try a lower speed if
+ * you commonly experience drop-outs during host printing.
+ * You may try up to 1000000 to speed up SD file transfer.
+ *
+ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
+ */
+#define BAUDRATE 250000
+
+// Enable the Bluetooth serial interface on AT90USB devices
+//#define BLUETOOTH
+
+// Choose the name from boards.h that matches your setup
+#ifndef MOTHERBOARD
+ #define MOTHERBOARD BOARD_RAMPS_14_EFB
+#endif
+
+// Name displayed in the LCD "Ready" message and Info menu
+//#define CUSTOM_MACHINE_NAME "3D Printer"
+
+// Printer's unique ID, used by some programs to differentiate between machines.
+// Choose your own or use a service like http://www.uuidgenerator.net/version4
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
+
+// @section extruder
+
+// This defines the number of extruders
+// :[1, 2, 3, 4, 5, 6, 7, 8]
+#define EXTRUDERS 1
+
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
+
+// For Cyclops or any "multi-extruder" that shares a single nozzle.
+//#define SINGLENOZZLE
+
+/**
+ * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
+ *
+ * This device allows one stepper driver on a control board to drive
+ * two to eight stepper motors, one at a time, in a manner suitable
+ * for extruders.
+ *
+ * This option only allows the multiplexer to switch on tool-change.
+ * Additional options to configure custom E moves are pending.
+ */
+//#define MK2_MULTIPLEXER
+#if ENABLED(MK2_MULTIPLEXER)
+ // Override the default DIO selector pins here, if needed.
+ // Some pins files may provide defaults for these pins.
+ //#define E_MUX0_PIN 40 // Always Required
+ //#define E_MUX1_PIN 42 // Needed for 3 to 8 inputs
+ //#define E_MUX2_PIN 44 // Needed for 5 to 8 inputs
+#endif
+
+/**
+ * Prusa Multi-Material Unit v2
+ *
+ * Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
+ * Requires EXTRUDERS = 5
+ *
+ * For additional configuration see Configuration_adv.h
+ */
+//#define PRUSA_MMU2
+
+// A dual extruder that uses a single stepper motor
+//#define SWITCHING_EXTRUDER
+#if ENABLED(SWITCHING_EXTRUDER)
+ #define SWITCHING_EXTRUDER_SERVO_NR 0
+ #define SWITCHING_EXTRUDER_SERVO_ANGLES { 0, 90 } // Angles for E0, E1[, E2, E3]
+ #if EXTRUDERS > 3
+ #define SWITCHING_EXTRUDER_E23_SERVO_NR 1
+ #endif
+#endif
+
+// A dual-nozzle that uses a servomotor to raise/lower one (or both) of the nozzles
+//#define SWITCHING_NOZZLE
+#if ENABLED(SWITCHING_NOZZLE)
+ #define SWITCHING_NOZZLE_SERVO_NR 0
+ //#define SWITCHING_NOZZLE_E1_SERVO_NR 1 // If two servos are used, the index of the second
+ #define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // Angles for E0, E1 (single servo) or lowered/raised (dual servo)
+#endif
+
+/**
+ * Two separate X-carriages with extruders that connect to a moving part
+ * via a solenoid docking mechanism. Requires SOL1_PIN and SOL2_PIN.
+ */
+//#define PARKING_EXTRUDER
+
+/**
+ * Two separate X-carriages with extruders that connect to a moving part
+ * via a magnetic docking mechanism using movements and no solenoid
+ *
+ * project : https://www.thingiverse.com/thing:3080893
+ * movements : https://youtu.be/0xCEiG9VS3k
+ * https://youtu.be/Bqbcs0CU2FE
+ */
+//#define MAGNETIC_PARKING_EXTRUDER
+
+#if EITHER(PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER)
+
+ #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
+ #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
+ //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
+
+ #if ENABLED(PARKING_EXTRUDER)
+
+ #define PARKING_EXTRUDER_SOLENOIDS_INVERT // If enabled, the solenoid is NOT magnetized with applied voltage
+ #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW // LOW or HIGH pin signal energizes the coil
+ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // (ms) Delay for magnetic field. No delay if 0 or not defined.
+ //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
+
+ #elif ENABLED(MAGNETIC_PARKING_EXTRUDER)
+
+ #define MPE_FAST_SPEED 9000 // (mm/m) Speed for travel before last distance point
+ #define MPE_SLOW_SPEED 4500 // (mm/m) Speed for last distance travel to park and couple
+ #define MPE_TRAVEL_DISTANCE 10 // (mm) Last distance point
+ #define MPE_COMPENSATION 0 // Offset Compensation -1 , 0 , 1 (multiplier) only for coupling
+
+ #endif
+
+#endif
+
+/**
+ * Switching Toolhead
+ *
+ * Support for swappable and dockable toolheads, such as
+ * the E3D Tool Changer. Toolheads are locked with a servo.
+ */
+//#define SWITCHING_TOOLHEAD
+
+/**
+ * Magnetic Switching Toolhead
+ *
+ * Support swappable and dockable toolheads with a magnetic
+ * docking mechanism using movement and no servo.
+ */
+//#define MAGNETIC_SWITCHING_TOOLHEAD
+
+/**
+ * Electromagnetic Switching Toolhead
+ *
+ * Parking for CoreXY / HBot kinematics.
+ * Toolheads are parked at one edge and held with an electromagnet.
+ * Supports more than 2 Toolheads. See https://youtu.be/JolbsAKTKf4
+ */
+//#define ELECTROMAGNETIC_SWITCHING_TOOLHEAD
+
+#if ANY(SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
+ #define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock
+ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis
+ #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis
+ #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders
+ #if ENABLED(SWITCHING_TOOLHEAD)
+ #define SWITCHING_TOOLHEAD_SERVO_NR 2 // Index of the servo connector
+ #define SWITCHING_TOOLHEAD_SERVO_ANGLES { 0, 180 } // (degrees) Angles for Lock, Unlock
+ #elif ENABLED(MAGNETIC_SWITCHING_TOOLHEAD)
+ #define SWITCHING_TOOLHEAD_Y_RELEASE 5 // (mm) Security distance Y axis
+ #define SWITCHING_TOOLHEAD_X_SECURITY { 90, 150 } // (mm) Security distance X axis (T0,T1)
+ //#define PRIME_BEFORE_REMOVE // Prime the nozzle before release from the dock
+ #if ENABLED(PRIME_BEFORE_REMOVE)
+ #define SWITCHING_TOOLHEAD_PRIME_MM 20 // (mm) Extruder prime length
+ #define SWITCHING_TOOLHEAD_RETRACT_MM 10 // (mm) Retract after priming length
+ #define SWITCHING_TOOLHEAD_PRIME_FEEDRATE 300 // (mm/m) Extruder prime feedrate
+ #define SWITCHING_TOOLHEAD_RETRACT_FEEDRATE 2400 // (mm/m) Extruder retract feedrate
+ #endif
+ #elif ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
+ #define SWITCHING_TOOLHEAD_Z_HOP 2 // (mm) Z raise for switching
+ #endif
+#endif
+
+/**
+ * "Mixing Extruder"
+ * - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
+ * - Extends the stepping routines to move multiple steppers in proportion to the mix.
+ * - Optional support for Repetier Firmware's 'M164 S' supporting virtual tools.
+ * - This implementation supports up to two mixing extruders.
+ * - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
+ */
+//#define MIXING_EXTRUDER
+#if ENABLED(MIXING_EXTRUDER)
+ #define MIXING_STEPPERS 2 // Number of steppers in your mixing extruder
+ #define MIXING_VIRTUAL_TOOLS 16 // Use the Virtual Tool method with M163 and M164
+ //#define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands
+ //#define GRADIENT_MIX // Support for gradient mixing with M166 and LCD
+ #if ENABLED(GRADIENT_MIX)
+ //#define GRADIENT_VTOOL // Add M166 T to use a V-tool index as a Gradient alias
+ #endif
+#endif
+
+// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
+// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
+// For the other hotends it is their distance from the extruder 0 hotend.
+//#define HOTEND_OFFSET_X { 0.0, 20.00 } // (mm) relative X-offset for each nozzle
+//#define HOTEND_OFFSET_Y { 0.0, 5.00 } // (mm) relative Y-offset for each nozzle
+//#define HOTEND_OFFSET_Z { 0.0, 0.00 } // (mm) relative Z-offset for each nozzle
+
+// @section machine
+
+/**
+ * Power Supply Control
+ *
+ * Enable and connect the power supply to the PS_ON_PIN.
+ * Specify whether the power supply is active HIGH or active LOW.
+ */
+//#define PSU_CONTROL
+//#define PSU_NAME "Power Supply"
+
+#if ENABLED(PSU_CONTROL)
+ #define PSU_ACTIVE_HIGH false // Set 'false' for ATX, 'true' for X-Box
+
+ //#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
+ //#define PSU_POWERUP_DELAY 100 // (ms) Delay for the PSU to warm up to full power
+
+ //#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
+ #if ENABLED(AUTO_POWER_CONTROL)
+ #define AUTO_POWER_FANS // Turn on PSU if fans need power
+ #define AUTO_POWER_E_FANS
+ #define AUTO_POWER_CONTROLLERFAN
+ #define AUTO_POWER_CHAMBER_FAN
+ //#define AUTO_POWER_E_TEMP 50 // (°C) Turn on PSU over this temperature
+ //#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature
+ #define POWER_TIMEOUT 30
+ #endif
+#endif
+
+// @section temperature
+
+//===========================================================================
+//============================= Thermal Settings ============================
+//===========================================================================
+
+/**
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
+ *
+ * Temperature sensors available:
+ *
+ * -5 : PT100 / PT1000 with MAX31865 (only for sensors 0-1)
+ * -3 : thermocouple with MAX31855 (only for sensors 0-1)
+ * -2 : thermocouple with MAX6675 (only for sensors 0-1)
+ * -4 : thermocouple with AD8495
+ * -1 : thermocouple with AD595
+ * 0 : not used
+ * 1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
+ * 331 : (3.3V scaled thermistor 1 table for MEGA)
+ * 332 : (3.3V scaled thermistor 1 table for DUE)
+ * 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
+ * 3 : Mendel-parts thermistor (4.7k pullup)
+ * 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
+ * 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)
+ * 501 : 100K Zonestar (Tronxy X3A) Thermistor
+ * 512 : 100k RPW-Ultra hotend thermistor (4.7k pullup)
+ * 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
+ * 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
+ * 71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
+ * 8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
+ * 9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
+ * 10 : 100k RS thermistor 198-961 (4.7k pullup)
+ * 11 : 100k beta 3950 1% thermistor (4.7k pullup)
+ * 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
+ * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
+ * 15 : 100k thermistor calibration for JGAurora A5 hotend
+ * 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
+ * 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR)
+ * 21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....)
+ * 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
+ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
+ * 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup
+ * 66 : 4.7M High Temperature thermistor from Dyze Design
+ * 67 : 450C thermistor from SliceEngineering
+ * 70 : the 100K thermistor found in the bq Hephestos 2
+ * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
+ * 99 : 100k thermistor with a 10K pull-up resistor (found on some Wanhao i3 machines)
+ *
+ * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
+ * (but gives greater accuracy and more stable PID)
+ * 51 : 100k thermistor - EPCOS (1k pullup)
+ * 52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
+ * 55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
+ *
+ * 1047 : Pt1000 with 4k7 pullup
+ * 1010 : Pt1000 with 1k pullup (non standard)
+ * 147 : Pt100 with 4k7 pullup
+ * 110 : Pt100 with 1k pullup (non standard)
+ *
+ * 1000 : Custom - Specify parameters in Configuration_adv.h
+ *
+ * Use these for Testing or Development purposes. NEVER for production machine.
+ * 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
+ * 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
+ */
+#define TEMP_SENSOR_0 1
+#define TEMP_SENSOR_1 0
+#define TEMP_SENSOR_2 0
+#define TEMP_SENSOR_3 0
+#define TEMP_SENSOR_4 0
+#define TEMP_SENSOR_5 0
+#define TEMP_SENSOR_6 0
+#define TEMP_SENSOR_7 0
+#define TEMP_SENSOR_BED 0
+#define TEMP_SENSOR_PROBE 0
+#define TEMP_SENSOR_CHAMBER 0
+
+// Dummy thermistor constant temperature readings, for use with 998 and 999
+#define DUMMY_THERMISTOR_998_VALUE 25
+#define DUMMY_THERMISTOR_999_VALUE 100
+
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
+// from the two sensors differ too much the print will be aborted.
+//#define TEMP_SENSOR_1_AS_REDUNDANT
+#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
+
+#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109
+#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
+#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
+
+#define TEMP_BED_RESIDENCY_TIME 10 // (seconds) Time to wait for bed to "settle" in M190
+#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
+#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
+
+// Below this temperature the heater will be switched off
+// because it probably indicates a broken thermistor wire.
+#define HEATER_0_MINTEMP 5
+#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
+
+// Above this temperature the heater will be switched off.
+// This can protect components from overheating, but NOT from shorts and failures.
+// (Use MINTEMP for thermistor short/failure protection.)
+#define HEATER_0_MAXTEMP 275
+#define HEATER_1_MAXTEMP 275
+#define HEATER_2_MAXTEMP 275
+#define HEATER_3_MAXTEMP 275
+#define HEATER_4_MAXTEMP 275
+#define HEATER_5_MAXTEMP 275
+#define HEATER_6_MAXTEMP 275
+#define HEATER_7_MAXTEMP 275
+#define BED_MAXTEMP 150
+
+//===========================================================================
+//============================= PID Settings ================================
+//===========================================================================
+// PID Tuning Guide here: http://reprap.org/wiki/PID_Tuning
+
+// Comment the following line to disable PID and enable bang-bang.
+#define PIDTEMP
+#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
+#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
+#define PID_K1 0.95 // Smoothing factor within any PID loop
+#if ENABLED(PIDTEMP)
+ //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
+ //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
+ //#define PID_DEBUG // Sends debug data to the serial port.
+ //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
+ //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
+ //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
+ // Set/get with gcode: M301 E[extruder number, 0-2]
+ #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
+ // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
+
+ // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
+
+ // Ultimaker
+ #define DEFAULT_Kp 22.2
+ #define DEFAULT_Ki 1.08
+ #define DEFAULT_Kd 114
+
+ // MakerGear
+ //#define DEFAULT_Kp 7.0
+ //#define DEFAULT_Ki 0.1
+ //#define DEFAULT_Kd 12
+
+ // Mendel Parts V9 on 12V
+ //#define DEFAULT_Kp 63.0
+ //#define DEFAULT_Ki 2.25
+ //#define DEFAULT_Kd 440
+
+#endif // PIDTEMP
+
+//===========================================================================
+//====================== PID > Bed Temperature Control ======================
+//===========================================================================
+
+/**
+ * PID Bed Heating
+ *
+ * If this option is enabled set PID constants below.
+ * If this option is disabled, bang-bang will be used and BED_LIMIT_SWITCHING will enable hysteresis.
+ *
+ * The PID frequency will be the same as the extruder PWM.
+ * If PID_dT is the default, and correct for the hardware/configuration, that means 7.689Hz,
+ * which is fine for driving a square wave into a resistive load and does not significantly
+ * impact FET heating. This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W
+ * heater. If your configuration is significantly different than this and you don't understand
+ * the issues involved, don't use bed PID until someone else verifies that your hardware works.
+ */
+//#define PIDTEMPBED
+
+//#define BED_LIMIT_SWITCHING
+
+/**
+ * Max Bed Power
+ * Applies to all forms of bed control (PID, bang-bang, and bang-bang with hysteresis).
+ * When set to any value below 255, enables a form of PWM to the bed that acts like a divider
+ * so don't use it unless you are OK with PWM on your bed. (See the comment on enabling PIDTEMPBED)
+ */
+#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
+
+#if ENABLED(PIDTEMPBED)
+ //#define MIN_BED_POWER 0
+ //#define PID_BED_DEBUG // Sends debug data to the serial port.
+
+ //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
+ //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
+ #define DEFAULT_bedKp 10.00
+ #define DEFAULT_bedKi .023
+ #define DEFAULT_bedKd 305.4
+
+ //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
+ //from pidautotune
+ //#define DEFAULT_bedKp 97.1
+ //#define DEFAULT_bedKi 1.41
+ //#define DEFAULT_bedKd 1675.16
+
+ // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
+#endif // PIDTEMPBED
+
+// @section extruder
+
+/**
+ * Prevent extrusion if the temperature is below EXTRUDE_MINTEMP.
+ * Add M302 to set the minimum extrusion temperature and/or turn
+ * cold extrusion prevention on and off.
+ *
+ * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
+ */
+#define PREVENT_COLD_EXTRUSION
+#define EXTRUDE_MINTEMP 170
+
+/**
+ * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH.
+ * Note: For Bowden Extruders make this large enough to allow load/unload.
+ */
+#define PREVENT_LENGTHY_EXTRUDE
+#define EXTRUDE_MAXLENGTH 200
+
+//===========================================================================
+//======================== Thermal Runaway Protection =======================
+//===========================================================================
+
+/**
+ * Thermal Protection provides additional protection to your printer from damage
+ * and fire. Marlin always includes safe min and max temperature ranges which
+ * protect against a broken or disconnected thermistor wire.
+ *
+ * The issue: If a thermistor falls out, it will report the much lower
+ * temperature of the air in the room, and the the firmware will keep
+ * the heater on.
+ *
+ * If you get "Thermal Runaway" or "Heating failed" errors the
+ * details can be tuned in Configuration_adv.h
+ */
+
+#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders
+#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed
+#define THERMAL_PROTECTION_CHAMBER // Enable thermal protection for the heated chamber
+
+//===========================================================================
+//============================= Mechanical Settings =========================
+//===========================================================================
+
+// @section machine
+
+// Uncomment one of these options to enable CoreXY, CoreXZ, or CoreYZ kinematics
+// either in the usual order or reversed
+//#define COREXY
+//#define COREXZ
+//#define COREYZ
+//#define COREYX
+//#define COREZX
+//#define COREZY
+
+//===========================================================================
+//============================== Endstop Settings ===========================
+//===========================================================================
+
+// @section homing
+
+// Specify here all the endstop connectors that are connected to any endstop or probe.
+// Almost all printers will be using one per axis. Probes will use one or more of the
+// extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
+#define USE_XMIN_PLUG
+#define USE_YMIN_PLUG
+#define USE_ZMIN_PLUG
+//#define USE_XMAX_PLUG
+//#define USE_YMAX_PLUG
+//#define USE_ZMAX_PLUG
+
+// Enable pullup for all endstops to prevent a floating state
+#define ENDSTOPPULLUPS
+#if DISABLED(ENDSTOPPULLUPS)
+ // Disable ENDSTOPPULLUPS to set pullups individually
+ //#define ENDSTOPPULLUP_XMAX
+ //#define ENDSTOPPULLUP_YMAX
+ //#define ENDSTOPPULLUP_ZMAX
+ //#define ENDSTOPPULLUP_XMIN
+ //#define ENDSTOPPULLUP_YMIN
+ //#define ENDSTOPPULLUP_ZMIN
+ //#define ENDSTOPPULLUP_ZMIN_PROBE
+#endif
+
+// Enable pulldown for all endstops to prevent a floating state
+//#define ENDSTOPPULLDOWNS
+#if DISABLED(ENDSTOPPULLDOWNS)
+ // Disable ENDSTOPPULLDOWNS to set pulldowns individually
+ //#define ENDSTOPPULLDOWN_XMAX
+ //#define ENDSTOPPULLDOWN_YMAX
+ //#define ENDSTOPPULLDOWN_ZMAX
+ //#define ENDSTOPPULLDOWN_XMIN
+ //#define ENDSTOPPULLDOWN_YMIN
+ //#define ENDSTOPPULLDOWN_ZMIN
+ //#define ENDSTOPPULLDOWN_ZMIN_PROBE
+#endif
+
+// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
+#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
+
+/**
+ * Stepper Drivers
+ *
+ * These settings allow Marlin to tune stepper driver timing and enable advanced options for
+ * stepper drivers that support them. You may also override timing options in Configuration_adv.h.
+ *
+ * A4988 is assumed for unspecified drivers.
+ *
+ * Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
+ * TB6560, TB6600, TMC2100,
+ * TMC2130, TMC2130_STANDALONE, TMC2160, TMC2160_STANDALONE,
+ * TMC2208, TMC2208_STANDALONE, TMC2209, TMC2209_STANDALONE,
+ * TMC26X, TMC26X_STANDALONE, TMC2660, TMC2660_STANDALONE,
+ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
+ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
+ */
+//#define X_DRIVER_TYPE A4988
+//#define Y_DRIVER_TYPE A4988
+//#define Z_DRIVER_TYPE A4988
+//#define X2_DRIVER_TYPE A4988
+//#define Y2_DRIVER_TYPE A4988
+//#define Z2_DRIVER_TYPE A4988
+//#define Z3_DRIVER_TYPE A4988
+//#define Z4_DRIVER_TYPE A4988
+//#define E0_DRIVER_TYPE A4988
+//#define E1_DRIVER_TYPE A4988
+//#define E2_DRIVER_TYPE A4988
+//#define E3_DRIVER_TYPE A4988
+//#define E4_DRIVER_TYPE A4988
+//#define E5_DRIVER_TYPE A4988
+//#define E6_DRIVER_TYPE A4988
+//#define E7_DRIVER_TYPE A4988
+
+// Enable this feature if all enabled endstop pins are interrupt-capable.
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
+//#define ENDSTOP_INTERRUPTS_FEATURE
+
+/**
+ * Endstop Noise Threshold
+ *
+ * Enable if your probe or endstops falsely trigger due to noise.
+ *
+ * - Higher values may affect repeatability or accuracy of some bed probes.
+ * - To fix noise install a 100nF ceramic capacitor inline with the switch.
+ * - This feature is not required for common micro-switches mounted on PCBs
+ * based on the Makerbot design, which already have the 100nF capacitor.
+ *
+ * :[2,3,4,5,6,7]
+ */
+//#define ENDSTOP_NOISE_THRESHOLD 2
+
+//=============================================================================
+//============================== Movement Settings ============================
+//=============================================================================
+// @section motion
+
+/**
+ * Default Settings
+ *
+ * These settings can be reset by M502
+ *
+ * Note that if EEPROM is enabled, saved values will override these.
+ */
+
+/**
+ * With this option each E stepper can have its own factors for the
+ * following movement settings. If fewer factors are given than the
+ * total number of extruders, the last value applies to the rest.
+ */
+//#define DISTINCT_E_FACTORS
+
+/**
+ * Default Axis Steps Per Unit (steps/mm)
+ * Override with M92
+ * X, Y, Z, E0 [, E1[, E2...]]
+ */
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 }
+
+/**
+ * Default Max Feed Rate (mm/s)
+ * Override with M203
+ * X, Y, Z, E0 [, E1[, E2...]]
+ */
+#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
+
+//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
+#if ENABLED(LIMITED_MAX_FR_EDITING)
+ #define MAX_FEEDRATE_EDIT_VALUES { 600, 600, 10, 50 } // ...or, set your own edit limits
+#endif
+
+/**
+ * Default Max Acceleration (change/s) change = mm/s
+ * (Maximum start speed for accelerated moves)
+ * Override with M201
+ * X, Y, Z, E0 [, E1[, E2...]]
+ */
+#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
+
+//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
+#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
+ #define MAX_ACCEL_EDIT_VALUES { 6000, 6000, 200, 20000 } // ...or, set your own edit limits
+#endif
+
+/**
+ * Default Acceleration (change/s) change = mm/s
+ * Override with M204
+ *
+ * M204 P Acceleration
+ * M204 R Retract Acceleration
+ * M204 T Travel Acceleration
+ */
+#define DEFAULT_ACCELERATION 3000 // 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
+
+/**
+ * Default Jerk limits (mm/s)
+ * Override with M205 X Y Z E
+ *
+ * "Jerk" specifies the minimum speed change that requires acceleration.
+ * When changing speed and direction, if the difference is less than the
+ * value set here, it may happen instantaneously.
+ */
+//#define CLASSIC_JERK
+#if ENABLED(CLASSIC_JERK)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+
+ //#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
+ #if ENABLED(LIMITED_JERK_EDITING)
+ #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
+ #endif
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
+
+/**
+ * Junction Deviation Factor
+ *
+ * See:
+ * https://reprap.org/forum/read.php?1,739819
+ * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
+ */
+#if DISABLED(CLASSIC_JERK)
+ #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
+#endif
+
+/**
+ * S-Curve Acceleration
+ *
+ * This option eliminates vibration during printing by fitting a Bézier
+ * curve to move acceleration, producing much smoother direction changes.
+ *
+ * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
+ */
+//#define S_CURVE_ACCELERATION
+
+//===========================================================================
+//============================= Z Probe Options =============================
+//===========================================================================
+// @section probes
+
+//
+// See http://marlinfw.org/docs/configuration/probes.html
+//
+
+/**
+ * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+ *
+ * Enable this option for a probe connected to the Z Min endstop pin.
+ */
+#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+
+/**
+ * Z_MIN_PROBE_PIN
+ *
+ * Define this pin if the probe is not connected to Z_MIN_PIN.
+ * If not defined the default pin for the selected MOTHERBOARD
+ * will be used. Most of the time the default is what you want.
+ *
+ * - The simplest option is to use a free endstop connector.
+ * - Use 5V for powered (usually inductive) sensors.
+ *
+ * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin:
+ * - For simple switches connect...
+ * - normally-closed switches to GND and D32.
+ * - normally-open switches to 5V and D32.
+ *
+ */
+//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default
+
+/**
+ * Probe Type
+ *
+ * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
+ * Activate one of these to use Auto Bed Leveling below.
+ */
+
+/**
+ * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.
+ * Use G29 repeatedly, adjusting the Z height at each point with movement commands
+ * or (with LCD_BED_LEVELING) the LCD controller.
+ */
+//#define PROBE_MANUALLY
+//#define MANUAL_PROBE_START_Z 0.2
+
+/**
+ * A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
+ * (e.g., an inductive probe or a nozzle-based probe-switch.)
+ */
+//#define FIX_MOUNTED_PROBE
+
+/**
+ * Use the nozzle as the probe, as with a conductive
+ * nozzle system or a piezo-electric smart effector.
+ */
+//#define NOZZLE_AS_PROBE
+
+/**
+ * Z Servo Probe, such as an endstop switch on a rotating arm.
+ */
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_SERVO_ANGLES { 70, 0 } // Z Servo Deploy and Stow angles
+
+/**
+ * The BLTouch probe uses a Hall effect sensor and emulates a servo.
+ */
+//#define BLTOUCH
+
+/**
+ * Touch-MI Probe by hotends.fr
+ *
+ * This probe is deployed and activated by moving the X-axis to a magnet at the edge of the bed.
+ * By default, the magnet is assumed to be on the left and activated by a home. If the magnet is
+ * on the right, enable and set TOUCH_MI_DEPLOY_XPOS to the deploy position.
+ *
+ * Also requires: BABYSTEPPING, BABYSTEP_ZPROBE_OFFSET, Z_SAFE_HOMING,
+ * and a minimum Z_HOMING_HEIGHT of 10.
+ */
+//#define TOUCH_MI_PROBE
+#if ENABLED(TOUCH_MI_PROBE)
+ #define TOUCH_MI_RETRACT_Z 0.5 // Height at which the probe retracts
+ //#define TOUCH_MI_DEPLOY_XPOS (X_MAX_BED + 2) // For a magnet on the right side of the bed
+ //#define TOUCH_MI_MANUAL_DEPLOY // For manual deploy (LCD menu)
+#endif
+
+// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
+//#define SOLENOID_PROBE
+
+// A sled-mounted probe like those designed by Charles Bell.
+//#define Z_PROBE_SLED
+//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
+
+// A probe deployed by moving the x-axis, such as the Wilson II's rack-and-pinion probe designed by Marty Rice.
+//#define RACK_AND_PINION_PROBE
+#if ENABLED(RACK_AND_PINION_PROBE)
+ #define Z_PROBE_DEPLOY_X X_MIN_POS
+ #define Z_PROBE_RETRACT_X X_MAX_POS
+#endif
+
+// Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
+// When the pin is defined you can use M672 to set/reset the probe sensivity.
+//#define DUET_SMART_EFFECTOR
+#if ENABLED(DUET_SMART_EFFECTOR)
+ #define SMART_EFFECTOR_MOD_PIN -1 // Connect a GPIO pin to the Smart Effector MOD pin
+#endif
+
+//
+// For Z_PROBE_ALLEN_KEY see the Delta example configurations.
+//
+
+/**
+ * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
+ *
+ * In the following example the X and Y offsets are both positive:
+ *
+ * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+ *
+ * +-- BACK ---+
+ * | |
+ * L | (+) P | R <-- probe (20,20)
+ * E | | I
+ * F | (-) N (+) | G <-- nozzle (10,10)
+ * T | | H
+ * | (-) | T
+ * | |
+ * O-- FRONT --+
+ * (0,0)
+ *
+ * Specify a Probe position as { X, Y, Z }
+ */
+#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+
+// Most probes should stay away from the edges of the bed, but
+// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
+#define MIN_PROBE_EDGE 10
+
+// X and Y axis travel speed (mm/m) between probes
+#define XY_PROBE_SPEED 8000
+
+// Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2)
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
+
+// Feedrate (mm/m) for the "accurate" probe of each point
+#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
+
+/**
+ * Multiple Probing
+ *
+ * You may get improved results by probing 2 or more times.
+ * With EXTRA_PROBING the more atypical reading(s) will be disregarded.
+ *
+ * A total of 2 does fast/slow probes with a weighted average.
+ * A total of 3 or more adds more slow probes, taking the average.
+ */
+//#define MULTIPLE_PROBING 2
+//#define EXTRA_PROBING 1
+
+/**
+ * Z probes require clearance when deploying, stowing, and moving between
+ * probe points to avoid hitting the bed and other hardware.
+ * Servo-mounted probes require extra space for the arm to rotate.
+ * Inductive probes need space to keep from triggering early.
+ *
+ * Use these settings to specify the distance (mm) to raise the probe (or
+ * lower the bed). The values set here apply over and above any (negative)
+ * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
+ * Only integer values >= 1 are valid here.
+ *
+ * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
+ * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
+ */
+#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
+#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
+#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
+//#define Z_AFTER_PROBING 5 // Z position after probing is done
+
+#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
+
+// For M851 give a range for adjusting the Z probe offset
+#define Z_PROBE_OFFSET_RANGE_MIN -20
+#define Z_PROBE_OFFSET_RANGE_MAX 20
+
+// Enable the M48 repeatability test to test probe accuracy
+//#define Z_MIN_PROBE_REPEATABILITY_TEST
+
+// Before deploy/stow pause for user confirmation
+//#define PAUSE_BEFORE_DEPLOY_STOW
+#if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
+ //#define PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED // For Manual Deploy Allenkey Probe
+#endif
+
+/**
+ * Enable one or more of the following if probing seems unreliable.
+ * Heaters and/or fans can be disabled during probing to minimize electrical
+ * noise. A delay can also be added to allow noise and vibration to settle.
+ * These options are most useful for the BLTouch probe, but may also improve
+ * readings with inductive probes and piezo sensors.
+ */
+//#define PROBING_HEATERS_OFF // Turn heaters off when probing
+#if ENABLED(PROBING_HEATERS_OFF)
+ //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy)
+#endif
+//#define PROBING_FANS_OFF // Turn fans off when probing
+//#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing
+//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
+
+// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
+// :{ 0:'Low', 1:'High' }
+#define X_ENABLE_ON 0
+#define Y_ENABLE_ON 0
+#define Z_ENABLE_ON 0
+#define E_ENABLE_ON 0 // For all extruders
+
+// Disables axis stepper immediately when it's not being used.
+// WARNING: When motors turn off there is a chance of losing position accuracy!
+#define DISABLE_X false
+#define DISABLE_Y false
+#define DISABLE_Z false
+
+// Warn on display about possibly reduced accuracy
+//#define DISABLE_REDUCED_ACCURACY_WARNING
+
+// @section extruder
+
+#define DISABLE_E false // For all extruders
+#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled
+
+// @section machine
+
+// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
+#define INVERT_X_DIR false
+#define INVERT_Y_DIR true
+#define INVERT_Z_DIR false
+
+// @section extruder
+
+// For direct drive extruder v9 set to true, for geared extruder set to false.
+#define INVERT_E0_DIR false
+#define INVERT_E1_DIR false
+#define INVERT_E2_DIR false
+#define INVERT_E3_DIR false
+#define INVERT_E4_DIR false
+#define INVERT_E5_DIR false
+#define INVERT_E6_DIR false
+#define INVERT_E7_DIR false
+
+// @section homing
+
+//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
+
+//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
+
+//#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
+ // Be sure you have this distance over your Z_MAX_POS in case.
+
+// Direction of endstops when homing; 1=MAX, -1=MIN
+// :[-1,1]
+#define X_HOME_DIR -1
+#define Y_HOME_DIR -1
+#define Z_HOME_DIR -1
+
+// @section machine
+
+// The size of the print bed
+#define X_BED_SIZE 200
+#define Y_BED_SIZE 200
+
+// Travel limits (mm) after homing, corresponding to endstop positions.
+#define X_MIN_POS 0
+#define Y_MIN_POS 0
+#define Z_MIN_POS 0
+#define X_MAX_POS X_BED_SIZE
+#define Y_MAX_POS Y_BED_SIZE
+#define Z_MAX_POS 200
+
+/**
+ * Software Endstops
+ *
+ * - Prevent moves outside the set machine bounds.
+ * - Individual axes can be disabled, if desired.
+ * - X and Y only apply to Cartesian robots.
+ * - Use 'M211' to set software endstops on/off or report current state
+ */
+
+// Min software endstops constrain movement within minimum coordinate bounds
+#define MIN_SOFTWARE_ENDSTOPS
+#if ENABLED(MIN_SOFTWARE_ENDSTOPS)
+ #define MIN_SOFTWARE_ENDSTOP_X
+ #define MIN_SOFTWARE_ENDSTOP_Y
+ #define MIN_SOFTWARE_ENDSTOP_Z
+#endif
+
+// Max software endstops constrain movement within maximum coordinate bounds
+#define MAX_SOFTWARE_ENDSTOPS
+#if ENABLED(MAX_SOFTWARE_ENDSTOPS)
+ #define MAX_SOFTWARE_ENDSTOP_X
+ #define MAX_SOFTWARE_ENDSTOP_Y
+ #define MAX_SOFTWARE_ENDSTOP_Z
+#endif
+
+#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
+ //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD
+#endif
+
+/**
+ * Filament Runout Sensors
+ * Mechanical or opto endstops are used to check for the presence of filament.
+ *
+ * RAMPS-based boards use SERVO3_PIN for the first runout sensor.
+ * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
+ * By default the firmware assumes HIGH=FILAMENT PRESENT.
+ */
+//#define FILAMENT_RUNOUT_SENSOR
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+ #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
+ #define FIL_RUNOUT_INVERTING false // Set to true to invert the logic of the sensor.
+ #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
+ //#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
+
+ // Set one or more commands to execute on filament runout.
+ // (After 'M412 H' Marlin will ask the host to handle the process.)
+ #define FILAMENT_RUNOUT_SCRIPT "M600"
+
+ // After a runout is detected, continue printing this length of filament
+ // before executing the runout script. Useful for a sensor at the end of
+ // a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead.
+ //#define FILAMENT_RUNOUT_DISTANCE_MM 25
+
+ #ifdef FILAMENT_RUNOUT_DISTANCE_MM
+ // Enable this option to use an encoder disc that toggles the runout pin
+ // as the filament moves. (Be sure to set FILAMENT_RUNOUT_DISTANCE_MM
+ // large enough to avoid false positives.)
+ //#define FILAMENT_MOTION_SENSOR
+ #endif
+#endif
+
+//===========================================================================
+//=============================== Bed Leveling ==============================
+//===========================================================================
+// @section calibrate
+
+/**
+ * Choose one of the options below to enable G29 Bed Leveling. The parameters
+ * and behavior of G29 will change depending on your selection.
+ *
+ * If using a Probe for Z Homing, enable Z_SAFE_HOMING also!
+ *
+ * - AUTO_BED_LEVELING_3POINT
+ * Probe 3 arbitrary points on the bed (that aren't collinear)
+ * You specify the XY coordinates of all 3 points.
+ * The result is a single tilted plane. Best for a flat bed.
+ *
+ * - AUTO_BED_LEVELING_LINEAR
+ * Probe several points in a grid.
+ * You specify the rectangle and the density of sample points.
+ * The result is a single tilted plane. Best for a flat bed.
+ *
+ * - AUTO_BED_LEVELING_BILINEAR
+ * Probe several points in a grid.
+ * You specify the rectangle and the density of sample points.
+ * The result is a mesh, best for large or uneven beds.
+ *
+ * - AUTO_BED_LEVELING_UBL (Unified Bed Leveling)
+ * A comprehensive bed leveling system combining the features and benefits
+ * of other systems. UBL also includes integrated Mesh Generation, Mesh
+ * Validation and Mesh Editing systems.
+ *
+ * - MESH_BED_LEVELING
+ * Probe a grid manually
+ * The result is a mesh, suitable for large or uneven beds. (See BILINEAR.)
+ * For machines without a probe, Mesh Bed Leveling provides a method to perform
+ * leveling in steps so you can manually adjust the Z height at each grid-point.
+ * With an LCD controller the process is guided step-by-step.
+ */
+//#define AUTO_BED_LEVELING_3POINT
+//#define AUTO_BED_LEVELING_LINEAR
+//#define AUTO_BED_LEVELING_BILINEAR
+//#define AUTO_BED_LEVELING_UBL
+//#define MESH_BED_LEVELING
+
+/**
+ * Normally G28 leaves leveling disabled on completion. Enable
+ * this option to have G28 restore the prior leveling state.
+ */
+//#define RESTORE_LEVELING_AFTER_G28
+
+/**
+ * Enable detailed logging of G28, G29, M48, etc.
+ * Turn on with the command 'M111 S32'.
+ * NOTE: Requires a lot of PROGMEM!
+ */
+//#define DEBUG_LEVELING_FEATURE
+
+#if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL)
+ // Gradually reduce leveling correction until a set height is reached,
+ // at which point movement will be level to the machine's XY plane.
+ // The height can be set with M420 Z
+ #define ENABLE_LEVELING_FADE_HEIGHT
+
+ // For Cartesian machines, instead of dividing moves on mesh boundaries,
+ // split up moves into short segments like a Delta. This follows the
+ // contours of the bed more closely than edge-to-edge straight moves.
+ #define SEGMENT_LEVELED_MOVES
+ #define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one)
+
+ /**
+ * Enable the G26 Mesh Validation Pattern tool.
+ */
+ //#define G26_MESH_VALIDATION
+ #if ENABLED(G26_MESH_VALIDATION)
+ #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
+ #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
+ #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
+ #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
+ #define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
+ #endif
+
+#endif
+
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
+
+ // Set the number of grid points per dimension.
+ #define GRID_MAX_POINTS_X 3
+ #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
+
+ // Probe along the Y axis, advancing X after each column
+ //#define PROBE_Y_FIRST
+
+ #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
+
+ // Beyond the probed grid, continue the implied tilt?
+ // Default is to maintain the height of the nearest edge.
+ //#define EXTRAPOLATE_BEYOND_GRID
+
+ //
+ // Experimental Subdivision of the grid by Catmull-Rom method.
+ // Synthesizes intermediate points to produce a more detailed mesh.
+ //
+ //#define ABL_BILINEAR_SUBDIVISION
+ #if ENABLED(ABL_BILINEAR_SUBDIVISION)
+ // Number of subdivisions between probe points
+ #define BILINEAR_SUBDIVISIONS 3
+ #endif
+
+ #endif
+
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
+
+ //===========================================================================
+ //========================= Unified Bed Leveling ============================
+ //===========================================================================
+
+ //#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh
+
+ #define MESH_INSET 1 // Set Mesh bounds as an inset region of the bed
+ #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
+ #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
+
+ #define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
+ #define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
+
+ //#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
+ // as the Z-Height correction value.
+
+#elif ENABLED(MESH_BED_LEVELING)
+
+ //===========================================================================
+ //=================================== Mesh ==================================
+ //===========================================================================
+
+ #define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed
+ #define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited.
+ #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
+
+ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
+
+#endif // BED_LEVELING
+
+/**
+ * Add a bed leveling sub-menu for ABL or MBL.
+ * Include a guided procedure if manual probing is enabled.
+ */
+//#define LCD_BED_LEVELING
+
+#if ENABLED(LCD_BED_LEVELING)
+ #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
+ #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment
+ //#define MESH_EDIT_MENU // Add a menu to edit mesh points
+#endif
+
+// Add a menu item to move between bed corners for manual bed adjustment
+//#define LEVEL_BED_CORNERS
+
+#if ENABLED(LEVEL_BED_CORNERS)
+ #define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
+ #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Move nozzle up before moving between corners
+ #define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
+ //#define LEVEL_CENTER_TOO // Move to the center after the last corner
+#endif
+
+/**
+ * Commands to execute at the end of G29 probing.
+ * Useful to retract or move the Z probe out of the way.
+ */
+//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"
+
+
+// @section homing
+
+// The center of the bed is at (X=0, Y=0)
+//#define BED_CENTER_AT_0_0
+
+// Manually set the home position. Leave these undefined for automatic settings.
+// For DELTA this is the top-center of the Cartesian print volume.
+//#define MANUAL_X_HOME_POS 0
+//#define MANUAL_Y_HOME_POS 0
+//#define MANUAL_Z_HOME_POS 0
+
+// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
+//
+// With this feature enabled:
+//
+// - Allow Z homing only after X and Y homing AND stepper drivers still enabled.
+// - If stepper drivers time out, it will need X and Y homing again before Z homing.
+// - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28).
+// - Prevent Z homing when the Z probe is outside bed area.
+//
+//#define Z_SAFE_HOMING
+
+#if ENABLED(Z_SAFE_HOMING)
+ #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28).
+ #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28).
+#endif
+
+// Homing speeds (mm/m)
+#define HOMING_FEEDRATE_XY (50*60)
+#define HOMING_FEEDRATE_Z (4*60)
+
+// Validate that endstops are triggered on homing moves
+#define VALIDATE_HOMING_ENDSTOPS
+
+// @section calibrate
+
+/**
+ * Bed Skew Compensation
+ *
+ * This feature corrects for misalignment in the XYZ axes.
+ *
+ * Take the following steps to get the bed skew in the XY plane:
+ * 1. Print a test square (e.g., https://www.thingiverse.com/thing:2563185)
+ * 2. For XY_DIAG_AC measure the diagonal A to C
+ * 3. For XY_DIAG_BD measure the diagonal B to D
+ * 4. For XY_SIDE_AD measure the edge A to D
+ *
+ * Marlin automatically computes skew factors from these measurements.
+ * Skew factors may also be computed and set manually:
+ *
+ * - Compute AB : SQRT(2*AC*AC+2*BD*BD-4*AD*AD)/2
+ * - XY_SKEW_FACTOR : TAN(PI/2-ACOS((AC*AC-AB*AB-AD*AD)/(2*AB*AD)))
+ *
+ * If desired, follow the same procedure for XZ and YZ.
+ * Use these diagrams for reference:
+ *
+ * Y Z Z
+ * ^ B-------C ^ B-------C ^ B-------C
+ * | / / | / / | / /
+ * | / / | / / | / /
+ * | A-------D | A-------D | A-------D
+ * +-------------->X +-------------->X +-------------->Y
+ * XY_SKEW_FACTOR XZ_SKEW_FACTOR YZ_SKEW_FACTOR
+ */
+//#define SKEW_CORRECTION
+
+#if ENABLED(SKEW_CORRECTION)
+ // Input all length measurements here:
+ #define XY_DIAG_AC 282.8427124746
+ #define XY_DIAG_BD 282.8427124746
+ #define XY_SIDE_AD 200
+
+ // Or, set the default skew factors directly here
+ // to override the above measurements:
+ #define XY_SKEW_FACTOR 0.0
+
+ //#define SKEW_CORRECTION_FOR_Z
+ #if ENABLED(SKEW_CORRECTION_FOR_Z)
+ #define XZ_DIAG_AC 282.8427124746
+ #define XZ_DIAG_BD 282.8427124746
+ #define YZ_DIAG_AC 282.8427124746
+ #define YZ_DIAG_BD 282.8427124746
+ #define YZ_SIDE_AD 200
+ #define XZ_SKEW_FACTOR 0.0
+ #define YZ_SKEW_FACTOR 0.0
+ #endif
+
+ // Enable this option for M852 to set skew at runtime
+ //#define SKEW_CORRECTION_GCODE
+#endif
+
+//=============================================================================
+//============================= Additional Features ===========================
+//=============================================================================
+
+// @section extras
+
+/**
+ * EEPROM
+ *
+ * Persistent storage to preserve configurable settings across reboots.
+ *
+ * M500 - Store settings to EEPROM.
+ * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
+ * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
+ */
+//#define EEPROM_SETTINGS // Persistent storage with M500 and M501
+//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
+#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
+#if ENABLED(EEPROM_SETTINGS)
+ //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors.
+#endif
+
+//
+// Host Keepalive
+//
+// When enabled Marlin will send a busy status message to the host
+// every couple of seconds when it can't accept commands.
+//
+#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
+#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
+
+//
+// G20/G21 Inch mode support
+//
+//#define INCH_MODE_SUPPORT
+
+//
+// M149 Set temperature units support
+//
+//#define TEMPERATURE_UNITS_SUPPORT
+
+// @section temperature
+
+// Preheat Constants
+#define PREHEAT_1_LABEL "PLA"
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
+
+#define PREHEAT_2_LABEL "ABS"
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
+
+/**
+ * Nozzle Park
+ *
+ * Park the nozzle at the given XYZ position on idle or G27.
+ *
+ * The "P" parameter controls the action applied to the Z axis:
+ *
+ * P0 (Default) If Z is below park Z raise the nozzle.
+ * P1 Raise the nozzle always to Z-park height.
+ * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
+ */
+//#define NOZZLE_PARK_FEATURE
+
+#if ENABLED(NOZZLE_PARK_FEATURE)
+ // Specify a park position as { X, Y, Z_raise }
+ #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
+ #define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
+ #define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
+#endif
+
+/**
+ * Clean Nozzle Feature -- EXPERIMENTAL
+ *
+ * Adds the G12 command to perform a nozzle cleaning process.
+ *
+ * Parameters:
+ * P Pattern
+ * S Strokes / Repetitions
+ * T Triangles (P1 only)
+ *
+ * Patterns:
+ * P0 Straight line (default). This process requires a sponge type material
+ * at a fixed bed location. "S" specifies strokes (i.e. back-forth motions)
+ * between the start / end points.
+ *
+ * P1 Zig-zag pattern between (X0, Y0) and (X1, Y1), "T" specifies the
+ * number of zig-zag triangles to do. "S" defines the number of strokes.
+ * Zig-zags are done in whichever is the narrower dimension.
+ * For example, "G12 P1 S1 T3" will execute:
+ *
+ * --
+ * | (X0, Y1) | /\ /\ /\ | (X1, Y1)
+ * | | / \ / \ / \ |
+ * A | | / \ / \ / \ |
+ * | | / \ / \ / \ |
+ * | (X0, Y0) | / \/ \/ \ | (X1, Y0)
+ * -- +--------------------------------+
+ * |________|_________|_________|
+ * T1 T2 T3
+ *
+ * P2 Circular pattern with middle at NOZZLE_CLEAN_CIRCLE_MIDDLE.
+ * "R" specifies the radius. "S" specifies the stroke count.
+ * Before starting, the nozzle moves to NOZZLE_CLEAN_START_POINT.
+ *
+ * Caveats: The ending Z should be the same as starting Z.
+ * Attention: EXPERIMENTAL. G-code arguments may change.
+ *
+ */
+//#define NOZZLE_CLEAN_FEATURE
+
+#if ENABLED(NOZZLE_CLEAN_FEATURE)
+ // Default number of pattern repetitions
+ #define NOZZLE_CLEAN_STROKES 12
+
+ // Default number of triangles
+ #define NOZZLE_CLEAN_TRIANGLES 3
+
+ // Specify positions for each tool as { { X, Y, Z }, { X, Y, Z } }
+ // Dual hotend system may use { { -20, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }, { 420, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }}
+ #define NOZZLE_CLEAN_START_POINT { { 30, 30, (Z_MIN_POS + 1) } }
+ #define NOZZLE_CLEAN_END_POINT { { 100, 60, (Z_MIN_POS + 1) } }
+
+ // Circular pattern radius
+ #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5
+ // Circular pattern circle fragments number
+ #define NOZZLE_CLEAN_CIRCLE_FN 10
+ // Middle point of circle
+ #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT
+
+ // Move the nozzle to the initial position after cleaning
+ #define NOZZLE_CLEAN_GOBACK
+
+ // Enable for a purge/clean station that's always at the gantry height (thus no Z move)
+ //#define NOZZLE_CLEAN_NO_Z
+#endif
+
+/**
+ * Print Job Timer
+ *
+ * Automatically start and stop the print job timer on M104/M109/M190.
+ *
+ * M104 (hotend, no wait) - high temp = none, low temp = stop timer
+ * M109 (hotend, wait) - high temp = start timer, low temp = stop timer
+ * M190 (bed, wait) - high temp = start timer, low temp = none
+ *
+ * The timer can also be controlled with the following commands:
+ *
+ * M75 - Start the print job timer
+ * M76 - Pause the print job timer
+ * M77 - Stop the print job timer
+ */
+#define PRINTJOB_TIMER_AUTOSTART
+
+/**
+ * Print Counter
+ *
+ * Track statistical data such as:
+ *
+ * - Total print jobs
+ * - Total successful print jobs
+ * - Total failed print jobs
+ * - Total time printing
+ *
+ * View the current statistics with M78.
+ */
+//#define PRINTCOUNTER
+
+//=============================================================================
+//============================= LCD and SD support ============================
+//=============================================================================
+
+// @section lcd
+
+/**
+ * LCD LANGUAGE
+ *
+ * Select the language to display on the LCD. These languages are available:
+ *
+ * en, an, bg, ca, cz, da, de, el, el_gr, es, eu, fi, fr, gl, hr, it, jp_kana,
+ * ko_KR, nl, pl, pt, pt_br, ru, sk, tr, uk, vi, zh_CN, zh_TW, test
+ *
+ * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
+ */
+#define LCD_LANGUAGE en
+
+/**
+ * LCD Character Set
+ *
+ * Note: This option is NOT applicable to Graphical Displays.
+ *
+ * All character-based LCDs provide ASCII plus one of these
+ * language extensions:
+ *
+ * - JAPANESE ... the most common
+ * - WESTERN ... with more accented characters
+ * - CYRILLIC ... for the Russian language
+ *
+ * To determine the language extension installed on your controller:
+ *
+ * - Compile and upload with LCD_LANGUAGE set to 'test'
+ * - Click the controller to view the LCD menu
+ * - The LCD will display Japanese, Western, or Cyrillic text
+ *
+ * See http://marlinfw.org/docs/development/lcd_language.html
+ *
+ * :['JAPANESE', 'WESTERN', 'CYRILLIC']
+ */
+#define DISPLAY_CHARSET_HD44780 JAPANESE
+
+/**
+ * Info Screen Style (0:Classic, 1:Prusa)
+ *
+ * :[0:'Classic', 1:'Prusa']
+ */
+#define LCD_INFO_SCREEN_STYLE 0
+
+/**
+ * SD CARD
+ *
+ * SD Card support is disabled by default. If your controller has an SD slot,
+ * you must uncomment the following option or it won't work.
+ *
+ */
+//#define SDSUPPORT
+
+/**
+ * SD CARD: SPI SPEED
+ *
+ * Enable one of the following items for a slower SPI transfer speed.
+ * This may be required to resolve "volume init" errors.
+ */
+//#define SPI_SPEED SPI_HALF_SPEED
+//#define SPI_SPEED SPI_QUARTER_SPEED
+//#define SPI_SPEED SPI_EIGHTH_SPEED
+
+/**
+ * SD CARD: ENABLE CRC
+ *
+ * Use CRC checks and retries on the SD communication.
+ */
+//#define SD_CHECK_AND_RETRY
+
+/**
+ * LCD Menu Items
+ *
+ * Disable all menus and only display the Status Screen, or
+ * just remove some extraneous menu items to recover space.
+ */
+//#define NO_LCD_MENUS
+//#define SLIM_LCD_MENUS
+
+//
+// ENCODER SETTINGS
+//
+// This option overrides the default number of encoder pulses needed to
+// produce one step. Should be increased for high-resolution encoders.
+//
+//#define ENCODER_PULSES_PER_STEP 4
+
+//
+// Use this option to override the number of step signals required to
+// move between next/prev menu items.
+//
+//#define ENCODER_STEPS_PER_MENU_ITEM 1
+
+/**
+ * Encoder Direction Options
+ *
+ * Test your encoder's behavior first with both options disabled.
+ *
+ * Reversed Value Edit and Menu Nav? Enable REVERSE_ENCODER_DIRECTION.
+ * Reversed Menu Navigation only? Enable REVERSE_MENU_DIRECTION.
+ * Reversed Value Editing only? Enable BOTH options.
+ */
+
+//
+// This option reverses the encoder direction everywhere.
+//
+// Set this option if CLOCKWISE causes values to DECREASE
+//
+//#define REVERSE_ENCODER_DIRECTION
+
+//
+// This option reverses the encoder direction for navigating LCD menus.
+//
+// If CLOCKWISE normally moves DOWN this makes it go UP.
+// If CLOCKWISE normally moves UP this makes it go DOWN.
+//
+//#define REVERSE_MENU_DIRECTION
+
+//
+// This option reverses the encoder direction for Select Screen.
+//
+// If CLOCKWISE normally moves LEFT this makes it go RIGHT.
+// If CLOCKWISE normally moves RIGHT this makes it go LEFT.
+//
+//#define REVERSE_SELECT_DIRECTION
+
+//
+// Individual Axis Homing
+//
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
+//
+//#define INDIVIDUAL_AXIS_HOMING_MENU
+
+//
+// SPEAKER/BUZZER
+//
+// If you have a speaker that can produce tones, enable it here.
+// By default Marlin assumes you have a buzzer with a fixed frequency.
+//
+//#define SPEAKER
+
+//
+// The duration and frequency for the UI feedback sound.
+// Set these to 0 to disable audio feedback in the LCD menus.
+//
+// Note: Test audio output with the G-Code:
+// M300 S P
+//
+//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
+//#define LCD_FEEDBACK_FREQUENCY_HZ 5000
+
+//=============================================================================
+//======================== LCD / Controller Selection =========================
+//======================== (Character-based LCDs) =========================
+//=============================================================================
+
+//
+// RepRapDiscount Smart Controller.
+// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
+//
+// Note: Usually sold with a white PCB.
+//
+//#define REPRAP_DISCOUNT_SMART_CONTROLLER
+
+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
+//
+// ULTIMAKER Controller.
+//
+//#define ULTIMAKERCONTROLLER
+
+//
+// ULTIPANEL as seen on Thingiverse.
+//
+//#define ULTIPANEL
+
+//
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
+// http://reprap.org/wiki/PanelOne
+//
+//#define PANEL_ONE
+
+//
+// GADGETS3D G3D LCD/SD Controller
+// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
+//
+// Note: Usually sold with a blue PCB.
+//
+//#define G3D_PANEL
+
+//
+// RigidBot Panel V1.0
+// http://www.inventapart.com/
+//
+//#define RIGIDBOT_PANEL
+
+//
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
+// https://www.aliexpress.com/item/32765887917.html
+//
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
+
+//
+// ANET and Tronxy 20x4 Controller
+//
+//#define ZONESTAR_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
+ // This LCD is known to be susceptible to electrical interference
+ // which scrambles the display. Pressing any button clears it up.
+ // This is a LCD2004 display with 5 analog buttons.
+
+//
+// Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD.
+//
+//#define ULTRA_LCD
+
+//=============================================================================
+//======================== LCD / Controller Selection =========================
+//===================== (I2C and Shift-Register LCDs) =====================
+//=============================================================================
+
+//
+// CONTROLLER TYPE: I2C
+//
+// Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
+// library. For more info: https://github.com/kiyoshigawa/LiquidCrystal_I2C
+//
+
+//
+// Elefu RA Board Control Panel
+// http://www.elefu.com/index.php?route=product/product&product_id=53
+//
+//#define RA_CONTROL_PANEL
+
+//
+// Sainsmart (YwRobot) LCD Displays
+//
+// These require F.Malpartida's LiquidCrystal_I2C library
+// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home
+//
+//#define LCD_SAINSMART_I2C_1602
+//#define LCD_SAINSMART_I2C_2004
+
+//
+// Generic LCM1602 LCD adapter
+//
+//#define LCM1602
+
+//
+// PANELOLU2 LCD with status LEDs,
+// separate encoder and click inputs.
+//
+// Note: This controller requires Arduino's LiquidTWI2 library v1.2.3 or later.
+// For more info: https://github.com/lincomatic/LiquidTWI2
+//
+// Note: The PANELOLU2 encoder click input can either be directly connected to
+// a pin (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1).
+//
+//#define LCD_I2C_PANELOLU2
+
+//
+// Panucatt VIKI LCD with status LEDs,
+// integrated click & L/R/U/D buttons, separate encoder inputs.
+//
+//#define LCD_I2C_VIKI
+
+//
+// CONTROLLER TYPE: Shift register panels
+//
+
+//
+// 2-wire Non-latching LCD SR from https://goo.gl/aJJ4sH
+// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
+//
+//#define SAV_3DLCD
+
+//
+// 3-wire SR LCD with strobe using 74HC4094
+// https://github.com/mikeshub/SailfishLCD
+// Uses the code directly from Sailfish
+//
+//#define FF_INTERFACEBOARD
+
+//=============================================================================
+//======================= LCD / Controller Selection =======================
+//========================= (Graphical LCDs) ========================
+//=============================================================================
+
+//
+// CONTROLLER TYPE: Graphical 128x64 (DOGM)
+//
+// IMPORTANT: The U8glib library is required for Graphical Display!
+// https://github.com/olikraus/U8glib_Arduino
+//
+
+//
+// RepRapDiscount FULL GRAPHIC Smart Controller
+// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
+//
+//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+
+//
+// ReprapWorld Graphical LCD
+// https://reprapworld.com/?products_details&products_id/1218
+//
+//#define REPRAPWORLD_GRAPHICAL_LCD
+
+//
+// Activate one of these if you have a Panucatt Devices
+// Viki 2.0 or mini Viki with Graphic LCD
+// http://panucatt.com
+//
+//#define VIKI2
+//#define miniVIKI
+
+//
+// MakerLab Mini Panel with graphic
+// controller and SD support - http://reprap.org/wiki/Mini_panel
+//
+//#define MINIPANEL
+
+//
+// MaKr3d Makr-Panel with graphic controller and SD support.
+// http://reprap.org/wiki/MaKr3d_MaKrPanel
+//
+//#define MAKRPANEL
+
+//
+// Adafruit ST7565 Full Graphic Controller.
+// https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
+//
+//#define ELB_FULL_GRAPHIC_CONTROLLER
+
+//
+// BQ LCD Smart Controller shipped by
+// default with the BQ Hephestos 2 and Witbox 2.
+//
+//#define BQ_LCD_SMART_CONTROLLER
+
+//
+// Cartesio UI
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
+//
+//#define CARTESIO_UI
+
+//
+// LCD for Melzi Card with Graphical LCD
+//
+//#define LCD_FOR_MELZI
+
+//
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
+//
+//#define ULTI_CONTROLLER
+
+//
+// MKS MINI12864 with graphic controller and SD support
+// https://reprap.org/wiki/MKS_MINI_12864
+//
+//#define MKS_MINI_12864
+
+//
+// FYSETC variant of the MINI12864 graphic controller with SD support
+// https://wiki.fysetc.com/Mini12864_Panel/
+//
+//#define FYSETC_MINI_12864_X_X // Type C/D/E/F. No tunable RGB Backlight by default
+//#define FYSETC_MINI_12864_1_2 // Type C/D/E/F. Simple RGB Backlight (always on)
+//#define FYSETC_MINI_12864_2_0 // Type A/B. Discreet RGB Backlight
+//#define FYSETC_MINI_12864_2_1 // Type A/B. Neopixel RGB Backlight
+//#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
+
+//
+// Factory display for Creality CR-10
+// https://www.aliexpress.com/item/32833148327.html
+//
+// This is RAMPS-compatible using a single 10-pin connector.
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
+//
+//#define CR10_STOCKDISPLAY
+
+//
+// Ender-2 OEM display, a variant of the MKS_MINI_12864
+//
+//#define ENDER2_STOCKDISPLAY
+
+//
+// ANET and Tronxy Graphical Controller
+//
+// Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
+// A clone of the RepRapDiscount full graphics display but with
+// different pins/wiring (see pins_ANET_10.h).
+//
+//#define ANET_FULL_GRAPHICS_LCD
+
+//
+// AZSMZ 12864 LCD with SD
+// https://www.aliexpress.com/item/32837222770.html
+//
+//#define AZSMZ_12864
+
+//
+// Silvergate GLCD controller
+// http://github.com/android444/Silvergate
+//
+//#define SILVER_GATE_GLCD_CONTROLLER
+
+//=============================================================================
+//============================== OLED Displays ==============================
+//=============================================================================
+
+//
+// SSD1306 OLED full graphics generic display
+//
+//#define U8GLIB_SSD1306
+
+//
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
+//
+//#define SAV_3DGLCD
+#if ENABLED(SAV_3DGLCD)
+ #define U8GLIB_SSD1306
+ //#define U8GLIB_SH1106
+#endif
+
+//
+// TinyBoy2 128x64 OLED / Encoder Panel
+//
+//#define OLED_PANEL_TINYBOY2
+
+//
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
+// http://reprap.org/wiki/MKS_12864OLED
+//
+// Tiny, but very sharp OLED display
+//
+//#define MKS_12864OLED // Uses the SH1106 controller (default)
+//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller
+
+//
+// Einstart S OLED SSD1306
+//
+//#define U8GLIB_SH1106_EINSTART
+
+//
+// Overlord OLED display/controller with i2c buzzer and LEDs
+//
+//#define OVERLORD_OLED
+
+//=============================================================================
+//========================== Extensible UI Displays ===========================
+//=============================================================================
+
+//
+// DGUS Touch Display with DWIN OS. (Choose one.)
+//
+//#define DGUS_LCD_UI_ORIGIN
+//#define DGUS_LCD_UI_FYSETC
+//#define DGUS_LCD_UI_HIPRECY
+
+//
+// Touch-screen LCD for Malyan M200 printers
+//
+//#define MALYAN_LCD
+
+//
+// Touch UI for FTDI EVE (FT800/FT810) displays
+// See Configuration_adv.h for all configuration options.
+//
+//#define TOUCH_UI_FTDI_EVE
+
+//
+// Third-party or vendor-customized controller interfaces.
+// Sources should be installed in 'src/lcd/extensible_ui'.
+//
+//#define EXTENSIBLE_UI
+
+//=============================================================================
+//=============================== Graphical TFTs ==============================
+//=============================================================================
+
+//
+// FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
+//
+//#define FSMC_GRAPHICAL_TFT
+
+//=============================================================================
+//============================ Other Controllers ============================
+//=============================================================================
+
+//
+// ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
+//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
+ #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
+
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
+
+//
+// RepRapWorld REPRAPWORLD_KEYPAD v1.1
+// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
+//
+//#define REPRAPWORLD_KEYPAD
+//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // (mm) Distance to move per key-press
+
+//=============================================================================
+//=============================== Extra Features ==============================
+//=============================================================================
+
+// @section extras
+
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
+//#define FAST_PWM_FAN
+
+// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
+// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
+// is too low, you should also increment SOFT_PWM_SCALE.
+//#define FAN_SOFT_PWM
+
+// Incrementing this by 1 will double the software PWM frequency,
+// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
+// However, control resolution will be halved for each increment;
+// at zero value, there are 128 effective control positions.
+// :[0,1,2,3,4,5,6,7]
+#define SOFT_PWM_SCALE 0
+
+// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
+// be used to mitigate the associated resolution loss. If enabled,
+// some of the PWM cycles are stretched so on average the desired
+// duty cycle is attained.
+//#define SOFT_PWM_DITHER
+
+// Temperature status LEDs that display the hotend and bed temperature.
+// If all hotends, bed temperature, and target temperature are under 54C
+// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
+//#define TEMP_STAT_LEDS
+
+// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
+//#define SF_ARC_FIX
+
+// Support for the BariCUDA Paste Extruder
+//#define BARICUDA
+
+// Support for BlinkM/CyzRgb
+//#define BLINKM
+
+// Support for PCA9632 PWM LED driver
+//#define PCA9632
+
+// Support for PCA9533 PWM LED driver
+// https://github.com/mikeshub/SailfishRGB_LED
+//#define PCA9533
+
+/**
+ * RGB LED / LED Strip Control
+ *
+ * Enable support for an RGB LED connected to 5V digital pins, or
+ * an RGB Strip connected to MOSFETs controlled by digital pins.
+ *
+ * Adds the M150 command to set the LED (or LED strip) color.
+ * If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of
+ * luminance values can be set from 0 to 255.
+ * For Neopixel LED an overall brightness parameter is also available.
+ *
+ * *** CAUTION ***
+ * LED Strips require a MOSFET Chip between PWM lines and LEDs,
+ * as the Arduino cannot handle the current the LEDs will require.
+ * Failure to follow this precaution can destroy your Arduino!
+ * NOTE: A separate 5V power supply is required! The Neopixel LED needs
+ * more current than the Arduino 5V linear regulator can produce.
+ * *** CAUTION ***
+ *
+ * LED Type. Enable only one of the following two options.
+ *
+ */
+//#define RGB_LED
+//#define RGBW_LED
+
+#if EITHER(RGB_LED, RGBW_LED)
+ //#define RGB_LED_R_PIN 34
+ //#define RGB_LED_G_PIN 43
+ //#define RGB_LED_B_PIN 35
+ //#define RGB_LED_W_PIN -1
+#endif
+
+// Support for Adafruit Neopixel LED driver
+//#define NEOPIXEL_LED
+#if ENABLED(NEOPIXEL_LED)
+ #define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
+ #define NEOPIXEL_PIN 4 // LED driving pin
+ //#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
+ //#define NEOPIXEL2_PIN 5
+ #define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip, larger of 2 strips if 2 neopixel strips are used
+ #define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
+ #define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255)
+ //#define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup
+
+ // Use a single Neopixel LED for static (background) lighting
+ //#define NEOPIXEL_BKGD_LED_INDEX 0 // Index of the LED to use
+ //#define NEOPIXEL_BKGD_COLOR { 255, 255, 255, 0 } // R, G, B, W
+#endif
+
+/**
+ * Printer Event LEDs
+ *
+ * During printing, the LEDs will reflect the printer status:
+ *
+ * - Gradually change from blue to violet as the heated bed gets to target temp
+ * - Gradually change from violet to red as the hotend gets to temperature
+ * - Change to white to illuminate work surface
+ * - Change to green once print has finished
+ * - Turn off after the print has finished and the user has pushed a button
+ */
+#if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
+ #define PRINTER_EVENT_LEDS
+#endif
+
+/**
+ * R/C SERVO support
+ * Sponsored by TrinityLabs, Reworked by codexmas
+ */
+
+/**
+ * Number of servos
+ *
+ * For some servo-related options NUM_SERVOS will be set automatically.
+ * Set this manually if there are extra servos needing manual control.
+ * Leave undefined or set to 0 to entirely disable the servo subsystem.
+ */
+//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
+
+// (ms) Delay before the next move will start, to give the servo time to reach its target angle.
+// 300ms is a good value but you can try less delay.
+// If the servo can't reach the requested position, increase it.
+#define SERVO_DELAY { 300 }
+
+// Only power servos during movement, otherwise leave off to prevent jitter
+//#define DEACTIVATE_SERVOS_AFTER_MOVE
+
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
diff --git a/Configuration_adv.h b/Configuration_adv.h
new file mode 100644
index 0000000000..e2bda3f805
--- /dev/null
+++ b/Configuration_adv.h
@@ -0,0 +1,3094 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 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 .
+ *
+ */
+#pragma once
+
+/**
+ * Configuration_adv.h
+ *
+ * Advanced settings.
+ * Only change these if you know exactly what you're doing.
+ * Some of these settings can damage your printer if improperly set!
+ *
+ * Basic settings can be found in Configuration.h
+ *
+ */
+#define CONFIGURATION_ADV_H_VERSION 020000
+
+// @section temperature
+
+//===========================================================================
+//=============================Thermal Settings ============================
+//===========================================================================
+
+//
+// Custom Thermistor 1000 parameters
+//
+#if TEMP_SENSOR_0 == 1000
+ #define HOTEND0_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND0_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND0_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_1 == 1000
+ #define HOTEND1_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND1_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND1_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_2 == 1000
+ #define HOTEND2_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND2_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND2_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_3 == 1000
+ #define HOTEND3_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND3_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND3_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_4 == 1000
+ #define HOTEND4_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND4_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND4_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_5 == 1000
+ #define HOTEND5_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND5_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND5_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_6 == 1000
+ #define HOTEND6_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND6_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND6_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_7 == 1000
+ #define HOTEND7_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND7_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND7_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_BED == 1000
+ #define BED_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define BED_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define BED_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_CHAMBER == 1000
+ #define CHAMBER_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define CHAMBER_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define CHAMBER_BETA 3950 // Beta value
+#endif
+
+//
+// Hephestos 2 24V heated bed upgrade kit.
+// https://store.bq.com/en/heated-bed-kit-hephestos2
+//
+//#define HEPHESTOS2_HEATED_BED_KIT
+#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
+ #undef TEMP_SENSOR_BED
+ #define TEMP_SENSOR_BED 70
+ #define HEATER_BED_INVERTING true
+#endif
+
+/**
+ * Heated Chamber settings
+ */
+#if TEMP_SENSOR_CHAMBER
+ #define CHAMBER_MINTEMP 5
+ #define CHAMBER_MAXTEMP 60
+ #define TEMP_CHAMBER_HYSTERESIS 1 // (°C) Temperature proximity considered "close enough" to the target
+ //#define CHAMBER_LIMIT_SWITCHING
+ //#define HEATER_CHAMBER_PIN 44 // Chamber heater on/off pin
+ //#define HEATER_CHAMBER_INVERTING false
+#endif
+
+#if DISABLED(PIDTEMPBED)
+ #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control
+ #if ENABLED(BED_LIMIT_SWITCHING)
+ #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
+ #endif
+#endif
+
+/**
+ * Thermal Protection provides additional protection to your printer from damage
+ * and fire. Marlin always includes safe min and max temperature ranges which
+ * protect against a broken or disconnected thermistor wire.
+ *
+ * The issue: If a thermistor falls out, it will report the much lower
+ * temperature of the air in the room, and the the firmware will keep
+ * the heater on.
+ *
+ * The solution: Once the temperature reaches the target, start observing.
+ * If the temperature stays too far below the target (hysteresis) for too
+ * long (period), the firmware will halt the machine as a safety precaution.
+ *
+ * If you get false positives for "Thermal Runaway", increase
+ * THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD
+ */
+#if ENABLED(THERMAL_PROTECTION_HOTENDS)
+ #define THERMAL_PROTECTION_PERIOD 40 // Seconds
+ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius
+
+ //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
+ #if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
+ //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303
+ #endif
+
+ /**
+ * Whenever an M104, M109, or M303 increases the target temperature, the
+ * firmware will wait for the WATCH_TEMP_PERIOD to expire. If the temperature
+ * hasn't increased by WATCH_TEMP_INCREASE degrees, the machine is halted and
+ * requires a hard reset. This test restarts with any M104/M109/M303, but only
+ * if the current temperature is far enough below the target for a reliable
+ * test.
+ *
+ * If you get false positives for "Heating failed", increase WATCH_TEMP_PERIOD
+ * and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
+ * below 2.
+ */
+ #define WATCH_TEMP_PERIOD 20 // Seconds
+ #define WATCH_TEMP_INCREASE 2 // Degrees Celsius
+#endif
+
+/**
+ * Thermal Protection parameters for the bed are just as above for hotends.
+ */
+#if ENABLED(THERMAL_PROTECTION_BED)
+ #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds
+ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
+
+ /**
+ * As described above, except for the bed (M140/M190/M303).
+ */
+ #define WATCH_BED_TEMP_PERIOD 60 // Seconds
+ #define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
+#endif
+
+/**
+ * Thermal Protection parameters for the heated chamber.
+ */
+#if ENABLED(THERMAL_PROTECTION_CHAMBER)
+ #define THERMAL_PROTECTION_CHAMBER_PERIOD 20 // Seconds
+ #define THERMAL_PROTECTION_CHAMBER_HYSTERESIS 2 // Degrees Celsius
+
+ /**
+ * Heated chamber watch settings (M141/M191).
+ */
+ #define WATCH_CHAMBER_TEMP_PERIOD 60 // Seconds
+ #define WATCH_CHAMBER_TEMP_INCREASE 2 // Degrees Celsius
+#endif
+
+#if ENABLED(PIDTEMP)
+ // Add an experimental additional term to the heater power, proportional to the extrusion speed.
+ // A well-chosen Kc value should add just enough power to melt the increased material volume.
+ //#define PID_EXTRUSION_SCALING
+ #if ENABLED(PID_EXTRUSION_SCALING)
+ #define DEFAULT_Kc (100) //heating power=Kc*(e_speed)
+ #define LPQ_MAX_LEN 50
+ #endif
+
+ /**
+ * Add an experimental additional term to the heater power, proportional to the fan speed.
+ * A well-chosen Kf value should add just enough power to compensate for power-loss from the cooling fan.
+ * You can either just add a constant compensation with the DEFAULT_Kf value
+ * or follow the instruction below to get speed-dependent compensation.
+ *
+ * Constant compensation (use only with fanspeeds of 0% and 100%)
+ * ---------------------------------------------------------------------
+ * A good starting point for the Kf-value comes from the calculation:
+ * kf = (power_fan * eff_fan) / power_heater * 255
+ * where eff_fan is between 0.0 and 1.0, based on fan-efficiency and airflow to the nozzle / heater.
+ *
+ * Example:
+ * Heater: 40W, Fan: 0.1A * 24V = 2.4W, eff_fan = 0.8
+ * Kf = (2.4W * 0.8) / 40W * 255 = 12.24
+ *
+ * Fan-speed dependent compensation
+ * --------------------------------
+ * 1. To find a good Kf value, set the hotend temperature, wait for it to settle, and enable the fan (100%).
+ * Make sure PID_FAN_SCALING_LIN_FACTOR is 0 and PID_FAN_SCALING_ALTERNATIVE_DEFINITION is not enabled.
+ * If you see the temperature drop repeat the test, increasing the Kf value slowly, until the temperature
+ * drop goes away. If the temperature overshoots after enabling the fan, the Kf value is too big.
+ * 2. Note the Kf-value for fan-speed at 100%
+ * 3. Determine a good value for PID_FAN_SCALING_MIN_SPEED, which is around the speed, where the fan starts moving.
+ * 4. Repeat step 1. and 2. for this fan speed.
+ * 5. Enable PID_FAN_SCALING_ALTERNATIVE_DEFINITION and enter the two identified Kf-values in
+ * PID_FAN_SCALING_AT_FULL_SPEED and PID_FAN_SCALING_AT_MIN_SPEED. Enter the minimum speed in PID_FAN_SCALING_MIN_SPEED
+ */
+ //#define PID_FAN_SCALING
+ #if ENABLED(PID_FAN_SCALING)
+ //#define PID_FAN_SCALING_ALTERNATIVE_DEFINITION
+ #if ENABLED(PID_FAN_SCALING_ALTERNATIVE_DEFINITION)
+ // The alternative definition is used for an easier configuration.
+ // Just figure out Kf at fullspeed (255) and PID_FAN_SCALING_MIN_SPEED.
+ // DEFAULT_Kf and PID_FAN_SCALING_LIN_FACTOR are calculated accordingly.
+
+ #define PID_FAN_SCALING_AT_FULL_SPEED 13.0 //=PID_FAN_SCALING_LIN_FACTOR*255+DEFAULT_Kf
+ #define PID_FAN_SCALING_AT_MIN_SPEED 6.0 //=PID_FAN_SCALING_LIN_FACTOR*PID_FAN_SCALING_MIN_SPEED+DEFAULT_Kf
+ #define PID_FAN_SCALING_MIN_SPEED 10.0 // Minimum fan speed at which to enable PID_FAN_SCALING
+
+ #define DEFAULT_Kf (255.0*PID_FAN_SCALING_AT_MIN_SPEED-PID_FAN_SCALING_AT_FULL_SPEED*PID_FAN_SCALING_MIN_SPEED)/(255.0-PID_FAN_SCALING_MIN_SPEED)
+ #define PID_FAN_SCALING_LIN_FACTOR (PID_FAN_SCALING_AT_FULL_SPEED-DEFAULT_Kf)/255.0
+
+ #else
+ #define PID_FAN_SCALING_LIN_FACTOR (0) // Power loss due to cooling = Kf * (fan_speed)
+ #define DEFAULT_Kf 10 // A constant value added to the PID-tuner
+ #define PID_FAN_SCALING_MIN_SPEED 10 // Minimum fan speed at which to enable PID_FAN_SCALING
+ #endif
+ #endif
+#endif
+
+/**
+ * Automatic Temperature:
+ * The hotend target temperature is calculated by all the buffered lines of gcode.
+ * The maximum buffered steps/sec of the extruder motor is called "se".
+ * Start autotemp mode with M109 S B F
+ * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
+ * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
+ * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
+ */
+#define AUTOTEMP
+#if ENABLED(AUTOTEMP)
+ #define AUTOTEMP_OLDWEIGHT 0.98
+#endif
+
+// Show extra position information with 'M114 D'
+//#define M114_DETAIL
+
+// Show Temperature ADC value
+// Enable for M105 to include ADC values read from temperature sensors.
+//#define SHOW_TEMP_ADC_VALUES
+
+/**
+ * High Temperature Thermistor Support
+ *
+ * Thermistors able to support high temperature tend to have a hard time getting
+ * good readings at room and lower temperatures. This means HEATER_X_RAW_LO_TEMP
+ * will probably be caught when the heating element first turns on during the
+ * preheating process, which will trigger a min_temp_error as a safety measure
+ * and force stop everything.
+ * To circumvent this limitation, we allow for a preheat time (during which,
+ * min_temp_error won't be triggered) and add a min_temp buffer to handle
+ * aberrant readings.
+ *
+ * If you want to enable this feature for your hotend thermistor(s)
+ * uncomment and set values > 0 in the constants below
+ */
+
+// The number of consecutive low temperature errors that can occur
+// before a min_temp_error is triggered. (Shouldn't be more than 10.)
+//#define MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED 0
+
+// The number of milliseconds a hotend will preheat before starting to check
+// the temperature. This value should NOT be set to the time it takes the
+// hot end to reach the target temperature, but the time it takes to reach
+// the minimum temperature your thermistor can read. The lower the better/safer.
+// This shouldn't need to be more than 30 seconds (30000)
+//#define MILLISECONDS_PREHEAT_TIME 0
+
+// @section extruder
+
+// Extruder runout prevention.
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
+//#define EXTRUDER_RUNOUT_PREVENT
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
+ #define EXTRUDER_RUNOUT_MINTEMP 190
+ #define EXTRUDER_RUNOUT_SECONDS 30
+ #define EXTRUDER_RUNOUT_SPEED 1500 // (mm/m)
+ #define EXTRUDER_RUNOUT_EXTRUDE 5 // (mm)
+#endif
+
+// @section temperature
+
+// Calibration for AD595 / AD8495 sensor to adjust temperature measurements.
+// The final temperature is calculated as (measuredTemp * GAIN) + OFFSET.
+#define TEMP_SENSOR_AD595_OFFSET 0.0
+#define TEMP_SENSOR_AD595_GAIN 1.0
+#define TEMP_SENSOR_AD8495_OFFSET 0.0
+#define TEMP_SENSOR_AD8495_GAIN 1.0
+
+/**
+ * Controller Fan
+ * To cool down the stepper drivers and MOSFETs.
+ *
+ * The fan will turn on automatically whenever any stepper is enabled
+ * and turn off after a set period after all steppers are turned off.
+ */
+//#define USE_CONTROLLER_FAN
+#if ENABLED(USE_CONTROLLER_FAN)
+ //#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan
+ #define CONTROLLERFAN_SECS 60 // Duration in seconds for the fan to run after all motors are disabled
+ #define CONTROLLERFAN_SPEED 255 // 255 == full speed
+ //#define CONTROLLERFAN_SPEED_Z_ONLY 127 // Reduce noise on machines that keep Z enabled
+#endif
+
+// When first starting the main fan, run it at full speed for the
+// given number of milliseconds. This gets the fan spinning reliably
+// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
+//#define FAN_KICKSTART_TIME 100
+
+// Some coolers may require a non-zero "off" state.
+//#define FAN_OFF_PWM 1
+
+/**
+ * PWM Fan Scaling
+ *
+ * Define the min/max speeds for PWM fans (as set with M106).
+ *
+ * With these options the M106 0-255 value range is scaled to a subset
+ * to ensure that the fan has enough power to spin, or to run lower
+ * current fans with higher current. (e.g., 5V/12V fans with 12V/24V)
+ * Value 0 always turns off the fan.
+ *
+ * Define one or both of these to override the default 0-255 range.
+ */
+//#define FAN_MIN_PWM 50
+//#define FAN_MAX_PWM 128
+
+/**
+ * FAST PWM FAN Settings
+ *
+ * Use to change the FAST FAN PWM frequency (if enabled in Configuration.h)
+ * Combinations of PWM Modes, prescale values and TOP resolutions are used internally to produce a
+ * frequency as close as possible to the desired frequency.
+ *
+ * FAST_PWM_FAN_FREQUENCY [undefined by default]
+ * Set this to your desired frequency.
+ * If left undefined this defaults to F = F_CPU/(2*255*1)
+ * i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
+ * These defaults are the same as with the old FAST_PWM_FAN implementation - no migration is required
+ * NOTE: Setting very low frequencies (< 10 Hz) may result in unexpected timer behavior.
+ *
+ * USE_OCR2A_AS_TOP [undefined by default]
+ * Boards that use TIMER2 for PWM have limitations resulting in only a few possible frequencies on TIMER2:
+ * 16MHz MCUs: [62.5KHz, 31.4KHz (default), 7.8KHz, 3.92KHz, 1.95KHz, 977Hz, 488Hz, 244Hz, 60Hz, 122Hz, 30Hz]
+ * 20MHz MCUs: [78.1KHz, 39.2KHz (default), 9.77KHz, 4.9KHz, 2.44KHz, 1.22KHz, 610Hz, 305Hz, 153Hz, 76Hz, 38Hz]
+ * A greater range can be achieved by enabling USE_OCR2A_AS_TOP. But note that this option blocks the use of
+ * PWM on pin OC2A. Only use this option if you don't need PWM on 0C2A. (Check your schematic.)
+ * USE_OCR2A_AS_TOP sacrifices duty cycle control resolution to achieve this broader range of frequencies.
+ */
+#if ENABLED(FAST_PWM_FAN)
+ //#define FAST_PWM_FAN_FREQUENCY 31400
+ //#define USE_OCR2A_AS_TOP
+#endif
+
+// @section extruder
+
+/**
+ * Extruder cooling fans
+ *
+ * Extruder auto fans automatically turn on when their extruders'
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
+ *
+ * Your board's pins file specifies the recommended pins. Override those here
+ * or set to -1 to disable completely.
+ *
+ * Multiple extruders can be assigned to the same pin in which case
+ * the fan will turn on when any selected extruder is above the threshold.
+ */
+#define E0_AUTO_FAN_PIN -1
+#define E1_AUTO_FAN_PIN -1
+#define E2_AUTO_FAN_PIN -1
+#define E3_AUTO_FAN_PIN -1
+#define E4_AUTO_FAN_PIN -1
+#define E5_AUTO_FAN_PIN -1
+#define CHAMBER_AUTO_FAN_PIN -1
+
+#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
+#define EXTRUDER_AUTO_FAN_SPEED 255 // 255 == full speed
+#define CHAMBER_AUTO_FAN_TEMPERATURE 30
+#define CHAMBER_AUTO_FAN_SPEED 255
+
+/**
+ * Part-Cooling Fan Multiplexer
+ *
+ * This feature allows you to digitally multiplex the fan output.
+ * The multiplexer is automatically switched at tool-change.
+ * Set FANMUX[012]_PINs below for up to 2, 4, or 8 multiplexed fans.
+ */
+#define FANMUX0_PIN -1
+#define FANMUX1_PIN -1
+#define FANMUX2_PIN -1
+
+/**
+ * M355 Case Light on-off / brightness
+ */
+//#define CASE_LIGHT_ENABLE
+#if ENABLED(CASE_LIGHT_ENABLE)
+ //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
+ #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
+ #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
+ #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
+ //#define CASE_LIGHT_MAX_PWM 128 // Limit pwm
+ //#define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
+ //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting.
+ //#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED.
+ #if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
+ #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }
+ #endif
+#endif
+
+// @section homing
+
+// If you want endstops to stay on (by default) even when not homing
+// enable this option. Override at any time with M120, M121.
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
+
+// @section extras
+
+//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
+
+// Employ an external closed loop controller. Override pins here if needed.
+//#define EXTERNAL_CLOSED_LOOP_CONTROLLER
+#if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
+ //#define CLOSED_LOOP_ENABLE_PIN -1
+ //#define CLOSED_LOOP_MOVE_COMPLETE_PIN -1
+#endif
+
+/**
+ * Dual Steppers / Dual Endstops
+ *
+ * This section will allow you to use extra E drivers to drive a second motor for X, Y, or Z axes.
+ *
+ * For example, set X_DUAL_STEPPER_DRIVERS setting to use a second motor. If the motors need to
+ * spin in opposite directions set INVERT_X2_VS_X_DIR. If the second motor needs its own endstop
+ * set X_DUAL_ENDSTOPS. This can adjust for "racking." Use X2_USE_ENDSTOP to set the endstop plug
+ * that should be used for the second endstop. Extra endstops will appear in the output of 'M119'.
+ *
+ * Use X_DUAL_ENDSTOP_ADJUSTMENT to adjust for mechanical imperfection. After homing both motors
+ * this offset is applied to the X2 motor. To find the offset home the X axis, and measure the error
+ * in X2. Dual endstop offsets can be set at runtime with 'M666 X Y Z'.
+ */
+
+//#define X_DUAL_STEPPER_DRIVERS
+#if ENABLED(X_DUAL_STEPPER_DRIVERS)
+ #define INVERT_X2_VS_X_DIR true // Set 'true' if X motors should rotate in opposite directions
+ //#define X_DUAL_ENDSTOPS
+ #if ENABLED(X_DUAL_ENDSTOPS)
+ #define X2_USE_ENDSTOP _XMAX_
+ #define X2_ENDSTOP_ADJUSTMENT 0
+ #endif
+#endif
+
+//#define Y_DUAL_STEPPER_DRIVERS
+#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+ #define INVERT_Y2_VS_Y_DIR true // Set 'true' if Y motors should rotate in opposite directions
+ //#define Y_DUAL_ENDSTOPS
+ #if ENABLED(Y_DUAL_ENDSTOPS)
+ #define Y2_USE_ENDSTOP _YMAX_
+ #define Y2_ENDSTOP_ADJUSTMENT 0
+ #endif
+#endif
+
+//
+// For Z set the number of stepper drivers
+//
+#define NUM_Z_STEPPER_DRIVERS 1 // (1-4) Z options change based on how many
+
+#if NUM_Z_STEPPER_DRIVERS > 1
+ //#define Z_MULTI_ENDSTOPS
+ #if ENABLED(Z_MULTI_ENDSTOPS)
+ #define Z2_USE_ENDSTOP _XMAX_
+ #define Z2_ENDSTOP_ADJUSTMENT 0
+ #if NUM_Z_STEPPER_DRIVERS >= 3
+ #define Z3_USE_ENDSTOP _YMAX_
+ #define Z3_ENDSTOP_ADJUSTMENT 0
+ #endif
+ #if NUM_Z_STEPPER_DRIVERS >= 4
+ #define Z4_USE_ENDSTOP _ZMAX_
+ #define Z4_ENDSTOP_ADJUSTMENT 0
+ #endif
+ #endif
+#endif
+
+/**
+ * Dual X Carriage
+ *
+ * This setup has two X carriages that can move independently, each with its own hotend.
+ * The carriages can be used to print an object with two colors or materials, or in
+ * "duplication mode" it can print two identical or X-mirrored objects simultaneously.
+ * The inactive carriage is parked automatically to prevent oozing.
+ * X1 is the left carriage, X2 the right. They park and home at opposite ends of the X axis.
+ * By default the X2 stepper is assigned to the first unused E plug on the board.
+ *
+ * The following Dual X Carriage modes can be selected with M605 S:
+ *
+ * 0 : (FULL_CONTROL) The slicer has full control over both X-carriages and can achieve optimal travel
+ * results as long as it supports dual X-carriages. (M605 S0)
+ *
+ * 1 : (AUTO_PARK) The firmware automatically parks and unparks the X-carriages on tool-change so
+ * that additional slicer support is not required. (M605 S1)
+ *
+ * 2 : (DUPLICATION) The firmware moves the second X-carriage and extruder in synchronization with
+ * the first X-carriage and extruder, to print 2 copies of the same object at the same time.
+ * Set the constant X-offset and temperature differential with M605 S2 X[offs] R[deg] and
+ * follow with M605 S2 to initiate duplicated movement.
+ *
+ * 3 : (MIRRORED) Formbot/Vivedino-inspired mirrored mode in which the second extruder duplicates
+ * the movement of the first except the second extruder is reversed in the X axis.
+ * Set the initial X offset and temperature differential with M605 S2 X[offs] R[deg] and
+ * follow with M605 S3 to initiate mirrored movement.
+ */
+//#define DUAL_X_CARRIAGE
+#if ENABLED(DUAL_X_CARRIAGE)
+ #define X1_MIN_POS X_MIN_POS // Set to X_MIN_POS
+ #define X1_MAX_POS X_BED_SIZE // Set a maximum so the first X-carriage can't hit the parked second X-carriage
+ #define X2_MIN_POS 80 // Set a minimum to ensure the second X-carriage can't hit the parked first X-carriage
+ #define X2_MAX_POS 353 // Set this to the distance between toolheads when both heads are homed
+ #define X2_HOME_DIR 1 // Set to 1. The second X-carriage always homes to the maximum endstop position
+ #define X2_HOME_POS X2_MAX_POS // Default X2 home position. Set to X2_MAX_POS.
+ // However: In this mode the HOTEND_OFFSET_X value for the second extruder provides a software
+ // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops
+ // without modifying the firmware (through the "M218 T1 X???" command).
+ // Remember: you should set the second extruder x-offset to 0 in your slicer.
+
+ // This is the default power-up mode which can be later using M605.
+ #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE
+
+ // Default x offset in duplication mode (typically set to half print bed width)
+ #define DEFAULT_DUPLICATION_X_OFFSET 100
+
+#endif // DUAL_X_CARRIAGE
+
+// Activate a solenoid on the active extruder with M380. Disable all with M381.
+// Define SOL0_PIN, SOL1_PIN, etc., for each extruder that has a solenoid.
+//#define EXT_SOLENOID
+
+// @section homing
+
+// Homing hits each endstop, retracts by these distances, then does a slower bump.
+#define X_HOME_BUMP_MM 5
+#define Y_HOME_BUMP_MM 5
+#define Z_HOME_BUMP_MM 2
+#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
+//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
+//#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing
+
+// When G28 is called, this option will make Y home before X
+//#define HOME_Y_BEFORE_X
+
+// Enable this if X or Y can't home without homing the other axis first.
+//#define CODEPENDENT_XY_HOMING
+
+#if ENABLED(BLTOUCH)
+ /**
+ * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
+ * Do not activate settings that the probe might not understand. Clones might misunderstand
+ * advanced commands.
+ *
+ * Note: If the probe is not deploying, check a "Cmd: Reset" and "Cmd: Self-Test" and then
+ * check the wiring of the BROWN, RED and ORANGE wires.
+ *
+ * Note: If the trigger signal of your probe is not being recognized, it has been very often
+ * because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
+ * like they would be with a real switch. So please check the wiring first.
+ *
+ * Settings for all BLTouch and clone probes:
+ */
+
+ // Safety: The probe needs time to recognize the command.
+ // Minimum command delay (ms). Enable and increase if needed.
+ //#define BLTOUCH_DELAY 500
+
+ /**
+ * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
+ */
+
+ // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
+ // in special cases, like noisy or filtered input configurations.
+ //#define BLTOUCH_FORCE_SW_MODE
+
+ /**
+ * Settings for BLTouch Smart 3.0 and 3.1
+ * Summary:
+ * - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
+ * - High-Speed mode
+ * - Disable LCD voltage options
+ */
+
+ /**
+ * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
+ * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
+ * If disabled, OD mode is the hard-coded default on 3.0
+ * On startup, Marlin will compare its eeprom to this vale. If the selected mode
+ * differs, a mode set eeprom write will be completed at initialization.
+ * Use the option below to force an eeprom write to a V3.1 probe regardless.
+ */
+ //#define BLTOUCH_SET_5V_MODE
+
+ /**
+ * Safety: Activate if connecting a probe with an unknown voltage mode.
+ * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
+ * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
+ * To preserve the life of the probe, use this once then turn it off and re-flash.
+ */
+ //#define BLTOUCH_FORCE_MODE_SET
+
+ /**
+ * Use "HIGH SPEED" mode for probing.
+ * Danger: Disable if your probe sometimes fails. Only suitable for stable well-adjusted systems.
+ * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function
+ * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state.
+ */
+ //#define BLTOUCH_HS_MODE
+
+ // Safety: Enable voltage mode settings in the LCD menu.
+ //#define BLTOUCH_LCD_VOLTAGE_MENU
+
+#endif // BLTOUCH
+
+/**
+ * Z Steppers Auto-Alignment
+ * Add the G34 command to align multiple Z steppers using a bed probe.
+ */
+//#define Z_STEPPER_AUTO_ALIGN
+#if ENABLED(Z_STEPPER_AUTO_ALIGN)
+ // Define probe X and Y positions for Z1, Z2 [, Z3]
+ #define Z_STEPPER_ALIGN_XY { { 10, 190 }, { 100, 10 }, { 190, 190 } }
+
+ // Provide Z stepper positions for more rapid convergence in bed alignment.
+ // Currently requires triple stepper drivers.
+ //#define Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
+ #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ // Define Stepper XY positions for Z1, Z2, Z3 corresponding to
+ // the Z screw positions in the bed carriage.
+ // Define one position per Z stepper in stepper driver order.
+ #define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
+ #else
+ // Amplification factor. Used to scale the correction step up or down.
+ // In case the stepper (spindle) position is further out than the test point.
+ // Use a value > 1. NOTE: This may cause instability
+ #define Z_STEPPER_ALIGN_AMP 1.0
+ #endif
+
+ // Set number of iterations to align
+ #define Z_STEPPER_ALIGN_ITERATIONS 3
+
+ // Enable to restore leveling setup after operation
+ #define RESTORE_LEVELING_AFTER_G34
+
+ // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
+ #define G34_MAX_GRADE 5 // (%) Maximum incline G34 will handle
+
+ // Stop criterion. If the accuracy is better than this stop iterating early
+ #define Z_STEPPER_ALIGN_ACC 0.02
+#endif
+
+// @section motion
+
+#define AXIS_RELATIVE_MODES { false, false, false, false }
+
+// Add a Duplicate option for well-separated conjoined nozzles
+//#define MULTI_NOZZLE_DUPLICATION
+
+// By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
+#define INVERT_X_STEP_PIN false
+#define INVERT_Y_STEP_PIN false
+#define INVERT_Z_STEP_PIN false
+#define INVERT_E_STEP_PIN false
+
+// Default stepper release if idle. Set to 0 to deactivate.
+// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true.
+// Time can be set by M18 and M84.
+#define DEFAULT_STEPPER_DEACTIVE_TIME 120
+#define DISABLE_INACTIVE_X true
+#define DISABLE_INACTIVE_Y true
+#define DISABLE_INACTIVE_Z true // Set to false if the nozzle will fall down on your printed part when print has finished.
+#define DISABLE_INACTIVE_E true
+
+#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
+#define DEFAULT_MINTRAVELFEEDRATE 0.0
+
+//#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated
+
+// Minimum time that a segment needs to take if the buffer is emptied
+#define DEFAULT_MINSEGMENTTIME 20000 // (ms)
+
+// If defined the movements slow down when the look ahead buffer is only half full
+#define SLOWDOWN
+
+// Frequency limit
+// See nophead's blog for more info
+// Not working O
+//#define XY_FREQUENCY_LIMIT 15
+
+// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
+// of the buffer and all stops. This should not be much greater than zero and should only be changed
+// if unwanted behavior is observed on a user's machine when running at very slow speeds.
+#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
+
+//
+// Backlash Compensation
+// Adds extra movement to axes on direction-changes to account for backlash.
+//
+//#define BACKLASH_COMPENSATION
+#if ENABLED(BACKLASH_COMPENSATION)
+ // Define values for backlash distance and correction.
+ // If BACKLASH_GCODE is enabled these values are the defaults.
+ #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm)
+ #define BACKLASH_CORRECTION 0.0 // 0.0 = no correction; 1.0 = full correction
+
+ // Set BACKLASH_SMOOTHING_MM to spread backlash correction over multiple segments
+ // to reduce print artifacts. (Enabling this is costly in memory and computation!)
+ //#define BACKLASH_SMOOTHING_MM 3 // (mm)
+
+ // Add runtime configuration and tuning of backlash values (M425)
+ //#define BACKLASH_GCODE
+
+ #if ENABLED(BACKLASH_GCODE)
+ // Measure the Z backlash when probing (G29) and set with "M425 Z"
+ #define MEASURE_BACKLASH_WHEN_PROBING
+
+ #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
+ // When measuring, the probe will move up to BACKLASH_MEASUREMENT_LIMIT
+ // mm away from point of contact in BACKLASH_MEASUREMENT_RESOLUTION
+ // increments while checking for the contact to be broken.
+ #define BACKLASH_MEASUREMENT_LIMIT 0.5 // (mm)
+ #define BACKLASH_MEASUREMENT_RESOLUTION 0.005 // (mm)
+ #define BACKLASH_MEASUREMENT_FEEDRATE Z_PROBE_SPEED_SLOW // (mm/m)
+ #endif
+ #endif
+#endif
+
+/**
+ * Automatic backlash, position and hotend offset calibration
+ *
+ * Enable G425 to run automatic calibration using an electrically-
+ * conductive cube, bolt, or washer mounted on the bed.
+ *
+ * G425 uses the probe to touch the top and sides of the calibration object
+ * on the bed and measures and/or correct positional offsets, axis backlash
+ * and hotend offsets.
+ *
+ * Note: HOTEND_OFFSET and CALIBRATION_OBJECT_CENTER must be set to within
+ * ±5mm of true values for G425 to succeed.
+ */
+//#define CALIBRATION_GCODE
+#if ENABLED(CALIBRATION_GCODE)
+
+ #define CALIBRATION_MEASUREMENT_RESOLUTION 0.01 // mm
+
+ #define CALIBRATION_FEEDRATE_SLOW 60 // mm/m
+ #define CALIBRATION_FEEDRATE_FAST 1200 // mm/m
+ #define CALIBRATION_FEEDRATE_TRAVEL 3000 // mm/m
+
+ // The following parameters refer to the conical section of the nozzle tip.
+ #define CALIBRATION_NOZZLE_TIP_HEIGHT 1.0 // mm
+ #define CALIBRATION_NOZZLE_OUTER_DIAMETER 2.0 // mm
+
+ // Uncomment to enable reporting (required for "G425 V", but consumes PROGMEM).
+ //#define CALIBRATION_REPORTING
+
+ // The true location and dimension the cube/bolt/washer on the bed.
+ #define CALIBRATION_OBJECT_CENTER { 264.0, -22.0, -2.0 } // mm
+ #define CALIBRATION_OBJECT_DIMENSIONS { 10.0, 10.0, 10.0 } // mm
+
+ // Comment out any sides which are unreachable by the probe. For best
+ // auto-calibration results, all sides must be reachable.
+ #define CALIBRATION_MEASURE_RIGHT
+ #define CALIBRATION_MEASURE_FRONT
+ #define CALIBRATION_MEASURE_LEFT
+ #define CALIBRATION_MEASURE_BACK
+
+ // Probing at the exact top center only works if the center is flat. If
+ // probing on a screwhead or hollow washer, probe near the edges.
+ //#define CALIBRATION_MEASURE_AT_TOP_EDGES
+
+ // Define the pin to read during calibration
+ #ifndef CALIBRATION_PIN
+ #define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop
+ #define CALIBRATION_PIN_INVERTING false // Set to true to invert the pin
+ //#define CALIBRATION_PIN_PULLDOWN
+ #define CALIBRATION_PIN_PULLUP
+ #endif
+#endif
+
+/**
+ * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
+ * below 1kHz (for AVR) or 10kHz (for ARM), where aliasing between axes in multi-axis moves causes audible
+ * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
+ * lowest stepping frequencies.
+ */
+//#define ADAPTIVE_STEP_SMOOTHING
+
+/**
+ * Custom Microstepping
+ * Override as-needed for your setup. Up to 3 MS pins are supported.
+ */
+//#define MICROSTEP1 LOW,LOW,LOW
+//#define MICROSTEP2 HIGH,LOW,LOW
+//#define MICROSTEP4 LOW,HIGH,LOW
+//#define MICROSTEP8 HIGH,HIGH,LOW
+//#define MICROSTEP16 LOW,LOW,HIGH
+//#define MICROSTEP32 HIGH,LOW,HIGH
+
+// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16]
+
+/**
+ * @section stepper motor current
+ *
+ * Some boards have a means of setting the stepper motor current via firmware.
+ *
+ * The power on motor currents are set by:
+ * PWM_MOTOR_CURRENT - used by MINIRAMBO & ULTIMAIN_2
+ * known compatible chips: A4982
+ * DIGIPOT_MOTOR_CURRENT - used by BQ_ZUM_MEGA_3D, RAMBO & SCOOVO_X9H
+ * known compatible chips: AD5206
+ * DAC_MOTOR_CURRENT_DEFAULT - used by PRINTRBOARD_REVF & RIGIDBOARD_V2
+ * known compatible chips: MCP4728
+ * DIGIPOT_I2C_MOTOR_CURRENTS - used by 5DPRINT, AZTEEG_X3_PRO, AZTEEG_X5_MINI_WIFI, MIGHTYBOARD_REVE
+ * known compatible chips: MCP4451, MCP4018
+ *
+ * Motor currents can also be set by M907 - M910 and by the LCD.
+ * M907 - applies to all.
+ * M908 - BQ_ZUM_MEGA_3D, RAMBO, PRINTRBOARD_REVF, RIGIDBOARD_V2 & SCOOVO_X9H
+ * M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2
+ */
+//#define PWM_MOTOR_CURRENT { 1300, 1300, 1250 } // Values in milliamps
+//#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
+//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
+
+// Use an I2C based DIGIPOT (e.g., Azteeg X3 Pro)
+//#define DIGIPOT_I2C
+#if ENABLED(DIGIPOT_I2C) && !defined(DIGIPOT_I2C_ADDRESS_A)
+ /**
+ * Common slave addresses:
+ *
+ * A (A shifted) B (B shifted) IC
+ * Smoothie 0x2C (0x58) 0x2D (0x5A) MCP4451
+ * AZTEEG_X3_PRO 0x2C (0x58) 0x2E (0x5C) MCP4451
+ * AZTEEG_X5_MINI 0x2C (0x58) 0x2E (0x5C) MCP4451
+ * AZTEEG_X5_MINI_WIFI 0x58 0x5C MCP4451
+ * MIGHTYBOARD_REVE 0x2F (0x5E) MCP4018
+ */
+ #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT
+ #define DIGIPOT_I2C_ADDRESS_B 0x2D // unshifted slave address for second DIGIPOT
+#endif
+
+//#define DIGIPOT_MCP4018 // Requires library from https://github.com/stawel/SlowSoftI2CMaster
+#define DIGIPOT_I2C_NUM_CHANNELS 8 // 5DPRINT: 4 AZTEEG_X3_PRO: 8 MKS SBASE: 5
+// Actual motor currents in Amps. The number of entries must match DIGIPOT_I2C_NUM_CHANNELS.
+// These correspond to the physical drivers, so be mindful if the order is changed.
+#define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 } // AZTEEG_X3_PRO
+
+//===========================================================================
+//=============================Additional Features===========================
+//===========================================================================
+
+// @section lcd
+
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
+ #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
+ #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
+ #if ENABLED(ULTIPANEL)
+ #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
+ #define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
+ #endif
+#endif
+
+// Change values more rapidly when the encoder is rotated faster
+#define ENCODER_RATE_MULTIPLIER
+#if ENABLED(ENCODER_RATE_MULTIPLIER)
+ #define ENCODER_10X_STEPS_PER_SEC 30 // (steps/s) Encoder rate for 10x speed
+ #define ENCODER_100X_STEPS_PER_SEC 80 // (steps/s) Encoder rate for 100x speed
+#endif
+
+// Play a beep when the feedrate is changed from the Status Screen
+//#define BEEP_ON_FEEDRATE_CHANGE
+#if ENABLED(BEEP_ON_FEEDRATE_CHANGE)
+ #define FEEDRATE_CHANGE_BEEP_DURATION 10
+ #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
+#endif
+
+#if HAS_LCD_MENU
+
+ // Include a page of printer information in the LCD Main Menu
+ //#define LCD_INFO_MENU
+ #if ENABLED(LCD_INFO_MENU)
+ //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
+ #endif
+
+ // BACK menu items keep the highlight at the top
+ //#define TURBO_BACK_MENU_ITEM
+
+ /**
+ * LED Control Menu
+ * Add LED Control to the LCD menu
+ */
+ //#define LED_CONTROL_MENU
+ #if ENABLED(LED_CONTROL_MENU)
+ #define LED_COLOR_PRESETS // Enable the Preset Color menu option
+ #if ENABLED(LED_COLOR_PRESETS)
+ #define LED_USER_PRESET_RED 255 // User defined RED value
+ #define LED_USER_PRESET_GREEN 128 // User defined GREEN value
+ #define LED_USER_PRESET_BLUE 0 // User defined BLUE value
+ #define LED_USER_PRESET_WHITE 255 // User defined WHITE value
+ #define LED_USER_PRESET_BRIGHTNESS 255 // User defined intensity
+ //#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
+ #endif
+ #endif
+
+#endif // HAS_LCD_MENU
+
+// Scroll a longer status message into view
+//#define STATUS_MESSAGE_SCROLLING
+
+// On the Info Screen, display XY with one decimal place when possible
+//#define LCD_DECIMAL_SMALL_XY
+
+// The timeout (in ms) to return to the status screen from sub-menus
+//#define LCD_TIMEOUT_TO_STATUS 15000
+
+// Add an 'M73' G-code to set the current percentage
+//#define LCD_SET_PROGRESS_MANUALLY
+
+// Show the E position (filament used) during printing
+//#define LCD_SHOW_E_TOTAL
+
+#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
+ //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
+ //#define SHOW_REMAINING_TIME // Display estimated time to completion
+ #if ENABLED(SHOW_REMAINING_TIME)
+ //#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
+ //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
+ #endif
+#endif
+
+#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
+ //#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
+ #if ENABLED(LCD_PROGRESS_BAR)
+ #define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
+ #define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
+ #define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
+ //#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
+ //#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
+ #endif
+#endif
+
+#if ENABLED(SDSUPPORT)
+
+ // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
+ // around this by connecting a push button or single throw switch to the pin defined
+ // as SD_DETECT_PIN in your board's pins definitions.
+ // This setting should be disabled unless you are using a push button, pulling the pin to ground.
+ // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
+ #define SD_DETECT_INVERTED
+
+ #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished
+ #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place.
+
+ // Reverse SD sort to show "more recent" files first, according to the card's FAT.
+ // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended.
+ #define SDCARD_RATHERRECENTFIRST
+
+ #define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing
+
+ //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
+
+ #define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27")
+
+ /**
+ * Continue after Power-Loss (Creality3D)
+ *
+ * Store the current state to the SD Card at the start of each layer
+ * during SD printing. If the recovery file is found at boot time, present
+ * an option on the LCD screen to continue the print from the last-known
+ * point in the file.
+ */
+ //#define POWER_LOSS_RECOVERY
+ #if ENABLED(POWER_LOSS_RECOVERY)
+ //#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
+ //#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)
+ //#define POWER_LOSS_PIN 44 // Pin to detect power loss
+ //#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
+ //#define POWER_LOSS_PULL // Set pullup / pulldown as appropriate
+ //#define POWER_LOSS_PURGE_LEN 20 // (mm) Length of filament to purge on resume
+ //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.
+
+ // Without a POWER_LOSS_PIN the following option helps reduce wear on the SD card,
+ // especially with "vase mode" printing. Set too high and vases cannot be continued.
+ #define POWER_LOSS_MIN_Z_CHANGE 0.05 // (mm) Minimum Z change before saving power-loss data
+ #endif
+
+ /**
+ * Sort SD file listings in alphabetical order.
+ *
+ * With this option enabled, items on SD cards will be sorted
+ * by name for easier navigation.
+ *
+ * By default...
+ *
+ * - Use the slowest -but safest- method for sorting.
+ * - Folders are sorted to the top.
+ * - The sort key is statically allocated.
+ * - No added G-code (M34) support.
+ * - 40 item sorting limit. (Items after the first 40 are unsorted.)
+ *
+ * SD sorting uses static allocation (as set by SDSORT_LIMIT), allowing the
+ * compiler to calculate the worst-case usage and throw an error if the SRAM
+ * limit is exceeded.
+ *
+ * - SDSORT_USES_RAM provides faster sorting via a static directory buffer.
+ * - SDSORT_USES_STACK does the same, but uses a local stack-based buffer.
+ * - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!)
+ * - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!)
+ */
+ //#define SDCARD_SORT_ALPHA
+
+ // SD Card Sorting options
+ #if ENABLED(SDCARD_SORT_ALPHA)
+ #define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
+ #define FOLDER_SORTING -1 // -1=above 0=none 1=below
+ #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
+ #define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
+ #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
+ #define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.
+ #define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
+ #define SDSORT_CACHE_VFATS 2 // Maximum number of 13-byte VFAT entries to use for sorting.
+ // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
+ #endif
+
+ // This allows hosts to request long names for files and folders with M33
+ //#define LONG_FILENAME_HOST_SUPPORT
+
+ // Enable this option to scroll long filenames in the SD card menu
+ //#define SCROLL_LONG_FILENAMES
+
+ // Leave the heaters on after Stop Print (not recommended!)
+ //#define SD_ABORT_NO_COOLDOWN
+
+ /**
+ * This option allows you to abort SD printing when any endstop is triggered.
+ * This feature must be enabled with "M540 S1" or from the LCD menu.
+ * To have any effect, endstops must be enabled during SD printing.
+ */
+ //#define SD_ABORT_ON_ENDSTOP_HIT
+
+ /**
+ * This option makes it easier to print the same SD Card file again.
+ * On print completion the LCD Menu will open with the file selected.
+ * You can just click to start the print, or navigate elsewhere.
+ */
+ //#define SD_REPRINT_LAST_SELECTED_FILE
+
+ /**
+ * Auto-report SdCard status with M27 S
+ */
+ //#define AUTO_REPORT_SD_STATUS
+
+ /**
+ * Support for USB thumb drives using an Arduino USB Host Shield or
+ * equivalent MAX3421E breakout board. The USB thumb drive will appear
+ * to Marlin as an SD card.
+ *
+ * The MAX3421E can be assigned the same pins as the SD card reader, with
+ * the following pin mapping:
+ *
+ * SCLK, MOSI, MISO --> SCLK, MOSI, MISO
+ * INT --> SD_DETECT_PIN [1]
+ * SS --> SDSS
+ *
+ * [1] On AVR an interrupt-capable pin is best for UHS3 compatibility.
+ */
+ //#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
+ *
+ * - UHS2 uses no interrupts and has been production-tested
+ * on a LulzBot TAZ Pro with a 32-bit Archim board.
+ *
+ * - UHS3 is newer code with better USB compatibility. But it
+ * is less tested and is known to interfere with Servos.
+ * [1] This requires USB_INTR_PIN to be interrupt-capable.
+ */
+ //#define USE_UHS3_USB
+ #endif
+
+ /**
+ * When using a bootloader that supports SD-Firmware-Flashing,
+ * add a menu item to activate SD-FW-Update on the next reboot.
+ *
+ * Requires ATMEGA2560 (Arduino Mega)
+ *
+ * Tested with this bootloader:
+ * https://github.com/FleetProbe/MicroBridge-Arduino-ATMega2560
+ */
+ //#define SD_FIRMWARE_UPDATE
+ #if ENABLED(SD_FIRMWARE_UPDATE)
+ #define SD_FIRMWARE_UPDATE_EEPROM_ADDR 0x1FF
+ #define SD_FIRMWARE_UPDATE_ACTIVE_VALUE 0xF0
+ #define SD_FIRMWARE_UPDATE_INACTIVE_VALUE 0xFF
+ #endif
+
+ // Add an optimized binary file transfer mode, initiated with 'M28 B1'
+ //#define BINARY_FILE_TRANSFER
+
+ #if HAS_SDCARD_CONNECTION
+ /**
+ * Set this option to one of the following (or the board's defaults apply):
+ *
+ * LCD - Use the SD drive in the external LCD controller.
+ * ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
+ * CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
+ *
+ * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
+ */
+ //#define SDCARD_CONNECTION LCD
+ #endif
+
+#endif // SDSUPPORT
+
+/**
+ * By default an onboard SD card reader may be shared as a USB mass-
+ * storage device. This option hides the SD card from the host PC.
+ */
+//#define NO_SD_HOST_DRIVE // Disable SD Card access over USB (for security).
+
+/**
+ * Additional options for Graphical Displays
+ *
+ * Use the optimizations here to improve printing performance,
+ * which can be adversely affected by graphical display drawing,
+ * especially when doing several short moves, and when printing
+ * on DELTA and SCARA machines.
+ *
+ * Some of these options may result in the display lagging behind
+ * controller events, as there is a trade-off between reliable
+ * printing performance versus fast display updates.
+ */
+#if HAS_GRAPHICAL_LCD
+ // Show SD percentage next to the progress bar
+ //#define DOGM_SD_PERCENT
+
+ // Enable to save many cycles by drawing a hollow frame on the Info Screen
+ #define XYZ_HOLLOW_FRAME
+
+ // Enable to save many cycles by drawing a hollow frame on Menu Screens
+ #define MENU_HOLLOW_FRAME
+
+ // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
+ // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
+ //#define USE_BIG_EDIT_FONT
+
+ // A smaller font may be used on the Info Screen. Costs 2300 bytes of PROGMEM.
+ // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
+ //#define USE_SMALL_INFOFONT
+
+ // Enable this option and reduce the value to optimize screen updates.
+ // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
+ //#define DOGM_SPI_DELAY_US 5
+
+ // Swap the CW/CCW indicators in the graphics overlay
+ //#define OVERLAY_GFX_REVERSE
+
+ /**
+ * ST7920-based LCDs can emulate a 16 x 4 character display using
+ * the ST7920 character-generator for very fast screen updates.
+ * Enable LIGHTWEIGHT_UI to use this special display mode.
+ *
+ * Since LIGHTWEIGHT_UI has limited space, the position and status
+ * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+ * length of time to display the status message before clearing.
+ *
+ * Set STATUS_EXPIRE_SECONDS to zero to never clear the status.
+ * This will prevent position updates from being displayed.
+ */
+ #if ENABLED(U8GLIB_ST7920)
+ //#define LIGHTWEIGHT_UI
+ #if ENABLED(LIGHTWEIGHT_UI)
+ #define STATUS_EXPIRE_SECONDS 20
+ #endif
+ #endif
+
+ /**
+ * Status (Info) Screen customizations
+ * These options may affect code size and screen render time.
+ * Custom status screens can forcibly override these settings.
+ */
+ //#define STATUS_COMBINE_HEATERS // Use combined heater images instead of separate ones
+ //#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends)
+ #define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM)
+ #define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
+ #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
+ #define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating
+ //#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
+ //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
+ //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
+ //#define STATUS_HEAT_PERCENT // Show heating in a progress bar
+ //#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
+ //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of PROGMEM.
+
+ // Frivolous Game Options
+ //#define MARLIN_BRICKOUT
+ //#define MARLIN_INVADERS
+ //#define MARLIN_SNAKE
+ //#define GAMES_EASTER_EGG // Add extra blank lines above the "Games" sub-menu
+
+#endif // HAS_GRAPHICAL_LCD
+
+//
+// Additional options for DGUS / DWIN displays
+//
+#if HAS_DGUS_LCD
+ #define DGUS_SERIAL_PORT 2
+ #define DGUS_BAUDRATE 115200
+
+ #define DGUS_RX_BUFFER_SIZE 128
+ #define DGUS_TX_BUFFER_SIZE 48
+ //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS // Fix Rx overrun situation (Currently only for AVR)
+
+ #define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
+ #define BOOTSCREEN_TIMEOUT 3000 // (ms) Duration to display the boot screen
+
+ #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
+ #define DGUS_PRINT_FILENAME // Display the filename during printing
+ #define DGUS_PREHEAT_UI // Display a preheat screen during heatup
+
+ #if ENABLED(DGUS_LCD_UI_FYSETC)
+ //#define DUGS_UI_MOVE_DIS_OPTION // Disabled by default for UI_FYSETC
+ #else
+ #define DUGS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY
+ #endif
+
+ #define DGUS_FILAMENT_LOADUNLOAD
+ #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
+ #define DGUS_FILAMENT_PURGE_LENGTH 10
+ #define DGUS_FILAMENT_LOAD_LENGTH_PER_TIME 0.5 // (mm) Adjust in proportion to DGUS_UPDATE_INTERVAL_MS
+ #endif
+
+ #define DGUS_UI_WAITING // Show a "waiting" screen between some screens
+ #if ENABLED(DGUS_UI_WAITING)
+ #define DGUS_UI_WAITING_STATUS 10
+ #define DGUS_UI_WAITING_STATUS_PERIOD 8 // Increase to slower waiting status looping
+ #endif
+ #endif
+#endif // HAS_DGUS_LCD
+
+//
+// Touch UI for the FTDI Embedded Video Engine (EVE)
+//
+#if ENABLED(TOUCH_UI_FTDI_EVE)
+ // Display board used
+ //#define LCD_FTDI_VM800B35A // FTDI 3.5" with FT800 (320x240)
+ //#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
+ //#define LCD_HAOYU_FT800CB // Haoyu with 4.3" or 5" (480x272)
+ //#define LCD_HAOYU_FT810CB // Haoyu with 5" (800x480)
+ //#define LCD_ALEPHOBJECTS_CLCD_UI // Aleph Objects Color LCD UI
+
+ // Correct the resolution if not using the stock TFT panel.
+ //#define TOUCH_UI_320x240
+ //#define TOUCH_UI_480x272
+ //#define TOUCH_UI_800x480
+
+ // Mappings for boards with a standard RepRapDiscount Display connector
+ //#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping
+ //#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
+ //#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
+ //#define OTHER_PIN_LAYOUT // Define pins manually below
+ #if ENABLED(OTHER_PIN_LAYOUT)
+ // The pins for CS and MOD_RESET (PD) must be chosen.
+ #define CLCD_MOD_RESET 9
+ #define CLCD_SPI_CS 10
+
+ // If using software SPI, specify pins for SCLK, MOSI, MISO
+ //#define CLCD_USE_SOFT_SPI
+ #if ENABLED(CLCD_USE_SOFT_SPI)
+ #define CLCD_SOFT_SPI_MOSI 11
+ #define CLCD_SOFT_SPI_MISO 12
+ #define CLCD_SOFT_SPI_SCLK 13
+ #endif
+ #endif
+
+ // Display Orientation. An inverted (i.e. upside-down) display
+ // is supported on the FT800. The FT810 and beyond also support
+ // portrait and mirrored orientations.
+ //#define TOUCH_UI_INVERTED
+ //#define TOUCH_UI_PORTRAIT
+ //#define TOUCH_UI_MIRRORED
+
+ // UTF8 processing and rendering.
+ // Unsupported characters are shown as '?'.
+ //#define TOUCH_UI_USE_UTF8
+ #if ENABLED(TOUCH_UI_USE_UTF8)
+ // Western accents support. These accented characters use
+ // combined bitmaps and require relatively little storage.
+ #define TOUCH_UI_UTF8_WESTERN_CHARSET
+ #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
+ // Additional character groups. These characters require
+ // full bitmaps and take up considerable storage:
+ //#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
+ //#define TOUCH_UI_UTF8_COPYRIGHT // © ®
+ //#define TOUCH_UI_UTF8_GERMANIC // ß
+ //#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
+ //#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
+ //#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
+ //#define TOUCH_UI_UTF8_ORDINALS // º ª
+ //#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
+ //#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
+ //#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
+ #endif
+ #endif
+
+ // Use a smaller font when labels don't fit buttons
+ #define TOUCH_UI_FIT_TEXT
+
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
+
+ // Use a numeric passcode for "Screen lock" keypad.
+ // (recommended for smaller displays)
+ //#define TOUCH_UI_PASSCODE
+
+ // Output extra debug info for Touch UI events
+ //#define TOUCH_UI_DEBUG
+
+ // Developer menu (accessed by touching "About Printer" copyright text)
+ //#define TOUCH_UI_DEVELOPER_MENU
+#endif
+
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ //#define TFT_MARLINUI_COLOR 0xFFFF // White
+ //#define TFT_MARLINBG_COLOR 0x0000 // Black
+ //#define TFT_DISABLED_COLOR 0x0003 // Almost black
+ //#define TFT_BTCANCEL_COLOR 0xF800 // Red
+ //#define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ //#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
+//
+// ADC Button Debounce
+//
+#if HAS_ADC_BUTTONS
+ #define ADC_BUTTON_DEBOUNCE_DELAY 16 // (ms) Increase if buttons bounce or repeat too fast
+#endif
+
+// @section safety
+
+/**
+ * The watchdog hardware timer will do a reset and disable all outputs
+ * if the firmware gets too overloaded to read the temperature sensors.
+ *
+ * If you find that watchdog reboot causes your AVR board to hang forever,
+ * enable WATCHDOG_RESET_MANUAL to use a custom timer instead of WDTO.
+ * NOTE: This method is less reliable as it can only catch hangups while
+ * interrupts are enabled.
+ */
+#define USE_WATCHDOG
+#if ENABLED(USE_WATCHDOG)
+ //#define WATCHDOG_RESET_MANUAL
+#endif
+
+// @section lcd
+
+/**
+ * Babystepping enables movement of the axes by tiny increments without changing
+ * the current position values. This feature is used primarily to adjust the Z
+ * axis in the first layer of a print in real-time.
+ *
+ * Warning: Does not respect endstops!
+ */
+//#define BABYSTEPPING
+#if ENABLED(BABYSTEPPING)
+ //#define BABYSTEP_WITHOUT_HOMING
+ //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
+ #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
+ #define BABYSTEP_MULTIPLICATOR_Z 1 // Babysteps are very small. Increase for faster motion.
+ #define BABYSTEP_MULTIPLICATOR_XY 1
+
+ //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
+ #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
+ #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
+ // Note: Extra time may be added to mitigate controller latency.
+ //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
+ //#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle.
+ #if ENABLED(MOVE_Z_WHEN_IDLE)
+ #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
+ #endif
+ #endif
+
+ //#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
+
+ //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
+ #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
+ //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
+ //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
+ #endif
+#endif
+
+// @section extruder
+
+/**
+ * Linear Pressure Control v1.5
+ *
+ * Assumption: advance [steps] = k * (delta velocity [steps/s])
+ * K=0 means advance disabled.
+ *
+ * NOTE: K values for LIN_ADVANCE 1.5 differ from earlier versions!
+ *
+ * Set K around 0.22 for 3mm PLA Direct Drive with ~6.5cm between the drive gear and heatbreak.
+ * Larger K values will be needed for flexible filament and greater distances.
+ * If this algorithm produces a higher speed offset than the extruder can handle (compared to E jerk)
+ * print acceleration will be reduced during the affected moves to keep within the limit.
+ *
+ * See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
+ * Mention @Sebastianv650 on GitHub to alert the author of any issues.
+ */
+//#define LIN_ADVANCE
+#if ENABLED(LIN_ADVANCE)
+ //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
+ #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed
+ //#define LA_DEBUG // If enabled, this will generate debug information output over USB.
+#endif
+
+// @section leveling
+
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
+/**
+ * Override MIN_PROBE_EDGE for each side of the build plate
+ * Useful to get probe points to exact positions on targets or
+ * to allow leveling to avoid plate clamps on only specific
+ * sides of the bed. With NOZZLE_AS_PROBE negative values are
+ * allowed, to permit probing outside the bed.
+ *
+ * If you are replacing the prior *_PROBE_BED_POSITION options,
+ * LEFT and FRONT values in most cases will map directly over
+ * RIGHT and REAR would be the inverse such as
+ * (X/Y_BED_SIZE - RIGHT/BACK_PROBE_BED_POSITION)
+ *
+ * This will allow all positions to match at compilation, however
+ * should the probe position be modified with M851XY then the
+ * probe points will follow. This prevents any change from causing
+ * the probe to be unable to reach any points.
+ */
+#if PROBE_SELECTED && !IS_KINEMATIC
+ //#define MIN_PROBE_EDGE_LEFT MIN_PROBE_EDGE
+ //#define MIN_PROBE_EDGE_RIGHT MIN_PROBE_EDGE
+ //#define MIN_PROBE_EDGE_FRONT MIN_PROBE_EDGE
+ //#define MIN_PROBE_EDGE_BACK MIN_PROBE_EDGE
+#endif
+
+#if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
+ // Override the mesh area if the automatic (max) area is too large
+ //#define MESH_MIN_X MESH_INSET
+ //#define MESH_MIN_Y MESH_INSET
+ //#define MESH_MAX_X X_BED_SIZE - (MESH_INSET)
+ //#define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET)
+#endif
+
+/**
+ * Repeatedly attempt G29 leveling until it succeeds.
+ * Stop after G29_MAX_RETRIES attempts.
+ */
+//#define G29_RETRY_AND_RECOVER
+#if ENABLED(G29_RETRY_AND_RECOVER)
+ #define G29_MAX_RETRIES 3
+ #define G29_HALT_ON_FAILURE
+ /**
+ * Specify the GCODE commands that will be executed when leveling succeeds,
+ * between attempts, and after the maximum number of retries have been tried.
+ */
+ #define G29_SUCCESS_COMMANDS "M117 Bed leveling done."
+ #define G29_RECOVER_COMMANDS "M117 Probe failed. Rewiping.\nG28\nG12 P0 S12 T0"
+ #define G29_FAILURE_COMMANDS "M117 Bed leveling failed.\nG0 Z10\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nG4 S1"
+
+#endif
+
+/**
+ * Thermal Probe Compensation
+ * Probe measurements are adjusted to compensate for temperature distortion.
+ * Use G76 to calibrate this feature. Use M871 to set values manually.
+ * For a more detailed explanation of the process see G76_M871.cpp.
+ */
+#if HAS_BED_PROBE && TEMP_SENSOR_PROBE && TEMP_SENSOR_BED
+ // Enable thermal first layer compensation using bed and probe temperatures
+ #define PROBE_TEMP_COMPENSATION
+
+ // Add additional compensation depending on hotend temperature
+ // Note: this values cannot be calibrated and have to be set manually
+ #ifdef PROBE_TEMP_COMPENSATION
+ // Max temperature that can be reached by heated bed.
+ // This is required only for the calibration process.
+ #define PTC_MAX_BED_TEMP 110
+
+ // Park position to wait for probe cooldown
+ #define PTC_PARK_POS_X 0.0F
+ #define PTC_PARK_POS_Y 0.0F
+ #define PTC_PARK_POS_Z 100.0F
+
+ // Probe position to probe and wait for probe to reach target temperature
+ #define PTC_PROBE_POS_X 90.0F
+ #define PTC_PROBE_POS_Y 100.0F
+
+ // Enable additional compensation using hotend temperature
+ // Note: this values cannot be calibrated automatically but have to be set manually
+ //#define USE_TEMP_EXT_COMPENSATION
+ #endif
+#endif
+
+// @section extras
+
+//
+// G60/G61 Position Save and Return
+//
+//#define SAVED_POSITIONS 1 // Each saved position slot costs 12 bytes
+
+//
+// G2/G3 Arc Support
+//
+#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
+#if ENABLED(ARC_SUPPORT)
+ #define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
+ //#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
+ #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle
+ //#define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum)
+ #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections
+ //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
+ //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
+#endif
+
+// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
+//#define BEZIER_CURVE_SUPPORT
+
+/**
+ * G38 Probe Target
+ *
+ * This option adds G38.2 and G38.3 (probe towards target)
+ * and optionally G38.4 and G38.5 (probe away from target).
+ * Set MULTIPLE_PROBING for G38 to probe more than once.
+ */
+//#define G38_PROBE_TARGET
+#if ENABLED(G38_PROBE_TARGET)
+ //#define G38_PROBE_AWAY // Include G38.4 and G38.5 to probe away from target
+ #define G38_MINIMUM_MOVE 0.0275 // (mm) Minimum distance that will produce a move.
+#endif
+
+// Moves (or segments) with fewer steps than this will be joined with the next move
+#define MIN_STEPS_PER_SEGMENT 6
+
+/**
+ * Minimum delay before and after setting the stepper DIR (in ns)
+ * 0 : No delay (Expect at least 10µS since one Stepper ISR must transpire)
+ * 20 : Minimum for TMC2xxx drivers
+ * 200 : Minimum for A4988 drivers
+ * 400 : Minimum for A5984 drivers
+ * 500 : Minimum for LV8729 drivers (guess, no info in datasheet)
+ * 650 : Minimum for DRV8825 drivers
+ * 1500 : Minimum for TB6600 drivers (guess, no info in datasheet)
+ * 15000 : Minimum for TB6560 drivers (guess, no info in datasheet)
+ *
+ * Override the default value based on the driver type set in Configuration.h.
+ */
+//#define MINIMUM_STEPPER_POST_DIR_DELAY 650
+//#define MINIMUM_STEPPER_PRE_DIR_DELAY 650
+
+/**
+ * Minimum stepper driver pulse width (in µs)
+ * 0 : Smallest possible width the MCU can produce, compatible with TMC2xxx drivers
+ * 0 : Minimum 500ns for LV8729, adjusted in stepper.h
+ * 1 : Minimum for A4988 and A5984 stepper drivers
+ * 2 : Minimum for DRV8825 stepper drivers
+ * 3 : Minimum for TB6600 stepper drivers
+ * 30 : Minimum for TB6560 stepper drivers
+ *
+ * Override the default value based on the driver type set in Configuration.h.
+ */
+//#define MINIMUM_STEPPER_PULSE 2
+
+/**
+ * Maximum stepping rate (in Hz) the stepper driver allows
+ * If undefined, defaults to 1MHz / (2 * MINIMUM_STEPPER_PULSE)
+ * 5000000 : Maximum for TMC2xxx stepper drivers
+ * 1000000 : Maximum for LV8729 stepper driver
+ * 500000 : Maximum for A4988 stepper driver
+ * 250000 : Maximum for DRV8825 stepper driver
+ * 150000 : Maximum for TB6600 stepper driver
+ * 15000 : Maximum for TB6560 stepper driver
+ *
+ * Override the default value based on the driver type set in Configuration.h.
+ */
+//#define MAXIMUM_STEPPER_RATE 250000
+
+// @section temperature
+
+// Control heater 0 and heater 1 in parallel.
+//#define HEATERS_PARALLEL
+
+//===========================================================================
+//================================= Buffers =================================
+//===========================================================================
+
+// @section hidden
+
+// The number of linear motions that can be in the plan at any give time.
+// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering.
+#if ENABLED(SDSUPPORT)
+ #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
+#else
+ #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
+#endif
+
+// @section serial
+
+// The ASCII buffer for serial input
+#define MAX_CMD_SIZE 96
+#define BUFSIZE 4
+
+// Transmission to Host Buffer Size
+// To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
+// To buffer a simple "ok" you need 4 bytes.
+// For ADVANCED_OK (M105) you need 32 bytes.
+// For debug-echo: 128 bytes for the optimal speed.
+// Other output doesn't need to be that speedy.
+// :[0, 2, 4, 8, 16, 32, 64, 128, 256]
+#define TX_BUFFER_SIZE 0
+
+// Host Receive Buffer Size
+// Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
+// To use flow control, set this buffer size to at least 1024 bytes.
+// :[0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048]
+//#define RX_BUFFER_SIZE 1024
+
+#if RX_BUFFER_SIZE >= 1024
+ // Enable to have the controller send XON/XOFF control characters to
+ // the host to signal the RX buffer is becoming full.
+ //#define SERIAL_XON_XOFF
+#endif
+
+// Add M575 G-code to change the baud rate
+//#define BAUD_RATE_GCODE
+
+#if ENABLED(SDSUPPORT)
+ // Enable this option to collect and display the maximum
+ // RX queue usage after transferring a file to SD.
+ //#define SERIAL_STATS_MAX_RX_QUEUED
+
+ // Enable this option to collect and display the number
+ // of dropped bytes after a file transfer to SD.
+ //#define SERIAL_STATS_DROPPED_RX
+#endif
+
+// Enable an emergency-command parser to intercept certain commands as they
+// enter the serial receive buffer, so they cannot be blocked.
+// Currently handles M108, M112, M410
+// Does not work on boards using AT90USB (USBCON) processors!
+//#define EMERGENCY_PARSER
+
+// Bad Serial-connections can miss a received command by sending an 'ok'
+// Therefore some clients abort after 30 seconds in a timeout.
+// Some other clients start sending commands while receiving a 'wait'.
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
+//#define NO_TIMEOUTS 1000 // Milliseconds
+
+// Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
+//#define ADVANCED_OK
+
+// Printrun may have trouble receiving long strings all at once.
+// This option inserts short delays between lines of serial output.
+#define SERIAL_OVERRUN_PROTECTION
+
+// @section extras
+
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P T3-255' : Set a secondary speed for
+ * 'M106 P T2' : Use the set secondary speed
+ * 'M106 P T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
+/**
+ * Firmware-based and LCD-controlled retract
+ *
+ * Add G10 / G11 commands for automatic firmware-based retract / recover.
+ * Use M207 and M208 to define parameters for retract / recover.
+ *
+ * Use M209 to enable or disable auto-retract.
+ * With auto-retract enabled, all G1 E moves within the set range
+ * will be converted to firmware-based retract/recover moves.
+ *
+ * Be sure to turn off auto-retract during filament change.
+ *
+ * Note that M207 / M208 / M209 settings are saved to EEPROM.
+ *
+ */
+//#define FWRETRACT
+#if ENABLED(FWRETRACT)
+ #define FWRETRACT_AUTORETRACT // Override slicer retractions
+ #if ENABLED(FWRETRACT_AUTORETRACT)
+ #define MIN_AUTORETRACT 0.1 // (mm) Don't convert E moves under this length
+ #define MAX_AUTORETRACT 10.0 // (mm) Don't convert E moves over this length
+ #endif
+ #define RETRACT_LENGTH 3 // (mm) Default retract length (positive value)
+ #define RETRACT_LENGTH_SWAP 13 // (mm) Default swap retract length (positive value)
+ #define RETRACT_FEEDRATE 45 // (mm/s) Default feedrate for retracting
+ #define RETRACT_ZRAISE 0 // (mm) Default retract Z-raise
+ #define RETRACT_RECOVER_LENGTH 0 // (mm) Default additional recover length (added to retract length on recover)
+ #define RETRACT_RECOVER_LENGTH_SWAP 0 // (mm) Default additional swap recover length (added to retract length on recover from toolchange)
+ #define RETRACT_RECOVER_FEEDRATE 8 // (mm/s) Default feedrate for recovering from retraction
+ #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // (mm/s) Default feedrate for recovering from swap retraction
+ #if ENABLED(MIXING_EXTRUDER)
+ //#define RETRACT_SYNC_MIXING // Retract and restore all mixing steppers simultaneously
+ #endif
+#endif
+
+/**
+ * Universal tool change settings.
+ * Applies to all types of extruders except where explicitly noted.
+ */
+#if EXTRUDERS > 1
+ // Z raise distance for tool-change, as needed for some extruders
+ #define TOOLCHANGE_ZRAISE 2 // (mm)
+ //#define TOOLCHANGE_NO_RETURN // Never return to the previous position on tool-change
+ #if ENABLED(TOOLCHANGE_NO_RETURN)
+ //#define EVENT_GCODE_AFTER_TOOLCHANGE "G12X" // G-code to run after tool-change is complete
+ #endif
+
+ // Retract and prime filament on tool-change
+ //#define TOOLCHANGE_FILAMENT_SWAP
+ #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
+ #define TOOLCHANGE_FIL_SWAP_LENGTH 12 // (mm)
+ #define TOOLCHANGE_FIL_EXTRA_PRIME 2 // (mm)
+ #define TOOLCHANGE_FIL_SWAP_RETRACT_SPEED 3600 // (mm/m)
+ #define TOOLCHANGE_FIL_SWAP_PRIME_SPEED 3600 // (mm/m)
+ #endif
+
+ /**
+ * Position to park head during tool change.
+ * Doesn't apply to SWITCHING_TOOLHEAD, DUAL_X_CARRIAGE, or PARKING_EXTRUDER
+ */
+ //#define TOOLCHANGE_PARK
+ #if ENABLED(TOOLCHANGE_PARK)
+ #define TOOLCHANGE_PARK_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
+ #define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/m)
+ #endif
+#endif
+
+/**
+ * Advanced Pause
+ * Experimental feature for filament change support and for parking the nozzle when paused.
+ * Adds the GCode M600 for initiating filament change.
+ * If PARK_HEAD_ON_PAUSE enabled, adds the GCode M125 to pause printing and park the nozzle.
+ *
+ * Requires an LCD display.
+ * Requires NOZZLE_PARK_FEATURE.
+ * This feature is required for the default FILAMENT_RUNOUT_SCRIPT.
+ */
+//#define ADVANCED_PAUSE_FEATURE
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+ #define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
+ #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
+ // This short retract is done immediately, before parking the nozzle.
+ #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast.
+ #define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
+ #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload.
+ // For Bowden, the full length of the tube and nozzle.
+ // For direct drive, the full length of the nozzle.
+ // Set to 0 for manual unloading.
+ #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load.
+ #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material.
+ // 0 to disable start loading and skip to fast load only
+ #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast.
+ #define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
+ #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 0 // (mm) Load length of filament, from extruder gear to nozzle.
+ // For Bowden, the full length of the tube and nozzle.
+ // For direct drive, the full length of the nozzle.
+ //#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
+ #define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
+ #define ADVANCED_PAUSE_PURGE_LENGTH 50 // (mm) Length to extrude after loading.
+ // Set to 0 for manual extrusion.
+ // Filament can be extruded repeatedly from the Filament Change menu
+ // until extrusion is consistent, and to purge old filament.
+ #define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park.
+ //#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
+
+ // Filament Unload does a Retract, Delay, and Purge first:
+ #define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.
+ #define FILAMENT_UNLOAD_PURGE_DELAY 5000 // (ms) Delay for the filament to cool after retract.
+ #define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged.
+ #define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload
+
+ #define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety.
+ #define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed.
+ #define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change.
+
+ //#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
+ //#define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change
+
+ //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
+ //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
+#endif
+
+// @section tmc
+
+/**
+ * TMC26X Stepper Driver options
+ *
+ * The TMC26XStepper library is required for this stepper driver.
+ * https://github.com/trinamic/TMC26XStepper
+ */
+#if HAS_DRIVER(TMC26X)
+
+ #if AXIS_DRIVER_TYPE_X(TMC26X)
+ #define X_MAX_CURRENT 1000 // (mA)
+ #define X_SENSE_RESISTOR 91 // (mOhms)
+ #define X_MICROSTEPS 16 // Number of microsteps
+ #endif
+
+ #if AXIS_DRIVER_TYPE_X2(TMC26X)
+ #define X2_MAX_CURRENT 1000
+ #define X2_SENSE_RESISTOR 91
+ #define X2_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_Y(TMC26X)
+ #define Y_MAX_CURRENT 1000
+ #define Y_SENSE_RESISTOR 91
+ #define Y_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_Y2(TMC26X)
+ #define Y2_MAX_CURRENT 1000
+ #define Y2_SENSE_RESISTOR 91
+ #define Y2_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_Z(TMC26X)
+ #define Z_MAX_CURRENT 1000
+ #define Z_SENSE_RESISTOR 91
+ #define Z_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_Z2(TMC26X)
+ #define Z2_MAX_CURRENT 1000
+ #define Z2_SENSE_RESISTOR 91
+ #define Z2_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_Z3(TMC26X)
+ #define Z3_MAX_CURRENT 1000
+ #define Z3_SENSE_RESISTOR 91
+ #define Z3_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_Z4(TMC26X)
+ #define Z4_MAX_CURRENT 1000
+ #define Z4_SENSE_RESISTOR 91
+ #define Z4_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E0(TMC26X)
+ #define E0_MAX_CURRENT 1000
+ #define E0_SENSE_RESISTOR 91
+ #define E0_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E1(TMC26X)
+ #define E1_MAX_CURRENT 1000
+ #define E1_SENSE_RESISTOR 91
+ #define E1_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E2(TMC26X)
+ #define E2_MAX_CURRENT 1000
+ #define E2_SENSE_RESISTOR 91
+ #define E2_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E3(TMC26X)
+ #define E3_MAX_CURRENT 1000
+ #define E3_SENSE_RESISTOR 91
+ #define E3_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E4(TMC26X)
+ #define E4_MAX_CURRENT 1000
+ #define E4_SENSE_RESISTOR 91
+ #define E4_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E5(TMC26X)
+ #define E5_MAX_CURRENT 1000
+ #define E5_SENSE_RESISTOR 91
+ #define E5_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E6(TMC26X)
+ #define E6_MAX_CURRENT 1000
+ #define E6_SENSE_RESISTOR 91
+ #define E6_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E7(TMC26X)
+ #define E7_MAX_CURRENT 1000
+ #define E7_SENSE_RESISTOR 91
+ #define E7_MICROSTEPS 16
+ #endif
+
+#endif // TMC26X
+
+// @section tmc_smart
+
+/**
+ * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode
+ * connect your SPI pins to the hardware SPI interface on your board and define
+ * the required CS pins in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3
+ * pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.).
+ * You may also use software SPI if you wish to use general purpose IO pins.
+ *
+ * To use TMC2208 stepper UART-configurable stepper drivers connect #_SERIAL_TX_PIN
+ * to the driver side PDN_UART pin with a 1K resistor.
+ * To use the reading capabilities, also connect #_SERIAL_RX_PIN to PDN_UART without
+ * a resistor.
+ * The drivers can also be used with hardware serial.
+ *
+ * TMCStepper library is required to use TMC stepper drivers.
+ * https://github.com/teemuatlut/TMCStepper
+ */
+#if HAS_TRINAMIC
+
+ #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current
+ #define INTERPOLATE true // Interpolate X/Y/Z_MICROSTEPS to 256
+
+ #if AXIS_IS_TMC(X)
+ #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current.
+ #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing
+ #define X_MICROSTEPS 16 // 0..256
+ #define X_RSENSE 0.11
+ #define X_CHAIN_POS -1 // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ...
+ #endif
+
+ #if AXIS_IS_TMC(X2)
+ #define X2_CURRENT 800
+ #define X2_CURRENT_HOME X2_CURRENT
+ #define X2_MICROSTEPS 16
+ #define X2_RSENSE 0.11
+ #define X2_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(Y)
+ #define Y_CURRENT 800
+ #define Y_CURRENT_HOME Y_CURRENT
+ #define Y_MICROSTEPS 16
+ #define Y_RSENSE 0.11
+ #define Y_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(Y2)
+ #define Y2_CURRENT 800
+ #define Y2_CURRENT_HOME Y2_CURRENT
+ #define Y2_MICROSTEPS 16
+ #define Y2_RSENSE 0.11
+ #define Y2_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(Z)
+ #define Z_CURRENT 800
+ #define Z_CURRENT_HOME Z_CURRENT
+ #define Z_MICROSTEPS 16
+ #define Z_RSENSE 0.11
+ #define Z_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(Z2)
+ #define Z2_CURRENT 800
+ #define Z2_CURRENT_HOME Z2_CURRENT
+ #define Z2_MICROSTEPS 16
+ #define Z2_RSENSE 0.11
+ #define Z2_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(Z3)
+ #define Z3_CURRENT 800
+ #define Z3_CURRENT_HOME Z3_CURRENT
+ #define Z3_MICROSTEPS 16
+ #define Z3_RSENSE 0.11
+ #define Z3_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(Z4)
+ #define Z4_CURRENT 800
+ #define Z4_CURRENT_HOME Z4_CURRENT
+ #define Z4_MICROSTEPS 16
+ #define Z4_RSENSE 0.11
+ #define Z4_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E0)
+ #define E0_CURRENT 800
+ #define E0_MICROSTEPS 16
+ #define E0_RSENSE 0.11
+ #define E0_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E1)
+ #define E1_CURRENT 800
+ #define E1_MICROSTEPS 16
+ #define E1_RSENSE 0.11
+ #define E1_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E2)
+ #define E2_CURRENT 800
+ #define E2_MICROSTEPS 16
+ #define E2_RSENSE 0.11
+ #define E2_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E3)
+ #define E3_CURRENT 800
+ #define E3_MICROSTEPS 16
+ #define E3_RSENSE 0.11
+ #define E3_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E4)
+ #define E4_CURRENT 800
+ #define E4_MICROSTEPS 16
+ #define E4_RSENSE 0.11
+ #define E4_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E5)
+ #define E5_CURRENT 800
+ #define E5_MICROSTEPS 16
+ #define E5_RSENSE 0.11
+ #define E5_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E6)
+ #define E6_CURRENT 800
+ #define E6_MICROSTEPS 16
+ #define E6_RSENSE 0.11
+ #define E6_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E7)
+ #define E7_CURRENT 800
+ #define E7_MICROSTEPS 16
+ #define E7_RSENSE 0.11
+ #define E7_CHAIN_POS -1
+ #endif
+
+ /**
+ * Override default SPI pins for TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160 drivers here.
+ * The default pins can be found in your board's pins file.
+ */
+ //#define X_CS_PIN -1
+ //#define Y_CS_PIN -1
+ //#define Z_CS_PIN -1
+ //#define X2_CS_PIN -1
+ //#define Y2_CS_PIN -1
+ //#define Z2_CS_PIN -1
+ //#define Z3_CS_PIN -1
+ //#define E0_CS_PIN -1
+ //#define E1_CS_PIN -1
+ //#define E2_CS_PIN -1
+ //#define E3_CS_PIN -1
+ //#define E4_CS_PIN -1
+ //#define E5_CS_PIN -1
+ //#define E6_CS_PIN -1
+ //#define E7_CS_PIN -1
+
+ /**
+ * Software option for SPI driven drivers (TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160).
+ * The default SW SPI pins are defined the respective pins files,
+ * but you can override or define them here.
+ */
+ //#define TMC_USE_SW_SPI
+ //#define TMC_SW_MOSI -1
+ //#define TMC_SW_MISO -1
+ //#define TMC_SW_SCK -1
+
+ /**
+ * Four TMC2209 drivers can use the same HW/SW serial port with hardware configured addresses.
+ * Set the address using jumpers on pins MS1 and MS2.
+ * Address | MS1 | MS2
+ * 0 | LOW | LOW
+ * 1 | HIGH | LOW
+ * 2 | LOW | HIGH
+ * 3 | HIGH | HIGH
+ *
+ * Set *_SERIAL_TX_PIN and *_SERIAL_RX_PIN to match for all drivers
+ * on the same serial port, either here or in your board's pins file.
+ */
+ #define X_SLAVE_ADDRESS 0
+ #define Y_SLAVE_ADDRESS 0
+ #define Z_SLAVE_ADDRESS 0
+ #define X2_SLAVE_ADDRESS 0
+ #define Y2_SLAVE_ADDRESS 0
+ #define Z2_SLAVE_ADDRESS 0
+ #define Z3_SLAVE_ADDRESS 0
+ #define Z4_SLAVE_ADDRESS 0
+ #define E0_SLAVE_ADDRESS 0
+ #define E1_SLAVE_ADDRESS 0
+ #define E2_SLAVE_ADDRESS 0
+ #define E3_SLAVE_ADDRESS 0
+ #define E4_SLAVE_ADDRESS 0
+ #define E5_SLAVE_ADDRESS 0
+ #define E6_SLAVE_ADDRESS 0
+ #define E7_SLAVE_ADDRESS 0
+
+ /**
+ * Software enable
+ *
+ * Use for drivers that do not use a dedicated enable pin, but rather handle the same
+ * function through a communication line such as SPI or UART.
+ */
+ //#define SOFTWARE_DRIVER_ENABLE
+
+ /**
+ * TMC2130, TMC2160, TMC2208, TMC2209, TMC5130 and TMC5160 only
+ * Use Trinamic's ultra quiet stepping mode.
+ * When disabled, Marlin will use spreadCycle stepping mode.
+ */
+ #define STEALTHCHOP_XY
+ #define STEALTHCHOP_Z
+ #define STEALTHCHOP_E
+
+ /**
+ * Optimize spreadCycle chopper parameters by using predefined parameter sets
+ * or with the help of an example included in the library.
+ * Provided parameter sets are
+ * CHOPPER_DEFAULT_12V
+ * CHOPPER_DEFAULT_19V
+ * CHOPPER_DEFAULT_24V
+ * CHOPPER_DEFAULT_36V
+ * CHOPPER_PRUSAMK3_24V // Imported parameters from the official Prusa firmware for MK3 (24V)
+ * CHOPPER_MARLIN_119 // Old defaults from Marlin v1.1.9
+ *
+ * Define you own with
+ * { , , hysteresis_start[1..8] }
+ */
+ #define CHOPPER_TIMING CHOPPER_DEFAULT_12V
+
+ /**
+ * Monitor Trinamic drivers for error conditions,
+ * like overtemperature and short to ground.
+ * In the case of overtemperature Marlin can decrease the driver current until error condition clears.
+ * Other detected conditions can be used to stop the current print.
+ * Relevant g-codes:
+ * M906 - Set or get motor current in milliamps using axis codes X, Y, Z, E. Report values if no axis codes given.
+ * M911 - Report stepper driver overtemperature pre-warn condition.
+ * M912 - Clear stepper driver overtemperature pre-warn condition flag.
+ * M122 - Report driver parameters (Requires TMC_DEBUG)
+ */
+ //#define MONITOR_DRIVER_STATUS
+
+ #if ENABLED(MONITOR_DRIVER_STATUS)
+ #define CURRENT_STEP_DOWN 50 // [mA]
+ #define REPORT_CURRENT_CHANGE
+ #define STOP_ON_ERROR
+ #endif
+
+ /**
+ * TMC2130, TMC2160, TMC2208, TMC2209, TMC5130 and TMC5160 only
+ * The driver will switch to spreadCycle when stepper speed is over HYBRID_THRESHOLD.
+ * This mode allows for faster movements at the expense of higher noise levels.
+ * STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD.
+ * M913 X/Y/Z/E to live tune the setting
+ */
+ //#define HYBRID_THRESHOLD
+
+ #define X_HYBRID_THRESHOLD 100 // [mm/s]
+ #define X2_HYBRID_THRESHOLD 100
+ #define Y_HYBRID_THRESHOLD 100
+ #define Y2_HYBRID_THRESHOLD 100
+ #define Z_HYBRID_THRESHOLD 3
+ #define Z2_HYBRID_THRESHOLD 3
+ #define Z3_HYBRID_THRESHOLD 3
+ #define Z4_HYBRID_THRESHOLD 3
+ #define E0_HYBRID_THRESHOLD 30
+ #define E1_HYBRID_THRESHOLD 30
+ #define E2_HYBRID_THRESHOLD 30
+ #define E3_HYBRID_THRESHOLD 30
+ #define E4_HYBRID_THRESHOLD 30
+ #define E5_HYBRID_THRESHOLD 30
+ #define E6_HYBRID_THRESHOLD 30
+ #define E7_HYBRID_THRESHOLD 30
+
+ /**
+ * Use StallGuard2 to home / probe X, Y, Z.
+ *
+ * TMC2130, TMC2160, TMC2209, TMC2660, TMC5130, and TMC5160 only
+ * Connect the stepper driver's DIAG1 pin to the X/Y endstop pin.
+ * X, Y, and Z homing will always be done in spreadCycle mode.
+ *
+ * X/Y/Z_STALL_SENSITIVITY is the default stall threshold.
+ * Use M914 X Y Z to set the stall threshold at runtime:
+ *
+ * Sensitivity TMC2209 Others
+ * HIGHEST 255 -64 (Too sensitive => False positive)
+ * LOWEST 0 63 (Too insensitive => No trigger)
+ *
+ * It is recommended to set [XYZ]_HOME_BUMP_MM to 0.
+ *
+ * SPI_ENDSTOPS *** Beta feature! *** TMC2130 Only ***
+ * Poll the driver through SPI to determine load when homing.
+ * Removes the need for a wire from DIAG1 to an endstop pin.
+ *
+ * IMPROVE_HOMING_RELIABILITY tunes acceleration and jerk when
+ * homing and adds a guard period for endstop triggering.
+ */
+ //#define SENSORLESS_HOMING // StallGuard capable drivers only
+
+ /**
+ * Use StallGuard2 to probe the bed with the nozzle.
+ *
+ * CAUTION: This could cause damage to machines that use a lead screw or threaded rod
+ * to move the Z axis. Take extreme care when attempting to enable this feature.
+ */
+ //#define SENSORLESS_PROBING // StallGuard capable drivers only
+
+ #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+ // TMC2209: 0...255. TMC2130: -64...63
+ #define X_STALL_SENSITIVITY 8
+ #define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
+ #define Y_STALL_SENSITIVITY 8
+ //#define Z_STALL_SENSITIVITY 8
+ //#define SPI_ENDSTOPS // TMC2130 only
+ //#define IMPROVE_HOMING_RELIABILITY
+ #endif
+
+ /**
+ * Beta feature!
+ * Create a 50/50 square wave step pulse optimal for stepper drivers.
+ */
+ //#define SQUARE_WAVE_STEPPING
+
+ /**
+ * Enable M122 debugging command for TMC stepper drivers.
+ * M122 S0/1 will enable continous reporting.
+ */
+ //#define TMC_DEBUG
+
+ /**
+ * You can set your own advanced settings by filling in predefined functions.
+ * A list of available functions can be found on the library github page
+ * https://github.com/teemuatlut/TMCStepper
+ *
+ * Example:
+ * #define TMC_ADV() { \
+ * stepperX.diag0_otpw(1); \
+ * stepperY.intpol(0); \
+ * }
+ */
+ #define TMC_ADV() { }
+
+#endif // HAS_TRINAMIC
+
+// @section L64XX
+
+/**
+ * L64XX Stepper Driver options
+ *
+ * Arduino-L6470 library (0.8.0 or higher) is required.
+ * https://github.com/ameyer/Arduino-L6470
+ *
+ * Requires the following to be defined in your pins_YOUR_BOARD file
+ * L6470_CHAIN_SCK_PIN
+ * L6470_CHAIN_MISO_PIN
+ * L6470_CHAIN_MOSI_PIN
+ * L6470_CHAIN_SS_PIN
+ * ENABLE_RESET_L64XX_CHIPS(Q) where Q is 1 to enable and 0 to reset
+ */
+
+#if HAS_L64XX
+
+ //#define L6470_CHITCHAT // Display additional status info
+
+ #if AXIS_IS_L64XX(X)
+ #define X_MICROSTEPS 128 // Number of microsteps (VALID: 1, 2, 4, 8, 16, 32, 128) - L6474 max is 16
+ #define X_OVERCURRENT 2000 // (mA) Current where the driver detects an over current
+ // L6470 & L6474 - VALID: 375 x (1 - 16) - 6A max - rounds down
+ // POWERSTEP01: VALID: 1000 x (1 - 32) - 32A max - rounds down
+ #define X_STALLCURRENT 1500 // (mA) Current where the driver detects a stall (VALID: 31.25 * (1-128) - 4A max - rounds down)
+ // L6470 & L6474 - VALID: 31.25 * (1-128) - 4A max - rounds down
+ // POWERSTEP01: VALID: 200 x (1 - 32) - 6.4A max - rounds down
+ // L6474 - STALLCURRENT setting is used to set the nominal (TVAL) current
+ #define X_MAX_VOLTAGE 127 // 0-255, Maximum effective voltage seen by stepper - not used by L6474
+ #define X_CHAIN_POS -1 // Position in SPI chain, 0=Not in chain, 1=Nearest MOSI
+ #define X_SLEW_RATE 1 // 0-3, Slew 0 is slowest, 3 is fastest
+ #endif
+
+ #if AXIS_IS_L64XX(X2)
+ #define X2_MICROSTEPS 128
+ #define X2_OVERCURRENT 2000
+ #define X2_STALLCURRENT 1500
+ #define X2_MAX_VOLTAGE 127
+ #define X2_CHAIN_POS -1
+ #define X2_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(Y)
+ #define Y_MICROSTEPS 128
+ #define Y_OVERCURRENT 2000
+ #define Y_STALLCURRENT 1500
+ #define Y_MAX_VOLTAGE 127
+ #define Y_CHAIN_POS -1
+ #define Y_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(Y2)
+ #define Y2_MICROSTEPS 128
+ #define Y2_OVERCURRENT 2000
+ #define Y2_STALLCURRENT 1500
+ #define Y2_MAX_VOLTAGE 127
+ #define Y2_CHAIN_POS -1
+ #define Y2_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(Z)
+ #define Z_MICROSTEPS 128
+ #define Z_OVERCURRENT 2000
+ #define Z_STALLCURRENT 1500
+ #define Z_MAX_VOLTAGE 127
+ #define Z_CHAIN_POS -1
+ #define Z_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(Z2)
+ #define Z2_MICROSTEPS 128
+ #define Z2_OVERCURRENT 2000
+ #define Z2_STALLCURRENT 1500
+ #define Z2_MAX_VOLTAGE 127
+ #define Z2_CHAIN_POS -1
+ #define Z2_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(Z3)
+ #define Z3_MICROSTEPS 128
+ #define Z3_OVERCURRENT 2000
+ #define Z3_STALLCURRENT 1500
+ #define Z3_MAX_VOLTAGE 127
+ #define Z3_CHAIN_POS -1
+ #define Z3_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(Z4)
+ #define Z4_MICROSTEPS 128
+ #define Z4_OVERCURRENT 2000
+ #define Z4_STALLCURRENT 1500
+ #define Z4_MAX_VOLTAGE 127
+ #define Z4_CHAIN_POS -1
+ #define Z4_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E0)
+ #define E0_MICROSTEPS 128
+ #define E0_OVERCURRENT 2000
+ #define E0_STALLCURRENT 1500
+ #define E0_MAX_VOLTAGE 127
+ #define E0_CHAIN_POS -1
+ #define E0_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E1)
+ #define E1_MICROSTEPS 128
+ #define E1_OVERCURRENT 2000
+ #define E1_STALLCURRENT 1500
+ #define E1_MAX_VOLTAGE 127
+ #define E1_CHAIN_POS -1
+ #define E1_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E2)
+ #define E2_MICROSTEPS 128
+ #define E2_OVERCURRENT 2000
+ #define E2_STALLCURRENT 1500
+ #define E2_MAX_VOLTAGE 127
+ #define E2_CHAIN_POS -1
+ #define E2_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E3)
+ #define E3_MICROSTEPS 128
+ #define E3_OVERCURRENT 2000
+ #define E3_STALLCURRENT 1500
+ #define E3_MAX_VOLTAGE 127
+ #define E3_CHAIN_POS -1
+ #define E3_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E4)
+ #define E4_MICROSTEPS 128
+ #define E4_OVERCURRENT 2000
+ #define E4_STALLCURRENT 1500
+ #define E4_MAX_VOLTAGE 127
+ #define E4_CHAIN_POS -1
+ #define E4_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E5)
+ #define E5_MICROSTEPS 128
+ #define E5_OVERCURRENT 2000
+ #define E5_STALLCURRENT 1500
+ #define E5_MAX_VOLTAGE 127
+ #define E5_CHAIN_POS -1
+ #define E5_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E6)
+ #define E6_MICROSTEPS 128
+ #define E6_OVERCURRENT 2000
+ #define E6_STALLCURRENT 1500
+ #define E6_MAX_VOLTAGE 127
+ #define E6_CHAIN_POS -1
+ #define E6_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E7)
+ #define E7_MICROSTEPS 128
+ #define E7_OVERCURRENT 2000
+ #define E7_STALLCURRENT 1500
+ #define E7_MAX_VOLTAGE 127
+ #define E7_CHAIN_POS -1
+ #define E7_SLEW_RATE 1
+ #endif
+
+ /**
+ * Monitor L6470 drivers for error conditions like over temperature and over current.
+ * In the case of over temperature Marlin can decrease the drive until the error condition clears.
+ * Other detected conditions can be used to stop the current print.
+ * Relevant g-codes:
+ * M906 - I1/2/3/4/5 Set or get motor drive level using axis codes X, Y, Z, E. Report values if no axis codes given.
+ * I not present or I0 or I1 - X, Y, Z or E0
+ * I2 - X2, Y2, Z2 or E1
+ * I3 - Z3 or E3
+ * I4 - Z4 or E4
+ * I5 - E5
+ * M916 - Increase drive level until get thermal warning
+ * M917 - Find minimum current thresholds
+ * M918 - Increase speed until max or error
+ * M122 S0/1 - Report driver parameters
+ */
+ //#define MONITOR_L6470_DRIVER_STATUS
+
+ #if ENABLED(MONITOR_L6470_DRIVER_STATUS)
+ #define KVAL_HOLD_STEP_DOWN 1
+ //#define L6470_STOP_ON_ERROR
+ #endif
+
+#endif // HAS_L64XX
+
+// @section i2cbus
+
+//
+// I2C Master ID for LPC176x LCD and Digital Current control
+// Does not apply to other peripherals based on the Wire library.
+//
+//#define I2C_MASTER_ID 1 // Set a value from 0 to 2
+
+/**
+ * TWI/I2C BUS
+ *
+ * This feature is an EXPERIMENTAL feature so it shall not be used on production
+ * machines. Enabling this will allow you to send and receive I2C data from slave
+ * devices on the bus.
+ *
+ * ; Example #1
+ * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
+ * ; It uses multiple M260 commands with one B arg
+ * M260 A99 ; Target slave address
+ * M260 B77 ; M
+ * M260 B97 ; a
+ * M260 B114 ; r
+ * M260 B108 ; l
+ * M260 B105 ; i
+ * M260 B110 ; n
+ * M260 S1 ; Send the current buffer
+ *
+ * ; Example #2
+ * ; Request 6 bytes from slave device with address 0x63 (99)
+ * M261 A99 B5
+ *
+ * ; Example #3
+ * ; Example serial output of a M261 request
+ * echo:i2c-reply: from:99 bytes:5 data:hello
+ */
+
+//#define EXPERIMENTAL_I2CBUS
+#if ENABLED(EXPERIMENTAL_I2CBUS)
+ #define I2C_SLAVE_ADDRESS 0 // Set a value from 8 to 127 to act as a slave
+#endif
+
+// @section extras
+
+/**
+ * Photo G-code
+ * Add the M240 G-code to take a photo.
+ * The photo can be triggered by a digital pin or a physical movement.
+ */
+//#define PHOTO_GCODE
+#if ENABLED(PHOTO_GCODE)
+ // A position to move to (and raise Z) before taking the photo
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
+
+ // Canon RC-1 or homebrew digital camera trigger
+ // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
+ //#define PHOTOGRAPH_PIN 23
+
+ // Canon Hack Development Kit
+ // http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
+ //#define CHDK_PIN 4
+
+ // Optional second move with delay to trigger the camera shutter
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
+
+ // Duration to hold the switch or keep CHDK_PIN high
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
+
+ /**
+ * PHOTO_PULSES_US may need adjustment depending on board and camera model.
+ * Pin must be running at 48.4kHz.
+ * Be sure to use a PHOTOGRAPH_PIN which can rise and fall quick enough.
+ * (e.g., MKS SBase temp sensor pin was too slow, so used P1.23 on J8.)
+ *
+ * Example pulse data for Nikon: https://bit.ly/2FKD0Aq
+ * IR Wiring: https://git.io/JvJf7
+ */
+ //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 } // (µs) Durations for each 48.4kHz oscillation
+ #ifdef PHOTO_PULSES_US
+ #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation
+ #endif
+#endif
+
+/**
+ * Spindle & Laser control
+ *
+ * Add the M3, M4, and M5 commands to turn the spindle/laser on and off, and
+ * to set spindle speed, spindle direction, and laser power.
+ *
+ * SuperPid is a router/spindle speed controller used in the CNC milling community.
+ * Marlin can be used to turn the spindle on and off. It can also be used to set
+ * the spindle speed from 5,000 to 30,000 RPM.
+ *
+ * You'll need to select a pin for the ON/OFF function and optionally choose a 0-5V
+ * hardware PWM pin for the speed control and a pin for the rotation direction.
+ *
+ * See http://marlinfw.org/docs/configuration/laser_spindle.html for more config details.
+ */
+//#define SPINDLE_FEATURE
+//#define LASER_FEATURE
+#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+ #define SPINDLE_LASER_ACTIVE_HIGH false // Set to "true" if the on/off function is active HIGH
+ #define SPINDLE_LASER_PWM true // Set to "true" if your controller supports setting the speed/power
+ #define SPINDLE_LASER_PWM_INVERT true // Set to "true" if the speed/power goes up when you want it to go slower
+ #define SPINDLE_LASER_POWERUP_DELAY 5000 // (ms) Delay to allow the spindle/laser to come up to speed/power
+ #define SPINDLE_LASER_POWERDOWN_DELAY 5000 // (ms) Delay to allow the spindle to stop
+
+ #if ENABLED(SPINDLE_FEATURE)
+ //#define SPINDLE_CHANGE_DIR // Enable if your spindle controller can change spindle direction
+ #define SPINDLE_CHANGE_DIR_STOP // Enable if the spindle should stop before changing spin direction
+ #define SPINDLE_INVERT_DIR false // Set to "true" if the spin direction is reversed
+
+ /**
+ * The M3 & M4 commands use the following equation to convert PWM duty cycle to speed/power
+ *
+ * SPEED/POWER = PWM duty cycle * SPEED_POWER_SLOPE + SPEED_POWER_INTERCEPT
+ * where PWM duty cycle varies from 0 to 255
+ *
+ * set the following for your controller (ALL MUST BE SET)
+ */
+ #define SPEED_POWER_SLOPE 118.4
+ #define SPEED_POWER_INTERCEPT 0
+ #define SPEED_POWER_MIN 5000
+ #define SPEED_POWER_MAX 30000 // SuperPID router controller 0 - 30,000 RPM
+ #else
+ #define SPEED_POWER_SLOPE 0.3922
+ #define SPEED_POWER_INTERCEPT 0
+ #define SPEED_POWER_MIN 10
+ #define SPEED_POWER_MAX 100 // 0-100%
+ #endif
+#endif
+
+/**
+ * Coolant Control
+ *
+ * Add the M7, M8, and M9 commands to turn mist or flood coolant on and off.
+ *
+ * Note: COOLANT_MIST_PIN and/or COOLANT_FLOOD_PIN must also be defined.
+ */
+//#define COOLANT_CONTROL
+#if ENABLED(COOLANT_CONTROL)
+ #define COOLANT_MIST // Enable if mist coolant is present
+ #define COOLANT_FLOOD // Enable if flood coolant is present
+ #define COOLANT_MIST_INVERT false // Set "true" if the on/off function is reversed
+ #define COOLANT_FLOOD_INVERT false // Set "true" if the on/off function is reversed
+#endif
+
+/**
+ * Filament Width Sensor
+ *
+ * Measures the filament width in real-time and adjusts
+ * flow rate to compensate for any irregularities.
+ *
+ * Also allows the measured filament diameter to set the
+ * extrusion rate, so the slicer only has to specify the
+ * volume.
+ *
+ * Only a single extruder is supported at this time.
+ *
+ * 34 RAMPS_14 : Analog input 5 on the AUX2 connector
+ * 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
+ * 301 RAMBO : Analog input 3
+ *
+ * Note: May require analog pins to be defined for other boards.
+ */
+//#define FILAMENT_WIDTH_SENSOR
+
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
+ #define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
+ #define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
+
+ #define FILWIDTH_ERROR_MARGIN 1.0 // (mm) If a measurement differs too much from nominal width ignore it
+ #define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
+
+ #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
+
+ // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
+ //#define FILAMENT_LCD_DISPLAY
+#endif
+
+/**
+ * CNC Coordinate Systems
+ *
+ * Enables G53 and G54-G59.3 commands to select coordinate systems
+ * and G92.1 to reset the workspace to native machine space.
+ */
+//#define CNC_COORDINATE_SYSTEMS
+
+/**
+ * Auto-report temperatures with M155 S
+ */
+#define AUTO_REPORT_TEMPERATURES
+
+/**
+ * Include capabilities in M115 output
+ */
+#define EXTENDED_CAPABILITIES_REPORT
+
+/**
+ * Expected Printer Check
+ * Add the M16 G-code to compare a string to the MACHINE_NAME.
+ * M16 with a non-matching string causes the printer to halt.
+ */
+//#define EXPECTED_PRINTER_CHECK
+
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
+ /**
+ * Volumetric extrusion default state
+ * Activate to make volumetric extrusion the default method,
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
+ *
+ * M200 D0 to disable, M200 Dn to set a new diameter.
+ */
+ //#define VOLUMETRIC_DEFAULT_ON
+#endif
+
+/**
+ * Enable this option for a leaner build of Marlin that removes all
+ * workspace offsets, simplifying coordinate transformations, leveling, etc.
+ *
+ * - M206 and M428 are disabled.
+ * - G92 will revert to its behavior from Marlin 1.0.
+ */
+//#define NO_WORKSPACE_OFFSETS
+
+/**
+ * Set the number of proportional font spaces required to fill up a typical character space.
+ * This can help to better align the output of commands like `G29 O` Mesh Output.
+ *
+ * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
+ * Otherwise, adjust according to your client and font.
+ */
+#define PROPORTIONAL_FONT_RATIO 1.0
+
+/**
+ * Spend 28 bytes of SRAM to optimize the GCode parser
+ */
+#define FASTER_GCODE_PARSER
+
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ * Note that G0 feedrates should be used with care for 3D printing (if used at all).
+ * High feedrates may cause ringing and harm print quality.
+ */
+//#define PAREN_COMMENTS // Support for parentheses-delimited comments
+//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
+
+// Enable and set a (default) feedrate for all G0 moves
+//#define G0_FEEDRATE 3000 // (mm/m)
+#ifdef G0_FEEDRATE
+ //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
+#endif
+
+/**
+ * Startup commands
+ *
+ * Execute certain G-code commands immediately after power-on.
+ */
+//#define STARTUP_COMMANDS "M17 Z"
+
+/**
+ * G-code Macros
+ *
+ * Add G-codes M810-M819 to define and run G-code macros.
+ * Macros are not saved to EEPROM.
+ */
+//#define GCODE_MACROS
+#if ENABLED(GCODE_MACROS)
+ #define GCODE_MACROS_SLOTS 5 // Up to 10 may be used
+ #define GCODE_MACROS_SLOT_SIZE 50 // Maximum length of a single macro
+#endif
+
+/**
+ * User-defined menu items that execute custom GCode
+ */
+//#define CUSTOM_USER_MENUS
+#if ENABLED(CUSTOM_USER_MENUS)
+ //#define CUSTOM_USER_MENU_TITLE "Custom Commands"
+ #define USER_SCRIPT_DONE "M117 User Script Done"
+ #define USER_SCRIPT_AUDIBLE_FEEDBACK
+ //#define USER_SCRIPT_RETURN // Return to status screen after a script
+
+ #define USER_DESC_1 "Home & UBL Info"
+ #define USER_GCODE_1 "G28\nG29 W"
+
+ #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
+ #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
+
+ #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
+ #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
+
+ #define USER_DESC_4 "Heat Bed/Home/Level"
+ #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
+
+ #define USER_DESC_5 "Home & Info"
+ #define USER_GCODE_5 "G28\nM503"
+#endif
+
+/**
+ * Host Action Commands
+ *
+ * Define host streamer action commands in compliance with the standard.
+ *
+ * See https://reprap.org/wiki/G-code#Action_commands
+ * Common commands ........ poweroff, pause, paused, resume, resumed, cancel
+ * G29_RETRY_AND_RECOVER .. probe_rewipe, probe_failed
+ *
+ * Some features add reason codes to extend these commands.
+ *
+ * Host Prompt Support enables Marlin to use the host for user prompts so
+ * filament runout and other processes can be managed from the host side.
+ */
+//#define HOST_ACTION_COMMANDS
+#if ENABLED(HOST_ACTION_COMMANDS)
+ //#define HOST_PROMPT_SUPPORT
+#endif
+
+/**
+ * Cancel Objects
+ *
+ * Implement M486 to allow Marlin to skip objects
+ */
+//#define CANCEL_OBJECTS
+
+/**
+ * I2C position encoders for closed loop control.
+ * Developed by Chris Barr at Aus3D.
+ *
+ * Wiki: http://wiki.aus3d.com.au/Magnetic_Encoder
+ * Github: https://github.com/Aus3D/MagneticEncoder
+ *
+ * Supplier: http://aus3d.com.au/magnetic-encoder-module
+ * Alternative Supplier: http://reliabuild3d.com/
+ *
+ * Reliabuild encoders have been modified to improve reliability.
+ */
+
+//#define I2C_POSITION_ENCODERS
+#if ENABLED(I2C_POSITION_ENCODERS)
+
+ #define I2CPE_ENCODER_CNT 1 // The number of encoders installed; max of 5
+ // encoders supported currently.
+
+ #define I2CPE_ENC_1_ADDR I2CPE_PRESET_ADDR_X // I2C address of the encoder. 30-200.
+ #define I2CPE_ENC_1_AXIS X_AXIS // Axis the encoder module is installed on. _AXIS.
+ #define I2CPE_ENC_1_TYPE I2CPE_ENC_TYPE_LINEAR // Type of encoder: I2CPE_ENC_TYPE_LINEAR -or-
+ // I2CPE_ENC_TYPE_ROTARY.
+ #define I2CPE_ENC_1_TICKS_UNIT 2048 // 1024 for magnetic strips with 2mm poles; 2048 for
+ // 1mm poles. For linear encoders this is ticks / mm,
+ // for rotary encoders this is ticks / revolution.
+ //#define I2CPE_ENC_1_TICKS_REV (16 * 200) // Only needed for rotary encoders; number of stepper
+ // steps per full revolution (motor steps/rev * microstepping)
+ //#define I2CPE_ENC_1_INVERT // Invert the direction of axis travel.
+ #define I2CPE_ENC_1_EC_METHOD I2CPE_ECM_MICROSTEP // Type of error error correction.
+ #define I2CPE_ENC_1_EC_THRESH 0.10 // Threshold size for error (in mm) above which the
+ // printer will attempt to correct the error; errors
+ // smaller than this are ignored to minimize effects of
+ // measurement noise / latency (filter).
+
+ #define I2CPE_ENC_2_ADDR I2CPE_PRESET_ADDR_Y // Same as above, but for encoder 2.
+ #define I2CPE_ENC_2_AXIS Y_AXIS
+ #define I2CPE_ENC_2_TYPE I2CPE_ENC_TYPE_LINEAR
+ #define I2CPE_ENC_2_TICKS_UNIT 2048
+ //#define I2CPE_ENC_2_TICKS_REV (16 * 200)
+ //#define I2CPE_ENC_2_INVERT
+ #define I2CPE_ENC_2_EC_METHOD I2CPE_ECM_MICROSTEP
+ #define I2CPE_ENC_2_EC_THRESH 0.10
+
+ #define I2CPE_ENC_3_ADDR I2CPE_PRESET_ADDR_Z // Encoder 3. Add additional configuration options
+ #define I2CPE_ENC_3_AXIS Z_AXIS // as above, or use defaults below.
+
+ #define I2CPE_ENC_4_ADDR I2CPE_PRESET_ADDR_E // Encoder 4.
+ #define I2CPE_ENC_4_AXIS E_AXIS
+
+ #define I2CPE_ENC_5_ADDR 34 // Encoder 5.
+ #define I2CPE_ENC_5_AXIS E_AXIS
+
+ // Default settings for encoders which are enabled, but without settings configured above.
+ #define I2CPE_DEF_TYPE I2CPE_ENC_TYPE_LINEAR
+ #define I2CPE_DEF_ENC_TICKS_UNIT 2048
+ #define I2CPE_DEF_TICKS_REV (16 * 200)
+ #define I2CPE_DEF_EC_METHOD I2CPE_ECM_NONE
+ #define I2CPE_DEF_EC_THRESH 0.1
+
+ //#define I2CPE_ERR_THRESH_ABORT 100.0 // Threshold size for error (in mm) error on any given
+ // axis after which the printer will abort. Comment out to
+ // disable abort behavior.
+
+ #define I2CPE_TIME_TRUSTED 10000 // After an encoder fault, there must be no further fault
+ // for this amount of time (in ms) before the encoder
+ // is trusted again.
+
+ /**
+ * Position is checked every time a new command is executed from the buffer but during long moves,
+ * this setting determines the minimum update time between checks. A value of 100 works well with
+ * error rolling average when attempting to correct only for skips and not for vibration.
+ */
+ #define I2CPE_MIN_UPD_TIME_MS 4 // (ms) Minimum time between encoder checks.
+
+ // Use a rolling average to identify persistant errors that indicate skips, as opposed to vibration and noise.
+ #define I2CPE_ERR_ROLLING_AVERAGE
+
+#endif // I2C_POSITION_ENCODERS
+
+/**
+ * Analog Joystick(s)
+ */
+//#define JOYSTICK
+#if ENABLED(JOYSTICK)
+ #define JOY_X_PIN 5 // RAMPS: Suggested pin A5 on AUX2
+ #define JOY_Y_PIN 10 // RAMPS: Suggested pin A10 on AUX2
+ #define JOY_Z_PIN 12 // RAMPS: Suggested pin A12 on AUX2
+ #define JOY_EN_PIN 44 // RAMPS: Suggested pin D44 on AUX2
+
+ //#define INVERT_JOY_X // Enable if X direction is reversed
+ //#define INVERT_JOY_Y // Enable if Y direction is reversed
+ //#define INVERT_JOY_Z // Enable if Z direction is reversed
+
+ // Use M119 with JOYSTICK_DEBUG to find reasonable values after connecting:
+ #define JOY_X_LIMITS { 5600, 8190-100, 8190+100, 10800 } // min, deadzone start, deadzone end, max
+ #define JOY_Y_LIMITS { 5600, 8250-100, 8250+100, 11000 }
+ #define JOY_Z_LIMITS { 4800, 8080-100, 8080+100, 11550 }
+#endif
+
+/**
+ * MAX7219 Debug Matrix
+ *
+ * Add support for a low-cost 8x8 LED Matrix based on the Max7219 chip as a realtime status display.
+ * Requires 3 signal wires. Some useful debug options are included to demonstrate its usage.
+ */
+//#define MAX7219_DEBUG
+#if ENABLED(MAX7219_DEBUG)
+ #define MAX7219_CLK_PIN 64
+ #define MAX7219_DIN_PIN 57
+ #define MAX7219_LOAD_PIN 44
+
+ //#define MAX7219_GCODE // Add the M7219 G-code to control the LED matrix
+ #define MAX7219_INIT_TEST 2 // Do a test pattern at initialization (Set to 2 for spiral)
+ #define MAX7219_NUMBER_UNITS 1 // Number of Max7219 units in chain.
+ #define MAX7219_ROTATE 0 // Rotate the display clockwise (in multiples of +/- 90°)
+ // connector at: right=0 bottom=-90 top=90 left=180
+ //#define MAX7219_REVERSE_ORDER // The individual LED matrix units may be in reversed order
+ //#define MAX7219_SIDE_BY_SIDE // Big chip+matrix boards can be chained side-by-side
+
+ /**
+ * Sample debug features
+ * If you add more debug displays, be careful to avoid conflicts!
+ */
+ #define MAX7219_DEBUG_PRINTER_ALIVE // Blink corner LED of 8x8 matrix to show that the firmware is functioning
+ #define MAX7219_DEBUG_PLANNER_HEAD 3 // Show the planner queue head position on this and the next LED matrix row
+ #define MAX7219_DEBUG_PLANNER_TAIL 5 // Show the planner queue tail position on this and the next LED matrix row
+
+ #define MAX7219_DEBUG_PLANNER_QUEUE 0 // Show the current planner queue depth on this and the next LED matrix row
+ // If you experience stuttering, reboots, etc. this option can reveal how
+ // tweaks made to the configuration are affecting the printer in real-time.
+#endif
+
+/**
+ * NanoDLP Sync support
+ *
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
+ */
+//#define NANODLP_Z_SYNC
+#if ENABLED(NANODLP_Z_SYNC)
+ //#define NANODLP_ALL_AXIS // Enables "Z_move_comp" output on any axis move.
+ // Default behavior is limited to Z axis only.
+#endif
+
+/**
+ * WiFi Support (Espressif ESP32 WiFi)
+ */
+//#define WIFISUPPORT // Marlin embedded WiFi managenent
+//#define ESP3D_WIFISUPPORT // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
+
+#if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
+ #define WIFI_SSID "Wifi SSID"
+ #define WIFI_PWD "Wifi Password"
+ //#define WEBSUPPORT // Start a webserver (which may include auto-discovery)
+ //#define OTASUPPORT // Support over-the-air firmware updates
+ //#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
+#endif
+
+/**
+ * Prusa Multi-Material Unit v2
+ * Enable in Configuration.h
+ */
+#if ENABLED(PRUSA_MMU2)
+
+ // Serial port used for communication with MMU2.
+ // For AVR enable the UART port used for the MMU. (e.g., internalSerial)
+ // For 32-bit boards check your HAL for available serial ports. (e.g., Serial2)
+ #define INTERNAL_SERIAL_PORT 2
+ #define MMU2_SERIAL internalSerial
+
+ // Use hardware reset for MMU if a pin is defined for it
+ //#define MMU2_RST_PIN 23
+
+ // Enable if the MMU2 has 12V stepper motors (MMU2 Firmware 1.0.2 and up)
+ //#define MMU2_MODE_12V
+
+ // G-code to execute when MMU2 F.I.N.D.A. probe detects filament runout
+ #define MMU2_FILAMENT_RUNOUT_SCRIPT "M600"
+
+ // Add an LCD menu for MMU2
+ //#define MMU2_MENUS
+ #if ENABLED(MMU2_MENUS)
+ // Settings for filament load / unload from the LCD menu.
+ // This is for Prusa MK3-style extruders. Customize for your hardware.
+ #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0
+ #define MMU2_LOAD_TO_NOZZLE_SEQUENCE \
+ { 7.2, 562 }, \
+ { 14.4, 871 }, \
+ { 36.0, 1393 }, \
+ { 14.4, 871 }, \
+ { 50.0, 198 }
+
+ #define MMU2_RAMMING_SEQUENCE \
+ { 1.0, 1000 }, \
+ { 1.0, 1500 }, \
+ { 2.0, 2000 }, \
+ { 1.5, 3000 }, \
+ { 2.5, 4000 }, \
+ { -15.0, 5000 }, \
+ { -14.0, 1200 }, \
+ { -6.0, 600 }, \
+ { 10.0, 700 }, \
+ { -10.0, 400 }, \
+ { -50.0, 2000 }
+
+ #endif
+
+ //#define MMU2_DEBUG // Write debug info to serial output
+
+#endif // PRUSA_MMU2
+
+/**
+ * Advanced Print Counter settings
+ */
+#if ENABLED(PRINTCOUNTER)
+ #define SERVICE_WARNING_BUZZES 3
+ // Activate up to 3 service interval watchdogs
+ //#define SERVICE_NAME_1 "Service S"
+ //#define SERVICE_INTERVAL_1 100 // print hours
+ //#define SERVICE_NAME_2 "Service L"
+ //#define SERVICE_INTERVAL_2 200 // print hours
+ //#define SERVICE_NAME_3 "Service 3"
+ //#define SERVICE_INTERVAL_3 1 // print hours
+#endif
+
+// @section develop
+
+//
+// M100 Free Memory Watcher to debug memory usage
+//
+//#define M100_FREE_MEMORY_WATCHER
+
+//
+// M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
+//
+//#define PINS_DEBUGGING
+
+// Enable Marlin dev mode which adds some special commands
+//#define MARLIN_DEV_MODE
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ceeb78c8cc..6929441f99 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -36,14 +36,16 @@
*/
//#define FilamentSensor // Standard older TM3D runout sensor
//#define lerdgeFilSensor // Newer inverted logic TM3D Runout Sensor
+//#define filamentEncoder
+
+//#define autoCalibrationKit
-//#define AUTO_CALIBRATE // Conductive block and grounding to heater block for automatic hotend calibration
//////////////////////////////////DO not edit below here unless you know what youre doing! //////////////////////////////////
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -80,9 +82,7 @@
#define E_2208
#define FilamentSensor
#endif
-#if ENABLED(lerdgeFilSensor) && DISABLED(FilamentSensor)
- #define FilamentSensor
-#endif
+
/**
* Configuration.h
*
@@ -98,7 +98,7 @@
* Advanced settings can be found in Configuration_adv.h
*
*/
-#define CONFIGURATION_H_VERSION 020000
+#define CONFIGURATION_H_VERSION 020005
//===========================================================================
//============================= Getting Started =============================
@@ -216,7 +216,7 @@
// @section extruder
// This defines the number of extruders
-// :[1, 2, 3, 4, 5, 6]
+// :[1, 2, 3, 4, 5, 6, 7, 8]
#define EXTRUDERS 2
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
@@ -438,7 +438,8 @@
* -1 : thermocouple with AD595
* 0 : not used
* 1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
- * 331 : (3.3V scaled thermistor 1 table)
+ * 331 : (3.3V scaled thermistor 1 table for MEGA)
+ * 332 : (3.3V scaled thermistor 1 table for DUE)
* 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
* 3 : Mendel-parts thermistor (4.7k pullup)
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
@@ -456,7 +457,8 @@
* 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
* 15 : 100k thermistor calibration for JGAurora A5 hotend
* 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
- * 20 : Pt100 with circuit in the Ultimainboard V2.x
+ * 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR)
+ * 21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....)
* 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
* 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
* 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup
@@ -487,7 +489,6 @@
#define TEMP_SENSOR_0 61
#define TEMP_SENSOR_1 61
#else
-
#define TEMP_SENSOR_0 1
#define TEMP_SENSOR_1 1
#endif
@@ -495,11 +496,14 @@
#define TEMP_SENSOR_3 0
#define TEMP_SENSOR_4 0
#define TEMP_SENSOR_5 0
+#define TEMP_SENSOR_6 0
+#define TEMP_SENSOR_7 0
#if(ENABLED(BedAC))
#define TEMP_SENSOR_BED 11
#else
#define TEMP_SENSOR_BED 0
#endif
+#define TEMP_SENSOR_PROBE 0
#define TEMP_SENSOR_CHAMBER 0
// Dummy thermistor constant temperature readings, for use with 998 and 999
@@ -511,11 +515,11 @@
//#define TEMP_SENSOR_1_AS_REDUNDANT
#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
-#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109
+#define TEMP_RESIDENCY_TIME 3 // (seconds) Time to wait for hotend to "settle" in M109
#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
-#define TEMP_BED_RESIDENCY_TIME 10 // (seconds) Time to wait for bed to "settle" in M190
+#define TEMP_BED_RESIDENCY_TIME 5 // (seconds) Time to wait for bed to "settle" in M190
#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
@@ -527,6 +531,8 @@
#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
// Above this temperature the heater will be switched off.
@@ -543,6 +549,8 @@
#define HEATER_3_MAXTEMP 275
#define HEATER_4_MAXTEMP 275
#define HEATER_5_MAXTEMP 275
+#define HEATER_6_MAXTEMP 275
+#define HEATER_7_MAXTEMP 275
#define BED_MAXTEMP 150
//===========================================================================
@@ -752,12 +760,13 @@
*
* A4988 is assumed for unspecified drivers.
*
- * Options: A4988, A5984, DRV8825, LV8729, L6470, TB6560, TB6600, TMC2100,
+ * Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
+ * TB6560, TB6600, TMC2100,
* TMC2130, TMC2130_STANDALONE, TMC2160, TMC2160_STANDALONE,
* TMC2208, TMC2208_STANDALONE, TMC2209, TMC2209_STANDALONE,
* TMC26X, TMC26X_STANDALONE, TMC2660, TMC2660_STANDALONE,
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
- * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
+ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
*/
#if ENABLED(X_2208)
#define X_DRIVER_TYPE TMC2208_STANDALONE
@@ -783,6 +792,7 @@
//#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988
//#define Z3_DRIVER_TYPE A4988
+//#define Z4_DRIVER_TYPE A4988
#if ENABLED(E_2208)
#define E0_DRIVER_TYPE TMC2208_STANDALONE
#define E1_DRIVER_TYPE TMC2208_STANDALONE
@@ -794,6 +804,8 @@
//#define E3_DRIVER_TYPE A4988
//#define E4_DRIVER_TYPE A4988
//#define E5_DRIVER_TYPE A4988
+//#define E6_DRIVER_TYPE A4988
+//#define E7_DRIVER_TYPE A4988
// Enable this feature if all enabled endstop pins are interrupt-capable.
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
@@ -857,7 +869,7 @@
/**
* Default Max Feed Rate (mm/s)
* Override with M203
- * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
+ * X, Y, Z, E0 [, E1[, E2...]]
*/
#if ENABLED(Y_2208) && DISABLED(Y_Spreadcycle)
#define Y_MAXFEED 100
@@ -910,6 +922,8 @@
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
+ //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
+
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
#if ENABLED(LIMITED_JERK_EDITING)
#define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
@@ -1042,6 +1056,21 @@
#define Z_PROBE_RETRACT_X X_MAX_POS
#endif
+// Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
+// When the pin is defined you can use M672 to set/reset the probe sensivity.
+//#define DUET_SMART_EFFECTOR
+#if ENABLED(DUET_SMART_EFFECTOR)
+ #define SMART_EFFECTOR_MOD_PIN -1 // Connect a GPIO pin to the Smart Effector MOD pin
+#endif
+
+/**
+ * Use StallGuard2 to probe the bed with the nozzle.
+ * Requires stallGuard-capable Trinamic stepper drivers.
+ * CAUTION: This can damage machines with Z lead screws.
+ * Take extreme care when setting up this feature.
+ */
+//#define SENSORLESS_PROBING
+
//
// For Z_PROBE_ALLEN_KEY see the Delta example configurations.
//
@@ -1068,11 +1097,12 @@
*/
#if ENABLED(TREX3)
- #define NOZZLE_TO_PROBE_OFFSET { -3, 31, -1.5 }
+ #define NOZZLE_TO_PROBE_OFFSET { -3, 31, 0 }
#else
- #define NOZZLE_TO_PROBE_OFFSET { -7, 29, -1.5 }
+ #define NOZZLE_TO_PROBE_OFFSET { -7, 29, 0 }
#endif
-// Certain types of probes need to stay away from edges
+// Most probes should stay away from the edges of the bed, but
+// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
#define MIN_PROBE_EDGE 10
// X and Y axis travel speed (mm/m) between probes
@@ -1118,8 +1148,8 @@
#define Z_PROBE_LOW_POINT -3 // Farthest distance below the trigger-point to go before stopping
// For M851 give a range for adjusting the Z probe offset
-#define Z_PROBE_OFFSET_RANGE_MIN -20
-#define Z_PROBE_OFFSET_RANGE_MAX 20
+#define Z_PROBE_OFFSET_RANGE_MIN -9
+#define Z_PROBE_OFFSET_RANGE_MAX 9
// Enable the M48 repeatability test to test probe accuracy
#define Z_MIN_PROBE_REPEATABILITY_TEST
@@ -1198,15 +1228,19 @@
#define INVERT_E3_DIR false
#define INVERT_E4_DIR false
#define INVERT_E5_DIR false
+#define INVERT_E6_DIR false
+#define INVERT_E7_DIR false
// @section homing
-//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
+//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
-//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
+//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
-#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
- // Be sure you have this distance over your Z_MAX_POS in case.
+//#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
+ // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding.
+
+//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z
// Direction of endstops when homing; 1=MAX, -1=MIN
// :[-1,1]
@@ -1277,7 +1311,7 @@
* For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
* By default the firmware assumes HIGH=FILAMENT PRESENT.
*/
- #if ENABLED(FilamentSensor)
+ #if ANY(FilamentSensor, filamentEncoder, lerdgeFilSensor)
#define FILAMENT_RUNOUT_SENSOR
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
@@ -1301,13 +1335,19 @@
// After a runout is detected, continue printing this length of filament
// before executing the runout script. Useful for a sensor at the end of
// a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead.
- #define FILAMENT_RUNOUT_DISTANCE_MM 5
+ #if ENABLED(filamentEncoder)
+ #define FILAMENT_RUNOUT_DISTANCE_MM 15
+ #else
+ #define FILAMENT_RUNOUT_DISTANCE_MM 5
+ #endif
#ifdef FILAMENT_RUNOUT_DISTANCE_MM
// Enable this option to use an encoder disc that toggles the runout pin
// as the filament moves. (Be sure to set FILAMENT_RUNOUT_DISTANCE_MM
// large enough to avoid false positives.)
- //#define FILAMENT_MOTION_SENSOR
+ #if ENABLED(filamentEncoder)
+ #define FILAMENT_MOTION_SENSOR
+ #endif
#endif
#endif
@@ -1375,7 +1415,7 @@
// Gradually reduce leveling correction until a set height is reached,
// at which point movement will be level to the machine's XY plane.
// The height can be set with M420 Z
- //#define ENABLE_LEVELING_FADE_HEIGHT
+ #define ENABLE_LEVELING_FADE_HEIGHT
// For Cartesian machines, instead of dividing moves on mesh boundaries,
// split up moves into short segments like a Delta. This follows the
@@ -1393,6 +1433,7 @@
#define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
#define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
#define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
+ #define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements.
#endif
#endif
@@ -1472,10 +1513,10 @@
#define LEVEL_BED_CORNERS
#if ENABLED(LEVEL_BED_CORNERS)
- #define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
- #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Move nozzle up before moving between corners
- #define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
- //#define LEVEL_CENTER_TOO // Move to the center after the last corner
+ #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
+ #define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
+ #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points
+ //#define LEVEL_CENTER_TOO // Move to the center after the last corner
#endif
/**
@@ -1608,11 +1649,6 @@
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
-//
-// M100 Free Memory Watcher
-//
-//#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
-
//
// G20/G21 Inch mode support
//
@@ -1694,18 +1730,19 @@
* Attention: EXPERIMENTAL. G-code arguments may change.
*
*/
-//#define NOZZLE_CLEAN_FEATURE
+#define NOZZLE_CLEAN_FEATURE
#if ENABLED(NOZZLE_CLEAN_FEATURE)
// Default number of pattern repetitions
- #define NOZZLE_CLEAN_STROKES 12
+ #define NOZZLE_CLEAN_STROKES 4
// Default number of triangles
#define NOZZLE_CLEAN_TRIANGLES 3
- // Specify positions as { X, Y, Z }
- #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1) }
- #define NOZZLE_CLEAN_END_POINT { 100, 60, (Z_MIN_POS + 1) }
+ // Specify positions for each tool as { { X, Y, Z }, { X, Y, Z } }
+ // Dual hotend system may use { { -20, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }, { 420, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }}
+ #define NOZZLE_CLEAN_START_POINT { { -20, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }, { 420, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }}
+ #define NOZZLE_CLEAN_END_POINT { { (-30), (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }, { (430), (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }}
// Circular pattern radius
#define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5
@@ -2134,7 +2171,7 @@
//
// Factory display for Creality CR-10
-// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
+// https://www.aliexpress.com/item/32833148327.html
//
// This is RAMPS-compatible using a single 10-pin connector.
// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 56395bec80..2bdf232cea 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,7 +31,7 @@
* Basic settings can be found in Configuration.h
*
*/
-#define CONFIGURATION_ADV_H_VERSION 020000
+#define CONFIGURATION_ADV_H_VERSION 020005
// @section temperature
@@ -78,6 +78,18 @@
#define HOTEND5_BETA 3950 // Beta value
#endif
+#if TEMP_SENSOR_6 == 1000
+ #define HOTEND6_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND6_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND6_BETA 3950 // Beta value
+#endif
+
+#if TEMP_SENSOR_7 == 1000
+ #define HOTEND7_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
+ #define HOTEND7_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+ #define HOTEND7_BETA 3950 // Beta value
+#endif
+
#if TEMP_SENSOR_BED == 1000
#define BED_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
#define BED_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
@@ -137,8 +149,8 @@
* THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD
*/
#if ENABLED(THERMAL_PROTECTION_HOTENDS)
- #define THERMAL_PROTECTION_PERIOD 60 // Seconds
- #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius
+ #define THERMAL_PROTECTION_PERIOD 30 // Seconds
+ #define THERMAL_PROTECTION_HYSTERESIS 15 // Degrees Celsius
#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
#if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
@@ -264,8 +276,10 @@
#define AUTOTEMP_OLDWEIGHT 0.98
#endif
-// Show extra position information with 'M114 D'
-#define M114_DETAIL
+// Extra options for the M114 "Current Position" report
+//#define M114_DETAIL // Use 'M114` for details to check planner calculations
+//#define M114_REALTIME // Real current position based on forward kinematics
+//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed.
// Show Temperature ADC value
// Enable for M105 to include ADC values read from temperature sensors.
@@ -485,7 +499,7 @@
//#define X_DUAL_ENDSTOPS
#if ENABLED(X_DUAL_ENDSTOPS)
#define X2_USE_ENDSTOP _XMAX_
- #define X_DUAL_ENDSTOPS_ADJUSTMENT 0
+ #define X2_ENDSTOP_ADJUSTMENT 0
#endif
#endif
@@ -495,27 +509,28 @@
//#define Y_DUAL_ENDSTOPS
#if ENABLED(Y_DUAL_ENDSTOPS)
#define Y2_USE_ENDSTOP _YMAX_
- #define Y_DUAL_ENDSTOPS_ADJUSTMENT 0
+ #define Y2_ENDSTOP_ADJUSTMENT 0
#endif
#endif
-//#define Z_DUAL_STEPPER_DRIVERS
-#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
- //#define Z_DUAL_ENDSTOPS
- #if ENABLED(Z_DUAL_ENDSTOPS)
- #define Z2_USE_ENDSTOP _XMAX_
- #define Z_DUAL_ENDSTOPS_ADJUSTMENT 0
- #endif
-#endif
+//
+// For Z set the number of stepper drivers
+//
+#define NUM_Z_STEPPER_DRIVERS 1 // (1-4) Z options change based on how many
-//#define Z_TRIPLE_STEPPER_DRIVERS
-#if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
- //#define Z_TRIPLE_ENDSTOPS
- #if ENABLED(Z_TRIPLE_ENDSTOPS)
- #define Z2_USE_ENDSTOP _XMAX_
- #define Z3_USE_ENDSTOP _YMAX_
- #define Z_TRIPLE_ENDSTOPS_ADJUSTMENT2 0
- #define Z_TRIPLE_ENDSTOPS_ADJUSTMENT3 0
+#if NUM_Z_STEPPER_DRIVERS > 1
+ //#define Z_MULTI_ENDSTOPS
+ #if ENABLED(Z_MULTI_ENDSTOPS)
+ #define Z2_USE_ENDSTOP _XMAX_
+ #define Z2_ENDSTOP_ADJUSTMENT 0
+ #if NUM_Z_STEPPER_DRIVERS >= 3
+ #define Z3_USE_ENDSTOP _YMAX_
+ #define Z3_ENDSTOP_ADJUSTMENT 0
+ #endif
+ #if NUM_Z_STEPPER_DRIVERS >= 4
+ #define Z4_USE_ENDSTOP _ZMAX_
+ #define Z4_ENDSTOP_ADJUSTMENT 0
+ #endif
#endif
#endif
@@ -665,11 +680,37 @@
*/
//#define Z_STEPPER_AUTO_ALIGN
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
- // Define probe X and Y positions for Z1, Z2 [, Z3]
- #define Z_STEPPER_ALIGN_XY { { 10, 290 }, { 150, 10 }, { 290, 290 } }
+ // Define probe X and Y positions for Z1, Z2 [, Z3 [, Z4]]
+ // If not defined, probe limits will be used.
+ // Override with 'M422 S X Y'
+ //#define Z_STEPPER_ALIGN_XY { { 10, 190 }, { 100, 10 }, { 190, 190 } }
+
+ /**
+ * Orientation for the automatically-calculated probe positions.
+ * Override Z stepper align points with 'M422 S X Y'
+ *
+ * 2 Steppers: (0) (1)
+ * | | 2 |
+ * | 1 2 | |
+ * | | 1 |
+ *
+ * 3 Steppers: (0) (1) (2) (3)
+ * | 3 | 1 | 2 1 | 2 |
+ * | | 3 | | 3 |
+ * | 1 2 | 2 | 3 | 1 |
+ *
+ * 4 Steppers: (0) (1) (2) (3)
+ * | 4 3 | 1 4 | 2 1 | 3 2 |
+ * | | | | |
+ * | 1 2 | 2 3 | 3 4 | 4 1 |
+ *
+ */
+ #ifndef Z_STEPPER_ALIGN_XY
+ //#define Z_STEPPERS_ORIENTATION 0
+ #endif
// Provide Z stepper positions for more rapid convergence in bed alignment.
- // Currently requires triple stepper drivers.
+ // Requires triple stepper drivers (i.e., set NUM_Z_STEPPER_DRIVERS to 3)
//#define Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
// Define Stepper XY positions for Z1, Z2, Z3 corresponding to
@@ -677,23 +718,19 @@
// Define one position per Z stepper in stepper driver order.
#define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
#else
- // Amplification factor. Used to scale the correction step up or down.
- // In case the stepper (spindle) position is further out than the test point.
- // Use a value > 1. NOTE: This may cause instability
- #define Z_STEPPER_ALIGN_AMP 1.0
+ // Amplification factor. Used to scale the correction step up or down in case
+ // the stepper (spindle) position is farther out than the test point.
+ #define Z_STEPPER_ALIGN_AMP 1.0 // Use a value > 1.0 NOTE: This may cause instability!
#endif
- // Set number of iterations to align
- #define Z_STEPPER_ALIGN_ITERATIONS 3
-
- // Enable to restore leveling setup after operation
- #define RESTORE_LEVELING_AFTER_G34
-
// On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
- #define G34_MAX_GRADE 5 // (%) Maximum incline G34 will handle
-
- // Stop criterion. If the accuracy is better than this stop iterating early
- #define Z_STEPPER_ALIGN_ACC 0.02
+ #define G34_MAX_GRADE 5 // (%) Maximum incline that G34 will handle
+ #define Z_STEPPER_ALIGN_ITERATIONS 5 // Number of iterations to apply during alignment
+ #define Z_STEPPER_ALIGN_ACC 0.02 // Stop iterating early if the accuracy is better than this
+ #define RESTORE_LEVELING_AFTER_G34 // Restore leveling after G34 is done?
+ // After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
+ // Re-homing might be more precise in reproducing the actual 'G28 Z' homing height, especially on an uneven bed.
+ #define HOME_AFTER_G34
#endif
// @section motion
@@ -759,7 +796,7 @@
#if ENABLED(BACKLASH_GCODE)
// Measure the Z backlash when probing (G29) and set with "M425 Z"
- //#define MEASURE_BACKLASH_WHEN_PROBING
+ #define MEASURE_BACKLASH_WHEN_PROBING
#if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
// When measuring, the probe will move up to BACKLASH_MEASUREMENT_LIMIT
@@ -785,7 +822,7 @@
* Note: HOTEND_OFFSET and CALIBRATION_OBJECT_CENTER must be set to within
* ±5mm of true values for G425 to succeed.
*/
-#if ENABLED(AUTO_CALIBRATE)
+#if ENABLED(autoCalibrationKit)
#define CALIBRATION_GCODE
#endif
#if ENABLED(CALIBRATION_GCODE)
@@ -801,11 +838,11 @@
#define CALIBRATION_NOZZLE_OUTER_DIAMETER 2.0 // mm
// Uncomment to enable reporting (required for "G425 V", but consumes PROGMEM).
- #define CALIBRATION_REPORTING
+ //#define CALIBRATION_REPORTING
// The true location and dimension the cube/bolt/washer on the bed.
- #define CALIBRATION_OBJECT_CENTER { 208.0, 28.0, 14.5 } // mm
- #define CALIBRATION_OBJECT_DIMENSIONS { 12.55, 12.55, 3.0 } // mm
+ #define CALIBRATION_OBJECT_CENTER { 264.0, 25.0, 12.5 } // mm
+ #define CALIBRATION_OBJECT_DIMENSIONS { 12.55, 12.55, 4.0 } // mm
// Comment out any sides which are unreachable by the probe. For best
// auto-calibration results, all sides must be reachable.
@@ -818,7 +855,7 @@
// probing on a screwhead or hollow washer, probe near the edges.
#define CALIBRATION_MEASURE_AT_TOP_EDGES
- // Define pin which is read during calibration
+ // Define the pin to read during calibration
#ifndef CALIBRATION_PIN
#define CALIBRATION_PIN 58 // Override in pins.h or set to -1 to use your Z endstop
#define CALIBRATION_PIN_INVERTING true // Set to true to invert the pin
@@ -970,6 +1007,10 @@
// Show the E position (filament used) during printing
//#define LCD_SHOW_E_TOTAL
+#if ENABLED(SHOW_BOOTSCREEN)
+ #define BOOTSCREEN_TIMEOUT 2000 // (ms) Total Duration to display the boot screen(s)
+#endif
+
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
//#define SHOW_REMAINING_TIME // Display estimated time to completion
@@ -992,12 +1033,9 @@
#if ENABLED(SDSUPPORT)
- // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
- // around this by connecting a push button or single throw switch to the pin defined
- // as SD_DETECT_PIN in your board's pins definitions.
- // This setting should be disabled unless you are using a push button, pulling the pin to ground.
- // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
- #define SD_DETECT_INVERTED
+ // The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
+ // Enable this option and set to HIGH if your SD cards are incorrectly detected.
+ #define SD_DETECT_STATE HIGH
#define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished
#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place.
@@ -1019,12 +1057,16 @@
* during SD printing. If the recovery file is found at boot time, present
* an option on the LCD screen to continue the print from the last-known
* point in the file.
+ *
+ * If the machine reboots when resuming a print you may need to replace or
+ * reformat the SD card. (Bad sectors delay startup triggering the watchdog.)
*/
- //#define POWER_LOSS_RECOVERY
+ #define POWER_LOSS_RECOVERY
#if ENABLED(POWER_LOSS_RECOVERY)
+ #define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
//#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
//#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)
- //#define POWER_LOSS_PIN 44 // Pin to detect power loss
+ //#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
//#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
//#define POWER_LOSS_PULL // Set pullup / pulldown as appropriate
//#define POWER_LOSS_PURGE_LEN 20 // (mm) Length of filament to purge on resume
@@ -1152,18 +1194,16 @@
// Add an optimized binary file transfer mode, initiated with 'M28 B1'
//#define BINARY_FILE_TRANSFER
- #if HAS_SDCARD_CONNECTION
- /**
- * Set this option to one of the following (or the board's defaults apply):
- *
- * LCD - Use the SD drive in the external LCD controller.
- * ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
- * CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
- *
- * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
- */
- //#define SDCARD_CONNECTION LCD
- #endif
+ /**
+ * Set this option to one of the following (or the board's defaults apply):
+ *
+ * LCD - Use the SD drive in the external LCD controller.
+ * ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
+ * CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
+ *
+ * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
+ */
+ //#define SDCARD_CONNECTION LCD
#endif // SDSUPPORT
@@ -1203,10 +1243,6 @@
// Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
//#define USE_SMALL_INFOFONT
- // Enable this option and reduce the value to optimize screen updates.
- // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
- //#define DOGM_SPI_DELAY_US 5
-
// Swap the CW/CCW indicators in the graphics overlay
//#define OVERLAY_GFX_REVERSE
@@ -1223,6 +1259,10 @@
* This will prevent position updates from being displayed.
*/
#if ENABLED(U8GLIB_ST7920)
+ // Enable this option and reduce the value to optimize screen updates.
+ // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
+ //#define DOGM_SPI_DELAY_US 5
+
//#define LIGHTWEIGHT_UI
#if ENABLED(LIGHTWEIGHT_UI)
#define STATUS_EXPIRE_SECONDS 20
@@ -1240,6 +1280,7 @@
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
#define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating
+ //#define STATUS_CUTTER_ANIM // Use a second bitmap to indicate spindle / laser active
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
@@ -1259,7 +1300,7 @@
// Additional options for DGUS / DWIN displays
//
#if HAS_DGUS_LCD
- #define DGUS_SERIAL_PORT 2
+ #define DGUS_SERIAL_PORT 3
#define DGUS_BAUDRATE 115200
#define DGUS_RX_BUFFER_SIZE 128
@@ -1267,16 +1308,15 @@
//#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS // Fix Rx overrun situation (Currently only for AVR)
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
- #define BOOTSCREEN_TIMEOUT 3000 // (ms) Duration to display the boot screen
#if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
#define DGUS_PRINT_FILENAME // Display the filename during printing
#define DGUS_PREHEAT_UI // Display a preheat screen during heatup
#if ENABLED(DGUS_LCD_UI_FYSETC)
- //#define DUGS_UI_MOVE_DIS_OPTION // Disabled by default for UI_FYSETC
+ //#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for UI_FYSETC
#else
- #define DUGS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY
+ #define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY
#endif
#define DGUS_FILAMENT_LOADUNLOAD
@@ -1313,9 +1353,11 @@
//#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
+ //#define S6_TFT_PINMAP // FYSETC S6 pin mapping
+
//#define OTHER_PIN_LAYOUT // Define pins manually below
#if ENABLED(OTHER_PIN_LAYOUT)
- // The pins for CS and MOD_RESET (PD) must be chosen.
+ // Pins for CS and MOD_RESET (PD) must be chosen
#define CLCD_MOD_RESET 9
#define CLCD_SPI_CS 10
@@ -1425,8 +1467,9 @@
*/
#define BABYSTEPPING
#if ENABLED(BABYSTEPPING)
+ #define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
//#define BABYSTEP_WITHOUT_HOMING
- #define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
+ //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
#define BABYSTEP_MULTIPLICATOR_Z 20 // Babysteps are very small. Increase for faster motion.
#define BABYSTEP_MULTIPLICATOR_XY 1
@@ -1555,10 +1598,10 @@
// Add additional compensation depending on hotend temperature
// Note: this values cannot be calibrated and have to be set manually
- #ifdef PROBE_TEMP_COMPENSATION
+ #if ENABLED(PROBE_TEMP_COMPENSATION)
// Max temperature that can be reached by heated bed.
// This is required only for the calibration process.
- #define PTC_MAX_BED_TEMP 110
+ #define PTC_MAX_BED_TEMP BED_MAXTEMP
// Park position to wait for probe cooldown
#define PTC_PARK_POS_X 0.0F
@@ -1577,21 +1620,31 @@
// @section extras
+//
+// G60/G61 Position Save and Return
+//
+//#define SAVED_POSITIONS 1 // Each saved position slot costs 12 bytes
+
//
// G2/G3 Arc Support
//
-#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
+#if DISABLED(autoCalibrationKit)
+ #define ARC_SUPPORT // Disable this feature to save ~3226 bytes
+#endif
#if ENABLED(ARC_SUPPORT)
- #define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
- #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle
+ #define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
+ //#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
+ #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle
//#define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum)
- #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections
- //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
- //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
+ #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections
+ //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
+ //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
#endif
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
-//#define BEZIER_CURVE_SUPPORT
+#if DISABLED(autoCalibrationKit)
+ //#define BEZIER_CURVE_SUPPORT
+#endif
/**
* G38 Probe Target
@@ -1785,7 +1838,10 @@
#if EXTRUDERS > 1
// Z raise distance for tool-change, as needed for some extruders
#define TOOLCHANGE_ZRAISE 1 // (mm)
- #define TOOLCHANGE_NO_RETURN // Don't return to the previous position on tool-change
+ #define TOOLCHANGE_NO_RETURN // Never return to the previous position on tool-change
+ #if ENABLED(TOOLCHANGE_NO_RETURN)
+ #define EVENT_GCODE_AFTER_TOOLCHANGE "G12X" // G-code to run after tool-change is complete
+ #endif
// Retract and prime filament on tool-change
#define TOOLCHANGE_FILAMENT_SWAP
@@ -1848,7 +1904,7 @@
// Filament Unload does a Retract, Delay, and Purge first:
#define FILAMENT_UNLOAD_PURGE_RETRACT 4 // (mm) Unload initial retract length.
#define FILAMENT_UNLOAD_PURGE_DELAY 2000 // (ms) Delay for the filament to cool after retract.
- #define FILAMENT_UNLOAD_PURGE_LENGTH 0 // (mm) An unretract is done, then this length is purged.
+ #define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged.
#define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload
#define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety.
@@ -1914,6 +1970,12 @@
#define Z3_MICROSTEPS 16
#endif
+ #if AXIS_DRIVER_TYPE_Z4(TMC26X)
+ #define Z4_MAX_CURRENT 1000
+ #define Z4_SENSE_RESISTOR 91
+ #define Z4_MICROSTEPS 16
+ #endif
+
#if AXIS_DRIVER_TYPE_E0(TMC26X)
#define E0_MAX_CURRENT 1000
#define E0_SENSE_RESISTOR 91
@@ -1950,6 +2012,18 @@
#define E5_MICROSTEPS 16
#endif
+ #if AXIS_DRIVER_TYPE_E6(TMC26X)
+ #define E6_MAX_CURRENT 1000
+ #define E6_SENSE_RESISTOR 91
+ #define E6_MICROSTEPS 16
+ #endif
+
+ #if AXIS_DRIVER_TYPE_E7(TMC26X)
+ #define E7_MAX_CURRENT 1000
+ #define E7_SENSE_RESISTOR 91
+ #define E7_MICROSTEPS 16
+ #endif
+
#endif // TMC26X
// @section tmc_smart
@@ -1970,7 +2044,7 @@
* TMCStepper library is required to use TMC stepper drivers.
* https://github.com/teemuatlut/TMCStepper
*/
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current
#define INTERPOLATE true // Interpolate X/Y/Z_MICROSTEPS to 256
@@ -2031,6 +2105,14 @@
#define Z3_CHAIN_POS -1
#endif
+ #if AXIS_IS_TMC(Z4)
+ #define Z4_CURRENT 800
+ #define Z4_CURRENT_HOME Z4_CURRENT
+ #define Z4_MICROSTEPS 16
+ #define Z4_RSENSE 0.11
+ #define Z4_CHAIN_POS -1
+ #endif
+
#if AXIS_IS_TMC(E0)
#define E0_CURRENT 800
#define E0_MICROSTEPS 16
@@ -2073,6 +2155,20 @@
#define E5_CHAIN_POS -1
#endif
+ #if AXIS_IS_TMC(E6)
+ #define E6_CURRENT 800
+ #define E6_MICROSTEPS 16
+ #define E6_RSENSE 0.11
+ #define E6_CHAIN_POS -1
+ #endif
+
+ #if AXIS_IS_TMC(E7)
+ #define E7_CURRENT 800
+ #define E7_MICROSTEPS 16
+ #define E7_RSENSE 0.11
+ #define E7_CHAIN_POS -1
+ #endif
+
/**
* Override default SPI pins for TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160 drivers here.
* The default pins can be found in your board's pins file.
@@ -2090,6 +2186,8 @@
//#define E3_CS_PIN -1
//#define E4_CS_PIN -1
//#define E5_CS_PIN -1
+ //#define E6_CS_PIN -1
+ //#define E7_CS_PIN -1
/**
* Software option for SPI driven drivers (TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160).
@@ -2120,12 +2218,15 @@
#define Y2_SLAVE_ADDRESS 0
#define Z2_SLAVE_ADDRESS 0
#define Z3_SLAVE_ADDRESS 0
+ #define Z4_SLAVE_ADDRESS 0
#define E0_SLAVE_ADDRESS 0
#define E1_SLAVE_ADDRESS 0
#define E2_SLAVE_ADDRESS 0
#define E3_SLAVE_ADDRESS 0
#define E4_SLAVE_ADDRESS 0
#define E5_SLAVE_ADDRESS 0
+ #define E6_SLAVE_ADDRESS 0
+ #define E7_SLAVE_ADDRESS 0
/**
* Software enable
@@ -2195,12 +2296,15 @@
#define Z_HYBRID_THRESHOLD 3
#define Z2_HYBRID_THRESHOLD 3
#define Z3_HYBRID_THRESHOLD 3
+ #define Z4_HYBRID_THRESHOLD 3
#define E0_HYBRID_THRESHOLD 30
#define E1_HYBRID_THRESHOLD 30
#define E2_HYBRID_THRESHOLD 30
#define E3_HYBRID_THRESHOLD 30
#define E4_HYBRID_THRESHOLD 30
#define E5_HYBRID_THRESHOLD 30
+ #define E6_HYBRID_THRESHOLD 30
+ #define E7_HYBRID_THRESHOLD 30
/**
* Use StallGuard2 to home / probe X, Y, Z.
@@ -2227,14 +2331,6 @@
*/
//#define SENSORLESS_HOMING // StallGuard capable drivers only
- /**
- * Use StallGuard2 to probe the bed with the nozzle.
- *
- * CAUTION: This could cause damage to machines that use a lead screw or threaded rod
- * to move the Z axis. Take extreme care when attempting to enable this feature.
- */
- //#define SENSORLESS_PROBING // StallGuard capable drivers only
-
#if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
// TMC2209: 0...255. TMC2130: -64...63
#define X_STALL_SENSITIVITY 8
@@ -2270,7 +2366,7 @@
*/
#define TMC_ADV() { }
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
// @section L64XX
@@ -2360,6 +2456,15 @@
#define Z3_SLEW_RATE 1
#endif
+ #if AXIS_IS_L64XX(Z4)
+ #define Z4_MICROSTEPS 128
+ #define Z4_OVERCURRENT 2000
+ #define Z4_STALLCURRENT 1500
+ #define Z4_MAX_VOLTAGE 127
+ #define Z4_CHAIN_POS -1
+ #define Z4_SLEW_RATE 1
+ #endif
+
#if AXIS_IS_L64XX(E0)
#define E0_MICROSTEPS 128
#define E0_OVERCURRENT 2000
@@ -2414,6 +2519,24 @@
#define E5_SLEW_RATE 1
#endif
+ #if AXIS_IS_L64XX(E6)
+ #define E6_MICROSTEPS 128
+ #define E6_OVERCURRENT 2000
+ #define E6_STALLCURRENT 1500
+ #define E6_MAX_VOLTAGE 127
+ #define E6_CHAIN_POS -1
+ #define E6_SLEW_RATE 1
+ #endif
+
+ #if AXIS_IS_L64XX(E7)
+ #define E7_MICROSTEPS 128
+ #define E7_OVERCURRENT 2000
+ #define E7_STALLCURRENT 1500
+ #define E7_MAX_VOLTAGE 127
+ #define E7_CHAIN_POS -1
+ #define E7_SLEW_RATE 1
+ #endif
+
/**
* Monitor L6470 drivers for error conditions like over temperature and over current.
* In the case of over temperature Marlin can decrease the drive until the error condition clears.
@@ -2423,7 +2546,7 @@
* I not present or I0 or I1 - X, Y, Z or E0
* I2 - X2, Y2, Z2 or E1
* I3 - Z3 or E3
- * I4 - E4
+ * I4 - Z4 or E4
* I5 - E5
* M916 - Increase drive level until get thermal warning
* M917 - Find minimum current thresholds
@@ -2439,6 +2562,14 @@
#endif // HAS_L64XX
+// @section i2cbus
+
+//
+// I2C Master ID for LPC176x LCD and Digital Current control
+// Does not apply to other peripherals based on the Wire library.
+//
+//#define I2C_MASTER_ID 1 // Set a value from 0 to 2
+
/**
* TWI/I2C BUS
*
@@ -2467,10 +2598,10 @@
* echo:i2c-reply: from:99 bytes:5 data:hello
*/
-// @section i2cbus
-
//#define EXPERIMENTAL_I2CBUS
-#define I2C_SLAVE_ADDRESS 0 // Set a value from 8 to 127 to act as a slave
+#if ENABLED(EXPERIMENTAL_I2CBUS)
+ #define I2C_SLAVE_ADDRESS 0 // Set a value from 8 to 127 to act as a slave
+#endif
// @section extras
@@ -2535,6 +2666,7 @@
#define LASER_FEATURE
#endif
#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+ //#define SHOW_CUTTER_ICON
#define SPINDLE_LASER_ACTIVE_HIGH true // Set to "true" if the on/off function is active HIGH
#define SPINDLE_LASER_PWM false // Set to "true" if your controller supports setting the speed/power
#define SPINDLE_LASER_PWM_INVERT true // Set to "true" if the speed/power goes up when you want it to go slower
@@ -2678,6 +2810,12 @@
*/
#define FASTER_GCODE_PARSER
+#if ENABLED(FASTER_GCODE_PARSER)
+ //#define GCODE_QUOTED_STRINGS // Support for quoted string parameters
+#endif
+
+//#define GCODE_CASE_INSENSITIVE // Accept G-code sent to the firmware in lowercase
+
/**
* CNC G-code options
* Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
@@ -2887,7 +3025,7 @@
#define MAX7219_LOAD_PIN 44
//#define MAX7219_GCODE // Add the M7219 G-code to control the LED matrix
- #define MAX7219_INIT_TEST 2 // Do a test pattern at initialization (Set to 2 for spiral)
+ #define MAX7219_INIT_TEST 2 // Test pattern at startup: 0=none, 1=sweep, 2=spiral
#define MAX7219_NUMBER_UNITS 1 // Number of Max7219 units in chain.
#define MAX7219_ROTATE 0 // Rotate the display clockwise (in multiples of +/- 90°)
// connector at: right=0 bottom=-90 top=90 left=180
@@ -2927,11 +3065,19 @@
//#define ESP3D_WIFISUPPORT // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
#if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
- #define WIFI_SSID "Wifi SSID"
- #define WIFI_PWD "Wifi Password"
//#define WEBSUPPORT // Start a webserver (which may include auto-discovery)
//#define OTASUPPORT // Support over-the-air firmware updates
//#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
+
+ /**
+ * To set a default WiFi SSID / Password, create a file called Configuration_Secure.h with
+ * the following defines, customized for your network. This specific file is excluded via
+ * .gitignore to prevent it from accidentally leaking to the public.
+ *
+ * #define WIFI_SSID "WiFi SSID"
+ * #define WIFI_PWD "WiFi Password"
+ */
+ //#include "Configuration_Secure.h" // External file with WiFi SSID / Password
#endif
/**
@@ -3003,9 +3149,14 @@
// @section develop
-/**
- * M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins
- */
+//
+// M100 Free Memory Watcher to debug memory usage
+//
+//#define M100_FREE_MEMORY_WATCHER
+
+//
+// M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
+//
//#define PINS_DEBUGGING
// Enable Marlin dev mode which adds some special commands
diff --git a/Marlin/Makefile b/Marlin/Makefile
index 0a47e0a8fc..1a9bb22087 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -92,6 +92,9 @@ U8GLIB ?= 1
# this defines whether to include the Trinamic TMCStepper library
TMC ?= 1
+# this defines whether to include the AdaFruit NeoPixel library
+NEOPIXEL ?= 0
+
############
# Try to automatically determine whether RELOC_WORKAROUND is needed based
# on GCC versions:
@@ -185,7 +188,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1109)
else ifeq ($(HARDWARE_MOTHERBOARD),1110)
# zrib V2.0 control board (Chinese knock off RAMPS replica)
else ifeq ($(HARDWARE_MOTHERBOARD),1111)
-# Bigtreetech or BIQU KFB2.0
+# BigTreeTech or BIQU KFB2.0
else ifeq ($(HARDWARE_MOTHERBOARD),1112)
# Felix 2.0+ Electronics Board (RAMPS like)
else ifeq ($(HARDWARE_MOTHERBOARD),1113)
@@ -251,6 +254,14 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1141)
else ifeq ($(HARDWARE_MOTHERBOARD),1142)
# Overlord/Overlord Pro
else ifeq ($(HARDWARE_MOTHERBOARD),1143)
+# ADIMLab Gantry v1
+else ifeq ($(HARDWARE_MOTHERBOARD),1144)
+# ADIMLab Gantry v2
+else ifeq ($(HARDWARE_MOTHERBOARD),1145)
+# BIQU Tango V1
+else ifeq ($(HARDWARE_MOTHERBOARD),1146)
+# MKS GEN L V2
+else ifeq ($(HARDWARE_MOTHERBOARD),1147)
#
# RAMBo and derivatives
@@ -277,42 +288,44 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1205)
else ifeq ($(HARDWARE_MOTHERBOARD),1300)
# Cartesio CN Controls V12
else ifeq ($(HARDWARE_MOTHERBOARD),1301)
-# Cheaptronic v1.0
+# Cartesio CN Controls V15
else ifeq ($(HARDWARE_MOTHERBOARD),1302)
-# Cheaptronic v2.0
+# Cheaptronic v1.0
else ifeq ($(HARDWARE_MOTHERBOARD),1303)
-# Makerbot Mightyboard Revision E
+# Cheaptronic v2.0
else ifeq ($(HARDWARE_MOTHERBOARD),1304)
-# Megatronics
+# Makerbot Mightyboard Revision E
else ifeq ($(HARDWARE_MOTHERBOARD),1305)
-# Megatronics v2.0
+# Megatronics
else ifeq ($(HARDWARE_MOTHERBOARD),1306)
-# Megatronics v3.0
+# Megatronics v2.0
else ifeq ($(HARDWARE_MOTHERBOARD),1307)
-# Megatronics v3.1
+# Megatronics v3.0
else ifeq ($(HARDWARE_MOTHERBOARD),1308)
-# Megatronics v3.2
+# Megatronics v3.1
else ifeq ($(HARDWARE_MOTHERBOARD),1309)
-# Elefu Ra Board (v3)
+# Megatronics v3.2
else ifeq ($(HARDWARE_MOTHERBOARD),1310)
-# Leapfrog
+# Elefu Ra Board (v3)
else ifeq ($(HARDWARE_MOTHERBOARD),1311)
-# Mega controller
+# Leapfrog
else ifeq ($(HARDWARE_MOTHERBOARD),1312)
-# Geeetech GT2560 Rev B for Mecreator2
+# Mega controller
else ifeq ($(HARDWARE_MOTHERBOARD),1313)
-# Geeetech GT2560 Rev. A
+# Geeetech GT2560 Rev B for Mecreator2
else ifeq ($(HARDWARE_MOTHERBOARD),1314)
-# Geeetech GT2560 Rev. A+ (with auto level probe)
+# Geeetech GT2560 Rev. A
else ifeq ($(HARDWARE_MOTHERBOARD),1315)
-# Geeetech GT2560 Rev B for A10(M/D)
+# Geeetech GT2560 Rev. A+ (with auto level probe)
else ifeq ($(HARDWARE_MOTHERBOARD),1316)
-# Geeetech GT2560 Rev B for A20(M/D)
+# Geeetech GT2560 Rev B for A10(M/D)
else ifeq ($(HARDWARE_MOTHERBOARD),1317)
-# Einstart retrofit
+# Geeetech GT2560 Rev B for A20(M/D)
else ifeq ($(HARDWARE_MOTHERBOARD),1318)
-# Wanhao 0ne+ i3 Mini
+# Einstart retrofit
else ifeq ($(HARDWARE_MOTHERBOARD),1319)
+# Wanhao 0ne+ i3 Mini
+else ifeq ($(HARDWARE_MOTHERBOARD),1320)
#
# ATmega1281, ATmega2561
@@ -687,7 +700,7 @@ CXXSTANDARD = -std=gnu++11
CDEBUG = -g$(DEBUG)
CWARN = -Wall -Wstrict-prototypes -Wno-packed-bitfield-compat -Wno-pragmas -Wunused-parameter
CXXWARN = -Wall -Wno-packed-bitfield-compat -Wno-pragmas -Wunused-parameter
-CTUNING = -fsigned-char -funsigned-bitfields -fpack-struct -fno-exceptions \
+CTUNING = -fsigned-char -funsigned-bitfields -fno-exceptions \
-fshort-enums -ffunction-sections -fdata-sections
ifneq ($(HARDWARE_MOTHERBOARD),)
CTUNING += -DMOTHERBOARD=${HARDWARE_MOTHERBOARD}
diff --git a/Marlin/Version.h b/Marlin/Version.h
index ed5ed5f55c..e99894cd43 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
-#define SHORT_BUILD_VERSION "2.0.2_TR22"
+#define SHORT_BUILD_VERSION "2.0.5_TR24"
/**
* Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
-#define STRING_DISTRIBUTION_DATE "2020-01-26"
+#define STRING_DISTRIBUTION_DATE "2020-04-02"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_AVR/HAL.cpp
rename to Marlin/src/HAL/AVR/HAL.cpp
index 4a10f73dcf..317d13a540 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/HAL.h
rename to Marlin/src/HAL/AVR/HAL.h
index 5c10ad08e4..0255169819 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
@@ -53,8 +53,8 @@
//#define analogInputToDigitalPin(IO) IO
#ifndef CRITICAL_SECTION_START
- #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli()
- #define CRITICAL_SECTION_END SREG = _sreg
+ #define CRITICAL_SECTION_START() unsigned char _sreg = SREG; cli()
+ #define CRITICAL_SECTION_END() SREG = _sreg
#endif
#define ISRS_ENABLED() TEST(SREG, SREG_I)
#define ENABLE_ISRS() sei()
diff --git a/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
rename to Marlin/src/HAL/AVR/HAL_SPI.cpp
index 7a0f7246ee..f1f9654c4e 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/AVR/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -197,7 +197,7 @@ void spiBegin() {
// output pin high - like sending 0xFF
WRITE(MOSI_PIN, HIGH);
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
WRITE(SCK_PIN, HIGH);
nop; // adjust so SCK is nice
@@ -224,7 +224,7 @@ void spiBegin() {
void spiSend(uint8_t data) {
// no interrupts during byte send - about 8µs
cli();
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
WRITE(SCK_PIN, LOW);
WRITE(MOSI_PIN, data & 0x80);
data <<= 1;
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
rename to Marlin/src/HAL/AVR/MarlinSerial.cpp
index 691dab9103..350d0f302d 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -55,7 +55,7 @@
// A SW memory barrier, to ensure GCC does not overoptimize loops
#define sw_barrier() asm volatile("": : :"memory");
- #include "../../feature/emergency_parser.h"
+ #include "../../feature/e_parser.h"
// "Atomically" read the RX head index value without disabling interrupts:
// This MUST be called with RX interrupts enabled, and CAN'T be called
@@ -682,7 +682,7 @@
// Round correctly so that print(1.999, 2) prints as "2.00"
double rounding = 0.5;
- for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
+ LOOP_L_N(i, digits) rounding *= 0.1;
number += rounding;
// Extract the integer part of the number and print it
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
similarity index 94%
rename from Marlin/src/HAL/HAL_AVR/MarlinSerial.h
rename to Marlin/src/HAL/AVR/MarlinSerial.h
index d2b3ff1558..cd7aad90a9 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,10 +31,10 @@
* Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
*/
-#include "../shared/MarlinSerial.h"
-
#include
+#include "../../inc/MarlinConfigPre.h"
+
#ifndef SERIAL_PORT
#define SERIAL_PORT 0
#endif
@@ -261,12 +261,12 @@
static constexpr int PORT = serial;
static constexpr unsigned int RX_SIZE = RX_BUFFER_SIZE;
static constexpr unsigned int TX_SIZE = TX_BUFFER_SIZE;
- static constexpr bool XONOFF = bSERIAL_XON_XOFF;
- static constexpr bool EMERGENCYPARSER = bEMERGENCY_PARSER;
- static constexpr bool DROPPED_RX = bSERIAL_STATS_DROPPED_RX;
- static constexpr bool RX_OVERRUNS = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
- static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
- static constexpr bool MAX_RX_QUEUED = bSERIAL_STATS_MAX_RX_QUEUED;
+ static constexpr bool XONOFF = ENABLED(SERIAL_XON_XOFF);
+ static constexpr bool EMERGENCYPARSER = ENABLED(EMERGENCY_PARSER);
+ static constexpr bool DROPPED_RX = ENABLED(SERIAL_STATS_DROPPED_RX);
+ static constexpr bool RX_OVERRUNS = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
+ static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
+ static constexpr bool MAX_RX_QUEUED = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
};
extern MarlinSerial> customizedSerial1;
@@ -304,7 +304,7 @@
static constexpr bool XONOFF = false;
static constexpr bool EMERGENCYPARSER = false;
static constexpr bool DROPPED_RX = false;
- static constexpr bool RX_OVERRUNS = bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS;
+ static constexpr bool RX_OVERRUNS = HAS_DGUS_LCD && ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS);
static constexpr bool RX_FRAMING_ERRORS = false;
static constexpr bool MAX_RX_QUEUED = false;
};
diff --git a/Marlin/src/HAL/HAL_AVR/Servo.cpp b/Marlin/src/HAL/AVR/Servo.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/Servo.cpp
rename to Marlin/src/HAL/AVR/Servo.cpp
index 33818edb96..02c131bd44 100644
--- a/Marlin/src/HAL/HAL_AVR/Servo.cpp
+++ b/Marlin/src/HAL/AVR/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/ServoTimers.h b/Marlin/src/HAL/AVR/ServoTimers.h
similarity index 97%
rename from Marlin/src/HAL/HAL_AVR/ServoTimers.h
rename to Marlin/src/HAL/AVR/ServoTimers.h
index 4991caefe6..86007fd102 100644
--- a/Marlin/src/HAL/HAL_AVR/ServoTimers.h
+++ b/Marlin/src/HAL/AVR/ServoTimers.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp b/Marlin/src/HAL/AVR/eeprom.cpp
similarity index 92%
rename from Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/AVR/eeprom.cpp
index 116a8288e2..ee416b7a12 100644
--- a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/AVR/eeprom.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,7 +25,7 @@
#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
bool PersistentStore::access_start() { return true; }
bool PersistentStore::access_finish() { return true; }
@@ -39,7 +39,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
if (v != eeprom_read_byte(p)) {
eeprom_write_byte(p, v);
if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
return true;
}
}
diff --git a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
rename to Marlin/src/HAL/AVR/endstop_interrupts.h
index 7053d4b0a1..8f89c69baf 100644
--- a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
+++ b/Marlin/src/HAL/AVR/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
rename to Marlin/src/HAL/AVR/fast_pwm.cpp
index 4884ede63f..42e7cc3f10 100644
--- a/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -167,7 +167,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
uint16_t prescaler[] = { 0, 1, 8, /*TIMER2 ONLY*/32, 64, /*TIMER2 ONLY*/128, 256, 1024 };
// loop over prescaler values
- for (uint8_t i = 1; i < 8; i++) {
+ LOOP_S_L_N(i, 1, 8) {
uint16_t res_temp_fast = 255, res_temp_phase_correct = 255;
if (timer.n == 2) {
// No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/fastio.cpp
rename to Marlin/src/HAL/AVR/fastio.cpp
index f0f7688f1b..9f70b50f71 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio.cpp
+++ b/Marlin/src/HAL/AVR/fastio.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/fastio.h
rename to Marlin/src/HAL/AVR/fastio.h
index a36bf468a0..a45e0f2beb 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -98,9 +98,9 @@
#define SET_INPUT(IO) _SET_INPUT(IO)
#define SET_INPUT_PULLUP(IO) do{ _SET_INPUT(IO); _WRITE(IO, HIGH); }while(0)
+#define SET_INPUT_PULLDOWN SET_INPUT
#define SET_OUTPUT(IO) _SET_OUTPUT(IO)
-
-#define SET_PWM(IO) SET_OUTPUT(IO)
+#define SET_PWM SET_OUTPUT
#define IS_INPUT(IO) _IS_INPUT(IO)
#define IS_OUTPUT(IO) _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h b/Marlin/src/HAL/AVR/fastio/fastio_1280.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
rename to Marlin/src/HAL/AVR/fastio/fastio_1280.h
index 62de534d53..b62156caa7 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_1280.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,7 +26,7 @@
*
* Hardware Pin : 02 03 06 07 01 05 15 16 17 18 23 24 25 26 64 63 13 12 46 45 44 43 78 77 76 75 74 73 72 71 60 59 58 57 56 55 54 53 50 70 52 51 42 41 40 39 38 37 36 35 22 21 20 19 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 | 04 08 09 10 11 14 27 28 29 30 31 32 33 34 47 48 49 61 62 65 66 67 68 69 79 80 81 98 99 100
* Port : E0 E1 E4 E5 G5 E3 H3 H4 H5 H6 B4 B5 B6 B7 J1 J0 H1 H0 D3 D2 D1 D0 A0 A1 A2 A3 A4 A5 A6 A7 C7 C6 C5 C4 C3 C2 C1 C0 D7 G2 G1 G0 L7 L6 L5 L4 L3 L2 L1 L0 B3 B2 B1 B0 F0 F1 F2 F3 F4 F5 F6 F7 K0 K1 K2 K3 K4 K5 K6 K7 | E2 E6 E7 xx xx H2 H7 G3 G4 xx xx xx xx xx D4 D5 D6 xx xx J2 J3 J4 J5 J6 J7 xx xx xx xx xx
- * Logical Pin : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 72 75 76 77 74 xx xx xx xx xx
+ * Logical Pin : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 73 75 76 77 74 xx xx xx xx xx
*/
#include "../fastio.h"
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h b/Marlin/src/HAL/AVR/fastio/fastio_1281.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
rename to Marlin/src/HAL/AVR/fastio/fastio_1281.h
index e3d2f12851..7552540ffe 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_1281.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h b/Marlin/src/HAL/AVR/fastio/fastio_168.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
rename to Marlin/src/HAL/AVR/fastio/fastio_168.h
index f6ee7a5d00..549e0246d5 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_168.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h b/Marlin/src/HAL/AVR/fastio/fastio_644.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
rename to Marlin/src/HAL/AVR/fastio/fastio_644.h
index 180a3c4e32..3a48c109e9 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_644.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h b/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
rename to Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
index 3f17a2e261..23d16a20e5 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
similarity index 92%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h b/Marlin/src/HAL/AVR/inc/Conditionals_adv.h
similarity index 92%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_adv.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/AVR/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h b/Marlin/src/HAL/AVR/inc/Conditionals_post.h
similarity index 92%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_post.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/AVR/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
similarity index 92%
rename from Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
rename to Marlin/src/HAL/AVR/inc/SanityCheck.h
index a9b0af5b99..1c7c68f216 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -56,10 +56,10 @@
/**
* The Trinamic library includes SoftwareSerial.h, leading to a compile error.
*/
-#if HAS_TRINAMIC && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
+#if HAS_TRINAMIC_CONFIG && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
#error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
#endif
-#if TMC_HAS_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
+#if HAS_TMC_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
#error "MONITOR_DRIVER_STATUS causes performance issues when used with SoftwareSerial-connected drivers. Disable MONITOR_DRIVER_STATUS or use hardware serial to continue."
#endif
diff --git a/Marlin/src/HAL/HAL_AVR/math.h b/Marlin/src/HAL/AVR/math.h
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/math.h
rename to Marlin/src/HAL/AVR/math.h
index d397cc4e9a..e8be0a04bc 100644
--- a/Marlin/src/HAL/HAL_AVR/math.h
+++ b/Marlin/src/HAL/AVR/math.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug.h
rename to Marlin/src/HAL/AVR/pinsDebug.h
index 0787076fb7..fbd2e084fa 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -70,12 +70,12 @@
void PRINT_ARRAY_NAME(uint8_t x) {
char *name_mem_pointer = (char*)pgm_read_ptr(&pin_array[x].name);
- for (uint8_t y = 0; y < MAX_NAME_LENGTH; y++) {
+ LOOP_L_N(y, MAX_NAME_LENGTH) {
char temp_char = pgm_read_byte(name_mem_pointer + y);
if (temp_char != 0)
SERIAL_CHAR(temp_char);
else {
- for (uint8_t i = 0; i < MAX_NAME_LENGTH - y; i++) SERIAL_CHAR(' ');
+ LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
break;
}
}
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
similarity index 97%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
rename to Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
index 4388430779..f6da077743 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
rename to Marlin/src/HAL/AVR/pinsDebug_plus_70.h
index e5bb82f226..6e7b8fbaa9 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_AVR/spi_pins.h b/Marlin/src/HAL/AVR/spi_pins.h
similarity index 97%
rename from Marlin/src/HAL/HAL_AVR/spi_pins.h
rename to Marlin/src/HAL/AVR/spi_pins.h
index c7951acfa3..daaebb76d7 100644
--- a/Marlin/src/HAL/HAL_AVR/spi_pins.h
+++ b/Marlin/src/HAL/AVR/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
rename to Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
index bc08bc379b..fab79646f0 100644
--- a/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
+++ b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -88,7 +88,7 @@ void u8g_spiSend_sw_AVR_mode_0(uint8_t val) {
volatile uint8_t *outData = u8g_outData,
*outClock = u8g_outClock;
U8G_ATOMIC_START();
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
if (val & 0x80)
*outData |= bitData;
else
@@ -108,7 +108,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
volatile uint8_t *outData = u8g_outData,
*outClock = u8g_outClock;
U8G_ATOMIC_START();
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
*outClock &= bitNotClock;
if (val & 0x80)
*outData |= bitData;
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.cpp b/Marlin/src/HAL/AVR/watchdog.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_AVR/watchdog.cpp
rename to Marlin/src/HAL/AVR/watchdog.cpp
index c7d487ebd1..e35a70f2cc 100644
--- a/Marlin/src/HAL/HAL_AVR/watchdog.cpp
+++ b/Marlin/src/HAL/AVR/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -62,7 +62,7 @@ void watchdog_init() {
#if ENABLED(WATCHDOG_RESET_MANUAL)
ISR(WDT_vect) {
sei(); // With the interrupt driven serial we need to allow interrupts.
- SERIAL_ERROR_MSG(MSG_WATCHDOG_FIRED);
+ SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
minkill(); // interrupt-safe final kill and infinite loop
}
#endif
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.h b/Marlin/src/HAL/AVR/watchdog.h
similarity index 94%
rename from Marlin/src/HAL/HAL_AVR/watchdog.h
rename to Marlin/src/HAL/AVR/watchdog.h
index efd725d7d7..57dfcfc0bf 100644
--- a/Marlin/src/HAL/HAL_AVR/watchdog.h
+++ b/Marlin/src/HAL/AVR/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp b/Marlin/src/HAL/DUE/DebugMonitor.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
rename to Marlin/src/HAL/DUE/DebugMonitor.cpp
index 20f10ce405..3ed9873e66 100644
--- a/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
+++ b/Marlin/src/HAL/DUE/DebugMonitor.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp b/Marlin/src/HAL/DUE/EepromEmulation.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
rename to Marlin/src/HAL/DUE/EepromEmulation.cpp
index c7b7007053..66af50cfd2 100644
--- a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
+++ b/Marlin/src/HAL/DUE/EepromEmulation.cpp
@@ -1,3 +1,24 @@
+/**
+ * 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 .
+ *
+ */
/* EEPROM emulation over flash with reduced wear
*
@@ -33,10 +54,10 @@
#include "../../inc/MarlinConfig.h"
-#if ENABLED(EEPROM_SETTINGS) && NONE(I2C_EEPROM, SPI_EEPROM)
+#if ENABLED(FLASH_EEPROM_EMULATION)
#include "../shared/Marduino.h"
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
#define EEPROMSize 4096
#define PagesPerGroup 128
@@ -995,5 +1016,5 @@ void eeprom_flush() {
ee_Flush();
}
-#endif // EEPROM_SETTINGS && (!I2C_EEPROM && !SPI_EEPROM)
+#endif // FLASH_EEPROM_EMULATION
#endif // ARDUINO_ARCH_AVR
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_DUE/HAL.cpp
rename to Marlin/src/HAL/DUE/HAL.cpp
index 2d2eb3b9ff..cb381ff4bb 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
similarity index 94%
rename from Marlin/src/HAL/HAL_DUE/HAL.h
rename to Marlin/src/HAL/DUE/HAL.h
index b5bac89568..42f6f175fb 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
@@ -39,7 +39,7 @@
#include
// Define MYSERIAL0/1 before MarlinSerial includes!
-#if SERIAL_PORT == -1
+#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
#define MYSERIAL0 customizedSerial1
#elif SERIAL_PORT == 0
#define MYSERIAL0 Serial
@@ -56,7 +56,7 @@
#ifdef SERIAL_PORT_2
#if SERIAL_PORT_2 == SERIAL_PORT
#error "SERIAL_PORT_2 must be different from SERIAL_PORT. Please update your configuration."
- #elif SERIAL_PORT_2 == -1
+ #elif SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER)
#define MYSERIAL1 customizedSerial2
#elif SERIAL_PORT_2 == 0
#define MYSERIAL1 Serial
@@ -94,7 +94,6 @@
#endif
#endif
-
#include "MarlinSerial.h"
#include "MarlinSerialUSB.h"
@@ -119,8 +118,8 @@ typedef int8_t pin_t;
//
// Interrupts
//
-#define CRITICAL_SECTION_START uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
#define ISRS_ENABLED() (!__get_PRIMASK())
#define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
rename to Marlin/src/HAL/DUE/HAL_SPI.cpp
index 3524ae8690..97a6fa05a1 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp b/Marlin/src/HAL/DUE/InterruptVectors.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
rename to Marlin/src/HAL/DUE/InterruptVectors.cpp
index b9f14823f6..7964f2d1f6 100644
--- a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
+++ b/Marlin/src/HAL/DUE/InterruptVectors.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -63,13 +63,13 @@ static pfnISR_Handler* get_relocated_table_addr() {
memcpy(&ram_tab, romtab, sizeof(ram_tab));
// Disable global interrupts
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
// Set the vector table base address to the SRAM copy
SCB->VTOR = (uint32_t)(&ram_tab);
// Reenable interrupts
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
// Return the address of the table
return (pfnISR_Handler*)(&ram_tab);
@@ -80,7 +80,7 @@ pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler) {
pfnISR_Handler *isrtab = get_relocated_table_addr();
// Disable global interrupts
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
// Get the original handler
pfnISR_Handler oldHandler = isrtab[irq + 16];
@@ -89,7 +89,7 @@ pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler) {
isrtab[irq + 16] = newHandler;
// Reenable interrupts
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
// Return the original one
return oldHandler;
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.h b/Marlin/src/HAL/DUE/InterruptVectors.h
similarity index 96%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors.h
rename to Marlin/src/HAL/DUE/InterruptVectors.h
index 87dd049624..534cd17f42 100644
--- a/Marlin/src/HAL/HAL_DUE/InterruptVectors.h
+++ b/Marlin/src/HAL/DUE/InterruptVectors.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
rename to Marlin/src/HAL/DUE/MarlinSerial.cpp
index 83a9c64fae..d114c75989 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -45,7 +45,7 @@ template typename MarlinSerial::ring_buffer_pos_t MarlinSeria
// A SW memory barrier, to ensure GCC does not overoptimize loops
#define sw_barrier() asm volatile("": : :"memory");
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
// (called with RX interrupts disabled)
template
@@ -606,7 +606,7 @@ void MarlinSerial::printFloat(double number, uint8_t digits) {
// Round correctly so that print(1.999, 2) prints as "2.00"
double rounding = 0.5;
- for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
+ LOOP_L_N(i, digits) rounding *= 0.1;
number += rounding;
// Extract the integer part of the number and print it
@@ -629,23 +629,13 @@ void MarlinSerial::printFloat(double number, uint8_t digits) {
// If not using the USB port as serial port
#if SERIAL_PORT >= 0
-
- // Preinstantiate
- template class MarlinSerial>;
-
- // Instantiate
- MarlinSerial> customizedSerial1;
-
+ template class MarlinSerial>; // Define
+ MarlinSerial> customizedSerial1; // Instantiate
#endif
-#ifdef SERIAL_PORT_2
-
- // Preinstantiate
- template class MarlinSerial>;
-
- // Instantiate
- MarlinSerial> customizedSerial2;
-
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
+ template class MarlinSerial>; // Define
+ MarlinSerial> customizedSerial2; // Instantiate
#endif
#endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h b/Marlin/src/HAL/DUE/MarlinSerial.h
similarity index 91%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial.h
rename to Marlin/src/HAL/DUE/MarlinSerial.h
index 92806f15b4..fa6a2c7d15 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/DUE/MarlinSerial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,10 +27,10 @@
* Based on MarlinSerial for AVR, copyright (c) 2006 Nicholas Zambetti. All right reserved.
*/
-#include "../shared/MarlinSerial.h"
-
#include
+#include "../../inc/MarlinConfigPre.h"
+
#define DEC 10
#define HEX 16
#define OCT 8
@@ -163,22 +163,18 @@ struct MarlinSerialCfg {
static constexpr int PORT = serial;
static constexpr unsigned int RX_SIZE = RX_BUFFER_SIZE;
static constexpr unsigned int TX_SIZE = TX_BUFFER_SIZE;
- static constexpr bool XONOFF = bSERIAL_XON_XOFF;
- static constexpr bool EMERGENCYPARSER = bEMERGENCY_PARSER;
- static constexpr bool DROPPED_RX = bSERIAL_STATS_DROPPED_RX;
- static constexpr bool RX_OVERRUNS = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
- static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
- static constexpr bool MAX_RX_QUEUED = bSERIAL_STATS_MAX_RX_QUEUED;
+ static constexpr bool XONOFF = ENABLED(SERIAL_XON_XOFF);
+ static constexpr bool EMERGENCYPARSER = ENABLED(EMERGENCY_PARSER);
+ static constexpr bool DROPPED_RX = ENABLED(SERIAL_STATS_DROPPED_RX);
+ static constexpr bool RX_OVERRUNS = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
+ static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
+ static constexpr bool MAX_RX_QUEUED = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
};
#if SERIAL_PORT >= 0
-
extern MarlinSerial> customizedSerial1;
-
-#endif // SERIAL_PORT >= 0
-
-#ifdef SERIAL_PORT_2
-
- extern MarlinSerial> customizedSerial2;
-
+#endif
+
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
+ extern MarlinSerial> customizedSerial2;
#endif
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
rename to Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index f7f48d5f42..7a020bbaf0 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,12 +29,12 @@
#include "../../inc/MarlinConfig.h"
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
#include "MarlinSerialUSB.h"
#if ENABLED(EMERGENCY_PARSER)
- #include "../../feature/emergency_parser.h"
+ #include "../../feature/e_parser.h"
#endif
// Imports from Atmel USB Stack/CDC implementation
@@ -259,7 +259,7 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
// Round correctly so that print(1.999, 2) prints as "2.00"
double rounding = 0.5;
- for (uint8_t i = 0; i < digits; ++i)
+ LOOP_L_N(i, digits)
rounding *= 0.1;
number += rounding;
@@ -283,8 +283,12 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
}
// Preinstantiate
-MarlinSerialUSB customizedSerial1;
-
-#endif // SERIAL_PORT == -1
+#if SERIAL_PORT == -1
+ MarlinSerialUSB customizedSerial1;
+#endif
+#if SERIAL_PORT_2 == -1
+ MarlinSerialUSB customizedSerial2;
+#endif
+#endif // HAS_USB_SERIAL
#endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
similarity index 92%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
rename to Marlin/src/HAL/DUE/MarlinSerialUSB.h
index 3d9d4bafaa..9aece901b1 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,7 +28,7 @@
#include "../../inc/MarlinConfig.h"
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
#include
@@ -88,6 +88,12 @@ private:
static void printFloat(double, uint8_t);
};
-extern MarlinSerialUSB customizedSerial1;
+#if SERIAL_PORT == -1
+ extern MarlinSerialUSB customizedSerial1;
+#endif
-#endif // SERIAL_PORT == -1
+#if SERIAL_PORT_2 == -1
+ extern MarlinSerialUSB customizedSerial2;
+#endif
+
+#endif // HAS_USB_SERIAL
diff --git a/Marlin/src/HAL/HAL_DUE/Servo.cpp b/Marlin/src/HAL/DUE/Servo.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/Servo.cpp
rename to Marlin/src/HAL/DUE/Servo.cpp
index f48fdf5796..266158bbc6 100644
--- a/Marlin/src/HAL/HAL_DUE/Servo.cpp
+++ b/Marlin/src/HAL/DUE/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/ServoTimers.h b/Marlin/src/HAL/DUE/ServoTimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/ServoTimers.h
rename to Marlin/src/HAL/DUE/ServoTimers.h
diff --git a/Marlin/src/HAL/HAL_DUE/Tone.cpp b/Marlin/src/HAL/DUE/Tone.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_DUE/Tone.cpp
rename to Marlin/src/HAL/DUE/Tone.cpp
index 2af97aac61..9b580b8b4c 100644
--- a/Marlin/src/HAL/HAL_DUE/Tone.cpp
+++ b/Marlin/src/HAL/DUE/Tone.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
index 2501bab78e..0fb8a782e5 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
index 47e56fddb0..01320ba9b9 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
index e078bc420f..c4816c3db5 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
index d3609f60ef..96b7a1f61e 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -80,7 +80,7 @@ Pio *SCK_pPio, *MOSI_pPio;
uint32_t SCK_dwMask, MOSI_dwMask;
void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
if (val & 0x80)
MOSI_pPio->PIO_SODR = MOSI_dwMask;
else
@@ -94,7 +94,7 @@ void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
}
void u8g_spiSend_sw_DUE_mode_3(uint8_t val) { // 3.5MHz
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
SCK_pPio->PIO_CODR = SCK_dwMask;
DELAY_NS(50);
if (val & 0x80)
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
similarity index 94%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
index b832474150..e0f15bfd81 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp b/Marlin/src/HAL/DUE/eeprom.cpp
similarity index 90%
rename from Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/DUE/eeprom.cpp
index fc1baa22ac..ec9ef51ffc 100644
--- a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/DUE/eeprom.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -27,9 +27,9 @@
#if ENABLED(EEPROM_SETTINGS)
#include "../../inc/MarlinConfig.h"
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
-#if !defined(E2END) && NONE(I2C_EEPROM, SPI_EEPROM)
+#if !defined(E2END) && ENABLED(FLASH_EEPROM_EMULATION)
#define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp)
#endif
@@ -38,7 +38,7 @@ extern void eeprom_flush();
bool PersistentStore::access_start() { return true; }
bool PersistentStore::access_finish() {
- #if NONE(I2C_EEPROM, SPI_EEPROM)
+ #if ENABLED(FLASH_EEPROM_EMULATION)
eeprom_flush();
#endif
return true;
@@ -54,7 +54,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
eeprom_write_byte(p, v);
delay(2);
if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
return true;
}
}
diff --git a/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h b/Marlin/src/HAL/DUE/endstop_interrupts.h
similarity index 97%
rename from Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
rename to Marlin/src/HAL/DUE/endstop_interrupts.h
index 14adc0c1cd..f81d9055d5 100644
--- a/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
+++ b/Marlin/src/HAL/DUE/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/fastio.h b/Marlin/src/HAL/DUE/fastio.h
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/fastio.h
rename to Marlin/src/HAL/DUE/fastio.h
index a97a944e33..01abd82049 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio.h
+++ b/Marlin/src/HAL/DUE/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -166,7 +166,7 @@
// Set pin as output (wrapper) - reads the pin and sets the output to that value
#define SET_OUTPUT(IO) _SET_OUTPUT(IO)
// Set pin as PWM
-#define SET_PWM(IO) SET_OUTPUT(IO)
+#define SET_PWM SET_OUTPUT
// Check if pin is an input
#define IS_INPUT(IO) ((digitalPinToPort(IO)->PIO_OSR & digitalPinToBitMask(IO)) == 0)
diff --git a/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
new file mode 100644
index 0000000000..672932f56c
--- /dev/null
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
@@ -0,0 +1,206 @@
+/**
+ * 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 .
+ *
+ */
+
+/**
+ * The PWM module is only used to generate interrupts at specified times. It
+ * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
+ * that interrupt.
+ *
+ * All PWMs use the same repetition rate. The G2 needs about 10KHz min in order to
+ * not have obvious ripple on the Vref signals.
+ *
+ * The data structures are setup to minimize the computation done by the ISR which
+ * minimizes ISR execution time. Execution times are 0.8 to 1.1 microseconds.
+ *
+ * FIve PWM interrupt sources are used. Channel 0 sets the base period. All Vref
+ * signals are set active when this counter overflows and resets to zero. The compare
+ * values in channels 1-4 are set to give the desired duty cycle for that Vref pin.
+ * When counter 0 matches the compare value then that channel generates an interrupt.
+ * The ISR checks the source of the interrupt and sets the corresponding pin inactive.
+ *
+ * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if MB(PRINTRBOARD_G2)
+
+#include "G2_PWM.h"
+
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+ #define G2_PWM_X 1
+#else
+ #define G2_PWM_X 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+ #define G2_PWM_Y 1
+#else
+ #define G2_PWM_Y 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+ #define G2_PWM_Z 1
+#else
+ #define G2_PWM_Z 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+ #define G2_PWM_E 1
+#else
+ #define G2_PWM_E 0
+#endif
+#define G2_MASK_X(V) (G2_PWM_X * (V))
+#define G2_MASK_Y(V) (G2_PWM_Y * (V))
+#define G2_MASK_Z(V) (G2_PWM_Z * (V))
+#define G2_MASK_E(V) (G2_PWM_E * (V))
+
+volatile uint32_t *SODR_A = &PIOA->PIO_SODR,
+ *SODR_B = &PIOB->PIO_SODR,
+ *CODR_A = &PIOA->PIO_CODR,
+ *CODR_B = &PIOB->PIO_CODR;
+
+PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;
+
+void Stepper::digipot_init() {
+
+ #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+ OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0); // init pins
+ #endif
+ #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+ OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
+ #endif
+ #if G2_PWM_Z
+ OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
+ #endif
+ #if G2_PWM_E
+ OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
+ #endif
+
+ #define WPKEY (0x50574D << 8) // “PWM” in ASCII
+ #define WPCMD_DIS_SW 0 // command to disable Write Protect SW
+ #define WPRG_ALL (PWM_WPCR_WPRG0 | PWM_WPCR_WPRG1 | PWM_WPCR_WPRG2 | PWM_WPCR_WPRG3 | PWM_WPCR_WPRG4 | PWM_WPCR_WPRG5) // all Write Protect Groups
+
+ #define PWM_CLOCK_F F_CPU / 1000000UL // set clock to 1MHz
+
+ PMC->PMC_PCER1 = PMC_PCER1_PID36; // enable PWM controller clock (disabled on power up)
+
+ PWM->PWM_WPCR = WPKEY | WPRG_ALL | WPCMD_DIS_SW; // enable setting of all PWM registers
+ PWM->PWM_CLK = PWM_CLOCK_F; // enable CLK_A and set it to 1MHz, leave CLK_B disabled
+ PWM->PWM_CH_NUM[0].PWM_CMR = 0b1011; // set channel 0 to Clock A input & to left aligned
+ if (G2_PWM_X) PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011; // set channel 1 to Clock A input & to left aligned
+ if (G2_PWM_Y) PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011; // set channel 2 to Clock A input & to left aligned
+ if (G2_PWM_Z) PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011; // set channel 3 to Clock A input & to left aligned
+ if (G2_PWM_E) PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011; // set channel 4 to Clock A input & to left aligned
+
+ PWM->PWM_CH_NUM[0].PWM_CPRD = PWM_PERIOD_US; // set channel 0 Period
+
+ PWM->PWM_IER2 = PWM_IER1_CHID0; // generate interrupt when counter0 overflows
+ PWM->PWM_IER2 = PWM_IER2_CMPM0
+ | G2_MASK_X(PWM_IER2_CMPM1)
+ | G2_MASK_Y(PWM_IER2_CMPM2)
+ | G2_MASK_Z(PWM_IER2_CMPM3)
+ | G2_MASK_E(PWM_IER2_CMPM4)
+ ; // generate interrupt on compare event
+
+ if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive
+ if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive
+ if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1])); // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive
+ if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2])); // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive
+
+ if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPM = 0x0001; // enable compare event
+ if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPM = 0x0001; // enable compare event
+ if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPM = 0x0001; // enable compare event
+ if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPM = 0x0001; // enable compare event
+
+ PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0
+ | G2_MASK_X(PWM_SCM_SYNC1)
+ | G2_MASK_Y(PWM_SCM_SYNC2)
+ | G2_MASK_Z(PWM_SCM_SYNC3)
+ | G2_MASK_E(PWM_SCM_SYNC4)
+ ; // sync 1-4 with 0, use mode 0 for updates
+
+ PWM->PWM_ENA = PWM_ENA_CHID0
+ | G2_MASK_X(PWM_ENA_CHID1)
+ | G2_MASK_Y(PWM_ENA_CHID2)
+ | G2_MASK_Z(PWM_ENA_CHID3)
+ | G2_MASK_E(PWM_ENA_CHID4)
+ ; // enable channels used by G2
+
+ PWM->PWM_IER1 = PWM_IER1_CHID0
+ | G2_MASK_X(PWM_IER1_CHID1)
+ | G2_MASK_Y(PWM_IER1_CHID2)
+ | G2_MASK_Z(PWM_IER1_CHID3)
+ | G2_MASK_E(PWM_IER1_CHID4)
+ ; // enable interrupts for channels used by G2
+
+ NVIC_EnableIRQ(PWM_IRQn); // Enable interrupt handler
+ NVIC_SetPriority(PWM_IRQn, NVIC_EncodePriority(0, 10, 0)); // normal priority for PWM module (can stand some jitter on the Vref signals)
+}
+
+void Stepper::digipot_current(const uint8_t driver, const int16_t current) {
+
+ if (!(PWM->PWM_CH_NUM[0].PWM_CPRD == PWM_PERIOD_US)) digipot_init(); // Init PWM system if needed
+
+ switch (driver) {
+ case 0:
+ if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update X & Y
+ if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));
+ if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001; // enable compare event
+ if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001; // enable compare event
+ if (G2_PWM_X || G2_PWM_Y) PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+ break;
+ case 1:
+ if (G2_PWM_Z) {
+ PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update Z
+ PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001; // enable compare event
+ PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+ }
+ break;
+ default:
+ if (G2_PWM_E) {
+ PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update E
+ PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001; // enable compare event
+ PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+ }
+ break;
+ }
+}
+
+volatile uint32_t PWM_ISR1_STATUS, PWM_ISR2_STATUS;
+
+void PWM_Handler() {
+ PWM_ISR1_STATUS = PWM->PWM_ISR1;
+ PWM_ISR2_STATUS = PWM->PWM_ISR2;
+ if (PWM_ISR1_STATUS & PWM_IER1_CHID0) { // CHAN_0 interrupt
+ if (G2_PWM_X) *ISR_table[0].set_register = ISR_table[0].write_mask; // set X to active
+ if (G2_PWM_Y) *ISR_table[1].set_register = ISR_table[1].write_mask; // set Y to active
+ if (G2_PWM_Z) *ISR_table[2].set_register = ISR_table[2].write_mask; // set Z to active
+ if (G2_PWM_E) *ISR_table[3].set_register = ISR_table[3].write_mask; // set E to active
+ }
+ else {
+ if (G2_PWM_X && (PWM_ISR2_STATUS & PWM_IER2_CMPM1)) *ISR_table[0].clr_register = ISR_table[0].write_mask; // set X to inactive
+ if (G2_PWM_Y && (PWM_ISR2_STATUS & PWM_IER2_CMPM2)) *ISR_table[1].clr_register = ISR_table[1].write_mask; // set Y to inactive
+ if (G2_PWM_Z && (PWM_ISR2_STATUS & PWM_IER2_CMPM3)) *ISR_table[2].clr_register = ISR_table[2].write_mask; // set Z to inactive
+ if (G2_PWM_E && (PWM_ISR2_STATUS & PWM_IER2_CMPM4)) *ISR_table[3].clr_register = ISR_table[3].write_mask; // set E to inactive
+ }
+ return;
+}
+
+#endif // PRINTRBOARD_G2
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
similarity index 94%
rename from Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
rename to Marlin/src/HAL/DUE/fastio/G2_PWM.h
index 4a84dfe64a..a94c1c5276 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -63,7 +63,7 @@ extern PWM_map ISR_table[NUM_PWMS];
extern uint32_t motor_current_setting[3];
#define IR_BIT(p) (WITHIN(p, 0, 3) ? (p) : (p) + 4)
-#define COPY_ACTIVE_TABLE() do{ for (uint8_t i = 0; i < 6 ; i++) work_table[i] = active_table[i]; }while(0)
+#define COPY_ACTIVE_TABLE() do{ LOOP_L_N(i, 6) work_table[i] = active_table[i]; }while(0)
#define PWM_MR0 19999 // base repetition rate minus one count - 20mS
#define PWM_PR 24 // prescaler value - prescaler divide by 24 + 1 - 1 MHz output
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h b/Marlin/src/HAL/DUE/fastio/G2_pins.h
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
rename to Marlin/src/HAL/DUE/fastio/G2_pins.h
index e5ce834f45..44b9cb35ee 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
+++ b/Marlin/src/HAL/DUE/fastio/G2_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h b/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
similarity index 92%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h b/Marlin/src/HAL/DUE/inc/Conditionals_adv.h
similarity index 92%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_adv.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/DUE/inc/Conditionals_post.h b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
new file mode 100644
index 0000000000..8a305009ce
--- /dev/null
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
@@ -0,0 +1,28 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if USE_FALLBACK_EEPROM
+ #undef SRAM_EEPROM_EMULATION
+ #undef SDCARD_EEPROM_EMULATION
+ #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h
similarity index 96%
rename from Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
rename to Marlin/src/HAL/DUE/inc/SanityCheck.h
index 44bf8e4473..0f7be7955f 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/DUE/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -56,6 +56,6 @@
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
#error "TMC220x Software Serial is not supported on this platform."
#endif
diff --git a/Marlin/src/HAL/HAL_DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/pinsDebug.h
rename to Marlin/src/HAL/DUE/pinsDebug.h
index ed78f8adbb..448c2391d3 100644
--- a/Marlin/src/HAL/HAL_DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_DUE/spi_pins.h b/Marlin/src/HAL/DUE/spi_pins.h
similarity index 96%
rename from Marlin/src/HAL/HAL_DUE/spi_pins.h
rename to Marlin/src/HAL/DUE/spi_pins.h
index 64ee17a9d8..a205540bcd 100644
--- a/Marlin/src/HAL/HAL_DUE/spi_pins.h
+++ b/Marlin/src/HAL/DUE/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/timers.cpp b/Marlin/src/HAL/DUE/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/timers.cpp
rename to Marlin/src/HAL/DUE/timers.cpp
index 6925f93498..74ae882843 100644
--- a/Marlin/src/HAL/HAL_DUE/timers.cpp
+++ b/Marlin/src/HAL/DUE/timers.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/timers.h
rename to Marlin/src/HAL/DUE/timers.h
index b7b2cf7341..5144660116 100644
--- a/Marlin/src/HAL/HAL_DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_DUE/usb/arduino_due_x.h b/Marlin/src/HAL/DUE/usb/arduino_due_x.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/arduino_due_x.h
rename to Marlin/src/HAL/DUE/usb/arduino_due_x.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/compiler.h b/Marlin/src/HAL/DUE/usb/compiler.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/compiler.h
rename to Marlin/src/HAL/DUE/usb/compiler.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_access.h b/Marlin/src/HAL/DUE/usb/conf_access.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_access.h
rename to Marlin/src/HAL/DUE/usb/conf_access.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_clock.h b/Marlin/src/HAL/DUE/usb/conf_clock.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_clock.h
rename to Marlin/src/HAL/DUE/usb/conf_clock.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_usb.h b/Marlin/src/HAL/DUE/usb/conf_usb.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_usb.h
rename to Marlin/src/HAL/DUE/usb/conf_usb.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c b/Marlin/src/HAL/DUE/usb/ctrl_access.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c
rename to Marlin/src/HAL/DUE/usb/ctrl_access.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h b/Marlin/src/HAL/DUE/usb/ctrl_access.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h
rename to Marlin/src/HAL/DUE/usb/ctrl_access.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/genclk.h b/Marlin/src/HAL/DUE/usb/genclk.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/genclk.h
rename to Marlin/src/HAL/DUE/usb/genclk.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/mrepeat.h b/Marlin/src/HAL/DUE/usb/mrepeat.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/mrepeat.h
rename to Marlin/src/HAL/DUE/usb/mrepeat.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/osc.h b/Marlin/src/HAL/DUE/usb/osc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/osc.h
rename to Marlin/src/HAL/DUE/usb/osc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/pll.h b/Marlin/src/HAL/DUE/usb/pll.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/pll.h
rename to Marlin/src/HAL/DUE/usb/pll.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/preprocessor.h b/Marlin/src/HAL/DUE/usb/preprocessor.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/preprocessor.h
rename to Marlin/src/HAL/DUE/usb/preprocessor.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sbc_protocol.h b/Marlin/src/HAL/DUE/usb/sbc_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sbc_protocol.h
rename to Marlin/src/HAL/DUE/usb/sbc_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp
rename to Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h
rename to Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h b/Marlin/src/HAL/DUE/usb/spc_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h
rename to Marlin/src/HAL/DUE/usb/spc_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/stringz.h b/Marlin/src/HAL/DUE/usb/stringz.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/stringz.h
rename to Marlin/src/HAL/DUE/usb/stringz.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sysclk.c b/Marlin/src/HAL/DUE/usb/sysclk.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sysclk.c
rename to Marlin/src/HAL/DUE/usb/sysclk.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sysclk.h b/Marlin/src/HAL/DUE/usb/sysclk.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sysclk.h
rename to Marlin/src/HAL/DUE/usb/sysclk.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/tpaste.h b/Marlin/src/HAL/DUE/usb/tpaste.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/tpaste.h
rename to Marlin/src/HAL/DUE/usb/tpaste.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc.c b/Marlin/src/HAL/DUE/usb/udc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc.c
rename to Marlin/src/HAL/DUE/usb/udc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc.h b/Marlin/src/HAL/DUE/usb/udc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc.h
rename to Marlin/src/HAL/DUE/usb/udc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc_desc.h b/Marlin/src/HAL/DUE/usb/udc_desc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc_desc.h
rename to Marlin/src/HAL/DUE/usb/udc_desc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udd.h b/Marlin/src/HAL/DUE/usb/udd.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udd.h
rename to Marlin/src/HAL/DUE/usb/udd.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi.h b/Marlin/src/HAL/DUE/usb/udi.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi.h
rename to Marlin/src/HAL/DUE/usb/udi.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c b/Marlin/src/HAL/DUE/usb/udi_cdc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c
rename to Marlin/src/HAL/DUE/usb/udi_cdc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h b/Marlin/src/HAL/DUE/usb/udi_cdc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h
rename to Marlin/src/HAL/DUE/usb/udi_cdc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h b/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h
rename to Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc_desc.c b/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc_desc.c
rename to Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c b/Marlin/src/HAL/DUE/usb/udi_composite_desc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c
rename to Marlin/src/HAL/DUE/usb/udi_composite_desc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_msc.c b/Marlin/src/HAL/DUE/usb/udi_msc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_msc.c
rename to Marlin/src/HAL/DUE/usb/udi_msc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_msc.h b/Marlin/src/HAL/DUE/usb/udi_msc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_msc.h
rename to Marlin/src/HAL/DUE/usb/udi_msc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c b/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c
rename to Marlin/src/HAL/DUE/usb/uotghs_device_due.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h b/Marlin/src/HAL/DUE/usb/uotghs_device_due.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h
rename to Marlin/src/HAL/DUE/usb/uotghs_device_due.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h b/Marlin/src/HAL/DUE/usb/uotghs_otg.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h
rename to Marlin/src/HAL/DUE/usb/uotghs_otg.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol.h b/Marlin/src/HAL/DUE/usb/usb_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol_cdc.h b/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol_cdc.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol_msc.h b/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol_msc.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_task.c b/Marlin/src/HAL/DUE/usb/usb_task.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_task.c
rename to Marlin/src/HAL/DUE/usb/usb_task.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_task.h b/Marlin/src/HAL/DUE/usb/usb_task.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_task.h
rename to Marlin/src/HAL/DUE/usb/usb_task.h
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.cpp b/Marlin/src/HAL/DUE/watchdog.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/watchdog.cpp
rename to Marlin/src/HAL/DUE/watchdog.cpp
index dd80f8c713..c245633d76 100644
--- a/Marlin/src/HAL/HAL_DUE/watchdog.cpp
+++ b/Marlin/src/HAL/DUE/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.h b/Marlin/src/HAL/DUE/watchdog.h
similarity index 94%
rename from Marlin/src/HAL/HAL_DUE/watchdog.h
rename to Marlin/src/HAL/DUE/watchdog.h
index 6e70adef81..7d9665f20e 100644
--- a/Marlin/src/HAL/HAL_DUE/watchdog.h
+++ b/Marlin/src/HAL/DUE/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
rename to Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp
index 544b1b3f67..4d70d34edb 100644
--- a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
+++ b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h
similarity index 94%
rename from Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
rename to Marlin/src/HAL/ESP32/FlushableHardwareSerial.h
index 9fca4fcbea..703bcbeb73 100644
--- a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
+++ b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
similarity index 84%
rename from Marlin/src/HAL/HAL_ESP32/HAL.cpp
rename to Marlin/src/HAL/ESP32/HAL.cpp
index 7bc007f3c4..d9afa13ab8 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include "../../inc/MarlinConfigPre.h"
@@ -105,6 +106,27 @@ void HAL_init_board() {
#endif
server.begin();
#endif
+
+ // ESP32 uses a GPIO matrix that allows pins to be assigned to hardware serial ports.
+ // The following code initializes hardware Serial1 and Serial2 to use user-defined pins
+ // if they have been defined.
+ #if defined(HARDWARE_SERIAL1_RX) && defined(HARDWARE_SERIAL1_TX)
+ HardwareSerial Serial1(1);
+ #ifdef TMC_BAUD_RATE // use TMC_BAUD_RATE for Serial1 if defined
+ Serial1.begin(TMC_BAUD_RATE, SERIAL_8N1, HARDWARE_SERIAL1_RX, HARDWARE_SERIAL1_TX);
+ #else // use default BAUDRATE if TMC_BAUD_RATE not defined
+ Serial1.begin(BAUDRATE, SERIAL_8N1, HARDWARE_SERIAL1_RX, HARDWARE_SERIAL1_TX);
+ #endif
+ #endif
+ #if defined(HARDWARE_SERIAL2_RX) && defined(HARDWARE_SERIAL2_TX)
+ HardwareSerial Serial2(2);
+ #ifdef TMC_BAUD_RATE // use TMC_BAUD_RATE for Serial1 if defined
+ Serial2.begin(TMC_BAUD_RATE, SERIAL_8N1, HARDWARE_SERIAL2_RX, HARDWARE_SERIAL2_TX);
+ #else // use default BAUDRATE if TMC_BAUD_RATE not defined
+ Serial2.begin(BAUDRATE, SERIAL_8N1, HARDWARE_SERIAL2_RX, HARDWARE_SERIAL2_TX);
+ #endif
+ #endif
+
}
void HAL_idletask() {
@@ -172,6 +194,12 @@ void HAL_adc_init() {
#if HAS_TEMP_ADC_5
adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db);
#endif
+ #if HAS_TEMP_ADC_6
+ adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db);
+ #endif
+ #if HAS_TEMP_ADC_7
+ adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db);
+ #endif
#if HAS_HEATED_BED
adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db);
#endif
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
similarity index 96%
rename from Marlin/src/HAL/HAL_ESP32/HAL.h
rename to Marlin/src/HAL/ESP32/HAL.h
index c4528f7520..a04343b69e 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
@@ -65,8 +65,8 @@ extern portMUX_TYPE spinlock;
#define NUM_SERIAL 1
#endif
-#define CRITICAL_SECTION_START portENTER_CRITICAL(&spinlock)
-#define CRITICAL_SECTION_END portEXIT_CRITICAL(&spinlock)
+#define CRITICAL_SECTION_START() portENTER_CRITICAL(&spinlock)
+#define CRITICAL_SECTION_END() portEXIT_CRITICAL(&spinlock)
#define ISRS_ENABLED() (spinlock.owner == portMUX_FREE_VAL)
#define ENABLE_ISRS() if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock)
#define DISABLE_ISRS() portENTER_CRITICAL(&spinlock)
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp b/Marlin/src/HAL/ESP32/HAL_SPI.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
rename to Marlin/src/HAL/ESP32/HAL_SPI.cpp
index eba880b4fd..981d9b49c1 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/ESP32/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.cpp b/Marlin/src/HAL/ESP32/Servo.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/Servo.cpp
rename to Marlin/src/HAL/ESP32/Servo.cpp
index c80c29a4eb..68ee3d9098 100644
--- a/Marlin/src/HAL/HAL_ESP32/Servo.cpp
+++ b/Marlin/src/HAL/ESP32/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.h b/Marlin/src/HAL/ESP32/Servo.h
similarity index 96%
rename from Marlin/src/HAL/HAL_ESP32/Servo.h
rename to Marlin/src/HAL/ESP32/Servo.h
index 7b73ef0f3c..3f575150eb 100644
--- a/Marlin/src/HAL/HAL_ESP32/Servo.h
+++ b/Marlin/src/HAL/ESP32/Servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp b/Marlin/src/HAL/ESP32/WebSocketSerial.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
rename to Marlin/src/HAL/ESP32/WebSocketSerial.cpp
index 9a38d3996a..c7ee6951e1 100644
--- a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
+++ b/Marlin/src/HAL/ESP32/WebSocketSerial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h b/Marlin/src/HAL/ESP32/WebSocketSerial.h
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
rename to Marlin/src/HAL/ESP32/WebSocketSerial.h
index 3d22c4d1b2..e76a2bc68e 100644
--- a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
+++ b/Marlin/src/HAL/ESP32/WebSocketSerial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
similarity index 88%
rename from Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
rename to Marlin/src/HAL/ESP32/eeprom_impl.cpp
index a65a4301a0..1c005ff3d4 100644
--- a/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,10 +24,10 @@
#include "../../inc/MarlinConfig.h"
-#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
+#if USE_WIRED_EEPROM
-#include "../shared/persistent_store_api.h"
-#include "EEPROM.h"
+#include "../shared/eeprom_api.h"
+#include
#define EEPROM_SIZE 4096
@@ -59,5 +59,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() { return EEPROM_SIZE; }
-#endif // EEPROM_SETTINGS
+#endif // USE_WIRED_EEPROM
#endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h b/Marlin/src/HAL/ESP32/endstop_interrupts.h
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
rename to Marlin/src/HAL/ESP32/endstop_interrupts.h
index fff53ce60f..2da1cc7477 100644
--- a/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
+++ b/Marlin/src/HAL/ESP32/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/fastio.h b/Marlin/src/HAL/ESP32/fastio.h
similarity index 95%
rename from Marlin/src/HAL/HAL_ESP32/fastio.h
rename to Marlin/src/HAL/ESP32/fastio.h
index 1641116b90..09930194d6 100644
--- a/Marlin/src/HAL/HAL_ESP32/fastio.h
+++ b/Marlin/src/HAL/ESP32/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -56,7 +56,7 @@
#define SET_OUTPUT(IO) do{ _SET_OUTPUT(IO); }while(0)
// Set pin as PWM
-#define SET_PWM(IO) SET_OUTPUT(IO)
+#define SET_PWM SET_OUTPUT
// Set pin as output and init
#define OUT_WRITE(IO,V) do{ _SET_OUTPUT(IO); WRITE(IO,V); }while(0)
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_ESP32/i2s.cpp
rename to Marlin/src/HAL/ESP32/i2s.cpp
index 7a94e1594d..d80c3c24e1 100644
--- a/Marlin/src/HAL/HAL_ESP32/i2s.cpp
+++ b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -153,8 +153,8 @@ void stepperTask(void* parameter) {
remaining--;
}
else {
- Stepper::stepper_pulse_phase_isr();
- remaining = Stepper::stepper_block_phase_isr();
+ Stepper::pulse_phase_isr();
+ remaining = Stepper::block_phase_isr();
}
}
}
@@ -308,7 +308,7 @@ int i2s_init() {
esp_intr_enable(i2s_isr_handle);
// Create the task that will feed the buffer
- xTaskCreate(stepperTask, "StepperTask", 10000, nullptr, 1, nullptr);
+ xTaskCreatePinnedToCore(stepperTask, "StepperTask", 10000, nullptr, 1, nullptr, CONFIG_ARDUINO_RUNNING_CORE); // run I2S stepper task on same core as rest of Marlin
// Route the i2s pins to the appropriate GPIO
gpio_matrix_out_check(I2S_DATA, I2S0O_DATA_OUT23_IDX, 0, 0);
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.h b/Marlin/src/HAL/ESP32/i2s.h
similarity index 94%
rename from Marlin/src/HAL/HAL_ESP32/i2s.h
rename to Marlin/src/HAL/ESP32/i2s.h
index 971405a343..63a579a184 100644
--- a/Marlin/src/HAL/HAL_ESP32/i2s.h
+++ b/Marlin/src/HAL/ESP32/i2s.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h b/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
similarity index 92%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h b/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
similarity index 92%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
rename to Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
new file mode 100644
index 0000000000..8849c06e93
--- /dev/null
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
@@ -0,0 +1,27 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#undef USE_WIRED_EEPROM
+#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
+ #define USE_WIRED_EEPROM 1
+#endif
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
similarity index 93%
rename from Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
rename to Marlin/src/HAL/ESP32/inc/SanityCheck.h
index ff9d7342dd..b6ad7a3c4b 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,7 +29,7 @@
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
#error "TMC220x Software Serial is not supported on this platform."
#endif
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.cpp b/Marlin/src/HAL/ESP32/ota.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/ota.cpp
rename to Marlin/src/HAL/ESP32/ota.cpp
index 781854aa8b..34a2482c9b 100644
--- a/Marlin/src/HAL/HAL_ESP32/ota.cpp
+++ b/Marlin/src/HAL/ESP32/ota.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.h b/Marlin/src/HAL/ESP32/ota.h
similarity index 92%
rename from Marlin/src/HAL/HAL_ESP32/ota.h
rename to Marlin/src/HAL/ESP32/ota.h
index 7e89e93ce2..1780fb32c1 100644
--- a/Marlin/src/HAL/HAL_ESP32/ota.h
+++ b/Marlin/src/HAL/ESP32/ota.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_ESP32/servotimers.h b/Marlin/src/HAL/ESP32/servotimers.h
similarity index 92%
rename from Marlin/src/HAL/HAL_ESP32/servotimers.h
rename to Marlin/src/HAL/ESP32/servotimers.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_ESP32/servotimers.h
+++ b/Marlin/src/HAL/ESP32/servotimers.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/spi_pins.h b/Marlin/src/HAL/ESP32/spi_pins.h
similarity index 92%
rename from Marlin/src/HAL/HAL_ESP32/spi_pins.h
rename to Marlin/src/HAL/ESP32/spi_pins.h
index 03ab215224..0e67615a2b 100644
--- a/Marlin/src/HAL/HAL_ESP32/spi_pins.h
+++ b/Marlin/src/HAL/ESP32/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.cpp b/Marlin/src/HAL/ESP32/spiffs.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_ESP32/spiffs.cpp
rename to Marlin/src/HAL/ESP32/spiffs.cpp
index b76d3810fa..0013dd6093 100644
--- a/Marlin/src/HAL/HAL_ESP32/spiffs.cpp
+++ b/Marlin/src/HAL/ESP32/spiffs.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.h b/Marlin/src/HAL/ESP32/spiffs.h
similarity index 93%
rename from Marlin/src/HAL/HAL_ESP32/spiffs.h
rename to Marlin/src/HAL/ESP32/spiffs.h
index 8a1ee2f191..b9cbb23bda 100644
--- a/Marlin/src/HAL/HAL_ESP32/spiffs.h
+++ b/Marlin/src/HAL/ESP32/spiffs.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.cpp b/Marlin/src/HAL/ESP32/timers.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/timers.cpp
rename to Marlin/src/HAL/ESP32/timers.cpp
index 543889760e..ef181a438c 100644
--- a/Marlin/src/HAL/HAL_ESP32/timers.cpp
+++ b/Marlin/src/HAL/ESP32/timers.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -106,7 +106,7 @@ void HAL_timer_start(const uint8_t timer_num, uint32_t frequency) {
timer_enable_intr(timer.group, timer.idx);
- timer_isr_register(timer.group, timer.idx, timer_isr, (void*)timer_num, 0, nullptr);
+ timer_isr_register(timer.group, timer.idx, timer_isr, (void*)(uint32_t)timer_num, 0, nullptr);
timer_start(timer.group, timer.idx);
}
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_ESP32/timers.h
rename to Marlin/src/HAL/ESP32/timers.h
index 325ab4098b..bc4306be20 100644
--- a/Marlin/src/HAL/HAL_ESP32/timers.h
+++ b/Marlin/src/HAL/ESP32/timers.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.cpp b/Marlin/src/HAL/ESP32/watchdog.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_ESP32/watchdog.cpp
rename to Marlin/src/HAL/ESP32/watchdog.cpp
index d05e67c856..9f681e6095 100644
--- a/Marlin/src/HAL/HAL_ESP32/watchdog.cpp
+++ b/Marlin/src/HAL/ESP32/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.h b/Marlin/src/HAL/ESP32/watchdog.h
similarity index 94%
rename from Marlin/src/HAL/HAL_ESP32/watchdog.h
rename to Marlin/src/HAL/ESP32/watchdog.h
index 9fb39ff9a5..7e07990865 100644
--- a/Marlin/src/HAL/HAL_ESP32/watchdog.h
+++ b/Marlin/src/HAL/ESP32/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/web.cpp b/Marlin/src/HAL/ESP32/web.cpp
similarity index 93%
rename from Marlin/src/HAL/HAL_ESP32/web.cpp
rename to Marlin/src/HAL/ESP32/web.cpp
index 6cb2145831..b795efe3c5 100644
--- a/Marlin/src/HAL/HAL_ESP32/web.cpp
+++ b/Marlin/src/HAL/ESP32/web.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,6 +26,8 @@
#if BOTH(WIFISUPPORT, WEBSUPPORT)
+#include "../../inc/MarlinConfig.h"
+
#undef DISABLED // esp32-hal-gpio.h
#include
#include "wifi.h"
diff --git a/Marlin/src/HAL/HAL_ESP32/web.h b/Marlin/src/HAL/ESP32/web.h
similarity index 92%
rename from Marlin/src/HAL/HAL_ESP32/web.h
rename to Marlin/src/HAL/ESP32/web.h
index d1d91b9c0f..8dbefd8eef 100644
--- a/Marlin/src/HAL/HAL_ESP32/web.h
+++ b/Marlin/src/HAL/ESP32/web.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.cpp b/Marlin/src/HAL/ESP32/wifi.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_ESP32/wifi.cpp
rename to Marlin/src/HAL/ESP32/wifi.cpp
index 19f1d8fb85..9203dd62e7 100644
--- a/Marlin/src/HAL/HAL_ESP32/wifi.cpp
+++ b/Marlin/src/HAL/ESP32/wifi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.h b/Marlin/src/HAL/ESP32/wifi.h
similarity index 93%
rename from Marlin/src/HAL/HAL_ESP32/wifi.h
rename to Marlin/src/HAL/ESP32/wifi.h
index 4cd656cb33..580c6c87f4 100644
--- a/Marlin/src/HAL/HAL_ESP32/wifi.h
+++ b/Marlin/src/HAL/ESP32/wifi.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL.h b/Marlin/src/HAL/HAL.h
index 5ad1393110..fa2782cfcb 100644
--- a/Marlin/src/HAL/HAL.h
+++ b/Marlin/src/HAL/HAL.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
deleted file mode 100644
index 4afd83ad4b..0000000000
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-
-/**
- * The PWM module is only used to generate interrupts at specified times. It
- * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
- * that interrupt.
- *
- * All PWMs use the same repetition rate. The G2 needs about 10KHz min in order to
- * not have obvious ripple on the Vref signals.
- *
- * The data structures are setup to minimize the computation done by the ISR which
- * minimizes ISR execution time. Execution times are 0.8 to 1.1 microseconds.
- *
- * FIve PWM interrupt sources are used. Channel 0 sets the base period. All Vref
- * signals are set active when this counter overflows and resets to zero. The compare
- * values in channels 1-4 are set to give the desired duty cycle for that Vref pin.
- * When counter 0 matches the compare value then that channel generates an interrupt.
- * The ISR checks the source of the interrupt and sets the corresponding pin inactive.
- *
- * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
- */
-
-#include "../../../inc/MarlinConfig.h"
-
-#if MB(PRINTRBOARD_G2)
-
-#include "G2_PWM.h"
-
-volatile uint32_t *SODR_A = &PIOA->PIO_SODR,
- *SODR_B = &PIOB->PIO_SODR,
- *CODR_A = &PIOA->PIO_CODR,
- *CODR_B = &PIOB->PIO_CODR;
-
-PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;
-
-void Stepper::digipot_init() {
-
- OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0); // init pins
- OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
- OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
- OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
-
- #define WPKEY (0x50574D << 8) // “PWM” in ASCII
- #define WPCMD_DIS_SW 0 // command to disable Write Protect SW
- #define WPRG_ALL (PWM_WPCR_WPRG0 | PWM_WPCR_WPRG1 | PWM_WPCR_WPRG2 | PWM_WPCR_WPRG3 | PWM_WPCR_WPRG4 | PWM_WPCR_WPRG5) // all Write Protect Groups
-
- #define PWM_CLOCK_F F_CPU / 1000000UL // set clock to 1MHz
-
- PMC->PMC_PCER1 = PMC_PCER1_PID36; // enable PWM controller clock (disabled on power up)
-
- PWM->PWM_WPCR = WPKEY | WPRG_ALL | WPCMD_DIS_SW; // enable setting of all PWM registers
- PWM->PWM_CLK = PWM_CLOCK_F; // enable CLK_A and set it to 1MHz, leave CLK_B disabled
- PWM->PWM_CH_NUM[0].PWM_CMR = 0b1011; // set channel 0 to Clock A input & to left aligned
- PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011; // set channel 1 to Clock A input & to left aligned
- PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011; // set channel 2 to Clock A input & to left aligned
- PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011; // set channel 3 to Clock A input & to left aligned
- PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011; // set channel 4 to Clock A input & to left aligned
-
- PWM->PWM_CH_NUM[0].PWM_CPRD = PWM_PERIOD_US; // set channel 0 Period
-
- PWM->PWM_IER2 = PWM_IER1_CHID0; // generate interrupt when counter0 overflows
- PWM->PWM_IER2 = PWM_IER2_CMPM0 | PWM_IER2_CMPM1 | PWM_IER2_CMPM2 | PWM_IER2_CMPM3 | PWM_IER2_CMPM4; // generate interrupt on compare event
-
- PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive
- PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive
- PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1])); // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive
- PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2])); // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive
-
- PWM->PWM_CMP[1].PWM_CMPM = 0x0001; // enable compare event
- PWM->PWM_CMP[2].PWM_CMPM = 0x0001; // enable compare event
- PWM->PWM_CMP[3].PWM_CMPM = 0x0001; // enable compare event
- PWM->PWM_CMP[4].PWM_CMPM = 0x0001; // enable compare event
-
- PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0 | PWM_SCM_SYNC1 | PWM_SCM_SYNC2 | PWM_SCM_SYNC3 | PWM_SCM_SYNC4; // sync 1-4 with 0, use mode 0 for updates
-
- PWM->PWM_ENA = PWM_ENA_CHID0 | PWM_ENA_CHID1 | PWM_ENA_CHID2 | PWM_ENA_CHID3 | PWM_ENA_CHID4; // enable the channels used by G2
- PWM->PWM_IER1 = PWM_IER1_CHID0 | PWM_IER1_CHID1 | PWM_IER1_CHID2 | PWM_IER1_CHID3 | PWM_IER1_CHID4; // enable interrupts for the channels used by G2
-
- NVIC_EnableIRQ(PWM_IRQn); // Enable interrupt handler
- NVIC_SetPriority(PWM_IRQn, NVIC_EncodePriority(0, 10, 0)); // normal priority for PWM module (can stand some jitter on the Vref signals)
-}
-
-void Stepper::digipot_current(const uint8_t driver, const int16_t current) {
-
- if (!(PWM->PWM_CH_NUM[0].PWM_CPRD == PWM_PERIOD_US)) digipot_init(); // Init PWM system if needed
-
- switch (driver) {
- case 0: PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update X & Y
- PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));
- PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001; // enable compare event
- PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001; // enable compare event
- PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
- break;
- case 1: PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update Z
- PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001; // enable compare event
- PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
- break;
- default:PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update E
- PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001; // enable compare event
- PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
- break;
- }
-}
-
-volatile uint32_t PWM_ISR1_STATUS, PWM_ISR2_STATUS;
-
-void PWM_Handler() {
- PWM_ISR1_STATUS = PWM->PWM_ISR1;
- PWM_ISR2_STATUS = PWM->PWM_ISR2;
- if (PWM_ISR1_STATUS & PWM_IER1_CHID0) { // CHAN_0 interrupt
- *ISR_table[0].set_register = ISR_table[0].write_mask; // set X to active
- *ISR_table[1].set_register = ISR_table[1].write_mask; // set Y to active
- *ISR_table[2].set_register = ISR_table[2].write_mask; // set Z to active
- *ISR_table[3].set_register = ISR_table[3].write_mask; // set E to active
- }
- else {
- if (PWM_ISR2_STATUS & PWM_IER2_CMPM1) *ISR_table[0].clr_register = ISR_table[0].write_mask; // set X to inactive
- if (PWM_ISR2_STATUS & PWM_IER2_CMPM2) *ISR_table[1].clr_register = ISR_table[1].write_mask; // set Y to inactive
- if (PWM_ISR2_STATUS & PWM_IER2_CMPM3) *ISR_table[2].clr_register = ISR_table[2].write_mask; // set Z to inactive
- if (PWM_ISR2_STATUS & PWM_IER2_CMPM4) *ISR_table[3].clr_register = ISR_table[3].write_mask; // set E to inactive
- }
- return;
-}
-
-#endif // PRINTRBOARD_G2
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
deleted file mode 100644
index ffc70b3452..0000000000
--- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#if PIO_PLATFORM_VERSION < 1001
- #error "nxplpc-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries. You may need to remove the platform and let it reinstall automatically."
-#endif
-#if PIO_FRAMEWORK_VERSION < 2002
- #error "framework-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries."
-#endif
-
-/**
- * Detect an old pins file by checking for old ADC pins values.
- */
-#define _OLD_TEMP_PIN(P) PIN_EXISTS(P) && _CAT(P,_PIN) <= 7 && _CAT(P,_PIN) != 2 && _CAT(P,_PIN) != 3
-#if _OLD_TEMP_PIN(TEMP_BED)
- #error "TEMP_BED_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_0)
- #error "TEMP_0_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_1)
- #error "TEMP_1_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_2)
- #error "TEMP_2_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_3)
- #error "TEMP_3_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_4)
- #error "TEMP_4_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_5)
- #error "TEMP_5_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_6)
- #error "TEMP_6_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_7)
- #error "TEMP_7_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#endif
-#undef _OLD_TEMP_PIN
-
-/**
- * Because PWM hardware channels all share the same frequency, along with the
- * fallback software channels, FAST_PWM_FAN is incompatible with Servos.
- */
-#if NUM_SERVOS > 0 && ENABLED(FAST_PWM_FAN)
- #error "BLTOUCH and Servos are incompatible with FAST_PWM_FAN on LPC176x boards."
-#endif
-
-/**
- * Test LPC176x-specific configuration values for errors at compile-time.
- */
-
-//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
-// #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
-//#endif
-
-#if IS_RE_ARM_BOARD && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && HAS_DRIVER(TMC2130) && DISABLED(TMC_USE_SW_SPI)
- #error "Re-ARM with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER and TMC2130 require TMC_USE_SW_SPI"
-#endif
-
-#if ENABLED(BAUD_RATE_GCODE)
- #error "BAUD_RATE_GCODE is not yet supported on LPC176x."
-#endif
diff --git a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py b/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
deleted file mode 100644
index 79c5d43eaa..0000000000
--- a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# sets output_port
-# if target_filename is found then that drive is used
-# else if target_drive is found then that drive is used
-#
-from __future__ import print_function
-
-target_filename = "FIRMWARE.CUR"
-target_drive = "REARM"
-
-import os
-import getpass
-import platform
-
-current_OS = platform.system()
-Import("env")
-
-def print_error(e):
- print('\nUnable to find destination disk (' + e + ')\n' \
- 'Please select it in platformio.ini using the upload_port keyword ' \
- '(https://docs.platformio.org/en/latest/projectconf/section_env_upload.html) ' \
- 'or copy the firmware (.pio/build/' + env.get('PIOENV') + '/firmware.bin) manually to the appropriate disk\n')
-
-try:
- if current_OS == 'Windows':
- #
- # platformio.ini will accept this for a Windows upload port designation: 'upload_port = L:'
- # Windows - doesn't care about the disk's name, only cares about the drive letter
- #
-
- #
- # get all drives on this computer
- #
- import subprocess
- # typical result (string): 'Drives: C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
- driveStr = str(subprocess.check_output("fsutil fsinfo drives"))
- # typical result (string): 'C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
- # driveStr = driveStr.strip().lstrip('Drives: ') <- Doesn't work in other Languages as English. In German is "Drives:" = "Laufwerke:"
- FirstFound = driveStr.find(':',0,-1) # Find the first ":" and
- driveStr = driveStr[FirstFound + 1 : -1] # truncate to the rest
- # typical result (array of stings): ['C:\\', 'D:\\', 'E:\\', 'F:\\',
- # 'G:\\', 'H:\\', 'I:\\', 'J:\\', 'K:\\', 'L:\\', 'M:\\', 'Y:\\', 'Z:\\']
- drives = driveStr.split()
-
- upload_disk = 'Disk not found'
- target_file_found = False
- target_drive_found = False
- for drive in drives:
- final_drive_name = drive.strip().rstrip('\\') # typical result (string): 'C:'
- try:
- volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
- except Exception as e:
- continue
- else:
- if target_drive in volume_info and target_file_found == False: # set upload if not found target file yet
- target_drive_found = True
- upload_disk = final_drive_name
- if target_filename in volume_info:
- if target_file_found == False:
- upload_disk = final_drive_name
- target_file_found = True
-
- #
- # set upload_port to drive if found
- #
-
- if target_file_found == True or target_drive_found == True:
- env.Replace(
- UPLOAD_PORT=upload_disk
- )
- print('upload disk: ', upload_disk)
- else:
- print_error('Autodetect Error')
-
- elif current_OS == 'Linux':
- #
- # platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
- #
- upload_disk = 'Disk not found'
- target_file_found = False
- target_drive_found = False
- drives = os.listdir(os.path.join(os.sep, 'media', getpass.getuser()))
- if target_drive in drives: # If target drive is found, use it.
- target_drive_found = True
- upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), target_drive) + os.sep
- else:
- for drive in drives:
- try:
- files = os.listdir(os.path.join(os.sep, 'media', getpass.getuser(), drive))
- except:
- continue
- else:
- if target_filename in files:
- upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), drive) + os.sep
- target_file_found = True
- break
- #
- # set upload_port to drive if found
- #
-
- if target_file_found or target_drive_found:
- env.Replace(
- UPLOAD_FLAGS="-P$UPLOAD_PORT",
- UPLOAD_PORT=upload_disk
- )
- print('upload disk: ', upload_disk)
- else:
- print_error('Autodetect Error')
-
- elif current_OS == 'Darwin': # MAC
- #
- # platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
- #
- upload_disk = 'Disk not found'
- drives = os.listdir('/Volumes') # human readable names
- target_file_found = False
- target_drive_found = False
- if target_drive in drives and target_file_found == False: # set upload if not found target file yet
- target_drive_found = True
- upload_disk = '/Volumes/' + target_drive + '/'
- for drive in drives:
- try:
- filenames = os.listdir('/Volumes/' + drive + '/') # will get an error if the drive is protected
- except:
- continue
- else:
- if target_filename in filenames:
- if target_file_found == False:
- upload_disk = '/Volumes/' + drive + '/'
- target_file_found = True
- #
- # set upload_port to drive if found
- #
-
- if target_file_found == True or target_drive_found == True:
- env.Replace(
- UPLOAD_PORT=upload_disk
- )
- print('\nupload disk: ', upload_disk, '\n')
- else:
- print_error('Autodetect Error')
-
-except Exception as e:
- print_error(str(e))
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
deleted file mode 100644
index e41dd85c85..0000000000
--- a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
- *
- * 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 .
- *
- */
-
-#ifdef __SAMD51__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(EEPROM_SETTINGS)
-
-#include "../shared/persistent_store_api.h"
-
-#if NONE(SPI_EEPROM, I2C_EEPROM)
- #define NVMCTRL_CMD(c) do{ \
- SYNC(!NVMCTRL->STATUS.bit.READY); \
- NVMCTRL->INTFLAG.bit.DONE = true; \
- NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \
- SYNC(NVMCTRL->INTFLAG.bit.DONE); \
- }while(0)
- #define NVMCTRL_FLUSH() do{ \
- if (NVMCTRL->SEESTAT.bit.LOAD) \
- NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH); \
- }while(0)
-#endif
-
-bool PersistentStore::access_start() {
- #if NONE(SPI_EEPROM, I2C_EEPROM)
- NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED; // Buffered mode and segment reallocation active
- #endif
-
- return true;
-}
-
-bool PersistentStore::access_finish() {
- #if NONE(SPI_EEPROM, I2C_EEPROM)
- NVMCTRL_FLUSH();
- if (!NVMCTRL->SEESTAT.bit.LOCK)
- NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE); // Lock E2P data write access
- #endif
-
- return true;
-}
-
-bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
- #if NONE(SPI_EEPROM, I2C_EEPROM)
- if (NVMCTRL->SEESTAT.bit.RLOCK)
- NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE); // Unlock E2P data write access
- #endif
-
- while (size--) {
- const uint8_t v = *value;
- #if ANY(SPI_EEPROM, I2C_EEPROM)
- uint8_t * const p = (uint8_t * const)pos;
- if (v != eeprom_read_byte(p)) {
- eeprom_write_byte(p, v);
- delay(2);
- if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
- return true;
- }
- }
- #else
- SYNC(NVMCTRL->SEESTAT.bit.BUSY);
- if (NVMCTRL->INTFLAG.bit.SEESFULL)
- NVMCTRL_FLUSH(); // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
- ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
- SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
- #endif
- crc16(crc, &v, 1);
- pos++;
- value++;
- }
- return false;
-}
-
-bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
- while (size--) {
- uint8_t c;
- #if ANY(SPI_EEPROM, I2C_EEPROM)
- c = eeprom_read_byte((uint8_t*)pos);
- #else
- SYNC(NVMCTRL->SEESTAT.bit.BUSY);
- c = ((volatile uint8_t *)SEEPROM_ADDR)[pos];
- #endif
- if (writing) *value = c;
- crc16(crc, &c, 1);
- pos++;
- value++;
- }
- return false;
-}
-
-size_t PersistentStore::capacity() {
- #if ANY(SPI_EEPROM, I2C_EEPROM)
- return E2END + 1;
- #else
- const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ,
- sblk = NVMCTRL->SEESTAT.bit.SBLK;
-
- if (!psz && !sblk) return 0;
- else if (psz <= 2) return (0x200 << psz);
- else if (sblk == 1 || psz == 3) return 4096;
- else if (sblk == 2 || psz == 4) return 8192;
- else if (sblk <= 4 || psz == 5) return 16384;
- else if (sblk >= 9 && psz == 7) return 65536;
- else return 32768;
- #endif
-}
-
-#endif // EEPROM_SETTINGS
-
-#endif // __SAMD51__
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.cpp b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
deleted file mode 100644
index 2434043966..0000000000
--- a/Marlin/src/HAL/HAL_SAMD51/timers.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
- *
- * 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 .
- *
- */
-
-#ifdef __SAMD51__
-
-// --------------------------------------------------------------------------
-// Includes
-// --------------------------------------------------------------------------
-#include "../../inc/MarlinConfig.h"
-#include "timers.h"
-
-// --------------------------------------------------------------------------
-// Local defines
-// --------------------------------------------------------------------------
-
-#define NUM_HARDWARE_TIMERS 8
-
-// --------------------------------------------------------------------------
-// Private Variables
-// --------------------------------------------------------------------------
-
-const tTimerConfig TimerConfig[NUM_HARDWARE_TIMERS] = {
- { TC0, TC0_IRQn, TC_PRIORITY(0) },
- { TC1, TC1_IRQn, TC_PRIORITY(1) },
- { TC2, TC2_IRQn, TC_PRIORITY(2) }, // Reserved by framework tone function
- { TC3, TC3_IRQn, TC_PRIORITY(3) }, // Reserved by servo library
- { TC4, TC4_IRQn, TC_PRIORITY(4) },
- { TC5, TC5_IRQn, TC_PRIORITY(5) },
- { TC6, TC6_IRQn, TC_PRIORITY(6) },
- { TC7, TC7_IRQn, TC_PRIORITY(7) }
-};
-
-// --------------------------------------------------------------------------
-// Private functions
-// --------------------------------------------------------------------------
-
-FORCE_INLINE void Disable_Irq(IRQn_Type irq) {
- NVIC_DisableIRQ(irq);
-
- // We NEED memory barriers to ensure Interrupts are actually disabled!
- // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
- __DSB();
- __ISB();
-}
-
-// --------------------------------------------------------------------------
-// Public functions
-// --------------------------------------------------------------------------
-
-void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
- Tc * const tc = TimerConfig[timer_num].pTimer;
- IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
-
- // Disable interrupt, just in case it was already enabled
- Disable_Irq(irq);
-
- // Disable timer interrupt
- tc->COUNT32.INTENCLR.reg = TC_INTENCLR_OVF; // disable overflow interrupt
-
- // TCn clock setup
- const uint8_t clockID = GCLK_CLKCTRL_IDs[TCC_INST_NUM + timer_num];
- GCLK->PCHCTRL[clockID].bit.CHEN = false;
- SYNC(GCLK->PCHCTRL[clockID].bit.CHEN);
- GCLK->PCHCTRL[clockID].reg = GCLK_PCHCTRL_GEN_GCLK0 | GCLK_PCHCTRL_CHEN; // 120MHz startup code programmed
- SYNC(!GCLK->PCHCTRL[clockID].bit.CHEN);
-
- // Stop timer, just in case, to be able to reconfigure it
- tc->COUNT32.CTRLA.bit.ENABLE = false;
- SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
-
- // Reset timer
- tc->COUNT32.CTRLA.bit.SWRST = true;
- SYNC(tc->COUNT32.SYNCBUSY.bit.SWRST);
-
- NVIC_SetPriority(irq, TimerConfig[timer_num].priority);
-
- // Wave mode, reset counter on overflow on 0 (I use count down to prevent double buffer use)
- tc->COUNT32.WAVE.reg = TC_WAVE_WAVEGEN_MFRQ;
- tc->COUNT32.CTRLA.reg = TC_CTRLA_MODE_COUNT32 | TC_CTRLA_PRESCALER_DIV1;
- tc->COUNT32.CTRLBSET.reg = TC_CTRLBCLR_DIR;
- SYNC(tc->COUNT32.SYNCBUSY.bit.CTRLB);
-
- // Set compare value
- tc->COUNT32.COUNT.reg = tc->COUNT32.CC[0].reg = (HAL_TIMER_RATE) / frequency;
-
- // And start timer
- tc->COUNT32.CTRLA.bit.ENABLE = true;
- SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
-
- // Enable interrupt on RC compare
- tc->COUNT32.INTENSET.reg = TC_INTENCLR_OVF; // enable overflow interrupt
-
- // Finally, enable IRQ
- NVIC_EnableIRQ(irq);
-}
-
-void HAL_timer_enable_interrupt(const uint8_t timer_num) {
- IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
- NVIC_EnableIRQ(irq);
-}
-
-void HAL_timer_disable_interrupt(const uint8_t timer_num) {
- IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
- Disable_Irq(irq);
-}
-
-// missing from CMSIS: Check if interrupt is enabled or not
-static bool NVIC_GetEnabledIRQ(IRQn_Type IRQn) {
- return (NVIC->ISER[(uint32_t)(IRQn) >> 5] & (1 << ((uint32_t)(IRQn) & 0x1F))) != 0;
-}
-
-bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
- IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
- return NVIC_GetEnabledIRQ(irq);
-}
-
-#endif // __SAMD51__
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
deleted file mode 100644
index 85f26f4016..0000000000
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.cpp b/Marlin/src/HAL/LINUX/HAL.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/HAL.cpp
rename to Marlin/src/HAL/LINUX/HAL.cpp
index a10b1629a0..d38644f1a5 100644
--- a/Marlin/src/HAL/HAL_LINUX/HAL.cpp
+++ b/Marlin/src/HAL/LINUX/HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LINUX/HAL.h
rename to Marlin/src/HAL/LINUX/HAL.h
index 63aa8fa11f..0475c953c3 100644
--- a/Marlin/src/HAL/HAL_LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
@@ -72,8 +72,8 @@ extern HalSerial usb_serial;
//
// Interrupts
//
-#define CRITICAL_SECTION_START
-#define CRITICAL_SECTION_END
+#define CRITICAL_SECTION_START()
+#define CRITICAL_SECTION_END()
#define ISRS_ENABLED()
#define ENABLE_ISRS()
#define DISABLE_ISRS()
diff --git a/Marlin/src/HAL/HAL_LINUX/arduino.cpp b/Marlin/src/HAL/LINUX/arduino.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_LINUX/arduino.cpp
rename to Marlin/src/HAL/LINUX/arduino.cpp
index 88128dd91a..008db15592 100644
--- a/Marlin/src/HAL/HAL_LINUX/arduino.cpp
+++ b/Marlin/src/HAL/LINUX/arduino.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp b/Marlin/src/HAL/LINUX/eeprom_impl.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
rename to Marlin/src/HAL/LINUX/eeprom_impl.cpp
index c4965d90e3..4745f05673 100644
--- a/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/LINUX/eeprom_impl.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,7 +26,7 @@
#if ENABLED(EEPROM_SETTINGS)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
#include
#define LINUX_EEPROM_SIZE (E2END + 1)
diff --git a/Marlin/src/HAL/HAL_LINUX/fastio.h b/Marlin/src/HAL/LINUX/fastio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/fastio.h
rename to Marlin/src/HAL/LINUX/fastio.h
index 5c2d6fcb7e..8b0526710d 100644
--- a/Marlin/src/HAL/HAL_LINUX/fastio.h
+++ b/Marlin/src/HAL/LINUX/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp b/Marlin/src/HAL/LINUX/hardware/Clock.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp
rename to Marlin/src/HAL/LINUX/hardware/Clock.cpp
index 39dd3d1b3b..8265fedbf0 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/Clock.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h b/Marlin/src/HAL/LINUX/hardware/Clock.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Clock.h
rename to Marlin/src/HAL/LINUX/hardware/Clock.h
index e61051a0a3..17c2fd9501 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h
+++ b/Marlin/src/HAL/LINUX/hardware/Clock.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp b/Marlin/src/HAL/LINUX/hardware/Gpio.cpp
similarity index 93%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp
rename to Marlin/src/HAL/LINUX/hardware/Gpio.cpp
index aced728172..e49fb13754 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/Gpio.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h b/Marlin/src/HAL/LINUX/hardware/Gpio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h
rename to Marlin/src/HAL/LINUX/hardware/Gpio.h
index 37f3bc7a44..33eea77731 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h
+++ b/Marlin/src/HAL/LINUX/hardware/Gpio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp b/Marlin/src/HAL/LINUX/hardware/Heater.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
rename to Marlin/src/HAL/LINUX/hardware/Heater.cpp
index 59da64d337..7c9bfaf80f 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/Heater.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h b/Marlin/src/HAL/LINUX/hardware/Heater.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Heater.h
rename to Marlin/src/HAL/LINUX/hardware/Heater.h
index e0c250f62c..bb759da090 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h
+++ b/Marlin/src/HAL/LINUX/hardware/Heater.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp
rename to Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
index 675afd4a21..a79f14f6f5 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h
similarity index 94%
rename from Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h
rename to Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h
index afc2125971..f8bca83e30 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h
+++ b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp b/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp
rename to Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
index df133e9e18..ec58fe77e5 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h b/Marlin/src/HAL/LINUX/hardware/LinearAxis.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h
rename to Marlin/src/HAL/LINUX/hardware/LinearAxis.h
index 1e8e887de5..04a5f3d0f7 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h
+++ b/Marlin/src/HAL/LINUX/hardware/LinearAxis.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp b/Marlin/src/HAL/LINUX/hardware/Timer.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp
rename to Marlin/src/HAL/LINUX/hardware/Timer.cpp
index 1c930cfce1..e7136bbdef 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/Timer.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h b/Marlin/src/HAL/LINUX/hardware/Timer.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Timer.h
rename to Marlin/src/HAL/LINUX/hardware/Timer.h
index 740d8ef4e8..ebfe8e8b9b 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h
+++ b/Marlin/src/HAL/LINUX/hardware/Timer.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h b/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
similarity index 92%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h b/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h
similarity index 92%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_adv.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/LINUX/inc/Conditionals_post.h
similarity index 92%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_post.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/LINUX/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
similarity index 93%
rename from Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
rename to Marlin/src/HAL/LINUX/inc/SanityCheck.h
index 3b18dec730..a3238b088b 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,6 +34,6 @@
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
#error "TMC220x Software Serial is not supported on this platform."
#endif
diff --git a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h b/Marlin/src/HAL/LINUX/include/Arduino.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/include/Arduino.h
rename to Marlin/src/HAL/LINUX/include/Arduino.h
index 13a8206e1b..55bf0f95ee 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h
+++ b/Marlin/src/HAL/LINUX/include/Arduino.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp
rename to Marlin/src/HAL/LINUX/include/pinmapping.cpp
index a4ddb1b1ff..0340e681fe 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp
+++ b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h b/Marlin/src/HAL/LINUX/include/pinmapping.h
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/include/pinmapping.h
rename to Marlin/src/HAL/LINUX/include/pinmapping.h
index a24f0b3ed1..0d99a38116 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h
+++ b/Marlin/src/HAL/LINUX/include/pinmapping.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/include/serial.h b/Marlin/src/HAL/LINUX/include/serial.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/include/serial.h
rename to Marlin/src/HAL/LINUX/include/serial.h
index c6da82ad5a..c881d5dbda 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/serial.h
+++ b/Marlin/src/HAL/LINUX/include/serial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,7 +23,7 @@
#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(EMERGENCY_PARSER)
- #include "../../../feature/emergency_parser.h"
+ #include "../../../feature/e_parser.h"
#endif
#include
diff --git a/Marlin/src/HAL/HAL_LINUX/main.cpp b/Marlin/src/HAL/LINUX/main.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/main.cpp
rename to Marlin/src/HAL/LINUX/main.cpp
index 4231affba7..1155f2a873 100644
--- a/Marlin/src/HAL/HAL_LINUX/main.cpp
+++ b/Marlin/src/HAL/LINUX/main.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_LINUX/pinsDebug.h b/Marlin/src/HAL/LINUX/pinsDebug.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LINUX/pinsDebug.h
rename to Marlin/src/HAL/LINUX/pinsDebug.h
index a28d2b60b9..e373d37067 100644
--- a/Marlin/src/HAL/HAL_LINUX/pinsDebug.h
+++ b/Marlin/src/HAL/LINUX/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_LINUX/servo_private.h b/Marlin/src/HAL/LINUX/servo_private.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LINUX/servo_private.h
rename to Marlin/src/HAL/LINUX/servo_private.h
index 2aba9a37db..d576ff9266 100644
--- a/Marlin/src/HAL/HAL_LINUX/servo_private.h
+++ b/Marlin/src/HAL/LINUX/servo_private.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/spi_pins.h b/Marlin/src/HAL/LINUX/spi_pins.h
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/spi_pins.h
rename to Marlin/src/HAL/LINUX/spi_pins.h
index fdd09b1c03..8abeb312f4 100644
--- a/Marlin/src/HAL/HAL_LINUX/spi_pins.h
+++ b/Marlin/src/HAL/LINUX/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.cpp b/Marlin/src/HAL/LINUX/timers.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LINUX/timers.cpp
rename to Marlin/src/HAL/LINUX/timers.cpp
index f293d7f408..ebfb950595 100644
--- a/Marlin/src/HAL/HAL_LINUX/timers.cpp
+++ b/Marlin/src/HAL/LINUX/timers.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/timers.h
rename to Marlin/src/HAL/LINUX/timers.h
index 8022aabd26..b657584922 100644
--- a/Marlin/src/HAL/HAL_LINUX/timers.h
+++ b/Marlin/src/HAL/LINUX/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.cpp b/Marlin/src/HAL/LINUX/watchdog.cpp
similarity index 93%
rename from Marlin/src/HAL/HAL_LINUX/watchdog.cpp
rename to Marlin/src/HAL/LINUX/watchdog.cpp
index 6338ea3b1d..5ffe860f05 100644
--- a/Marlin/src/HAL/HAL_LINUX/watchdog.cpp
+++ b/Marlin/src/HAL/LINUX/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.h b/Marlin/src/HAL/LINUX/watchdog.h
similarity index 93%
rename from Marlin/src/HAL/HAL_LINUX/watchdog.h
rename to Marlin/src/HAL/LINUX/watchdog.h
index 51d30c8437..4771426a0b 100644
--- a/Marlin/src/HAL/HAL_LINUX/watchdog.h
+++ b/Marlin/src/HAL/LINUX/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp b/Marlin/src/HAL/LPC1768/DebugMonitor.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
rename to Marlin/src/HAL/LPC1768/DebugMonitor.cpp
index fefee386e5..2a39e56168 100644
--- a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
+++ b/Marlin/src/HAL/LPC1768/DebugMonitor.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -199,14 +199,23 @@ void HardFault_HandlerC(unsigned long *sp, unsigned long lr, unsigned long cause
// Clear cause of reset to prevent entering smoothie bootstrap
HAL_clear_reset_source();
+
// Restart watchdog
- //WDT_Restart(WDT);
- watchdog_init();
+ #if ENABLED(USE_WATCHDOG)
+ //WDT_Restart(WDT);
+ watchdog_init();
+ #endif
// Reset controller
NVIC_SystemReset();
- for (;;) watchdog_init();
+ // Nothing below here is compiled because NVIC_SystemReset loops forever
+
+ for (;;) {
+ #if ENABLED(USE_WATCHDOG)
+ watchdog_init();
+ #endif
+ }
}
extern "C" {
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_LPC1768/HAL.cpp
rename to Marlin/src/HAL/LPC1768/HAL.cpp
index 4da55c2f3d..f206ce7adb 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -67,9 +67,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
return ind > -1 ? ind : dval;
}
-void flashFirmware(int16_t value) {
- NVIC_SystemReset();
-}
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
void HAL_clear_reset_source(void) {
#if ENABLED(USE_WATCHDOG)
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
similarity index 96%
rename from Marlin/src/HAL/HAL_LPC1768/HAL.h
rename to Marlin/src/HAL/LPC1768/HAL.h
index 69247dfd9b..f5ea629f16 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
@@ -119,8 +119,8 @@ extern "C" volatile uint32_t _millis;
//
// Interrupts
//
-#define CRITICAL_SECTION_START uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
#define ISRS_ENABLED() (!__get_PRIMASK())
#define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq()
@@ -195,7 +195,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
void HAL_idletask();
#define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
/**
* set_pwm_frequency
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp
rename to Marlin/src/HAL/LPC1768/HAL_SPI.cpp
index 5f32c7874d..1c20e7f652 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp b/Marlin/src/HAL/LPC1768/MarlinSerial.cpp
similarity index 78%
rename from Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
rename to Marlin/src/HAL/LPC1768/MarlinSerial.cpp
index a8778f7446..1b80b211fb 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,28 +25,28 @@
#include "../../inc/MarlinConfigPre.h"
#include "MarlinSerial.h"
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0)
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
MarlinSerial MSerial(LPC_UART0);
extern "C" void UART0_IRQHandler() {
MSerial.IRQHandler();
}
#endif
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 1) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 1)
+#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
MarlinSerial MSerial1((LPC_UART_TypeDef *) LPC_UART1);
extern "C" void UART1_IRQHandler() {
MSerial1.IRQHandler();
}
#endif
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 2) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 2)
+#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
MarlinSerial MSerial2(LPC_UART2);
extern "C" void UART2_IRQHandler() {
MSerial2.IRQHandler();
}
#endif
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 3) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 3)
+#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
MarlinSerial MSerial3(LPC_UART3);
extern "C" void UART3_IRQHandler() {
MSerial3.IRQHandler();
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h b/Marlin/src/HAL/LPC1768/MarlinSerial.h
similarity index 94%
rename from Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
rename to Marlin/src/HAL/LPC1768/MarlinSerial.h
index 8050685538..b6bbf8e453 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if ENABLED(EMERGENCY_PARSER)
- #include "../../feature/emergency_parser.h"
+ #include "../../feature/e_parser.h"
#endif
#ifndef SERIAL_PORT
diff --git a/Marlin/src/HAL/HAL_LPC1768/Servo.h b/Marlin/src/HAL/LPC1768/Servo.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/Servo.h
rename to Marlin/src/HAL/LPC1768/Servo.h
index 1bbf84c73e..71e2bb5695 100644
--- a/Marlin/src/HAL/HAL_LPC1768/Servo.h
+++ b/Marlin/src/HAL/LPC1768/Servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h b/Marlin/src/HAL/LPC1768/eeprom_api.h
similarity index 88%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
rename to Marlin/src/HAL/LPC1768/eeprom_api.h
index cafa53b30e..f874eac58a 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
+++ b/Marlin/src/HAL/LPC1768/eeprom_api.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,6 +21,6 @@
*/
#pragma once
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
#define FLASH_EEPROM_EMULATION
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/LPC1768/eeprom_flash.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
rename to Marlin/src/HAL/LPC1768/eeprom_flash.cpp
index 3de02022eb..9225807480 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_flash.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,15 +36,12 @@
* 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently
* unused).
*/
-#include "../../inc/MarlinConfigPre.h"
-
-#if ENABLED(EEPROM_SETTINGS)
-
-#include "persistent_store_api.h"
#include "../../inc/MarlinConfig.h"
#if ENABLED(FLASH_EEPROM_EMULATION)
+#include "eeprom_api.h"
+
extern "C" {
#include
}
@@ -128,5 +125,4 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() { return EEPROM_SIZE; }
#endif // FLASH_EEPROM_EMULATION
-#endif // EEPROM_SETTINGS
#endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
index 2454dea195..d982bd6268 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -22,14 +22,11 @@
*/
#ifdef TARGET_LPC1768
-#include "../../inc/MarlinConfigPre.h"
-
-#if ENABLED(EEPROM_SETTINGS)
-
#include "../../inc/MarlinConfig.h"
-#include "persistent_store_api.h"
-#if DISABLED(FLASH_EEPROM_EMULATION)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
+
+#include "eeprom_api.h"
#include
#include
@@ -178,6 +175,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
size_t PersistentStore::capacity() { return 4096; } // 4KiB of Emulated EEPROM
-#endif // !FLASH_EEPROM_EMULATION
-#endif // EEPROM_SETTINGS
+#endif // SDCARD_EEPROM_EMULATION
#endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
rename to Marlin/src/HAL/LPC1768/endstop_interrupts.h
index fc09189d32..4c4e9bd3f0 100644
--- a/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
+++ b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp
rename to Marlin/src/HAL/LPC1768/fast_pwm.cpp
index 6c7de9bb1d..a1feb25903 100644
--- a/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/fastio.h b/Marlin/src/HAL/LPC1768/fastio.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/fastio.h
rename to Marlin/src/HAL/LPC1768/fastio.h
index 8b90ec20d3..8e8e66db72 100644
--- a/Marlin/src/HAL/HAL_LPC1768/fastio.h
+++ b/Marlin/src/HAL/LPC1768/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -104,7 +104,7 @@
/// set pin as output wrapper - reads the pin and sets the output to that value
#define SET_OUTPUT(IO) do{ _WRITE(IO, _READ(IO)); _SET_OUTPUT(IO); }while(0)
// set pin as PWM
-#define SET_PWM(IO) SET_OUTPUT(IO)
+#define SET_PWM SET_OUTPUT
/// check if pin is an input wrapper
#define IS_INPUT(IO) _IS_INPUT(IO)
diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
new file mode 100644
index 0000000000..490cfd50e8
--- /dev/null
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
@@ -0,0 +1,26 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+ #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
new file mode 100644
index 0000000000..949c7f4899
--- /dev/null
+++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -0,0 +1,253 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if PIO_PLATFORM_VERSION < 1001
+ #error "nxplpc-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries. You may need to remove the platform and let it reinstall automatically."
+#endif
+#if PIO_FRAMEWORK_VERSION < 2002
+ #error "framework-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries."
+#endif
+
+/**
+ * Detect an old pins file by checking for old ADC pins values.
+ */
+#define _OLD_TEMP_PIN(P) PIN_EXISTS(P) && _CAT(P,_PIN) <= 7 && _CAT(P,_PIN) != 2 && _CAT(P,_PIN) != 3
+#if _OLD_TEMP_PIN(TEMP_BED)
+ #error "TEMP_BED_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_0)
+ #error "TEMP_0_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_1)
+ #error "TEMP_1_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_2)
+ #error "TEMP_2_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_3)
+ #error "TEMP_3_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_4)
+ #error "TEMP_4_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_5)
+ #error "TEMP_5_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_6)
+ #error "TEMP_6_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_7)
+ #error "TEMP_7_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#endif
+#undef _OLD_TEMP_PIN
+
+/**
+ * Because PWM hardware channels all share the same frequency, along with the
+ * fallback software channels, FAST_PWM_FAN is incompatible with Servos.
+ */
+static_assert(!(NUM_SERVOS && ENABLED(FAST_PWM_FAN)), "BLTOUCH and Servos are incompatible with FAST_PWM_FAN on LPC176x boards.");
+
+/**
+ * Test LPC176x-specific configuration values for errors at compile-time.
+ */
+
+//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+// #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
+//#endif
+
+#if MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
+ #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && HAS_DRIVER(TMC2130) && DISABLED(TMC_USE_SW_SPI)
+ #error "Re-ARM with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER and TMC2130 requires TMC_USE_SW_SPI."
+ #endif
+#endif
+
+static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported on LPC176x.");
+
+/**
+ * Flag any serial port conflicts
+ *
+ * Port | TX | RX |
+ * --- | --- | --- |
+ * Serial | P0_02 | P0_03 |
+ * Serial1 | P0_15 | P0_16 |
+ * Serial2 | P0_10 | P0_11 |
+ * Serial3 | P0_00 | P0_01 |
+ */
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
+ #define IS_TX0(P) (P == P0_02)
+ #define IS_RX0(P) (P == P0_03)
+ #if IS_TX0(TMC_SW_MISO) || IS_RX0(TMC_SW_MOSI)
+ #error "Serial port pins (0) conflict with Trinamic SPI pins!"
+ #elif ENABLED(MK2_MULTIPLEXER) && (IS_TX0(E_MUX1_PIN) || IS_RX0(E_MUX0_PIN))
+ #error "Serial port pins (0) conflict with MK2 multiplexer pins!"
+ #elif (AXIS_HAS_SPI(X) && IS_TX0(X_CS_PIN)) || (AXIS_HAS_SPI(Y) && IS_RX0(Y_CS_PIN))
+ #error "Serial port pins (0) conflict with X/Y axis SPI pins!"
+ #endif
+ #undef IS_TX0
+ #undef IS_RX0
+#endif
+
+#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
+ #define IS_TX1(P) (P == P0_15)
+ #define IS_RX1(P) (P == P0_16)
+ #if IS_TX1(TMC_SW_SCK)
+ #error "Serial port pins (1) conflict with other pins!"
+ #elif HAS_SPI_LCD
+ #if IS_TX1(BTN_EN2) || IS_RX1(BTN_EN1)
+ #error "Serial port pins (1) conflict with Encoder Buttons!"
+ #elif IS_TX1(SCK_PIN) || IS_TX1(LCD_PINS_D4) || IS_TX1(DOGLCD_SCK) || IS_TX1(LCD_RESET_PIN) || IS_TX1(LCD_PINS_RS) || IS_TX1(SHIFT_CLK) \
+ || IS_RX1(LCD_SDSS) || IS_RX1(LCD_PINS_RS) || IS_RX1(MISO_PIN) || IS_RX1(DOGLCD_A0) || IS_RX1(SS_PIN) || IS_RX1(LCD_SDSS) || IS_RX1(DOGLCD_CS) || IS_RX1(LCD_RESET_PIN) || IS_RX1(LCD_BACKLIGHT_PIN)
+ #error "Serial port pins (1) conflict with LCD pins!"
+ #endif
+ #endif
+ #undef IS_TX1
+ #undef IS_RX1
+#endif
+
+#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
+ #define IS_TX2(P) (P == P0_10)
+ #define IS_RX2(P) (P == P0_11)
+ #if IS_TX2(X2_ENABLE_PIN) || IS_RX2(X2_DIR_PIN) || IS_RX2(X2_STEP_PIN) || (AXIS_HAS_SPI(X2) && IS_TX2(X2_CS_PIN))
+ #error "Serial port pins (2) conflict with X2 pins!"
+ #elif IS_TX2(Y2_ENABLE_PIN) || IS_RX2(Y2_DIR_PIN) || IS_RX2(Y2_STEP_PIN) || (AXIS_HAS_SPI(Y2) && IS_TX2(Y2_CS_PIN))
+ #error "Serial port pins (2) conflict with Y2 pins!"
+ #elif IS_TX2(Z2_ENABLE_PIN) || IS_RX2(Z2_DIR_PIN) || IS_RX2(Z2_STEP_PIN) || (AXIS_HAS_SPI(Z2) && IS_TX2(Z2_CS_PIN))
+ #error "Serial port pins (2) conflict with Z2 pins!"
+ #elif IS_TX2(Z3_ENABLE_PIN) || IS_RX2(Z3_DIR_PIN) || IS_RX2(Z3_STEP_PIN) || (AXIS_HAS_SPI(Z3) && IS_TX2(Z3_CS_PIN))
+ #error "Serial port pins (2) conflict with Z3 pins!"
+ #elif IS_TX2(Z4_ENABLE_PIN) || IS_RX2(Z4_DIR_PIN) || IS_RX2(Z4_STEP_PIN) || (AXIS_HAS_SPI(Z4) && IS_TX2(Z4_CS_PIN))
+ #error "Serial port pins (2) conflict with Z4 pins!"
+ #elif IS_RX2(X_DIR_PIN) || IS_RX2(Y_DIR_PIN)
+ #error "Serial port pins (2) conflict with other pins!"
+ #elif Y_HOME_DIR < 0 && IS_TX2(Y_STOP_PIN)
+ #error "Serial port pins (2) conflict with Y endstop pin!"
+ #elif HAS_CUSTOM_PROBE_PIN && IS_TX2(Z_MIN_PROBE_PIN)
+ #error "Serial port pins (2) conflict with probe pin!"
+ #elif IS_TX2(X_ENABLE_PIN) || IS_RX2(X_DIR_PIN) || IS_TX2(Y_ENABLE_PIN) || IS_RX2(Y_DIR_PIN)
+ #error "Serial port pins (2) conflict with X/Y stepper pins!"
+ #elif EXTRUDERS > 1 && (IS_TX2(E1_ENABLE_PIN) || (AXIS_HAS_SPI(E1) && IS_TX2(E1_CS_PIN)))
+ #error "Serial port pins (2) conflict with E1 stepper pins!"
+ #elif EXTRUDERS && (IS_RX2(E0_DIR_PIN) || IS_RX2(E0_STEP_PIN))
+ #error "Serial port pins (2) conflict with E stepper pins!"
+ #endif
+ #undef IS_TX2
+ #undef IS_RX2
+#endif
+
+#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
+ #define PIN_IS_TX3(P) (PIN_EXISTS(P) && P##_PIN == P0_00)
+ #define PIN_IS_RX3(P) (P##_PIN == P0_01)
+ #if PIN_IS_TX3(X_MIN) || PIN_IS_RX3(X_MAX)
+ #error "Serial port pins (3) conflict with X endstop pins!"
+ #elif PIN_IS_TX3(Y_SERIAL_TX) || PIN_IS_TX3(Y_SERIAL_RX) \
+ || PIN_IS_RX3(X_SERIAL_TX) || PIN_IS_RX3(X_SERIAL_RX)
+ #error "Serial port pins (3) conflict with X/Y axis UART pins!"
+ #elif PIN_IS_TX3(X2_DIR) || PIN_IS_RX3(X2_STEP)
+ #error "Serial port pins (3) conflict with X2 pins!"
+ #elif PIN_IS_TX3(Y2_DIR) || PIN_IS_RX3(Y2_STEP)
+ #error "Serial port pins (3) conflict with Y2 pins!"
+ #elif PIN_IS_TX3(Z2_DIR) || PIN_IS_RX3(Z2_STEP)
+ #error "Serial port pins (3) conflict with Z2 pins!"
+ #elif PIN_IS_TX3(Z3_DIR) || PIN_IS_RX3(Z3_STEP)
+ #error "Serial port pins (3) conflict with Z3 pins!"
+ #elif PIN_IS_TX3(Z4_DIR) || PIN_IS_RX3(Z4_STEP)
+ #error "Serial port pins (3) conflict with Z4 pins!"
+ #elif EXTRUDERS > 1 && (PIN_IS_TX3(E1_DIR) || PIN_IS_RX3(E1_STEP))
+ #error "Serial port pins (3) conflict with E1 pins!"
+ #endif
+ #undef PIN_IS_TX3
+ #undef PIN_IS_RX3
+#endif
+
+//
+// Flag any i2c pin conflicts
+//
+#if ANY(DIGIPOT_I2C, DIGIPOT_MCP4018, DAC_STEPPER_CURRENT, EXPERIMENTAL_I2CBUS, I2C_POSITION_ENCODERS, PCA9632, I2C_EEPROM)
+ #define USEDI2CDEV_M 1 // /Wire.cpp
+
+ #if USEDI2CDEV_M == 0 // P0_27 [D57] (AUX-1) .......... P0_28 [D58] (AUX-1)
+ #define PIN_IS_SDA0(P) (P##_PIN == P0_27)
+ #define IS_SCL0(P) (P == P0_28)
+ #if ENABLED(SDSUPPORT) && PIN_IS_SDA0(SD_DETECT)
+ #error "SDA0 overlaps with SD_DETECT_PIN!"
+ #elif PIN_IS_SDA0(E0_AUTO_FAN)
+ #error "SDA0 overlaps with E0_AUTO_FAN_PIN!"
+ #elif PIN_IS_SDA0(BEEPER)
+ #error "SDA0 overlaps with BEEPER_PIN!"
+ #elif IS_SCL0(BTN_ENC)
+ #error "SCL0 overlaps with Encoder Button!"
+ #elif IS_SCL0(SS_PIN)
+ #error "SCL0 overlaps with SS_PIN!"
+ #elif IS_SCL0(LCD_SDSS)
+ #error "SCL0 overlaps with LCD_SDSS!"
+ #endif
+ #undef PIN_IS_SDA0
+ #undef IS_SCL0
+ #elif USEDI2CDEV_M == 1 // P0_00 [D20] (SCA) ............ P0_01 [D21] (SCL)
+ #define PIN_IS_SDA1(P) (PIN_EXISTS(P) && P##_PIN == P0_00)
+ #define PIN_IS_SCL1(P) (P##_PIN == P0_01)
+ #if PIN_IS_SDA1(X_MIN) || PIN_IS_SCL1(X_MAX)
+ #error "One or more i2c (1) pins overlaps with X endstop pins! Disable i2c peripherals."
+ #elif PIN_IS_SDA1(X2_DIR) || PIN_IS_SCL1(X2_STEP)
+ #error "One or more i2c (1) pins overlaps with X2 pins! Disable i2c peripherals."
+ #elif PIN_IS_SDA1(Y2_DIR) || PIN_IS_SCL1(Y2_STEP)
+ #error "One or more i2c (1) pins overlaps with Y2 pins! Disable i2c peripherals."
+ #elif PIN_IS_SDA1(Z2_DIR) || PIN_IS_SCL1(Z2_STEP)
+ #error "One or more i2c (1) pins overlaps with Z2 pins! Disable i2c peripherals."
+ #elif PIN_IS_SDA1(Z3_DIR) || PIN_IS_SCL1(Z3_STEP)
+ #error "One or more i2c (1) pins overlaps with Z3 pins! Disable i2c peripherals."
+ #elif PIN_IS_SDA1(Z4_DIR) || PIN_IS_SCL1(Z4_STEP)
+ #error "One or more i2c (1) pins overlaps with Z4 pins! Disable i2c peripherals."
+ #elif EXTRUDERS > 1 && (PIN_IS_SDA1(E1_DIR) || PIN_IS_SCL1(E1_STEP))
+ #error "One or more i2c (1) pins overlaps with E1 pins! Disable i2c peripherals."
+ #endif
+ #undef PIN_IS_SDA1
+ #undef PIN_IS_SCL1
+ #elif USEDI2CDEV_M == 2 // P0_10 [D38] (X_ENABLE_PIN) ... P0_11 [D55] (X_DIR_PIN)
+ #define PIN_IS_SDA2(P) (P##_PIN == P0_10)
+ #define PIN_IS_SCL2(P) (P##_PIN == P0_11)
+ #if PIN_IS_SDA2(Y_STOP)
+ #error "i2c SDA2 overlaps with Y endstop pin!"
+ #elif HAS_CUSTOM_PROBE_PIN && PIN_IS_SDA2(Z_MIN_PROBE)
+ #error "i2c SDA2 overlaps with Z probe pin!"
+ #elif PIN_IS_SDA2(X_ENABLE) || PIN_IS_SDA2(Y_ENABLE)
+ #error "i2c SDA2 overlaps with X/Y ENABLE pin!"
+ #elif AXIS_HAS_SPI(X) && PIN_IS_SDA2(X_CS)
+ #error "i2c SDA2 overlaps with X CS pin!"
+ #elif PIN_IS_SDA2(X2_ENABLE)
+ #error "i2c SDA2 overlaps with X2 enable pin! Disable i2c peripherals."
+ #elif PIN_IS_SDA2(Y2_ENABLE)
+ #error "i2c SDA2 overlaps with Y2 enable pin! Disable i2c peripherals."
+ #elif PIN_IS_SDA2(Z2_ENABLE)
+ #error "i2c SDA2 overlaps with Z2 enable pin! Disable i2c peripherals."
+ #elif PIN_IS_SDA2(Z3_ENABLE)
+ #error "i2c SDA2 overlaps with Z3 enable pin! Disable i2c peripherals."
+ #elif PIN_IS_SDA2(Z4_ENABLE)
+ #error "i2c SDA2 overlaps with Z4 enable pin! Disable i2c peripherals."
+ #elif EXTRUDERS > 1 && PIN_IS_SDA2(E1_ENABLE)
+ #error "i2c SDA2 overlaps with E1 enable pin! Disable i2c peripherals."
+ #elif EXTRUDERS > 1 && AXIS_HAS_SPI(E1) && PIN_IS_SDA2(E1_CS)
+ #error "i2c SDA2 overlaps with E1 CS pin! Disable i2c peripherals."
+ #elif EXTRUDERS && (PIN_IS_SDA2(E0_STEP) || PIN_IS_SDA2(E0_DIR))
+ #error "i2c SCL2 overlaps with E0 STEP/DIR pin! Disable i2c peripherals."
+ #elif PIN_IS_SDA2(X_DIR) || PIN_IS_SDA2(Y_DIR)
+ #error "One or more i2c pins overlaps with X/Y DIR pin! Disable i2c peripherals."
+ #endif
+ #undef PIN_IS_SDA2
+ #undef PIN_IS_SCL2
+ #endif
+
+ #undef USEDI2CDEV_M
+#endif
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h b/Marlin/src/HAL/LPC1768/include/SPI.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/include/SPI.h
rename to Marlin/src/HAL/LPC1768/include/SPI.h
index 559759ea03..af085f29a9 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
+++ b/Marlin/src/HAL/LPC1768/include/SPI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
rename to Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
index dd83c7a971..1e53be5f62 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
+++ b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
rename to Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h
index db6715e2b6..6e9ad6f179 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
+++ b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c b/Marlin/src/HAL/LPC1768/include/i2c_util.c
similarity index 96%
rename from Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c
rename to Marlin/src/HAL/LPC1768/include/i2c_util.c
index f3dc6d2308..b92f3f0453 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c
+++ b/Marlin/src/HAL/LPC1768/include/i2c_util.c
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h b/Marlin/src/HAL/LPC1768/include/i2c_util.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
rename to Marlin/src/HAL/LPC1768/include/i2c_util.h
index 1ca3fc1844..eae275e0f9 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
+++ b/Marlin/src/HAL/LPC1768/include/i2c_util.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
similarity index 91%
rename from Marlin/src/HAL/HAL_LPC1768/main.cpp
rename to Marlin/src/HAL/LPC1768/main.cpp
index b20841bdeb..d7b05dce9d 100644
--- a/Marlin/src/HAL/HAL_LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,6 +37,7 @@ extern "C" {
#include "../../sd/cardreader.h"
#include "../../inc/MarlinConfig.h"
+#include "../../core/millis_t.h"
#include "HAL.h"
#include "timers.h"
@@ -66,7 +67,7 @@ void HAL_init() {
#endif
// Flash status LED 3 times to indicate Marlin has started booting
- for (uint8_t i = 0; i < 6; ++i) {
+ LOOP_L_N(i, 6) {
TOGGLE(LED_PIN);
delay(100);
}
@@ -89,7 +90,7 @@ void HAL_init() {
//debug_frmwrk_init();
//_DBG("\n\nDebug running\n");
- // Initialise the SD card chip select pins as soon as possible
+ // Initialize the SD card chip select pins as soon as possible
#if PIN_EXISTS(SS)
OUT_WRITE(SS_PIN, HIGH);
#endif
@@ -136,15 +137,6 @@ void HAL_init() {
#endif
}
- #if NUM_SERIAL > 0
- MYSERIAL0.begin(BAUDRATE);
- #if NUM_SERIAL > 1
- MYSERIAL1.begin(BAUDRATE);
- #endif
- SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialized\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000);
- SERIAL_FLUSHTX();
- #endif
-
HAL_timer_init();
}
diff --git a/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h b/Marlin/src/HAL/LPC1768/pinsDebug.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/pinsDebug.h
rename to Marlin/src/HAL/LPC1768/pinsDebug.h
index 133cd11be2..6cc824afa3 100644
--- a/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h
+++ b/Marlin/src/HAL/LPC1768/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h b/Marlin/src/HAL/LPC1768/spi_pins.h
similarity index 96%
rename from Marlin/src/HAL/HAL_LPC1768/spi_pins.h
rename to Marlin/src/HAL/LPC1768/spi_pins.h
index acf991a9d7..9b983428bd 100644
--- a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h
+++ b/Marlin/src/HAL/LPC1768/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.cpp b/Marlin/src/HAL/LPC1768/timers.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/timers.cpp
rename to Marlin/src/HAL/LPC1768/timers.cpp
index 7bf7ff3880..686b251c69 100644
--- a/Marlin/src/HAL/HAL_LPC1768/timers.cpp
+++ b/Marlin/src/HAL/LPC1768/timers.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/timers.h
rename to Marlin/src/HAL/LPC1768/timers.h
index 5f4e06265e..30da933521 100644
--- a/Marlin/src/HAL/HAL_LPC1768/timers.h
+++ b/Marlin/src/HAL/LPC1768/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp
rename to Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
index 360cce7f66..6d643f5bf6 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h
similarity index 94%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h
index 85ca067441..9de3e93274 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_defines.h
index 1153329d89..e7518d698a 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h b/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h
similarity index 94%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_delay.h
index 314e20b43f..0d9b8d3dcc 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c
rename to Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
index d441b7b4d0..67e78f36f0 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
index 569706b483..8a73b69ded 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
index 057a137445..c0105bc129 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
index d19e66d415..b99abb6867 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
index ac289c1a20..5f3da457aa 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
index 0a1bd84875..a1f8097e52 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
similarity index 93%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
index 7b6557148a..6eac5daf24 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -73,7 +73,7 @@
uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
if (spi_speed == 0) {
LPC176x::gpio_set(mosi_pin, !!(b & 0x80));
LPC176x::gpio_set(sck_pin, HIGH);
@@ -83,16 +83,16 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
}
else {
const uint8_t state = (b & 0x80) ? HIGH : LOW;
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
LPC176x::gpio_set(mosi_pin, state);
- for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+ LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
LPC176x::gpio_set(sck_pin, HIGH);
b <<= 1;
if (miso_pin >= 0 && LPC176x::gpio_get(miso_pin)) b |= 1;
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
LPC176x::gpio_set(sck_pin, LOW);
}
}
@@ -102,7 +102,7 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
const uint8_t state = (b & 0x80) ? HIGH : LOW;
if (spi_speed == 0) {
LPC176x::gpio_set(sck_pin, LOW);
@@ -111,13 +111,13 @@ uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck
LPC176x::gpio_set(sck_pin, HIGH);
}
else {
- for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+ LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
LPC176x::gpio_set(sck_pin, LOW);
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
LPC176x::gpio_set(mosi_pin, state);
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
LPC176x::gpio_set(sck_pin, HIGH);
}
b <<= 1;
diff --git a/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
new file mode 100644
index 0000000000..9b0d0617a0
--- /dev/null
+++ b/Marlin/src/HAL/LPC1768/upload_extra_script.py
@@ -0,0 +1,145 @@
+#
+# sets output_port
+# if target_filename is found then that drive is used
+# else if target_drive is found then that drive is used
+#
+from __future__ import print_function
+
+target_filename = "FIRMWARE.CUR"
+target_drive = "REARM"
+
+import os
+import getpass
+import platform
+
+current_OS = platform.system()
+Import("env")
+
+def print_error(e):
+ print('\nUnable to find destination disk (%s)\n' \
+ 'Please select it in platformio.ini using the upload_port keyword ' \
+ '(https://docs.platformio.org/en/latest/projectconf/section_env_upload.html) ' \
+ 'or copy the firmware (.pio/build/%s/firmware.bin) manually to the appropriate disk\n' \
+ %(e, env.get('PIOENV')))
+
+try:
+ if current_OS == 'Windows':
+ #
+ # platformio.ini will accept this for a Windows upload port designation: 'upload_port = L:'
+ # Windows - doesn't care about the disk's name, only cares about the drive letter
+ #
+
+ #
+ # get all drives on this computer
+ #
+ import subprocess
+ # typical result (string): 'Drives: C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
+ driveStr = str(subprocess.check_output("fsutil fsinfo drives"))
+ # typical result (string): 'C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
+ # driveStr = driveStr.strip().lstrip('Drives: ') <- Doesn't work in other Languages as English. In German is "Drives:" = "Laufwerke:"
+ FirstFound = driveStr.find(':',0,-1) # Find the first ":" and
+ driveStr = driveStr[FirstFound + 1 : -1] # truncate to the rest
+ # typical result (array of stings): ['C:\\', 'D:\\', 'E:\\', 'F:\\',
+ # 'G:\\', 'H:\\', 'I:\\', 'J:\\', 'K:\\', 'L:\\', 'M:\\', 'Y:\\', 'Z:\\']
+ drives = driveStr.split()
+
+ upload_disk = 'Disk not found'
+ target_file_found = False
+ target_drive_found = False
+ for drive in drives:
+ final_drive_name = drive.strip().rstrip('\\') # typical result (string): 'C:'
+ try:
+ volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
+ except Exception as e:
+ continue
+ else:
+ if target_drive in volume_info and target_file_found == False: # set upload if not found target file yet
+ target_drive_found = True
+ upload_disk = final_drive_name
+ if target_filename in volume_info:
+ if target_file_found == False:
+ upload_disk = final_drive_name
+ target_file_found = True
+
+ #
+ # set upload_port to drive if found
+ #
+
+ if target_file_found == True or target_drive_found == True:
+ env.Replace(
+ UPLOAD_PORT=upload_disk
+ )
+ print('upload disk: ', upload_disk)
+ else:
+ print_error('Autodetect Error')
+
+ elif current_OS == 'Linux':
+ #
+ # platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
+ #
+ upload_disk = 'Disk not found'
+ target_file_found = False
+ target_drive_found = False
+ drives = os.listdir(os.path.join(os.sep, 'media', getpass.getuser()))
+ if target_drive in drives: # If target drive is found, use it.
+ target_drive_found = True
+ upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), target_drive) + os.sep
+ else:
+ for drive in drives:
+ try:
+ files = os.listdir(os.path.join(os.sep, 'media', getpass.getuser(), drive))
+ except:
+ continue
+ else:
+ if target_filename in files:
+ upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), drive) + os.sep
+ target_file_found = True
+ break
+ #
+ # set upload_port to drive if found
+ #
+
+ if target_file_found or target_drive_found:
+ env.Replace(
+ UPLOAD_FLAGS="-P$UPLOAD_PORT",
+ UPLOAD_PORT=upload_disk
+ )
+ print('upload disk: ', upload_disk)
+ else:
+ print_error('Autodetect Error')
+
+ elif current_OS == 'Darwin': # MAC
+ #
+ # platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
+ #
+ upload_disk = 'Disk not found'
+ drives = os.listdir('/Volumes') # human readable names
+ target_file_found = False
+ target_drive_found = False
+ if target_drive in drives and target_file_found == False: # set upload if not found target file yet
+ target_drive_found = True
+ upload_disk = '/Volumes/' + target_drive + '/'
+ for drive in drives:
+ try:
+ filenames = os.listdir('/Volumes/' + drive + '/') # will get an error if the drive is protected
+ except:
+ continue
+ else:
+ if target_filename in filenames:
+ if target_file_found == False:
+ upload_disk = '/Volumes/' + drive + '/'
+ target_file_found = True
+ #
+ # set upload_port to drive if found
+ #
+
+ if target_file_found == True or target_drive_found == True:
+ env.Replace(
+ UPLOAD_PORT=upload_disk
+ )
+ print('\nupload disk: ', upload_disk, '\n')
+ else:
+ print_error('Autodetect Error')
+
+except Exception as e:
+ print_error(str(e))
diff --git a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp b/Marlin/src/HAL/LPC1768/usb_serial.cpp
similarity index 91%
rename from Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
rename to Marlin/src/HAL/LPC1768/usb_serial.cpp
index c83931745a..ddb31da20f 100644
--- a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
+++ b/Marlin/src/HAL/LPC1768/usb_serial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,7 +26,7 @@
#if ENABLED(EMERGENCY_PARSER)
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
EmergencyParser::State emergency_state;
bool CDC_RecvCallback(const char buffer) {
emergency_parser.update(emergency_state, buffer);
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp b/Marlin/src/HAL/LPC1768/watchdog.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
rename to Marlin/src/HAL/LPC1768/watchdog.cpp
index f9518cd25c..73563a6baa 100644
--- a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
+++ b/Marlin/src/HAL/LPC1768/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.h b/Marlin/src/HAL/LPC1768/watchdog.h
similarity index 93%
rename from Marlin/src/HAL/HAL_LPC1768/watchdog.h
rename to Marlin/src/HAL/LPC1768/watchdog.h
index dd6617ea31..e9e25e4f2a 100644
--- a/Marlin/src/HAL/HAL_LPC1768/watchdog.h
+++ b/Marlin/src/HAL/LPC1768/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/win_usb_driver/lpc176x_usb_driver.inf b/Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/win_usb_driver/lpc176x_usb_driver.inf
rename to Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_SAMD51/HAL.cpp
rename to Marlin/src/HAL/SAMD51/HAL.cpp
index 6074e4bbd6..b3a741fe13 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
@@ -427,7 +427,6 @@ void HAL_init() {
dma_init();
#endif
#if ENABLED(SDSUPPORT)
- // SD_DETECT_PIN may be removed if NO_SD_HOST_DRIVE is not defined in Configuration_adv.h
#if SD_CONNECTION_IS(ONBOARD) && PIN_EXISTS(SD_DETECT)
SET_INPUT_PULLUP(SD_DETECT_PIN);
#endif
@@ -479,10 +478,10 @@ void HAL_adc_init() {
#if ADC_IS_REQUIRED
memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results)); // Fill result with invalid values
- for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi)
+ LOOP_L_N(pi, COUNT(adc_pins))
pinPeripheral(adc_pins[pi], PIO_ANALOG);
- for (uint8_t ai = FIRST_ADC; ai <= LAST_ADC; ++ai) {
+ LOOP_S_LE_N(ai, FIRST_ADC, LAST_ADC) {
Adc* adc = ((Adc*[])ADC_INSTS)[ai];
// ADC clock setup
@@ -496,14 +495,14 @@ void HAL_adc_init() {
// Preloaded data (fixed for all ADC instances hence not loaded by DMA)
adc->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val; // VRefA pin
SYNC(adc->SYNCBUSY.bit.REFCTRL);
- adc->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_12BIT_Val;
+ adc->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_10BIT_Val; // ... ADC_CTRLB_RESSEL_16BIT_Val
SYNC(adc->SYNCBUSY.bit.CTRLB);
adc->SAMPCTRL.bit.SAMPLEN = (6 - 1); // Sampling clocks
- adc->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_16 | ADC_AVGCTRL_ADJRES(4); // 16 Accumulated conversions and shift 4 to get oversampled 12 bits result
- SYNC(adc->SYNCBUSY.bit.AVGCTRL);
+ //adc->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_16 | ADC_AVGCTRL_ADJRES(4); // 16 Accumulated conversions and shift 4 to get oversampled 12 bits result
+ //SYNC(adc->SYNCBUSY.bit.AVGCTRL);
+
// Registers loaded by DMA
adc->DSEQCTRL.bit.INPUTCTRL = true;
-
adc->DSEQCTRL.bit.AUTOSTART = true; // Start conversion after DMA sequence
adc->CTRLA.bit.ENABLE = true; // Enable ADC
@@ -514,7 +513,7 @@ void HAL_adc_init() {
void HAL_adc_start_conversion(const uint8_t adc_pin) {
#if ADC_IS_REQUIRED
- for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi) {
+ LOOP_L_N(pi, COUNT(adc_pins)) {
if (adc_pin == adc_pins[pi]) {
HAL_adc_result = HAL_adc_results[pi];
return;
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
similarity index 91%
rename from Marlin/src/HAL/HAL_SAMD51/HAL.h
rename to Marlin/src/HAL/SAMD51/HAL.h
index 37437cb758..f2ee02a22f 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
@@ -101,8 +101,8 @@ typedef int8_t pin_t;
//
// Interrupts
//
-#define CRITICAL_SECTION_START uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
#define ISRS_ENABLED() (!__get_PRIMASK())
#define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq()
@@ -122,14 +122,14 @@ uint8_t eeprom_read_byte(uint8_t *pos);
//
// ADC
//
-extern uint16_t HAL_adc_result; // result of last ADC conversion
+extern uint16_t HAL_adc_result; // Most recent ADC conversion
#define HAL_ANALOG_SELECT(pin)
void HAL_adc_init();
-#define HAL_ADC_FILTERED // Disable oversampling done in Marlin as ADC values already filtered in HAL
-#define HAL_ADC_RESOLUTION 12
+//#define HAL_ADC_FILTERED // Disable Marlin's oversampling. The HAL filters ADC values.
+#define HAL_ADC_RESOLUTION 10 // ... 12
#define HAL_START_ADC(pin) HAL_adc_start_conversion(pin)
#define HAL_READ_ADC() HAL_adc_result
#define HAL_ADC_READY() true
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp b/Marlin/src/HAL/SAMD51/HAL_SPI.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
rename to Marlin/src/HAL/SAMD51/HAL_SPI.cpp
index bbd12912a2..83226daa48 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL_SPI.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
@@ -46,9 +46,6 @@
// ------------------------
#error "Software SPI not supported for SAMD51. Use Hardware SPI."
- #if SD_CONNECTION_IS(ONBOARD)
- #endif
-
#else // !SOFTWARE_SPI
#ifdef ADAFRUIT_GRAND_CENTRAL_M4
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp
rename to Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
index 2da4d8c07e..f13b29555a 100644
--- a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp
+++ b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
similarity index 92%
rename from Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h
rename to Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
index 0768d8a04e..a9eb0470a2 100644
--- a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h
+++ b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.cpp b/Marlin/src/HAL/SAMD51/QSPIFlash.cpp
new file mode 100644
index 0000000000..76a3329707
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.cpp
@@ -0,0 +1,78 @@
+/**
+ * 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 .
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(QSPI_EEPROM)
+
+#include "QSPIFlash.h"
+
+#define INVALID_ADDR 0xffffffff
+#define SECTOR_OF(a) (a & ~(SFLASH_SECTOR_SIZE - 1))
+#define OFFSET_OF(a) (a & (SFLASH_SECTOR_SIZE - 1))
+
+Adafruit_SPIFlashBase * QSPIFlash::_flashBase = nullptr;
+uint8_t QSPIFlash::_buf[SFLASH_SECTOR_SIZE];
+uint32_t QSPIFlash::_addr = INVALID_ADDR;
+
+void QSPIFlash::begin() {
+ if (_flashBase != nullptr) return;
+
+ _flashBase = new Adafruit_SPIFlashBase(new Adafruit_FlashTransport_QSPI());
+ _flashBase->begin(NULL);
+}
+
+size_t QSPIFlash::size() {
+ return _flashBase->size();
+}
+
+uint8_t QSPIFlash::readByte(const uint32_t address) {
+ if (SECTOR_OF(address) == _addr) return _buf[OFFSET_OF(address)];
+
+ return _flashBase->read8(address);
+}
+
+void QSPIFlash::writeByte(const uint32_t address, const uint8_t value) {
+ uint32_t const sector_addr = SECTOR_OF(address);
+
+ // Page changes, flush old and update new cache
+ if (sector_addr != _addr) {
+ flush();
+ _addr = sector_addr;
+
+ // read a whole page from flash
+ _flashBase->readBuffer(sector_addr, _buf, SFLASH_SECTOR_SIZE);
+ }
+
+ _buf[OFFSET_OF(address)] = value;
+}
+
+void QSPIFlash::flush() {
+ if (_addr == INVALID_ADDR) return;
+
+ _flashBase->eraseSector(_addr / SFLASH_SECTOR_SIZE);
+ _flashBase->writeBuffer(_addr, _buf, SFLASH_SECTOR_SIZE);
+
+ _addr = INVALID_ADDR;
+}
+
+#endif // QSPI_EEPROM
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.h b/Marlin/src/HAL/SAMD51/QSPIFlash.h
new file mode 100644
index 0000000000..b6f22769ff
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.h
@@ -0,0 +1,51 @@
+/**
+ * @file QSPIFlash.h
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach and Dean Miller for Adafruit Industries LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Derived from Adafruit_SPIFlash class with no SdFat references
+ *
+ */
+
+#pragma once
+
+#include
+
+// This class extends Adafruit_SPIFlashBase by adding caching support.
+//
+// This class will use 4096 Bytes of RAM as a block cache.
+class QSPIFlash {
+ public:
+ static void begin();
+ static size_t size();
+ static uint8_t readByte(const uint32_t address);
+ static void writeByte(const uint32_t address, const uint8_t v);
+ static void flush();
+
+ private:
+ static Adafruit_SPIFlashBase * _flashBase;
+ static uint8_t _buf[SFLASH_SECTOR_SIZE];
+ static uint32_t _addr;
+};
+
+extern QSPIFlash qspi;
diff --git a/Marlin/src/HAL/HAL_SAMD51/SAMD51.h b/Marlin/src/HAL/SAMD51/SAMD51.h
similarity index 98%
rename from Marlin/src/HAL/HAL_SAMD51/SAMD51.h
rename to Marlin/src/HAL/SAMD51/SAMD51.h
index d29d134c00..ef84a20820 100644
--- a/Marlin/src/HAL/HAL_SAMD51/SAMD51.h
+++ b/Marlin/src/HAL/SAMD51/SAMD51.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/Servo.cpp b/Marlin/src/HAL/SAMD51/Servo.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_SAMD51/Servo.cpp
rename to Marlin/src/HAL/SAMD51/Servo.cpp
index dbae750425..b39869ef32 100644
--- a/Marlin/src/HAL/HAL_SAMD51/Servo.cpp
+++ b/Marlin/src/HAL/SAMD51/Servo.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h b/Marlin/src/HAL/SAMD51/ServoTimers.h
similarity index 95%
rename from Marlin/src/HAL/HAL_SAMD51/ServoTimers.h
rename to Marlin/src/HAL/SAMD51/ServoTimers.h
index 8b77d5b503..3572c608d2 100644
--- a/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h
+++ b/Marlin/src/HAL/SAMD51/ServoTimers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/SAMD51/eeprom.cpp b/Marlin/src/HAL/SAMD51/eeprom.cpp
new file mode 100644
index 0000000000..e167515bff
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom.cpp
@@ -0,0 +1,66 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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 .
+ *
+ */
+
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(EEPROM_SETTINGS) && NONE(QSPI_EEPROM, FLASH_EEPROM_EMULATION)
+
+#include "../shared/eeprom_api.h"
+
+size_t PersistentStore::capacity() { return E2END + 1; }
+
+bool PersistentStore::access_start() { return true; }
+bool PersistentStore::access_finish() { return true; }
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+ while (size--) {
+ const uint8_t v = *value;
+ uint8_t * const p = (uint8_t * const)pos;
+ if (v != eeprom_read_byte(p)) {
+ eeprom_write_byte(p, v);
+ delay(2);
+ if (eeprom_read_byte(p) != v) {
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
+ return true;
+ }
+ }
+ crc16(crc, &v, 1);
+ pos++;
+ value++;
+ }
+ return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+ while (size--) {
+ uint8_t c = eeprom_read_byte((uint8_t*)pos);
+ if (writing) *value = c;
+ crc16(crc, &c, 1);
+ pos++;
+ value++;
+ }
+ return false;
+}
+
+#endif // EEPROM_SETTINGS && !(QSPI_EEPROM || FLASH_EEPROM_EMULATION)
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/eeprom_flash.cpp b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
new file mode 100644
index 0000000000..fd8973369a
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
@@ -0,0 +1,96 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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 .
+ *
+ */
+
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+
+#include "../shared/eeprom_api.h"
+
+#define NVMCTRL_CMD(c) do{ \
+ SYNC(!NVMCTRL->STATUS.bit.READY); \
+ NVMCTRL->INTFLAG.bit.DONE = true; \
+ NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \
+ SYNC(NVMCTRL->INTFLAG.bit.DONE); \
+ }while(0)
+#define NVMCTRL_FLUSH() do{ \
+ if (NVMCTRL->SEESTAT.bit.LOAD) \
+ NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH); \
+ }while(0)
+
+size_t PersistentStore::capacity() {
+ const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ,
+ sblk = NVMCTRL->SEESTAT.bit.SBLK;
+
+ return (!psz && !sblk) ? 0
+ : (psz <= 2) ? (0x200 << psz)
+ : (sblk == 1 || psz == 3) ? 4096
+ : (sblk == 2 || psz == 4) ? 8192
+ : (sblk <= 4 || psz == 5) ? 16384
+ : (sblk >= 9 && psz == 7) ? 65536
+ : 32768;
+}
+
+bool PersistentStore::access_start() {
+ NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED; // Buffered mode and segment reallocation active
+ if (NVMCTRL->SEESTAT.bit.RLOCK)
+ NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE); // Unlock E2P data write access
+ return true;
+}
+
+bool PersistentStore::access_finish() {
+ NVMCTRL_FLUSH();
+ if (!NVMCTRL->SEESTAT.bit.LOCK)
+ NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE); // Lock E2P data write access
+ return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+ while (size--) {
+ const uint8_t v = *value;
+ SYNC(NVMCTRL->SEESTAT.bit.BUSY);
+ if (NVMCTRL->INTFLAG.bit.SEESFULL)
+ NVMCTRL_FLUSH(); // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
+ ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
+ SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
+ crc16(crc, &v, 1);
+ pos++;
+ value++;
+ }
+ return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+ while (size--) {
+ SYNC(NVMCTRL->SEESTAT.bit.BUSY);
+ uint8_t c = ((volatile uint8_t *)SEEPROM_ADDR)[pos];
+ if (writing) *value = c;
+ crc16(crc, &c, 1);
+ pos++;
+ value++;
+ }
+ return false;
+}
+
+#endif // FLASH_EEPROM_EMULATION
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
new file mode 100644
index 0000000000..c6aa383f9f
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
@@ -0,0 +1,71 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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 .
+ *
+ */
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(QSPI_EEPROM)
+
+#include "../shared/eeprom_api.h"
+
+#include "QSPIFlash.h"
+
+static bool initialized;
+
+size_t PersistentStore::capacity() { return qspi.size(); }
+
+bool PersistentStore::access_start() {
+ if (!initialized) {
+ qspi.begin();
+ initialized = true;
+ }
+ return true;
+}
+
+bool PersistentStore::access_finish() {
+ qspi.flush();
+ return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+ while (size--) {
+ const uint8_t v = *value;
+ qspi.writeByte(pos, v);
+ crc16(crc, &v, 1);
+ pos++;
+ value++;
+ }
+ return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+ while (size--) {
+ uint8_t c = qspi.readByte(pos);
+ if (writing) *value = c;
+ crc16(crc, &c, 1);
+ pos++;
+ value++;
+ }
+ return false;
+}
+
+#endif // QSPI_EEPROM
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
similarity index 99%
rename from Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
rename to Marlin/src/HAL/SAMD51/endstop_interrupts.h
index 4f6b61a0d1..4c8f441ce2 100644
--- a/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
+++ b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio.h b/Marlin/src/HAL/SAMD51/fastio.h
similarity index 97%
rename from Marlin/src/HAL/HAL_SAMD51/fastio.h
rename to Marlin/src/HAL/SAMD51/fastio.h
index ecd9acea44..d3b3dc1f63 100644
--- a/Marlin/src/HAL/HAL_SAMD51/fastio.h
+++ b/Marlin/src/HAL/SAMD51/fastio.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@
/**
* Magic I/O routines
*
- * Now you can simply SET_OUTPUT(STEP); WRITE(STEP, HIGH); WRITE(STEP, LOW);
+ * Now you can simply SET_OUTPUT(IO); WRITE(IO, HIGH); WRITE(IO, LOW);
*/
// Read a pin
@@ -88,8 +88,8 @@
const EPortType port = (EPortType)GET_SAMD_PORT(IO); \
const uint32_t pin = GET_SAMD_PIN(IO); \
\
- PORT->Group[port].PINCFG[pin].reg = (uint8_t)(PORT_PINCFG_INEN); \
PORT->Group[port].DIRSET.reg = MASK(pin); \
+ PORT->Group[port].PINCFG[pin].reg = 0; \
}while(0)
// Set pin as output (open drain)
#define SET_OUTPUT_OD(IO) do{ \
@@ -100,9 +100,9 @@
PORT->Group[port].DIRCLR.reg = MASK(pin); \
}while(0)
// Set pin as PWM (push pull)
-#define SET_PWM(IO) SET_OUTPUT(IO)
+#define SET_PWM SET_OUTPUT
// Set pin as PWM (open drain)
-#define SET_PWM_OD(IO) SET_OUTPUT_OD(IO)
+#define SET_PWM_OD SET_OUTPUT_OD
// check if pin is an output
#define IS_OUTPUT(IO) ((PORT->Group[(EPortType)GET_SAMD_PORT(IO)].DIR.reg & MASK(GET_SAMD_PIN(IO))) \
@@ -245,6 +245,7 @@
#define DIO17_PIN PIN_PC23
#define DIO88_PIN PIN_PC24 // NEOPIXEL
// PORTD
+ #define DIO53_PIN PIN_PD10
#define DIO22_PIN PIN_PD12
#define DIO6_PIN PIN_PD20
#define DIO7_PIN PIN_PD21
diff --git a/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
new file mode 100644
index 0000000000..490cfd50e8
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
@@ -0,0 +1,26 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+ #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
similarity index 85%
rename from Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
rename to Marlin/src/HAL/SAMD51/inc/SanityCheck.h
index 0c1e83115e..cc7a10e7a6 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
@@ -23,6 +23,10 @@
* Test SAMD51 specific configuration values for errors at compile-time.
*/
+#if ENABLED(FLASH_EEPROM_EMULATION)
+ #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
+#endif
+
#if defined(ADAFRUIT_GRAND_CENTRAL_M4) && SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
@@ -42,11 +46,3 @@
#if ENABLED(FAST_PWM_FAN)
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-
-#if ENABLED(EEPROM_SETTINGS) && NONE(SPI_EEPROM, I2C_EEPROM)
- #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Activator"
-#endif
-
-#if TMC_HAS_SW_SERIAL
- #error "TMC220x Software Serial is not supported on this platform."
-#endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
similarity index 98%
rename from Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
rename to Marlin/src/HAL/SAMD51/pinsDebug.h
index 64f6929c00..15b6473382 100644
--- a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/SAMD51/pinsDebug.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
@@ -149,5 +149,6 @@ void pwm_details(int32_t pin) {
* 92 | PA9 | QSPI: IO1
* 93 | PA10 | QSPI: IO2
* 94 | PA11 | QSPI: IO3
+ * 95 | PB31 | SD: DETECT
*
*/
diff --git a/Marlin/src/HAL/HAL_SAMD51/spi_pins.h b/Marlin/src/HAL/SAMD51/spi_pins.h
similarity index 95%
rename from Marlin/src/HAL/HAL_SAMD51/spi_pins.h
rename to Marlin/src/HAL/SAMD51/spi_pins.h
index 3315fa08ac..049aacb57a 100644
--- a/Marlin/src/HAL/HAL_SAMD51/spi_pins.h
+++ b/Marlin/src/HAL/SAMD51/spi_pins.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/SAMD51/timers.cpp b/Marlin/src/HAL/SAMD51/timers.cpp
new file mode 100644
index 0000000000..3eb021c25b
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/timers.cpp
@@ -0,0 +1,167 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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 .
+ *
+ */
+
+#ifdef __SAMD51__
+
+// --------------------------------------------------------------------------
+// Includes
+// --------------------------------------------------------------------------
+#include "../../inc/MarlinConfig.h"
+#include "timers.h"
+
+// --------------------------------------------------------------------------
+// Local defines
+// --------------------------------------------------------------------------
+
+#define NUM_HARDWARE_TIMERS 8
+
+// --------------------------------------------------------------------------
+// Private Variables
+// --------------------------------------------------------------------------
+
+const tTimerConfig TimerConfig[NUM_HARDWARE_TIMERS+1] = {
+ { {.pTc=TC0}, TC0_IRQn, TC_PRIORITY(0) }, // 0 - stepper
+ { {.pTc=TC1}, TC1_IRQn, TC_PRIORITY(1) }, // 1 - stepper (needed by 32 bit timers)
+ { {.pTc=TC2}, TC2_IRQn, TC_PRIORITY(2) }, // 2 - tone (framework)
+ { {.pTc=TC3}, TC3_IRQn, TC_PRIORITY(3) }, // 3 - servo
+ { {.pTc=TC4}, TC4_IRQn, TC_PRIORITY(4) }, // 4 - software serial
+ { {.pTc=TC5}, TC5_IRQn, TC_PRIORITY(5) },
+ { {.pTc=TC6}, TC6_IRQn, TC_PRIORITY(6) },
+ { {.pTc=TC7}, TC7_IRQn, TC_PRIORITY(7) },
+ { {.pRtc=RTC}, RTC_IRQn, TC_PRIORITY(8) } // 8 - temperature
+};
+
+// --------------------------------------------------------------------------
+// Private functions
+// --------------------------------------------------------------------------
+
+FORCE_INLINE void Disable_Irq(IRQn_Type irq) {
+ NVIC_DisableIRQ(irq);
+
+ // We NEED memory barriers to ensure Interrupts are actually disabled!
+ // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
+ __DSB();
+ __ISB();
+}
+
+// --------------------------------------------------------------------------
+// Public functions
+// --------------------------------------------------------------------------
+
+void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
+ IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+
+ // Disable interrupt, just in case it was already enabled
+ Disable_Irq(irq);
+
+ if (timer_num == RTC_TIMER_NUM) {
+ Rtc * const rtc = TimerConfig[timer_num].pRtc;
+
+ // Disable timer interrupt
+ rtc->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_CMP0;
+
+ // RTC clock setup
+ OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_XOSC32K; // External 32.768KHz oscillator
+
+ // Stop timer, just in case, to be able to reconfigure it
+ rtc->MODE0.CTRLA.bit.ENABLE = false;
+ SYNC(rtc->MODE0.SYNCBUSY.bit.ENABLE);
+
+ // Mode, reset counter on match
+ rtc->MODE0.CTRLA.reg = RTC_MODE0_CTRLA_MODE_COUNT32 | RTC_MODE0_CTRLA_MATCHCLR;
+
+ // Set compare value
+ rtc->MODE0.COMP[0].reg = (32768 + frequency / 2) / frequency;
+ SYNC(rtc->MODE0.SYNCBUSY.bit.COMP0);
+
+ // Enable interrupt on compare
+ rtc->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0; // reset pending interrupt
+ rtc->MODE0.INTENSET.reg = RTC_MODE0_INTENSET_CMP0; // enable compare 0 interrupt
+
+ // And start timer
+ rtc->MODE0.CTRLA.bit.ENABLE = true;
+ SYNC(rtc->MODE0.SYNCBUSY.bit.ENABLE);
+ }
+ else {
+ Tc * const tc = TimerConfig[timer_num].pTc;
+
+ // Disable timer interrupt
+ tc->COUNT32.INTENCLR.reg = TC_INTENCLR_OVF; // disable overflow interrupt
+
+ // TCn clock setup
+ const uint8_t clockID = GCLK_CLKCTRL_IDs[TCC_INST_NUM + timer_num]; // TC clock are preceeded by TCC ones
+ GCLK->PCHCTRL[clockID].bit.CHEN = false;
+ SYNC(GCLK->PCHCTRL[clockID].bit.CHEN);
+ GCLK->PCHCTRL[clockID].reg = GCLK_PCHCTRL_GEN_GCLK0 | GCLK_PCHCTRL_CHEN; // 120MHz startup code programmed
+ SYNC(!GCLK->PCHCTRL[clockID].bit.CHEN);
+
+ // Stop timer, just in case, to be able to reconfigure it
+ tc->COUNT32.CTRLA.bit.ENABLE = false;
+ SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
+
+ // Reset timer
+ tc->COUNT32.CTRLA.bit.SWRST = true;
+ SYNC(tc->COUNT32.SYNCBUSY.bit.SWRST);
+
+ // Wave mode, reset counter on overflow on 0 (I use count down to prevent double buffer use)
+ tc->COUNT32.WAVE.reg = TC_WAVE_WAVEGEN_MFRQ;
+ tc->COUNT32.CTRLA.reg = TC_CTRLA_MODE_COUNT32 | TC_CTRLA_PRESCALER_DIV1;
+ tc->COUNT32.CTRLBSET.reg = TC_CTRLBCLR_DIR;
+ SYNC(tc->COUNT32.SYNCBUSY.bit.CTRLB);
+
+ // Set compare value
+ tc->COUNT32.COUNT.reg = tc->COUNT32.CC[0].reg = (HAL_TIMER_RATE) / frequency;
+
+ // Enable interrupt on compare
+ tc->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF; // reset pending interrupt
+ tc->COUNT32.INTENSET.reg = TC_INTENSET_OVF; // enable overflow interrupt
+
+ // And start timer
+ tc->COUNT32.CTRLA.bit.ENABLE = true;
+ SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
+ }
+
+ // Finally, enable IRQ
+ NVIC_SetPriority(irq, TimerConfig[timer_num].priority);
+ NVIC_EnableIRQ(irq);
+}
+
+void HAL_timer_enable_interrupt(const uint8_t timer_num) {
+ const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+ NVIC_EnableIRQ(irq);
+}
+
+void HAL_timer_disable_interrupt(const uint8_t timer_num) {
+ const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+ Disable_Irq(irq);
+}
+
+// missing from CMSIS: Check if interrupt is enabled or not
+static bool NVIC_GetEnabledIRQ(IRQn_Type IRQn) {
+ return (NVIC->ISER[(uint32_t)(IRQn) >> 5] & (1 << ((uint32_t)(IRQn) & 0x1F))) != 0;
+}
+
+bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
+ const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+ return NVIC_GetEnabledIRQ(irq);
+}
+
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.h b/Marlin/src/HAL/SAMD51/timers.h
similarity index 73%
rename from Marlin/src/HAL/HAL_SAMD51/timers.h
rename to Marlin/src/HAL/SAMD51/timers.h
index 80c37d14af..4b21e47162 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.h
+++ b/Marlin/src/HAL/SAMD51/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
@@ -25,20 +25,21 @@
// --------------------------------------------------------------------------
// Defines
// --------------------------------------------------------------------------
+#define RTC_TIMER_NUM 8 // This is not a TC but a RTC
typedef uint32_t hal_timer_t;
#define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
-#define HAL_TIMER_RATE SystemCoreClock // frequency of timers peripherals
+#define HAL_TIMER_RATE F_CPU // frequency of timers peripherals
#define STEP_TIMER_NUM 0 // index of timer to use for stepper (also +1 for 32bits counter)
#define PULSE_TIMER_NUM STEP_TIMER_NUM
-#define TEMP_TIMER_NUM 4 // index of timer to use for temperature (also +1 for 32bits counter)
+#define TEMP_TIMER_NUM RTC_TIMER_NUM // index of timer to use for temperature
#define TEMP_TIMER_FREQUENCY 1000 // temperature interrupt frequency
#define STEPPER_TIMER_RATE HAL_TIMER_RATE // frequency of stepper timer (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)
-#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs
+#define STEPPER_TIMER_TICKS_PER_US (STEPPER_TIMER_RATE / 1000000) // stepper timer ticks per µs
#define STEPPER_TIMER_PRESCALE (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
#define PULSE_TIMER_RATE STEPPER_TIMER_RATE
@@ -56,20 +57,27 @@ typedef uint32_t hal_timer_t;
: (t == TEMP_TIMER_NUM) ? 6 \
: 7
-#define _TC_HANDLER(t) void TC##t##_Handler()
-#define TC_HANDLER(t) _TC_HANDLER(t)
-#define HAL_STEP_TIMER_ISR() TC_HANDLER(STEP_TIMER_NUM)
+#define _TC_HANDLER(t) void TC##t##_Handler()
+#define TC_HANDLER(t) _TC_HANDLER(t)
+#define HAL_STEP_TIMER_ISR() TC_HANDLER(STEP_TIMER_NUM)
#if STEP_TIMER_NUM != PULSE_TIMER_NUM
- #define HAL_PULSE_TIMER_ISR() TC_HANDLER(PULSE_TIMER_NUM)
+ #define HAL_PULSE_TIMER_ISR() TC_HANDLER(PULSE_TIMER_NUM)
+#endif
+#if TEMP_TIMER_NUM == RTC_TIMER_NUM
+ #define HAL_TEMP_TIMER_ISR() void RTC_Handler()
+#else
+ #define HAL_TEMP_TIMER_ISR() TC_HANDLER(TEMP_TIMER_NUM)
#endif
-#define HAL_TEMP_TIMER_ISR() TC_HANDLER(TEMP_TIMER_NUM)
// --------------------------------------------------------------------------
// Types
// --------------------------------------------------------------------------
typedef struct {
- Tc *pTimer;
+ union {
+ Tc *pTc;
+ Rtc *pRtc;
+ };
IRQn_Type IRQ_Id;
uint8_t priority;
} tTimerConfig;
@@ -87,17 +95,20 @@ extern const tTimerConfig TimerConfig[];
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare) {
- Tc * const tc = TimerConfig[timer_num].pTimer;
+ // Should never be called with timer RTC_TIMER_NUM
+ Tc * const tc = TimerConfig[timer_num].pTc;
tc->COUNT32.CC[0].reg = HAL_TIMER_TYPE_MAX - compare;
}
FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
- Tc * const tc = TimerConfig[timer_num].pTimer;
+ // Should never be called with timer RTC_TIMER_NUM
+ Tc * const tc = TimerConfig[timer_num].pTc;
return (hal_timer_t)(HAL_TIMER_TYPE_MAX - tc->COUNT32.CC[0].reg);
}
FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
- Tc * const tc = TimerConfig[timer_num].pTimer;
+ // Should never be called with timer RTC_TIMER_NUM
+ Tc * const tc = TimerConfig[timer_num].pTc;
tc->COUNT32.CTRLBSET.reg = TC_CTRLBCLR_CMD_READSYNC;
SYNC(tc->COUNT32.SYNCBUSY.bit.CTRLB || tc->COUNT32.SYNCBUSY.bit.COUNT);
return HAL_TIMER_TYPE_MAX - tc->COUNT32.COUNT.reg;
@@ -108,9 +119,16 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
- Tc * const tc = TimerConfig[timer_num].pTimer;
- // Clear interrupt flag
- tc->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;
+ if (timer_num == RTC_TIMER_NUM) {
+ Rtc * const rtc = TimerConfig[timer_num].pRtc;
+ // Clear interrupt flag
+ rtc->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0;
+ }
+ else {
+ Tc * const tc = TimerConfig[timer_num].pTc;
+ // Clear interrupt flag
+ tc->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;
+ }
}
#define HAL_timer_isr_epilogue(timer_num)
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp b/Marlin/src/HAL/SAMD51/watchdog.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
rename to Marlin/src/HAL/SAMD51/watchdog.cpp
index 69a6de4ef7..13539b4d70 100644
--- a/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
+++ b/Marlin/src/HAL/SAMD51/watchdog.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.h b/Marlin/src/HAL/SAMD51/watchdog.h
similarity index 94%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog.h
rename to Marlin/src/HAL/SAMD51/watchdog.h
index b626b0b06a..aa8ef35371 100644
--- a/Marlin/src/HAL/HAL_SAMD51/watchdog.h
+++ b/Marlin/src/HAL/SAMD51/watchdog.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32/HAL.cpp
rename to Marlin/src/HAL/STM32/HAL.cpp
index 4d3693164d..77f8d27640 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2017 Victor Perez
@@ -28,7 +28,7 @@
#include "../../inc/MarlinConfig.h"
#include "../shared/Delay.h"
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
#include "SoftwareSerial.h"
#endif
@@ -87,7 +87,7 @@ void HAL_init() {
while (!LL_PWR_IsActiveFlag_BRR());
#endif // EEPROM_EMULATED_SRAM
- #if TMC_HAS_SW_SERIAL
+ #if HAS_TMC_SW_SERIAL
SoftwareSerial::setInterruptPriority(SWSERIAL_TIMER_IRQ_PRIO, 0);
#endif
}
@@ -133,6 +133,6 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRe
uint16_t HAL_adc_get_result() { return HAL_adc_result; }
-void flashFirmware(int16_t) { NVIC_SystemReset(); }
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32/HAL.h
rename to Marlin/src/HAL/STM32/HAL.h
index 995c7144f3..c310cca74e 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2017 Victor Perez
@@ -127,8 +127,8 @@
#define analogInputToDigitalPin(p) (p)
#endif
-#define CRITICAL_SECTION_START uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
#define ISRS_ENABLED() (!__get_PRIMASK())
#define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq()
@@ -223,4 +223,4 @@ uint16_t HAL_adc_get_result();
#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
#define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32/HAL_SPI.cpp
index de45c8948e..7b37fff9c2 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/README.md b/Marlin/src/HAL/STM32/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/README.md
rename to Marlin/src/HAL/STM32/README.md
diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
new file mode 100644
index 0000000000..ebe15f9391
--- /dev/null
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -0,0 +1,274 @@
+/**
+ * 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 .
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(SDIO_SUPPORT) && !defined(STM32GENERIC)
+
+#include
+#include
+
+//#include "SdMscDriver.h"
+
+//#include "usbd_msc_bot.h"
+//#include "usbd_msc_scsi.h"
+//#include "usbd_msc_composite.h"
+//#include "usbd_msc_cdc_composite.h"
+
+//#include "usbd_msc_data.h"
+
+#if defined(STM32F103xE) || defined(STM32F103xG)
+ #include
+ #include
+#elif defined(STM32F4xx)
+ #include
+ #include
+ #include
+ #include
+#elif defined(STM32F7xx)
+ #include
+ #include
+ #include
+ #include
+#else
+ #error "ERROR - Only STM32F103xE, STM32F103xG, STM32F4xx or STM32F7xx CPUs supported"
+#endif
+
+SD_HandleTypeDef hsd; // create SDIO structure
+
+#define TRANSFER_CLOCK_DIV ((uint8_t)SDIO_INIT_CLK_DIV/40)
+
+#ifndef USBD_OK
+ #define USBD_OK 0
+#endif
+
+void go_to_transfer_speed() {
+
+ SD_InitTypeDef Init;
+
+ /* Default SDIO peripheral configuration for SD card initialization */
+ Init.ClockEdge = hsd.Init.ClockEdge;
+ Init.ClockBypass = hsd.Init.ClockBypass;
+ Init.ClockPowerSave = hsd.Init.ClockPowerSave;
+ Init.BusWide = hsd.Init.BusWide;
+ Init.HardwareFlowControl = hsd.Init.HardwareFlowControl;
+ Init.ClockDiv = TRANSFER_CLOCK_DIV;
+
+ /* Initialize SDIO peripheral interface with default configuration */
+ SDIO_Init(hsd.Instance, Init);
+}
+
+void SD_LowLevel_Init(void) {
+
+ uint32_t tempreg;
+
+ GPIO_InitTypeDef GPIO_InitStruct;
+
+ __HAL_RCC_GPIOC_CLK_ENABLE(); //enable GPIO clocks
+ __HAL_RCC_GPIOD_CLK_ENABLE(); //enable GPIO clocks
+
+ GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12; // D0 & SCK
+ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+ GPIO_InitStruct.Pull = 1; //GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+ GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+ HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+ #if defined(SDIO_D1_PIN) && defined(SDIO_D2_PIN) && defined(SDIO_D3_PIN) // define D1-D3 only if have a four bit wide SDIO bus
+ GPIO_InitStruct.Pin = GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11; // D1-D3
+ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+ GPIO_InitStruct.Pull = 1; //GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+ GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+ HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+ #endif
+
+ // Configure PD.02 CMD line
+ GPIO_InitStruct.Pin = GPIO_PIN_2;
+ HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
+ RCC->APB2RSTR &= ~RCC_APB2RSTR_SDIORST_Msk; // take SDIO out of reset
+ RCC->APB2ENR |= RCC_APB2RSTR_SDIORST_Msk; // enable SDIO clock
+
+ // Enable the DMA2 Clock
+
+ //Initialize the SDIO (with initial <400Khz Clock)
+ tempreg = 0; //Reset value
+ tempreg |= SDIO_CLKCR_CLKEN; //Clock is enabled
+ tempreg |= (uint32_t)0x76; //Clock Divider. Clock = 48000/(118+2) = 400Khz
+ //Keep the rest at 0 => HW_Flow Disabled, Rising Clock Edge, Disable CLK ByPass, Bus Width = 0, Power save Disable
+ SDIO->CLKCR = tempreg;
+
+ //Power up the SDIO
+ SDIO->POWER = 0x03;
+}
+
+
+void HAL_SD_MspInit(SD_HandleTypeDef *hsd) { // application specific init
+ UNUSED(hsd); /* Prevent unused argument(s) compilation warning */
+ __HAL_RCC_SDIO_CLK_ENABLE(); // turn on SDIO clock
+}
+
+constexpr uint8_t SD_RETRY_COUNT = (1
+ #if ENABLED(SD_CHECK_AND_RETRY)
+ + 2
+ #endif
+);
+
+bool SDIO_Init() {
+ //init SDIO and get SD card info
+
+ uint8_t retryCnt = SD_RETRY_COUNT;
+
+ bool status;
+ hsd.Instance = SDIO;
+ hsd.State = (HAL_SD_StateTypeDef) 0; // HAL_SD_STATE_RESET
+ SD_LowLevel_Init();
+
+ uint8_t retry_Cnt = retryCnt;
+ for (;;) {
+ status = (bool) HAL_SD_Init(&hsd);
+ if (!status) break;
+ if (!--retry_Cnt) return false; // return failing status if retries are exhausted
+ }
+
+ go_to_transfer_speed();
+
+ #if defined(SDIO_D1_PIN) && defined(SDIO_D2_PIN) && defined(SDIO_D3_PIN) // go to 4 bit wide mode if pins are defined
+ retry_Cnt = retryCnt;
+ for (;;) {
+ if (!HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B)) break; // some cards are only 1 bit wide so a pass here is not required
+ if (!--retry_Cnt) break;
+ }
+ if (!retry_Cnt) { // wide bus failed, go back to one bit wide mode
+ hsd.State = (HAL_SD_StateTypeDef) 0; // HAL_SD_STATE_RESET
+ SD_LowLevel_Init();
+ retry_Cnt = retryCnt;
+ for (;;) {
+ status = (bool) HAL_SD_Init(&hsd);
+ if (!status) break;
+ if (!--retry_Cnt) return false; // return failing status if retries are exhausted
+ }
+ }
+ #endif
+
+ return true;
+}
+
+void init_SDIO_pins(void) {
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+
+ /**SDIO GPIO Configuration
+ PC8 ------> SDIO_D0
+ PC12 ------> SDIO_CK
+ PD2 ------> SDIO_CMD
+ */
+ GPIO_InitStruct.Pin = GPIO_PIN_8;
+ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+ GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+ HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+ GPIO_InitStruct.Pin = GPIO_PIN_12;
+ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+ GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+ HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+ GPIO_InitStruct.Pin = GPIO_PIN_2;
+ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+ GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+ HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+}
+
+//bool SDIO_init() { return (bool) (SD_SDIO_Init() ? 1 : 0);}
+//bool SDIO_Init_C() { return (bool) (SD_SDIO_Init() ? 1 : 0);}
+
+bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
+ bool status;
+
+ hsd.Instance = SDIO;
+
+ uint8_t retryCnt = SD_RETRY_COUNT;
+
+ for (;;) {
+ bool status = (bool) HAL_SD_ReadBlocks(&hsd, (uint8_t*)dst, block, 1, 1000); // read one 512 byte block with 500mS timeout
+ status |= (bool) HAL_SD_GetCardState(&hsd); // make sure all is OK
+ if (!status) return false; // return passing status
+ if (!--retryCnt) return true; // return failing status if retries are exhausted
+ }
+
+ /*
+ return (bool) ((status_read | status_card) ? 1 : 0);
+
+ if (SDIO_GetCardState() != SDIO_CARD_TRANSFER) return false;
+ if (blockAddress >= SdCard.LogBlockNbr) return false;
+ if ((0x03 & (uint32_t)data)) return false; // misaligned data
+
+ if (SdCard.CardType != CARD_SDHC_SDXC) { blockAddress *= 512U; }
+
+ if (!SDIO_CmdReadSingleBlock(blockAddress)) {
+ SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS);
+ dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
+ return false;
+ }
+
+ while (!SDIO_GET_FLAG(SDIO_STA_DATAEND | SDIO_STA_TRX_ERROR_FLAGS)) {}
+
+ dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
+
+ if (SDIO->STA & SDIO_STA_RXDAVL) {
+ while (SDIO->STA & SDIO_STA_RXDAVL) (void)SDIO->FIFO;
+ SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
+ return false;
+ }
+
+ if (SDIO_GET_FLAG(SDIO_STA_TRX_ERROR_FLAGS)) {
+ SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
+ return false;
+ }
+ SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
+ */
+
+ return true;
+}
+
+bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
+ bool status;
+
+ hsd.Instance = SDIO;
+
+ uint8_t retryCnt = SD_RETRY_COUNT;
+
+ for (;;) {
+ status = (bool) HAL_SD_WriteBlocks(&hsd, (uint8_t*)src, block, 1, 500); // write one 512 byte block with 500mS timeout
+ status |= (bool) HAL_SD_GetCardState(&hsd); // make sure all is OK
+ if (!status) return (bool) status; // return passing status
+ if (!--retryCnt) return (bool) status; // return failing status if retries are exhausted
+ }
+}
+
+#endif // SDIO_SUPPORT
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.cpp b/Marlin/src/HAL/STM32/Servo.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32/Servo.cpp
rename to Marlin/src/HAL/STM32/Servo.cpp
index 9af8ba6184..2dcadb8876 100644
--- a/Marlin/src/HAL/HAL_STM32/Servo.cpp
+++ b/Marlin/src/HAL/STM32/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.h b/Marlin/src/HAL/STM32/Servo.h
similarity index 92%
rename from Marlin/src/HAL/HAL_STM32/Servo.h
rename to Marlin/src/HAL/STM32/Servo.h
index ec4b6be131..e8b3c4b100 100644
--- a/Marlin/src/HAL/HAL_STM32/Servo.h
+++ b/Marlin/src/HAL/STM32/Servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,6 +24,8 @@
#include
+#include "../../core/millis_t.h"
+
// Inherit and expand on the official library
class libServo : public Servo {
public:
diff --git a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.cpp b/Marlin/src/HAL/STM32/SoftwareSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/SoftwareSerial.cpp
rename to Marlin/src/HAL/STM32/SoftwareSerial.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.h b/Marlin/src/HAL/STM32/SoftwareSerial.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32/SoftwareSerial.h
rename to Marlin/src/HAL/STM32/SoftwareSerial.h
index 3799701cfe..504bd6979b 100644
--- a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.h
+++ b/Marlin/src/HAL/STM32/SoftwareSerial.h
@@ -29,9 +29,7 @@
* The latest version of this library can always be found at
* http://arduiniana.org.
*/
-
-#ifndef SOFTWARESERIAL_H
-#define SOFTWARESERIAL_H
+#pragma once
#include
@@ -64,7 +62,6 @@ class SoftwareSerial : public Stream {
uint32_t delta_start = 0;
// static data
- static bool initialised;
static HardwareTimer timer;
static const IRQn_Type timer_interrupt_number;
static uint32_t timer_interrupt_priority;
@@ -91,7 +88,7 @@ class SoftwareSerial : public Stream {
public:
// public methods
- SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic = false);
+ SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic=false);
virtual ~SoftwareSerial();
void begin(long speed);
bool listen();
@@ -115,5 +112,3 @@ class SoftwareSerial : public Stream {
using Print::write;
};
-
-#endif // SOFTWARESERIAL_H
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32/eeprom_flash.cpp
index 0242b78aeb..39012f8205 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -27,7 +27,7 @@
#if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
// Only STM32F4 can support wear leveling at this time
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/STM32/eeprom_impl.cpp
similarity index 84%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
rename to Marlin/src/HAL/STM32/eeprom_impl.cpp
index 44f01cb88f..cd0f93e8d8 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_impl.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -24,9 +24,9 @@
#include "../../inc/MarlinConfig.h"
-#if ENABLED(EEPROM_SETTINGS) && ANY(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if EITHER(USE_WIRED_EEPROM, SRAM_EEPROM_EMULATION)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
bool PersistentStore::access_start() {
return true;
@@ -41,14 +41,14 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
uint8_t v = *value;
// Save to either external EEPROM, program flash or Backup SRAM
- #if EITHER(SPI_EEPROM, I2C_EEPROM)
+ #if USE_WIRED_EEPROM
// EEPROM has only ~100,000 write cycles,
// so only write bytes that have changed!
uint8_t * const p = (uint8_t * const)pos;
if (v != eeprom_read_byte(p)) {
eeprom_write_byte(p, v);
if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
return true;
}
}
@@ -68,7 +68,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
do {
// Read from either external EEPROM, program flash or Backup SRAM
const uint8_t c = (
- #if EITHER(SPI_EEPROM, I2C_EEPROM)
+ #if USE_WIRED_EEPROM
eeprom_read_byte((uint8_t*)pos)
#else
(*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
@@ -85,13 +85,13 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() {
return (
- #if ENABLED(SRAM_EEPROM_EMULATION)
- 4096 // 4kB
- #else
+ #if USE_WIRED_EEPROM
E2END + 1
+ #else
+ 4096 // 4kB
#endif
);
}
-#endif // EEPROM_SETTINGS && (SRAM_EEPROM_EMULATION || SPI_EEPROM || I2C_EEPROM)
+#endif // USE_WIRED_EEPROM || SRAM_EEPROM_EMULATION
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
similarity index 91%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32/eeprom_sdcard.cpp
index 6ce63073c4..2b89c21b89 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,9 +28,9 @@
#include "../../inc/MarlinConfig.h"
-#if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
#ifndef E2END
#define E2END 0xFFF // 4KB
@@ -99,5 +99,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; }
-#endif // EEPROM_SETTINGS
-#endif // STM32
+#endif // SDCARD_EEPROM_EMULATION
+#endif // STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h b/Marlin/src/HAL/STM32/endstop_interrupts.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
rename to Marlin/src/HAL/STM32/endstop_interrupts.h
index 96fa444668..0b97c3c774 100644
--- a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
+++ b/Marlin/src/HAL/STM32/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.cpp b/Marlin/src/HAL/STM32/fastio.cpp
similarity index 90%
rename from Marlin/src/HAL/HAL_STM32/fastio.cpp
rename to Marlin/src/HAL/STM32/fastio.cpp
index 33685cedda..c51effaa04 100644
--- a/Marlin/src/HAL/HAL_STM32/fastio.cpp
+++ b/Marlin/src/HAL/STM32/fastio.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,7 +27,7 @@
GPIO_TypeDef* FastIOPortMap[LastPort + 1];
void FastIO_init() {
- for (uint8_t i = 0; i < NUM_DIGITAL_PINS; i++)
+ LOOP_L_N(i, NUM_DIGITAL_PINS)
FastIOPortMap[STM_PORT(digitalPin[i])] = get_GPIO_Port(STM_PORT(digitalPin[i]));
}
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.h b/Marlin/src/HAL/STM32/fastio.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32/fastio.h
rename to Marlin/src/HAL/STM32/fastio.h
index 917ee3a1a6..c17901fa99 100644
--- a/Marlin/src/HAL/HAL_STM32/fastio.h
+++ b/Marlin/src/HAL/STM32/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -55,7 +55,7 @@ void FastIO_init(); // Must be called before using fast io macros
else FastIOPortMap[STM_PORT(digitalPin[IO])]->BRR = _BV32(STM_PIN(digitalPin[IO])) ; \
}while(0)
#else
- #define _WRITE(IO, V) (FastIOPortMap[STM_PORT(digitalPin[IO])]->BSRR = _BV32(STM_PIN(digitalPin[IO]) + (V ? 0 : 16)))
+ #define _WRITE(IO, V) (FastIOPortMap[STM_PORT(digitalPin[IO])]->BSRR = _BV32(STM_PIN(digitalPin[IO]) + ((V) ? 0 : 16)))
#endif
#define _READ(IO) bool(READ_BIT(FastIOPortMap[STM_PORT(digitalPin[IO])]->IDR, _BV32(STM_PIN(digitalPin[IO]))))
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
new file mode 100644
index 0000000000..11603c9ef4
--- /dev/null
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
@@ -0,0 +1,27 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+ #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32/inc/SanityCheck.h
index 9a1727bceb..b1d0029ba9 100644
--- a/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug.h
rename to Marlin/src/HAL/STM32/pinsDebug.h
index 4e27cee195..8c5d1ec2b6 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h b/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
rename to Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
index b1c2562185..e3d28aed07 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
+++ b/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -29,9 +29,9 @@
#ifdef BOARD_NR_GPIO_PINS // Only in STM32GENERIC (Maple)
#ifdef __STM32F1__
- #include "../HAL_STM32F1/fastio.h"
+ #include "../STM32F1/fastio.h"
#elif defined(STM32F4) || defined(STM32F7)
- #include "../HAL_STM32_F4_F7/fastio.h"
+ #include "../STM32_F4_F7/fastio.h"
#else
#include "fastio.h"
#endif
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h b/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h
rename to Marlin/src/HAL/STM32/pinsDebug_STM32duino.h
index 9d9796eabe..58b8c32cc7 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h
+++ b/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_STM32/pins_Xref.h b/Marlin/src/HAL/STM32/pins_Xref.h
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32/pins_Xref.h
rename to Marlin/src/HAL/STM32/pins_Xref.h
index 84278c3916..7e88ec76ba 100644
--- a/Marlin/src/HAL/HAL_STM32/pins_Xref.h
+++ b/Marlin/src/HAL/STM32/pins_Xref.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/spi_pins.h b/Marlin/src/HAL/STM32/spi_pins.h
similarity index 93%
rename from Marlin/src/HAL/HAL_STM32/spi_pins.h
rename to Marlin/src/HAL/STM32/spi_pins.h
index f8c9546b63..8f46ca12c5 100644
--- a/Marlin/src/HAL/HAL_STM32/spi_pins.h
+++ b/Marlin/src/HAL/STM32/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32/timers.cpp
rename to Marlin/src/HAL/STM32/timers.cpp
index c2a4cbdc0e..b7b65f714e 100644
--- a/Marlin/src/HAL/HAL_STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
similarity index 94%
rename from Marlin/src/HAL/HAL_STM32/timers.h
rename to Marlin/src/HAL/STM32/timers.h
index aa85836bd5..8a0950a4d7 100644
--- a/Marlin/src/HAL/HAL_STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2017 Victor Perez
*
@@ -61,8 +61,6 @@
#define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
- // STM32F401 only has timers 1-5 & 9-11 with timers 4 & 5 usually assigned to TIMER_SERVO and TIMER_TONE
-
#ifndef STEP_TIMER
#define STEP_TIMER 9
#endif
@@ -76,19 +74,19 @@
#define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
#ifndef STEP_TIMER
- #define STEP_TIMER 6
+ #define STEP_TIMER 6 // STM32F401 has no TIM6, TIM7, or TIM8
#endif
#ifndef TEMP_TIMER
- #define TEMP_TIMER 14
+ #define TEMP_TIMER 14 // TIM7 is consumed by Software Serial if used.
#endif
#elif defined(STM32F7xx)
- #define HAL_TIMER_RATE (F_CPU/2) // frequency of timer peripherals
+ #define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
#ifndef STEP_TIMER
- #define STEP_TIMER 6
+ #define STEP_TIMER 6 // the RIGHT timer!
#endif
#ifndef TEMP_TIMER
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32/watchdog.cpp
rename to Marlin/src/HAL/STM32/watchdog.cpp
index 4defadaa77..2c6b583e83 100644
--- a/Marlin/src/HAL/HAL_STM32/watchdog.cpp
+++ b/Marlin/src/HAL/STM32/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.h b/Marlin/src/HAL/STM32/watchdog.h
similarity index 93%
rename from Marlin/src/HAL/HAL_STM32/watchdog.h
rename to Marlin/src/HAL/STM32/watchdog.h
index 6855016737..efa7d2b3d0 100644
--- a/Marlin/src/HAL/HAL_STM32/watchdog.h
+++ b/Marlin/src/HAL/STM32/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_STM32F1/HAL.cpp
rename to Marlin/src/HAL/STM32F1/HAL.cpp
index 0db0371cae..01fd2c8fc3 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2017 Victor Perez
@@ -261,14 +261,6 @@ void HAL_idletask() {
#endif
}
-/* VGPV Done with defines
-// disable interrupts
-void cli() { noInterrupts(); }
-
-// enable interrupts
-void sei() { interrupts(); }
-*/
-
void HAL_clear_reset_source() { }
/**
@@ -396,6 +388,6 @@ void analogWrite(pin_t pin, int pwm_val8) {
analogWrite(uint8_t(pin), pwm_val8);
}
-void flashFirmware(int16_t value) { nvic_sys_reset(); }
+void flashFirmware(const int16_t) { nvic_sys_reset(); }
#endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32F1/HAL.h
rename to Marlin/src/HAL/STM32F1/HAL.h
index 4d2ff2a0a3..ff42beb92a 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2017 Victor Perez
@@ -160,10 +160,11 @@ void HAL_idletask();
#ifndef digitalPinHasPWM
#define digitalPinHasPWM(P) (PIN_MAP[P].timer_device != nullptr)
+ #define NO_COMPILE_TIME_PWM
#endif
-#define CRITICAL_SECTION_START uint32_t primask = __get_primask(); (void)__iCliRetVal()
-#define CRITICAL_SECTION_END if (!primask) (void)__iSeiRetVal()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_primask(); (void)__iCliRetVal()
+#define CRITICAL_SECTION_END() if (!primask) (void)__iSeiRetVal()
#define ISRS_ENABLED() (!__get_primask())
#define ENABLE_ISRS() ((void)__iSeiRetVal())
#define DISABLE_ISRS() ((void)__iCliRetVal())
@@ -287,4 +288,4 @@ void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
#define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
#define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp b/Marlin/src/HAL/STM32F1/HAL_SPI.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32F1/HAL_SPI.cpp
index 9f3f34239d..bfbdf6af40 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/README.md b/Marlin/src/HAL/STM32F1/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/README.md
rename to Marlin/src/HAL/STM32F1/README.md
diff --git a/Marlin/src/HAL/HAL_STM32F1/SPI.cpp b/Marlin/src/HAL/STM32F1/SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SPI.cpp
rename to Marlin/src/HAL/STM32F1/SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SPI.h
rename to Marlin/src/HAL/STM32F1/SPI.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.cpp b/Marlin/src/HAL/STM32F1/Servo.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/Servo.cpp
rename to Marlin/src/HAL/STM32F1/Servo.cpp
index 5dc2169154..06abb2c2b9 100644
--- a/Marlin/src/HAL/HAL_STM32F1/Servo.cpp
+++ b/Marlin/src/HAL/STM32F1/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.h b/Marlin/src/HAL/STM32F1/Servo.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32F1/Servo.h
rename to Marlin/src/HAL/STM32F1/Servo.h
index 92f4dd678d..b3ca09f238 100644
--- a/Marlin/src/HAL/HAL_STM32F1/Servo.h
+++ b/Marlin/src/HAL/STM32F1/Servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp b/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
rename to Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
index 99772a03c2..e9e4a162a5 100644
--- a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
+++ b/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h b/Marlin/src/HAL/STM32F1/SoftwareSerial.h
similarity index 94%
rename from Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h
rename to Marlin/src/HAL/STM32F1/SoftwareSerial.h
index 330d7d632d..1899a2ae0b 100644
--- a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h
+++ b/Marlin/src/HAL/STM32F1/SoftwareSerial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_STM32F1/build_flags.py b/Marlin/src/HAL/STM32F1/build_flags.py
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32F1/build_flags.py
rename to Marlin/src/HAL/STM32F1/build_flags.py
index 6310740fe0..98c871a1d8 100644
--- a/Marlin/src/HAL/HAL_STM32F1/build_flags.py
+++ b/Marlin/src/HAL/STM32F1/build_flags.py
@@ -15,7 +15,7 @@ if __name__ == "__main__":
"--specs=nano.specs",
"--specs=nosys.specs",
- "-IMarlin/src/HAL/HAL_STM32F1",
+ "-IMarlin/src/HAL/STM32F1",
"-MMD",
"-MP",
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
rename to Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
index a16b379b30..cc26a003d1 100644
--- a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
similarity index 90%
rename from Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
rename to Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
index 753a5d5e70..2e9d11f97e 100644
--- a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -32,7 +32,7 @@
static uint8_t SPI_speed = SPI_SPEED;
static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
if (spi_speed == 0) {
WRITE(DOGLCD_MOSI, !!(b & 0x80));
WRITE(DOGLCD_SCK, HIGH);
@@ -42,16 +42,16 @@ static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, c
}
else {
const uint8_t state = (b & 0x80) ? HIGH : LOW;
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
WRITE(DOGLCD_MOSI, state);
- for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+ LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
WRITE(DOGLCD_SCK, HIGH);
b <<= 1;
if (miso_pin >= 0 && READ(miso_pin)) b |= 1;
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
WRITE(DOGLCD_SCK, LOW);
}
}
@@ -59,7 +59,7 @@ static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, c
}
static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
- for (uint8_t i = 0; i < 8; i++) {
+ LOOP_L_N(i, 8) {
const uint8_t state = (b & 0x80) ? HIGH : LOW;
if (spi_speed == 0) {
WRITE(DOGLCD_SCK, LOW);
@@ -68,13 +68,13 @@ static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, c
WRITE(DOGLCD_SCK, HIGH);
}
else {
- for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+ LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
WRITE(DOGLCD_SCK, LOW);
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
WRITE(DOGLCD_MOSI, state);
- for (uint8_t j = 0; j < spi_speed; j++)
+ LOOP_L_N(j, spi_speed)
WRITE(DOGLCD_SCK, HIGH);
}
b <<= 1;
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32F1/eeprom.cpp
similarity index 87%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32F1/eeprom.cpp
index babcdeaee3..ed5d50cbde 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -22,9 +22,9 @@
#include "../../inc/MarlinConfig.h"
-#if ENABLED(EEPROM_SETTINGS) && EITHER(SPI_EEPROM, I2C_EEPROM)
+#if USE_WIRED_EEPROM
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
bool PersistentStore::access_start() {
#if ENABLED(SPI_EEPROM)
@@ -49,7 +49,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
if (v != eeprom_read_byte(p)) {
eeprom_write_byte(p, v);
if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
return true;
}
}
@@ -73,5 +73,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() { return E2END + 1; }
-#endif // EEPROM_SETTINGS && EITHER(SPI_EEPROM, I2C_EEPROM)
+#endif // USE_WIRED_EEPROM
#endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp b/Marlin/src/HAL/STM32F1/eeprom_flash.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32F1/eeprom_flash.cpp
index bbca1cb391..9c81730465 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_flash.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -31,10 +31,9 @@
#include "../../inc/MarlinConfig.h"
-// This is for EEPROM emulation in flash
-#if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION)
+#if ENABLED(FLASH_EEPROM_EMULATION)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
#include
#include
@@ -108,5 +107,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
size_t PersistentStore::capacity() { return EEPROM_SIZE; }
-#endif // EEPROM_SETTINGS && EEPROM FLASH
+#endif // FLASH_EEPROM_EMULATION
#endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
similarity index 92%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
index 38d5803f58..7894e69787 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,9 +29,9 @@
#include "../../inc/MarlinConfig.h"
-#if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
#ifndef E2END
#define E2END 0xFFF // 4KB
@@ -100,6 +100,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; }
-#endif // EEPROM_SETTINGS
-
+#endif // SDCARD_EEPROM_EMULATION
#endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
rename to Marlin/src/HAL/STM32F1/endstop_interrupts.h
index 9c18ee35ae..246e292983 100644
--- a/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
+++ b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/fastio.h b/Marlin/src/HAL/STM32F1/fastio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32F1/fastio.h
rename to Marlin/src/HAL/STM32F1/fastio.h
index 3aafb9de39..9bf78d4254 100644
--- a/Marlin/src/HAL/HAL_STM32F1/fastio.h
+++ b/Marlin/src/HAL/STM32F1/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h
similarity index 92%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
rename to Marlin/src/HAL/STM32F1/inc/Conditionals_post.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
similarity index 92%
rename from Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32F1/inc/SanityCheck.h
index 7673d8673a..b8ebc446d6 100644
--- a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-#if !defined(HAVE_SW_SERIAL) && TMC_HAS_SW_SERIAL
+#if !defined(HAVE_SW_SERIAL) && HAS_TMC_SW_SERIAL
#warning "With TMC2208/9 consider using SoftwareSerialM with HAVE_SW_SERIAL and appropriate SS_TIMER."
#error "Missing SoftwareSerial implementation."
#endif
diff --git a/Marlin/src/HAL/HAL_STM32F1/maple_win_usb_driver/maple_serial.inf b/Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/maple_win_usb_driver/maple_serial.inf
rename to Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp b/Marlin/src/HAL/STM32F1/msc_sd.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp
rename to Marlin/src/HAL/STM32F1/msc_sd.cpp
index 81e430fa2a..a086b82bc3 100644
--- a/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/msc_sd.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.h b/Marlin/src/HAL/STM32F1/msc_sd.h
similarity index 91%
rename from Marlin/src/HAL/HAL_STM32F1/msc_sd.h
rename to Marlin/src/HAL/STM32F1/msc_sd.h
index 9f06ca5fdb..125ba36466 100644
--- a/Marlin/src/HAL/HAL_STM32F1/msc_sd.h
+++ b/Marlin/src/HAL/STM32F1/msc_sd.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
*
* This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
rename to Marlin/src/HAL/STM32F1/onboard_sd.cpp
index c5b4f34cd2..0fd94a9199 100644
--- a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
@@ -1,7 +1,7 @@
/**
* STM32F1: MMCv3/SDv1/SDv2 (SPI mode) control module
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
* Copyright (C) 2015, ChaN, all right reserved.
*
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h b/Marlin/src/HAL/STM32F1/onboard_sd.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32F1/onboard_sd.h
rename to Marlin/src/HAL/STM32F1/onboard_sd.h
index ec73162ba1..1dc7ec5b3b 100644
--- a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.h
@@ -1,5 +1,5 @@
/*-----------------------------------------------------------------------
-/ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+/ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
/ * Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
/ * Low level disk interface module include file (C)ChaN, 2015
/-----------------------------------------------------------------------*/
diff --git a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
similarity index 85%
rename from Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
rename to Marlin/src/HAL/STM32F1/pinsDebug.h
index a8b632870a..913cb62afc 100644
--- a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -19,9 +19,9 @@
#pragma once
#ifdef NUM_DIGITAL_PINS // Only in ST's Arduino core (STM32duino, STM32Core)
- #include "../HAL_STM32/pinsDebug_STM32duino.h"
+ #include "../STM32/pinsDebug_STM32duino.h"
#elif defined(BOARD_NR_GPIO_PINS) // Only in STM32GENERIC (Maple)
- #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+ #include "../STM32/pinsDebug_STM32GENERIC.h"
#else
#error "M43 not supported for this board"
#endif
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.cpp b/Marlin/src/HAL/STM32F1/sdio.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/sdio.cpp
rename to Marlin/src/HAL/STM32F1/sdio.cpp
index c1cab57a9e..da6beda85c 100644
--- a/Marlin/src/HAL/HAL_STM32F1/sdio.cpp
+++ b/Marlin/src/HAL/STM32F1/sdio.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.h b/Marlin/src/HAL/STM32F1/sdio.h
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/sdio.h
rename to Marlin/src/HAL/STM32F1/sdio.h
index ca0aced695..f51ba6d0a6 100644
--- a/Marlin/src/HAL/HAL_STM32F1/sdio.h
+++ b/Marlin/src/HAL/STM32F1/sdio.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2017 Victor Perez
*
diff --git a/Marlin/src/HAL/HAL_STM32F1/spi_pins.h b/Marlin/src/HAL/STM32F1/spi_pins.h
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32F1/spi_pins.h
rename to Marlin/src/HAL/STM32F1/spi_pins.h
index edea89cc7d..e8e4cbba11 100644
--- a/Marlin/src/HAL/HAL_STM32F1/spi_pins.h
+++ b/Marlin/src/HAL/STM32F1/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.cpp b/Marlin/src/HAL/STM32F1/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32F1/timers.cpp
rename to Marlin/src/HAL/STM32F1/timers.cpp
index 051f0323c6..720bd37ba4 100644
--- a/Marlin/src/HAL/HAL_STM32F1/timers.cpp
+++ b/Marlin/src/HAL/STM32F1/timers.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
similarity index 97%
rename from Marlin/src/HAL/HAL_STM32F1/timers.h
rename to Marlin/src/HAL/STM32F1/timers.h
index d5d02a3dc6..e5733cc563 100644
--- a/Marlin/src/HAL/HAL_STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2017 Victor Perez
*
@@ -70,7 +70,7 @@ typedef uint16_t hal_timer_t;
//#define TEMP_TIMER_NUM 4 // 2->4, Timer 2 for Stepper Current PWM
#define PULSE_TIMER_NUM STEP_TIMER_NUM
-#if MB(BTT_SKR_MINI_E3_V1_0, BIGTREE_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
+#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
// SKR Mini E3 boards use PA8 as FAN_PIN, so TIMER 1 is used for Fan PWM.
#ifdef STM32_HIGH_DENSITY
#define SERVO0_TIMER_NUM 8 // tone.cpp uses Timer 4
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp b/Marlin/src/HAL/STM32F1/watchdog.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
rename to Marlin/src/HAL/STM32F1/watchdog.cpp
index 17f5aa9725..9556d1fa66 100644
--- a/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
+++ b/Marlin/src/HAL/STM32F1/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.h b/Marlin/src/HAL/STM32F1/watchdog.h
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog.h
rename to Marlin/src/HAL/STM32F1/watchdog.h
index 21f97dd7a1..7218b1a720 100644
--- a/Marlin/src/HAL/HAL_STM32F1/watchdog.h
+++ b/Marlin/src/HAL/STM32F1/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
similarity index 90%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
rename to Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
index 5e6ae09bf1..cc1a1bb01e 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -27,13 +27,7 @@
// Include configs and pins to get all EEPROM flags
#include "../../inc/MarlinConfig.h"
-#ifdef STM32F7
- #define HAS_EMULATED_EEPROM 1
-#else
- #define HAS_EMULATED_EEPROM NONE(I2C_EEPROM, SPI_EEPROM)
-#endif
-
-#if HAS_EMULATED_EEPROM && ENABLED(EEPROM_SETTINGS)
+#if ENABLED(FLASH_EEPROM_EMULATION)
// ------------------------
// Includes
@@ -108,7 +102,7 @@ void eeprom_read_block(void *__dst, const void *__src, size_t __n) {
uint16_t data = 0xFF;
uint16_t eeprom_address = unsigned(__src);
- for (uint8_t c = 0; c < __n; c++) {
+ LOOP_L_N(c, __n) {
EE_ReadVariable(eeprom_address+c, &data);
*((uint8_t*)__dst + c) = data;
}
@@ -118,5 +112,5 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n) {
}
-#endif // EEPROM_SETTINGS
+#endif // FLASH_EEPROM_EMULATION
#endif // STM32GENERIC && (STM32F4 || STM32F7)
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp b/Marlin/src/HAL/STM32_F4_F7/HAL.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
rename to Marlin/src/HAL/STM32_F4_F7/HAL.cpp
index e24483f642..5acda8af41 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/HAL.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2017 Victor Perez
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h b/Marlin/src/HAL/STM32_F4_F7/HAL.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
rename to Marlin/src/HAL/STM32_F4_F7/HAL.h
index 41b445d65e..b5d8ac29cf 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
+++ b/Marlin/src/HAL/STM32_F4_F7/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2017 Victor Perez
@@ -127,8 +127,8 @@
#define analogInputToDigitalPin(p) (p)
#endif
-#define CRITICAL_SECTION_START uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
#define ISRS_ENABLED() (!__get_PRIMASK())
#define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp b/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
index 2f85182e20..deb14f2cfe 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/README.md b/Marlin/src/HAL/STM32_F4_F7/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/README.md
rename to Marlin/src/HAL/STM32_F4_F7/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/README.md b/Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/README.md
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
index 32219962ee..ffd46dae60 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
index 726207fbcf..c52f5ea21c 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
+++ b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2017 Victor Perez
*
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/README.md b/Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/README.md
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h b/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp
index 5a3b32ef5b..d90f22e03a 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h
index 38ecde30bb..00428c54f1 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
+++ b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2017 Victor Perez
*
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp b/Marlin/src/HAL/STM32_F4_F7/Servo.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
rename to Marlin/src/HAL/STM32_F4_F7/Servo.cpp
index b3aac77615..e7fb15e6b1 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h b/Marlin/src/HAL/STM32_F4_F7/Servo.h
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
rename to Marlin/src/HAL/STM32_F4_F7/Servo.h
index 64fa05025c..076a547bb2 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
+++ b/Marlin/src/HAL/STM32_F4_F7/Servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
similarity index 92%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
index 4bd86d225d..b957aae6a8 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -27,7 +27,7 @@
#if ENABLED(EEPROM_SETTINGS)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
bool PersistentStore::access_start() { return true; }
bool PersistentStore::access_finish() { return true; }
@@ -41,7 +41,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
if (v != eeprom_read_byte(p)) {
eeprom_write_byte(p, v);
if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
return true;
}
}
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp b/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp
rename to Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.h b/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.h
rename to Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h b/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
rename to Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h
index 96fa444668..0b97c3c774 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
+++ b/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h b/Marlin/src/HAL/STM32_F4_F7/fastio.h
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
rename to Marlin/src/HAL/STM32_F4_F7/fastio.h
index 1e5ef2ef30..ee64ca833d 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
+++ b/Marlin/src/HAL/STM32_F4_F7/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
new file mode 100644
index 0000000000..d21624955e
--- /dev/null
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
@@ -0,0 +1,29 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if ENABLED(EEPROM_SETTINGS) && defined(STM32F7)
+ #undef USE_WIRED_EEPROM
+ #undef SRAM_EEPROM_EMULATION
+ #undef SDCARD_EEPROM_EMULATION
+ #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h b/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h
similarity index 94%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h
index c647ea0c03..e04258fa07 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,6 +36,6 @@
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
#error "TMC220x Software Serial is not supported on this platform."
#endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h b/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
similarity index 85%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
rename to Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
index 342b875561..208a3524f7 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
+++ b/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -19,9 +19,9 @@
#pragma once
#ifdef NUM_DIGITAL_PINS // Only in ST's Arduino core (STM32duino, STM32Core)
- #include "../HAL_STM32/pinsDebug_STM32duino.h"
+ #include "../STM32/pinsDebug_STM32duino.h"
#elif defined(BOARD_NR_GPIO_PINS) // Only in STM32GENERIC (Maple)
- #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+ #include "../STM32/pinsDebug_STM32GENERIC.h"
#else
#error "M43 Pins Debugging not supported for this board."
#endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h b/Marlin/src/HAL/STM32_F4_F7/spi_pins.h
similarity index 93%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h
rename to Marlin/src/HAL/STM32_F4_F7/spi_pins.h
index 4aef289a77..f120e7178b 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h
+++ b/Marlin/src/HAL/STM32_F4_F7/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h b/Marlin/src/HAL/STM32_F4_F7/timers.h
similarity index 93%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/timers.h
index cf33205bdd..632c05a5ad 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
+++ b/Marlin/src/HAL/STM32_F4_F7/timers.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2017 Victor Perez
*
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp b/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
rename to Marlin/src/HAL/STM32_F4_F7/watchdog.cpp
index 900d1ef6a6..347edcd49d 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h b/Marlin/src/HAL/STM32_F4_F7/watchdog.h
similarity index 93%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
rename to Marlin/src/HAL/STM32_F4_F7/watchdog.h
index 9e2a2dc21c..ece6ef0162 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
+++ b/Marlin/src/HAL/STM32_F4_F7/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
rename to Marlin/src/HAL/TEENSY31_32/HAL.cpp
index 2e15324e3b..f226a4a90e 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
similarity index 93%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
rename to Marlin/src/HAL/TEENSY31_32/HAL.h
index 684afa58f4..15e9ab71bb 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
@@ -70,8 +70,8 @@ typedef int8_t pin_t;
#define analogInputToDigitalPin(p) ((p < 12u) ? (p) + 54u : -1)
#endif
-#define CRITICAL_SECTION_START uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
#define ISRS_ENABLED() (!__get_PRIMASK())
#define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
rename to Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
index 4236f02b0f..83d4d00bf2 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp b/Marlin/src/HAL/TEENSY31_32/Servo.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
rename to Marlin/src/HAL/TEENSY31_32/Servo.cpp
index 6451f6b172..2b01d3d875 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h b/Marlin/src/HAL/TEENSY31_32/Servo.h
similarity index 95%
rename from Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
rename to Marlin/src/HAL/TEENSY31_32/Servo.h
index 3eb7d39b22..9243291e43 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
+++ b/Marlin/src/HAL/TEENSY31_32/Servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp b/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
similarity index 91%
rename from Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
rename to Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
index 6da102638f..96499d4f19 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -22,7 +22,7 @@
#if ENABLED(EEPROM_SETTINGS)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
bool PersistentStore::access_start() { return true; }
bool PersistentStore::access_finish() { return true; }
@@ -36,7 +36,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
if (v != eeprom_read_byte(p)) {
eeprom_write_byte(p, v);
if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
return true;
}
}
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
rename to Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
index 221b721b35..21fea5bd01 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
+++ b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h b/Marlin/src/HAL/TEENSY31_32/fastio.h
similarity index 95%
rename from Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
rename to Marlin/src/HAL/TEENSY31_32/fastio.h
index d1b5f567d7..e74920d493 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
+++ b/Marlin/src/HAL/TEENSY31_32/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -76,8 +76,9 @@
#define SET_INPUT(IO) _SET_INPUT(IO)
#define SET_INPUT_PULLUP(IO) _SET_INPUT_PULLUP(IO)
+#define SET_INPUT_PULLDOWN SET_INPUT
#define SET_OUTPUT(IO) _SET_OUTPUT(IO)
-#define SET_PWM(IO) SET_OUTPUT(IO)
+#define SET_PWM SET_OUTPUT
#define IS_INPUT(IO) _IS_INPUT(IO)
#define IS_OUTPUT(IO) _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
new file mode 100644
index 0000000000..11603c9ef4
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
@@ -0,0 +1,27 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+ #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
similarity index 93%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
rename to Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
index b680a1a445..9268868596 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,6 +33,6 @@
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
#error "TMC220x Software Serial is not supported on this platform."
#endif
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/pinsDebug.h b/Marlin/src/HAL/TEENSY31_32/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/pinsDebug.h
rename to Marlin/src/HAL/TEENSY31_32/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h b/Marlin/src/HAL/TEENSY31_32/spi_pins.h
similarity index 93%
rename from Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h
rename to Marlin/src/HAL/TEENSY31_32/spi_pins.h
index 8a0ab8f9a4..79230f3d44 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h
+++ b/Marlin/src/HAL/TEENSY31_32/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp b/Marlin/src/HAL/TEENSY31_32/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
rename to Marlin/src/HAL/TEENSY31_32/timers.cpp
index e4ccf33a4b..92641742f9 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/timers.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY31_32/timers.h
rename to Marlin/src/HAL/TEENSY31_32/timers.h
index 6dff7701be..00f9f0740d 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp b/Marlin/src/HAL/TEENSY31_32/watchdog.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
rename to Marlin/src/HAL/TEENSY31_32/watchdog.cpp
index d1313e1f5d..618294591b 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h b/Marlin/src/HAL/TEENSY31_32/watchdog.h
similarity index 94%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
rename to Marlin/src/HAL/TEENSY31_32/watchdog.h
index 861afcbc91..cb881f8595 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
+++ b/Marlin/src/HAL/TEENSY31_32/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
rename to Marlin/src/HAL/TEENSY35_36/HAL.cpp
index 34d2354637..86ba40870f 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
similarity index 93%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
rename to Marlin/src/HAL/TEENSY35_36/HAL.h
index 97763bf205..7e5be1081c 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
@@ -73,8 +73,8 @@ typedef int8_t pin_t;
#define analogInputToDigitalPin(p) ((p < 12u) ? (p) + 54u : -1)
#endif
-#define CRITICAL_SECTION_START uint32_t primask = __get_primask(); __disable_irq()
-#define CRITICAL_SECTION_END if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START() uint32_t primask = __get_primask(); __disable_irq()
+#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
#define ISRS_ENABLED() (!__get_primask())
#define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
rename to Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
index 44ab74cc9b..b35533aa94 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp b/Marlin/src/HAL/TEENSY35_36/Servo.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
rename to Marlin/src/HAL/TEENSY35_36/Servo.cpp
index d376b80a7d..f2fd5fe7ff 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/Servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h b/Marlin/src/HAL/TEENSY35_36/Servo.h
similarity index 94%
rename from Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
rename to Marlin/src/HAL/TEENSY35_36/Servo.h
index cafd323a38..4962105d79 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
+++ b/Marlin/src/HAL/TEENSY35_36/Servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp b/Marlin/src/HAL/TEENSY35_36/eeprom.cpp
similarity index 92%
rename from Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/TEENSY35_36/eeprom.cpp
index 17934f71a3..c66a45e2a5 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/eeprom.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -27,7 +27,7 @@
#if ENABLED(EEPROM_SETTINGS)
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
#include
bool PersistentStore::access_start() { return true; }
@@ -42,7 +42,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
if (v != eeprom_read_byte(p)) {
eeprom_write_byte(p, v);
if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+ SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
return true;
}
}
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
rename to Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
index 2b7169641b..eaaf297ea2 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
+++ b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h b/Marlin/src/HAL/TEENSY35_36/fastio.h
similarity index 95%
rename from Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
rename to Marlin/src/HAL/TEENSY35_36/fastio.h
index d1b5f567d7..e74920d493 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
+++ b/Marlin/src/HAL/TEENSY35_36/fastio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -76,8 +76,9 @@
#define SET_INPUT(IO) _SET_INPUT(IO)
#define SET_INPUT_PULLUP(IO) _SET_INPUT_PULLUP(IO)
+#define SET_INPUT_PULLDOWN SET_INPUT
#define SET_OUTPUT(IO) _SET_OUTPUT(IO)
-#define SET_PWM(IO) SET_OUTPUT(IO)
+#define SET_PWM SET_OUTPUT
#define IS_INPUT(IO) _IS_INPUT(IO)
#define IS_OUTPUT(IO) _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..0285c52ee3
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h
@@ -0,0 +1,22 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h
similarity index 92%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
rename to Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h
index 85f26f4016..0285c52ee3 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
similarity index 93%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
rename to Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
index 5cb2cbfc8c..f42bd63b17 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
+++ b/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,6 +33,6 @@
#error "FAST_PWM_FAN is not yet implemented for this platform."
#endif
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
#error "TMC220x Software Serial is not supported on this platform."
#endif
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h
rename to Marlin/src/HAL/TEENSY35_36/pinsDebug.h
index db750cf6ec..61a54f15ed 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h
+++ b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h b/Marlin/src/HAL/TEENSY35_36/spi_pins.h
similarity index 93%
rename from Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h
rename to Marlin/src/HAL/TEENSY35_36/spi_pins.h
index 9c6a83e3f8..b29a9346a1 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h
+++ b/Marlin/src/HAL/TEENSY35_36/spi_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp b/Marlin/src/HAL/TEENSY35_36/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
rename to Marlin/src/HAL/TEENSY35_36/timers.cpp
index 6bbc16dcb5..81e23e4d17 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/timers.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY35_36/timers.h
rename to Marlin/src/HAL/TEENSY35_36/timers.h
index 8ae51107c7..6dc26a9665 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
*
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp b/Marlin/src/HAL/TEENSY35_36/watchdog.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
rename to Marlin/src/HAL/TEENSY35_36/watchdog.cpp
index f58217c750..69afa04a54 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/watchdog.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h b/Marlin/src/HAL/TEENSY35_36/watchdog.h
similarity index 93%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
rename to Marlin/src/HAL/TEENSY35_36/watchdog.h
index 7c27260906..ec3f18f094 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
+++ b/Marlin/src/HAL/TEENSY35_36/watchdog.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/platforms.h b/Marlin/src/HAL/platforms.h
index e3e7f52cfa..cc462f37c5 100644
--- a/Marlin/src/HAL/platforms.h
+++ b/Marlin/src/HAL/platforms.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,32 +21,30 @@
*/
#pragma once
+#define XSTR(V...) #V
+
#ifdef __AVR__
- #define HAL_PLATFORM HAL_AVR
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/AVR/NAME)
#elif defined(ARDUINO_ARCH_SAM)
- #define HAL_PLATFORM HAL_DUE
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/DUE/NAME)
#elif defined(__MK20DX256__)
- #define HAL_PLATFORM HAL_TEENSY31_32
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY31_32/NAME)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
- #define HAL_PLATFORM HAL_TEENSY35_36
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY35_36/NAME)
#elif defined(TARGET_LPC1768)
- #define HAL_PLATFORM HAL_LPC1768
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/LPC1768/NAME)
#elif defined(__STM32F1__) || defined(TARGET_STM32F1)
- #define HAL_PLATFORM HAL_STM32F1
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32F1/NAME)
#elif defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F7))
- #define HAL_PLATFORM HAL_STM32_F4_F7
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32_F4_F7/NAME)
#elif defined(ARDUINO_ARCH_STM32)
- #define HAL_PLATFORM HAL_STM32
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32/NAME)
#elif defined(ARDUINO_ARCH_ESP32)
- #define HAL_PLATFORM HAL_ESP32
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME)
#elif defined(__PLAT_LINUX__)
- #define HAL_PLATFORM HAL_LINUX
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/LINUX/NAME)
#elif defined(__SAMD51__)
- #define HAL_PLATFORM HAL_SAMD51
+ #define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME)
#else
#error "Unsupported Platform!"
#endif
-
-#define XSTR_(M) #M
-#define XSTR(M) XSTR_(M)
-#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)
diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index 4ba14d9681..5cb68b1503 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,7 +29,6 @@
* DELAY_US(count): Delay execution in microseconds
*/
-#include "../../core/millis_t.h"
#include "../../core/macros.h"
#if defined(__arm__) || defined(__thumb__)
diff --git a/Marlin/src/HAL/shared/HAL_SPI.h b/Marlin/src/HAL/shared/HAL_SPI.h
index d805207047..0410d70c93 100644
--- a/Marlin/src/HAL/shared/HAL_SPI.h
+++ b/Marlin/src/HAL/shared/HAL_SPI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/HAL_ST7920.h b/Marlin/src/HAL/shared/HAL_ST7920.h
index de40ade5ab..69c1d741ae 100644
--- a/Marlin/src/HAL/shared/HAL_ST7920.h
+++ b/Marlin/src/HAL/shared/HAL_ST7920.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
#pragma once
/**
- * HAL/HAL_ST7920.h
+ * HAL/ST7920.h
* For the HALs that provide direct access to the ST7920 display
* (bypassing U8G), it will allow the LIGHTWEIGHT_UI to operate.
*/
diff --git a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
index e740a171d8..46e7b71f88 100644
--- a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
+++ b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/Marduino.h b/Marlin/src/HAL/shared/Marduino.h
index a2de03a2b6..c022fc72ed 100644
--- a/Marlin/src/HAL/shared/Marduino.h
+++ b/Marlin/src/HAL/shared/Marduino.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/MarlinSerial.h b/Marlin/src/HAL/shared/MarlinSerial.h
deleted file mode 100644
index c82bdbee7d..0000000000
--- a/Marlin/src/HAL/shared/MarlinSerial.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * HAL/shared/MarlinSerial.h
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-constexpr bool
- #if HAS_DGUS_LCD
- bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS = (false
- #if ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS)
- || true
- #endif
- ),
- #endif
- bSERIAL_XON_XOFF = (false
- #if ENABLED(SERIAL_XON_XOFF)
- || true
- #endif
- ),
- bEMERGENCY_PARSER = (false
- #if ENABLED(EMERGENCY_PARSER)
- || true
- #endif
- ),
- bSERIAL_STATS_DROPPED_RX = (false
- #if ENABLED(SERIAL_STATS_DROPPED_RX)
- || true
- #endif
- ),
- bSERIAL_STATS_RX_BUFFER_OVERRUNS = (false
- #if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
- || true
- #endif
- ),
- bSERIAL_STATS_RX_FRAMING_ERRORS = (false
- #if ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS)
- || true
- #endif
- ),
- bSERIAL_STATS_MAX_RX_QUEUED = (false
- #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
- || true
- #endif
- );
diff --git a/Marlin/src/HAL/shared/backtrace/backtrace.cpp b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
index dab3968255..7264969c74 100644
--- a/Marlin/src/HAL/shared/backtrace/backtrace.cpp
+++ b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/backtrace/backtrace.h b/Marlin/src/HAL/shared/backtrace/backtrace.h
index a2b8eae594..636eb09a71 100644
--- a/Marlin/src/HAL/shared/backtrace/backtrace.h
+++ b/Marlin/src/HAL/shared/backtrace/backtrace.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/persistent_store_api.cpp b/Marlin/src/HAL/shared/eeprom_api.cpp
similarity index 91%
rename from Marlin/src/HAL/shared/persistent_store_api.cpp
rename to Marlin/src/HAL/shared/eeprom_api.cpp
index 9aed03a0c8..d8839e3d9d 100644
--- a/Marlin/src/HAL/shared/persistent_store_api.cpp
+++ b/Marlin/src/HAL/shared/eeprom_api.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
@@ -24,7 +24,7 @@
#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
- #include "persistent_store_api.h"
+ #include "eeprom_api.h"
PersistentStore persistentStore;
#endif
diff --git a/Marlin/src/HAL/shared/persistent_store_api.h b/Marlin/src/HAL/shared/eeprom_api.h
similarity index 96%
rename from Marlin/src/HAL/shared/persistent_store_api.h
rename to Marlin/src/HAL/shared/eeprom_api.h
index 02013120a7..d7bee8a5f3 100644
--- a/Marlin/src/HAL/shared/persistent_store_api.h
+++ b/Marlin/src/HAL/shared/eeprom_api.h
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/shared/eeprom_i2c.cpp b/Marlin/src/HAL/shared/eeprom_i2c.cpp
index 2752b7d4cc..3eb72194ac 100644
--- a/Marlin/src/HAL/shared/eeprom_i2c.cpp
+++ b/Marlin/src/HAL/shared/eeprom_i2c.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,6 +23,9 @@
/**
* Description: functions for I2C connected external EEPROM.
* Not platform dependent.
+ *
+ * TODO: Some platform Arduino libraries define these functions
+ * so Marlin needs to add a glue layer to prevent the conflict.
*/
#include "../../inc/MarlinConfig.h"
diff --git a/Marlin/src/HAL/shared/eeprom_spi.cpp b/Marlin/src/HAL/shared/eeprom_spi.cpp
index 35e7d9b0a9..ce7479aedb 100644
--- a/Marlin/src/HAL/shared/eeprom_spi.cpp
+++ b/Marlin/src/HAL/shared/eeprom_spi.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/math_32bit.h b/Marlin/src/HAL/shared/math_32bit.h
index a69992a655..d93ab9caf6 100644
--- a/Marlin/src/HAL/shared/math_32bit.h
+++ b/Marlin/src/HAL/shared/math_32bit.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/servo.cpp b/Marlin/src/HAL/shared/servo.cpp
index b5975e58e7..2c3d7bb7d3 100644
--- a/Marlin/src/HAL/shared/servo.cpp
+++ b/Marlin/src/HAL/shared/servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -68,7 +68,7 @@ uint8_t ServoCount = 0; // the total number of attached
static boolean isTimerActive(timer16_Sequence_t timer) {
// returns true if any servo is active on this timer
- for (uint8_t channel = 0; channel < SERVOS_PER_TIMER; channel++) {
+ LOOP_L_N(channel, SERVOS_PER_TIMER) {
if (SERVO(timer, channel).Pin.isActive)
return true;
}
@@ -129,9 +129,9 @@ void Servo::writeMicroseconds(int value) {
value = constrain(value, SERVO_MIN(min), SERVO_MAX(max)) - (TRIM_DURATION);
value = usToTicks(value); // convert to ticks after compensating for interrupt overhead - 12 Aug 2009
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
servo_info[channel].ticks = value;
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
}
}
diff --git a/Marlin/src/HAL/shared/servo.h b/Marlin/src/HAL/shared/servo.h
index e4905b7295..b582221b86 100644
--- a/Marlin/src/HAL/shared/servo.h
+++ b/Marlin/src/HAL/shared/servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -68,19 +68,19 @@
*/
#if IS_TEENSY32
- #include "../HAL_TEENSY31_32/Servo.h"
+ #include "../TEENSY31_32/Servo.h"
#elif IS_TEENSY35 || IS_TEENSY36
- #include "../HAL_TEENSY35_36/Servo.h"
+ #include "../TEENSY35_36/Servo.h"
#elif defined(TARGET_LPC1768)
- #include "../HAL_LPC1768/Servo.h"
+ #include "../LPC1768/Servo.h"
#elif defined(__STM32F1__) || defined(TARGET_STM32F1)
- #include "../HAL_STM32F1/Servo.h"
+ #include "../STM32F1/Servo.h"
#elif defined(STM32GENERIC) && defined(STM32F4)
- #include "../HAL_STM32_F4_F7/Servo.h"
+ #include "../STM32_F4_F7/Servo.h"
#elif defined(ARDUINO_ARCH_STM32)
- #include "../HAL_STM32/Servo.h"
+ #include "../STM32/Servo.h"
#elif defined(ARDUINO_ARCH_ESP32)
- #include "../HAL_ESP32/Servo.h"
+ #include "../ESP32/Servo.h"
#else
#include
diff --git a/Marlin/src/HAL/shared/servo_private.h b/Marlin/src/HAL/shared/servo_private.h
index 1d4cdc7e3e..58e455b124 100644
--- a/Marlin/src/HAL/shared/servo_private.h
+++ b/Marlin/src/HAL/shared/servo_private.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -44,11 +44,11 @@
// Architecture specific include
#ifdef __AVR__
- #include "../HAL_AVR/ServoTimers.h"
+ #include "../AVR/ServoTimers.h"
#elif defined(ARDUINO_ARCH_SAM)
- #include "../HAL_DUE/ServoTimers.h"
+ #include "../DUE/ServoTimers.h"
#elif defined(__SAMD51__)
- #include "../HAL_SAMD51/ServoTimers.h"
+ #include "../SAMD51/ServoTimers.h"
#else
#error "This library only supports boards with an AVR, SAM3X or SAMD51 processor."
#endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 7ec6ffb488..3a6582bbb1 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -78,7 +78,7 @@
#endif
#if ENABLED(MAX7219_DEBUG)
- #include "feature/Max7219_Debug_LEDs.h"
+ #include "feature/max7219.h"
#endif
#if HAS_COLOR_LEDS
@@ -107,10 +107,10 @@
#endif
#if ENABLED(I2C_POSITION_ENCODERS)
- #include "feature/I2CPositionEncoder.h"
+ #include "feature/encoder_i2c.h"
#endif
-#if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
+#if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
#include "feature/tmc_util.h"
#endif
@@ -142,7 +142,7 @@
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "feature/power_loss_recovery.h"
+ #include "feature/powerloss.h"
#endif
#if ENABLED(CANCEL_OBJECTS)
@@ -165,7 +165,7 @@
#include "feature/fanmux.h"
#endif
-#if DO_SWITCH_EXTRUDER || ANY(SWITCHING_NOZZLE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
+#if DO_SWITCH_EXTRUDER || ANY(SWITCHING_NOZZLE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, ELECTROMAGNETIC_SWITCHING_TOOLHEAD, SWITCHING_TOOLHEAD)
#include "module/tool_change.h"
#endif
@@ -174,7 +174,7 @@
#endif
#if ENABLED(PRUSA_MMU2)
- #include "feature/prusa_MMU2/mmu2.h"
+ #include "feature/mmu2/mmu2.h"
#endif
#if HAS_L64XX
@@ -187,12 +187,22 @@ const char NUL_STR[] PROGMEM = "",
M21_STR[] PROGMEM = "M21",
M23_STR[] PROGMEM = "M23 %s",
M24_STR[] PROGMEM = "M24",
+ SP_P_STR[] PROGMEM = " P",
+ SP_T_STR[] PROGMEM = " T",
SP_X_STR[] PROGMEM = " X",
SP_Y_STR[] PROGMEM = " Y",
SP_Z_STR[] PROGMEM = " Z",
- SP_E_STR[] PROGMEM = " E";
+ SP_E_STR[] PROGMEM = " E",
+ X_LBL[] PROGMEM = "X:",
+ Y_LBL[] PROGMEM = "Y:",
+ Z_LBL[] PROGMEM = "Z:",
+ E_LBL[] PROGMEM = "E:",
+ SP_X_LBL[] PROGMEM = " X:",
+ SP_Y_LBL[] PROGMEM = " Y:",
+ SP_Z_LBL[] PROGMEM = " Z:",
+ SP_E_LBL[] PROGMEM = " E:";
-bool Running = true;
+MarlinState marlin_state = MF_INITIALIZING;
// For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
bool wait_for_heatup = true;
@@ -200,10 +210,19 @@ bool wait_for_heatup = true;
// For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
#if HAS_RESUME_CONTINUE
bool wait_for_user; // = false;
-#endif
-#if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
- bool suspend_auto_report; // = false
+ void wait_for_user_response(millis_t ms/*=0*/, const bool no_sleep/*=false*/) {
+ #if DISABLED(ADVANCED_PAUSE_FEATURE)
+ UNUSED(no_sleep);
+ #endif
+ KEEPALIVE_STATE(PAUSED_FOR_USER);
+ wait_for_user = true;
+ if (ms) ms += millis(); // expire time
+ while (wait_for_user && !(ms && ELAPSED(millis(), ms)))
+ idle(TERN_(ADVANCED_PAUSE_FEATURE, no_sleep));
+ wait_for_user = false;
+ }
+
#endif
// Inactivity shutdown
@@ -235,11 +254,8 @@ void setup_powerhold() {
OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
#endif
#if ENABLED(PSU_CONTROL)
- #if ENABLED(PSU_DEFAULT_OFF)
- powersupply_on = true; PSU_OFF();
- #else
- powersupply_on = false; PSU_ON();
- #endif
+ powersupply_on = ENABLED(PSU_DEFAULT_OFF);
+ if (ENABLED(PSU_DEFAULT_OFF)) PSU_OFF(); else PSU_ON();
#endif
}
@@ -271,7 +287,7 @@ void setup_powerhold() {
bool pin_is_protected(const pin_t pin) {
static const pin_t sensitive_pins[] PROGMEM = SENSITIVE_PINS;
- for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) {
+ LOOP_L_N(i, COUNT(sensitive_pins)) {
pin_t sensitive_pin;
memcpy_P(&sensitive_pin, &sensitive_pins[i], sizeof(pin_t));
if (pin == sensitive_pin) return true;
@@ -280,7 +296,7 @@ bool pin_is_protected(const pin_t pin) {
}
void protected_pin_err() {
- SERIAL_ERROR_MSG(MSG_ERR_PROTECTED_PIN);
+ SERIAL_ERROR_MSG(STR_ERR_PROTECTED_PIN);
}
void quickstop_stepper() {
@@ -291,7 +307,7 @@ void quickstop_stepper() {
}
void enable_e_steppers() {
- #define _ENA_E(N) enable_E##N();
+ #define _ENA_E(N) ENABLE_AXIS_E##N();
REPEAT(E_STEPPERS, _ENA_E)
}
@@ -299,28 +315,28 @@ void enable_all_steppers() {
#if ENABLED(AUTO_POWER_CONTROL)
powerManager.power_on();
#endif
- enable_X();
- enable_Y();
- enable_Z();
+ ENABLE_AXIS_X();
+ ENABLE_AXIS_Y();
+ ENABLE_AXIS_Z();
enable_e_steppers();
}
void disable_e_steppers() {
- #define _DIS_E(N) disable_E##N();
+ #define _DIS_E(N) DISABLE_AXIS_E##N();
REPEAT(E_STEPPERS, _DIS_E)
}
void disable_e_stepper(const uint8_t e) {
- #define _CASE_DIS_E(N) case N: disable_E##N(); break;
+ #define _CASE_DIS_E(N) case N: DISABLE_AXIS_E##N(); break;
switch (e) {
REPEAT(EXTRUDERS, _CASE_DIS_E)
}
}
void disable_all_steppers() {
- disable_X();
- disable_Y();
- disable_Z();
+ DISABLE_AXIS_X();
+ DISABLE_AXIS_Y();
+ DISABLE_AXIS_Z();
disable_e_steppers();
}
@@ -343,7 +359,7 @@ void disable_all_steppers() {
void event_probe_recover() {
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), PSTR("Dismiss"));
+ host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR);
#endif
#ifdef ACTION_ON_G29_RECOVER
host_action(PSTR(ACTION_ON_G29_RECOVER));
@@ -392,8 +408,8 @@ void startOrResumeJob() {
#if ENABLED(SDSUPPORT)
- void abortSDPrinting() {
- card.stopSDPrint(
+ inline void abortSDPrinting() {
+ card.endFilePrint(
#if SD_RESORT
true
#endif
@@ -414,10 +430,15 @@ void startOrResumeJob() {
#endif
}
-#endif
+ inline void finishSDPrinting() {
+ if (queue.enqueue_one_P(PSTR("M1001")))
+ marlin_state = MF_RUNNING;
+ }
+
+#endif // SDSUPPORT
/**
- * Manage several activities:
+ * Minimal management of Marlin's core activities:
* - Check for Filament Runout
* - Keep the command buffer full
* - Check for maximum inactive time between commands
@@ -430,7 +451,7 @@ void startOrResumeJob() {
* - Pulse FET_SAFETY_PIN if it exists
*/
-void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
+inline void manage_inactivity(const bool ignore_stepper_queue=false) {
#if HAS_FILAMENT_SENSOR
runout.run();
@@ -442,36 +463,24 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
if (max_inactive_time && ELAPSED(ms, gcode.previous_move_ms + max_inactive_time)) {
SERIAL_ERROR_START();
- SERIAL_ECHOLNPAIR(MSG_KILL_INACTIVE_TIME, parser.command_ptr);
+ SERIAL_ECHOLNPAIR(STR_KILL_INACTIVE_TIME, parser.command_ptr);
kill();
}
// Prevent steppers timing-out in the middle of M600
- #if BOTH(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_NO_STEPPER_TIMEOUT)
- #define MOVE_AWAY_TEST !did_pause_print
- #else
- #define MOVE_AWAY_TEST true
- #endif
+ #define STAY_TEST (BOTH(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_NO_STEPPER_TIMEOUT) && did_pause_print)
if (stepper_inactive_time) {
static bool already_shutdown_steppers; // = false
if (planner.has_blocks_queued())
gcode.reset_stepper_timeout();
- else if (MOVE_AWAY_TEST && !ignore_stepper_queue && ELAPSED(ms, gcode.previous_move_ms + stepper_inactive_time)) {
+ else if (!STAY_TEST && !ignore_stepper_queue && ELAPSED(ms, gcode.previous_move_ms + stepper_inactive_time)) {
if (!already_shutdown_steppers) {
already_shutdown_steppers = true; // L6470 SPI will consume 99% of free time without this
- #if ENABLED(DISABLE_INACTIVE_X)
- disable_X();
- #endif
- #if ENABLED(DISABLE_INACTIVE_Y)
- disable_Y();
- #endif
- #if ENABLED(DISABLE_INACTIVE_Z)
- disable_Z();
- #endif
- #if ENABLED(DISABLE_INACTIVE_E)
- disable_e_steppers();
- #endif
+ if (ENABLED(DISABLE_INACTIVE_X)) DISABLE_AXIS_X();
+ if (ENABLED(DISABLE_INACTIVE_Y)) DISABLE_AXIS_Y();
+ if (ENABLED(DISABLE_INACTIVE_Z)) DISABLE_AXIS_Z();
+ if (ENABLED(DISABLE_INACTIVE_E)) disable_e_steppers();
#if HAS_LCD_MENU && ENABLED(AUTO_BED_LEVELING_UBL)
if (ubl.lcd_map_control) {
ubl.lcd_map_control = false;
@@ -507,7 +516,7 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
// KILL the machine
// ----------------------------------------------------------------
if (killCount >= KILL_DELAY) {
- SERIAL_ERROR_MSG(MSG_KILL_BUTTON);
+ SERIAL_ERROR_MSG(STR_KILL_BUTTON);
kill();
}
#endif
@@ -527,7 +536,7 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
#endif
#if ENABLED(USE_CONTROLLER_FAN)
- controllerfan_update(); // Check if fan should be turned on to cool stepper drivers down
+ controllerFan.update(); // Check if fan should be turned on to cool stepper drivers down
#endif
#if ENABLED(AUTO_POWER_CONTROL)
@@ -542,11 +551,14 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
#if ENABLED(SWITCHING_EXTRUDER)
bool oldstatus;
switch (active_extruder) {
- default: oldstatus = E0_ENABLE_READ(); enable_E0(); break;
+ default: oldstatus = E0_ENABLE_READ(); ENABLE_AXIS_E0(); break;
#if E_STEPPERS > 1
- case 2: case 3: oldstatus = E1_ENABLE_READ(); enable_E1(); break;
+ case 2: case 3: oldstatus = E1_ENABLE_READ(); ENABLE_AXIS_E1(); break;
#if E_STEPPERS > 2
- case 4: case 5: oldstatus = E2_ENABLE_READ(); enable_E2(); break;
+ case 4: case 5: oldstatus = E2_ENABLE_READ(); ENABLE_AXIS_E2(); break;
+ #if E_STEPPERS > 3
+ case 6: case 7: oldstatus = E3_ENABLE_READ(); ENABLE_AXIS_E3(); break;
+ #endif // E_STEPPERS > 3
#endif // E_STEPPERS > 2
#endif // E_STEPPERS > 1
}
@@ -554,7 +566,7 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
bool oldstatus;
switch (active_extruder) {
default:
- #define _CASE_EN(N) case N: oldstatus = E##N##_ENABLE_READ(); enable_E##N(); break;
+ #define _CASE_EN(N) case N: oldstatus = E##N##_ENABLE_READ(); ENABLE_AXIS_E##N(); break;
REPEAT(E_STEPPERS, _CASE_EN);
}
#endif
@@ -593,7 +605,7 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
// travel moves have been received so enact them
delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
destination = current_position;
- prepare_move_to_destination();
+ prepare_line_to_destination();
}
#endif
@@ -630,52 +642,54 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
/**
* Standard idle routine keeps the machine alive
*/
-void idle(
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- bool no_stepper_sleep/*=false*/
- #endif
-) {
+void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) {
+ // Handle Power-Loss Recovery
#if ENABLED(POWER_LOSS_RECOVERY) && PIN_EXISTS(POWER_LOSS)
recovery.outage();
#endif
+ // Run StallGuard endstop checks
#if ENABLED(SPI_ENDSTOPS)
if (endstops.tmc_spi_homing.any
- #if ENABLED(IMPROVE_HOMING_RELIABILITY)
- && ELAPSED(millis(), sg_guard_period)
- #endif
- ) {
- for (uint8_t i = 4; i--;) // Read SGT 4 times per idle loop
+ && TERN1(IMPROVE_HOMING_RELIABILITY, ELAPSED(millis(), sg_guard_period))
+ ) LOOP_L_N(i, 4) // Read SGT 4 times per idle loop
if (endstops.tmc_spi_homing_check()) break;
- }
#endif
+ // Max7219 heartbeat, animation, etc.
#if ENABLED(MAX7219_DEBUG)
max7219.idle_tasks();
#endif
+ // Read Buttons and Update the LCD
ui.update();
+ // Announce Host Keepalive state (if any)
#if ENABLED(HOST_KEEPALIVE_FEATURE)
gcode.host_keepalive();
#endif
+ // Core Marlin activities
manage_inactivity(
#if ENABLED(ADVANCED_PAUSE_FEATURE)
no_stepper_sleep
#endif
);
+ // Manage heaters (and Watchdog)
thermalManager.manage_heater();
+ // Update the Print Job Timer state
#if ENABLED(PRINTCOUNTER)
print_job_timer.tick();
#endif
+ // Update the Beeper queue
#if USE_BEEPER
buzzer.tick();
#endif
+ // Run i2c Position Encoders
#if ENABLED(I2C_POSITION_ENCODERS)
static millis_t i2cpem_next_update_ms;
if (planner.has_blocks_queued()) {
@@ -687,12 +701,14 @@ void idle(
}
#endif
+ // Run HAL idle tasks
#ifdef HAL_IDLETASK
HAL_idletask();
#endif
+ // Auto-report Temperatures / SD Status
#if HAS_AUTO_REPORTING
- if (!suspend_auto_report) {
+ if (!gcode.autoreport_paused) {
#if ENABLED(AUTO_REPORT_TEMPERATURES)
thermalManager.auto_report_temperatures();
#endif
@@ -702,14 +718,17 @@ void idle(
}
#endif
+ // Handle USB Flash Drive insert / remove
#if ENABLED(USB_FLASH_DRIVE_SUPPORT)
Sd2Card::idle();
#endif
+ // Update the Prusa MMU2
#if ENABLED(PRUSA_MMU2)
mmu2.mmu_loop();
#endif
+ // Handle Joystick jogging
#if ENABLED(POLL_JOG)
joystick.inject_jog_moves();
#endif
@@ -722,7 +741,7 @@ void idle(
void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr*/, const bool steppers_off/*=false*/) {
thermalManager.disable_all_heaters();
- SERIAL_ERROR_MSG(MSG_ERR_KILLED);
+ SERIAL_ERROR_MSG(STR_ERR_KILLED);
#if HAS_DISPLAY
ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
@@ -793,11 +812,10 @@ void stop() {
#endif
if (IsRunning()) {
- queue.stop();
- SERIAL_ERROR_MSG(MSG_ERR_STOPPED);
+ SERIAL_ERROR_MSG(STR_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED);
safe_delay(350); // allow enough time for messages to get out before stopping
- Running = false;
+ marlin_state = MF_STOPPED;
}
}
@@ -818,6 +836,7 @@ void stop() {
* • Digipot I2C
* • Z probe sled
* • status LEDs
+ * • Max7219
*/
void setup() {
@@ -831,10 +850,6 @@ void setup() {
OUT_WRITE(SMART_EFFECTOR_MOD_PIN, LOW); // Put Smart Effector into NORMAL mode
#endif
- #if ENABLED(MAX7219_DEBUG)
- max7219.init();
- #endif
-
#if ENABLED(DISABLE_DEBUG)
// Disable any hardware debug to free up pins for IO
#ifdef JTAGSWD_DISABLE
@@ -875,15 +890,10 @@ void setup() {
#if NUM_SERIAL > 0
MYSERIAL0.begin(BAUDRATE);
- #if NUM_SERIAL > 1
- MYSERIAL1.begin(BAUDRATE);
- #endif
- #endif
-
- #if NUM_SERIAL > 0
uint32_t serial_connect_timeout = millis() + 1000UL;
while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
#if NUM_SERIAL > 1
+ MYSERIAL1.begin(BAUDRATE);
serial_connect_timeout = millis() + 1000UL;
while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
#endif
@@ -892,7 +902,7 @@ void setup() {
SERIAL_ECHOLNPGM("start");
SERIAL_ECHO_START();
- #if TMC_HAS_SPI
+ #if HAS_TMC_SPI
#if DISABLED(TMC_USE_SW_SPI)
SPI.begin();
#endif
@@ -905,79 +915,97 @@ void setup() {
// Check startup - does nothing if bootloader sets MCUSR to 0
byte mcu = HAL_get_reset_source();
- if (mcu & 1) SERIAL_ECHOLNPGM(MSG_POWERUP);
- if (mcu & 2) SERIAL_ECHOLNPGM(MSG_EXTERNAL_RESET);
- if (mcu & 4) SERIAL_ECHOLNPGM(MSG_BROWNOUT_RESET);
- if (mcu & 8) SERIAL_ECHOLNPGM(MSG_WATCHDOG_RESET);
- if (mcu & 32) SERIAL_ECHOLNPGM(MSG_SOFTWARE_RESET);
+ if (mcu & 1) SERIAL_ECHOLNPGM(STR_POWERUP);
+ if (mcu & 2) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
+ if (mcu & 4) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
+ if (mcu & 8) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
+ if (mcu & 32) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
HAL_clear_reset_source();
- SERIAL_ECHOPGM(MSG_MARLIN);
+ serialprintPGM(GET_TEXT(MSG_MARLIN));
SERIAL_CHAR(' ');
SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION);
SERIAL_EOL();
#if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR)
SERIAL_ECHO_MSG(
- MSG_CONFIGURATION_VER
+ STR_CONFIGURATION_VER
STRING_DISTRIBUTION_DATE
- MSG_AUTHOR STRING_CONFIG_H_AUTHOR
+ STR_AUTHOR STRING_CONFIG_H_AUTHOR
);
SERIAL_ECHO_MSG("Compiled: " __DATE__);
#endif
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_FREE_MEMORY, freeMemory(), MSG_PLANNER_BUFFER_BYTES, (int)sizeof(block_t) * (BLOCK_BUFFER_SIZE));
+ SERIAL_ECHOLNPAIR(STR_FREE_MEMORY, freeMemory(), STR_PLANNER_BUFFER_BYTES, (int)sizeof(block_t) * (BLOCK_BUFFER_SIZE));
// UI must be initialized before EEPROM
// (because EEPROM code calls the UI).
+ #if ENABLED(MARLIN_DEV_MODE)
+ auto log_current_ms = [&](PGM_P const msg) {
+ SERIAL_ECHO_START();
+ SERIAL_CHAR('['); SERIAL_ECHO(millis()); SERIAL_ECHO("] ");
+ serialprintPGM(msg);
+ SERIAL_EOL();
+ };
+ #define SETUP_LOG(M) log_current_ms(PSTR(M))
+ #else
+ #define SETUP_LOG(...) NOOP
+ #endif
+ #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
+
// Set up LEDs early
#if HAS_COLOR_LEDS
- leds.setup();
+ SETUP_RUN(leds.setup());
#endif
- ui.init();
+ #if ENABLED(USE_CONTROLLER_FAN) // Set up fan controller to initialize also the default configurations.
+ SETUP_RUN(controllerFan.setup());
+ #endif
+
+ SETUP_RUN(ui.init());
+ SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.)
+
#if HAS_SPI_LCD && ENABLED(SHOW_BOOTSCREEN)
- ui.show_bootscreen();
+ SETUP_RUN(ui.show_bootscreen());
#endif
- #if ENABLED(SDSUPPORT)
- card.mount(); // Mount the SD card before settings.first_load
+ #if ENABLED(SDSUPPORT) && defined(SDCARD_CONNECTION) && !SD_CONNECTION_IS(LCD)
+ SETUP_RUN(card.mount()); // Mount onboard / custom SD card before settings.first_load
#endif
- // Load data from EEPROM if available (or use defaults)
- // This also updates variables in the planner, elsewhere
- settings.first_load();
+ SETUP_RUN(settings.first_load()); // Load data from EEPROM if available (or use defaults)
+ // This also updates variables in the planner, elsewhere
+
+ #if HAS_SERVICE_INTERVALS
+ SETUP_RUN(ui.reset_status(true)); // Show service messages or keep current status
+ #endif
#if ENABLED(TOUCH_BUTTONS)
- touch.init();
+ SETUP_RUN(touch.init());
#endif
#if HAS_M206_COMMAND
- // Initialize current position based on home_offset
- current_position += home_offset;
+ current_position += home_offset; // Init current position based on home_offset
#endif
- // Vital to init stepper/planner equivalent for current_position
- sync_plan_position();
+ sync_plan_position(); // Vital to init stepper/planner equivalent for current_position
- thermalManager.init(); // Initialize temperature loop
+ SETUP_RUN(thermalManager.init()); // Initialize temperature loop
- print_job_timer.init(); // Initial setup of print job timer
+ SETUP_RUN(print_job_timer.init()); // Initial setup of print job timer
- ui.reset_status(); // Print startup message after print statistics are loaded
+ SETUP_RUN(endstops.init()); // Init endstops and pullups
- endstops.init(); // Init endstops and pullups
-
- stepper.init(); // Init stepper. This enables interrupts!
+ SETUP_RUN(stepper.init()); // Init stepper. This enables interrupts!
#if HAS_SERVOS
- servo_init();
+ SETUP_RUN(servo_init());
#endif
#if HAS_Z_SERVO_PROBE
- servo_probe_init();
+ SETUP_RUN(probe.servo_probe_init());
#endif
#if HAS_PHOTOGRAPH
@@ -985,7 +1013,7 @@ void setup() {
#endif
#if HAS_CUTTER
- cutter.init();
+ SETUP_RUN(cutter.init());
#endif
#if ENABLED(COOLANT_MIST)
@@ -996,23 +1024,19 @@ void setup() {
#endif
#if HAS_BED_PROBE
- endstops.enable_z_probe(false);
- #endif
-
- #if ENABLED(USE_CONTROLLER_FAN)
- SET_OUTPUT(CONTROLLER_FAN_PIN);
+ SETUP_RUN(endstops.enable_z_probe(false));
#endif
#if HAS_STEPPER_RESET
- enableStepperDrivers();
+ SETUP_RUN(enableStepperDrivers());
#endif
#if ENABLED(DIGIPOT_I2C)
- digipot_i2c_init();
+ SETUP_RUN(digipot_i2c_init());
#endif
#if ENABLED(DAC_STEPPER_CURRENT)
- dac_init();
+ SETUP_RUN(dac_init());
#endif
#if EITHER(Z_PROBE_SLED, SOLENOID_PROBE) && HAS_SOLENOID_1
@@ -1035,41 +1059,44 @@ void setup() {
#if DISABLED(CASE_LIGHT_USE_NEOPIXEL)
if (PWM_PIN(CASE_LIGHT_PIN)) SET_PWM(CASE_LIGHT_PIN); else SET_OUTPUT(CASE_LIGHT_PIN);
#endif
- update_case_light();
+ SETUP_RUN(update_case_light());
#endif
#if ENABLED(MK2_MULTIPLEXER)
+ SETUP_LOG("MK2_MULTIPLEXER");
SET_OUTPUT(E_MUX0_PIN);
SET_OUTPUT(E_MUX1_PIN);
SET_OUTPUT(E_MUX2_PIN);
#endif
#if HAS_FANMUX
- fanmux_init();
+ SETUP_RUN(fanmux_init());
#endif
#if ENABLED(MIXING_EXTRUDER)
- mixer.init();
+ SETUP_RUN(mixer.init());
#endif
#if ENABLED(BLTOUCH)
- bltouch.init(/*set_voltage=*/true);
+ SETUP_RUN(bltouch.init(/*set_voltage=*/true));
#endif
#if ENABLED(I2C_POSITION_ENCODERS)
- I2CPEM.init();
+ SETUP_RUN(I2CPEM.init());
#endif
#if ENABLED(EXPERIMENTAL_I2CBUS) && I2C_SLAVE_ADDRESS > 0
+ SETUP_LOG("i2c...");
i2c.onReceive(i2c_on_receive);
i2c.onRequest(i2c_on_request);
#endif
#if DO_SWITCH_EXTRUDER
- move_extruder_servo(0); // Initialize extruder servo
+ SETUP_RUN(move_extruder_servo(0)); // Initialize extruder servo
#endif
#if ENABLED(SWITCHING_NOZZLE)
+ SETUP_LOG("SWITCHING_NOZZLE");
// Initialize nozzle servo(s)
#if SWITCHING_NOZZLE_TWO_SERVOS
lower_nozzle(0);
@@ -1080,75 +1107,89 @@ void setup() {
#endif
#if ENABLED(MAGNETIC_PARKING_EXTRUDER)
- mpe_settings_init();
+ SETUP_RUN(mpe_settings_init());
#endif
#if ENABLED(PARKING_EXTRUDER)
- pe_solenoid_init();
+ SETUP_RUN(pe_solenoid_init());
+ #endif
+
+ #if ENABLED(SWITCHING_TOOLHEAD)
+ swt_init();
#endif
#if ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
- est_init();
+ SETUP_RUN(est_init());
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- recovery.check();
+ SETUP_RUN(recovery.check());
#endif
#if ENABLED(USE_WATCHDOG)
- watchdog_init(); // Reinit watchdog after HAL_get_reset_source call
+ SETUP_RUN(watchdog_init()); // Reinit watchdog after HAL_get_reset_source call
#endif
#if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
- init_closedloop();
+ SETUP_RUN(init_closedloop());
#endif
#ifdef STARTUP_COMMANDS
+ SETUP_LOG("STARTUP_COMMANDS");
queue.inject_P(PSTR(STARTUP_COMMANDS));
#endif
#if ENABLED(INIT_SDCARD_ON_BOOT) && !HAS_SPI_LCD
- card.beginautostart();
+ SETUP_RUN(card.beginautostart());
#endif
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_action_prompt_end();
+ SETUP_RUN(host_action_prompt_end());
#endif
- #if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
- test_tmc_connection(true, true, true, true);
+ #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
+ SETUP_RUN(test_tmc_connection(true, true, true, true));
#endif
#if ENABLED(PRUSA_MMU2)
- mmu2.init();
+ SETUP_RUN(mmu2.init());
#endif
+
+ #if ENABLED(MAX7219_DEBUG)
+ SETUP_RUN(max7219.init());
+ #endif
+
+ marlin_state = MF_RUNNING;
+
+ SETUP_LOG("setup() completed.");
}
/**
* The main Marlin program loop
*
- * - Save or log commands to SD
- * - Process available commands (if not saving)
- * - Call endstop manager
- * - Call inactivity manager
+ * - Call idle() to handle all tasks between G-code commands
+ * Note that no G-codes from the queue can be executed during idle()
+ * but many G-codes can be called directly anytime like macros.
+ * - Check whether SD card auto-start is needed now.
+ * - Check whether SD print finishing is needed now.
+ * - Run one G-code command from the immediate or main command queue
+ * and open up one space. Commands in the main queue may come from sd
+ * card, host, or by direct injection. The queue will continue to fill
+ * as long as idle() or manage_inactivity() are being called.
*/
void loop() {
do {
-
idle();
#if ENABLED(SDSUPPORT)
card.checkautostart();
if (card.flag.abort_sd_printing) abortSDPrinting();
+ if (marlin_state == MF_SD_COMPLETE) finishSDPrinting();
#endif
queue.advance();
endstops.event_handler();
- } while (false // Return to caller for best compatibility
- #ifdef __AVR__
- || true // Loop forever on slower (AVR) boards
- #endif
- );
+ } while (ENABLED(__AVR__)); // Loop forever on slower (AVR) boards
}
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index b7f1460ff8..3f8b72b88a 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,13 +38,9 @@
void stop();
-void idle(
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- bool no_stepper_sleep = false // pass true to keep steppers from disabling on timeout
- #endif
-);
-
-void manage_inactivity(const bool ignore_stepper_queue=false);
+// Pass true to keep steppers from timing out
+void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep=false));
+inline void idle_no_sleep() { idle(TERN_(ADVANCED_PAUSE_FEATURE, true)); }
#if ENABLED(EXPERIMENTAL_I2CBUS)
#include "feature/twibus.h"
@@ -70,9 +66,20 @@ void minkill(const bool steppers_off=false);
void quickstop_stepper();
-extern bool Running;
-inline bool IsRunning() { return Running; }
-inline bool IsStopped() { return !Running; }
+// Global State of the firmware
+enum MarlinState : uint8_t {
+ MF_INITIALIZING = 0,
+ MF_RUNNING = _BV(0),
+ MF_PAUSED = _BV(1),
+ MF_WAITING = _BV(2),
+ MF_STOPPED = _BV(3),
+ MF_SD_COMPLETE = _BV(4),
+ MF_KILLED = _BV(7)
+};
+
+extern MarlinState marlin_state;
+inline bool IsRunning() { return marlin_state == MF_RUNNING; }
+inline bool IsStopped() { return marlin_state != MF_RUNNING; }
bool printingIsActive();
bool printingIsPaused();
@@ -82,10 +89,7 @@ extern bool wait_for_heatup;
#if HAS_RESUME_CONTINUE
extern bool wait_for_user;
-#endif
-
-#if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
- extern bool suspend_auto_report;
+ void wait_for_user_response(millis_t ms=0, const bool no_sleep=false);
#endif
// Inactivity shutdown timer
@@ -121,4 +125,6 @@ void protected_pin_err();
#endif
extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
- SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[];
+ SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[],
+ X_LBL[], Y_LBL[], Z_LBL[], E_LBL[], SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[];
+
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 7a3b413e99..30c2d3eb87 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -59,49 +59,51 @@
#define BOARD_BAM_DICE 1103 // 2PrintBeta BAM&DICE with STK drivers
#define BOARD_BAM_DICE_DUE 1104 // 2PrintBeta BAM&DICE Due with STK drivers
#define BOARD_MKS_BASE 1105 // MKS BASE v1.0
-#define BOARD_MKS_BASE_14 1106 // MKS v1.4 with A4982 stepper drivers
-#define BOARD_MKS_BASE_15 1107 // MKS v1.5 with Allegro A4982 stepper drivers
-#define BOARD_MKS_BASE_HEROIC 1108 // MKS BASE 1.0 with Heroic HR4982 stepper drivers
-#define BOARD_MKS_GEN_13 1109 // MKS GEN v1.3 or 1.4
-#define BOARD_MKS_GEN_L 1110 // MKS GEN L
-#define BOARD_KFB_2 1111 // BigTreeTech or BIQU KFB2.0
-#define BOARD_ZRIB_V20 1112 // zrib V2.0 control board (Chinese knock off RAMPS replica)
-#define BOARD_FELIX2 1113 // Felix 2.0+ Electronics Board (RAMPS like)
-#define BOARD_RIGIDBOARD 1114 // Invent-A-Part RigidBoard
-#define BOARD_RIGIDBOARD_V2 1115 // Invent-A-Part RigidBoard V2
-#define BOARD_SAINSMART_2IN1 1116 // Sainsmart 2-in-1 board
-#define BOARD_ULTIMAKER 1117 // Ultimaker
-#define BOARD_ULTIMAKER_OLD 1118 // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-#define BOARD_AZTEEG_X3 1119 // Azteeg X3
-#define BOARD_AZTEEG_X3_PRO 1120 // Azteeg X3 Pro
-#define BOARD_ULTIMAIN_2 1121 // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-#define BOARD_RUMBA 1122 // Rumba
-#define BOARD_RUMBA_RAISE3D 1123 // Raise3D N series Rumba derivative
-#define BOARD_RL200 1124 // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
-#define BOARD_FORMBOT_TREX2PLUS 1125 // Formbot T-Rex 2 Plus
-#define BOARD_FORMBOT_TREX3 1126 // Formbot T-Rex 3
-#define BOARD_FORMBOT_RAPTOR 1127 // Formbot Raptor
-#define BOARD_FORMBOT_RAPTOR2 1128 // Formbot Raptor 2
-#define BOARD_BQ_ZUM_MEGA_3D 1129 // bq ZUM Mega 3D
-#define BOARD_MAKEBOARD_MINI 1130 // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
-#define BOARD_TRIGORILLA_13 1131 // TriGorilla Anycubic version 1.3-based on RAMPS EFB
-#define BOARD_TRIGORILLA_14 1132 // ... Ver 1.4
-#define BOARD_TRIGORILLA_14_11 1133 // ... Rev 1.1 (new servo pin order)
-#define BOARD_RAMPS_ENDER_4 1134 // Creality: Ender-4, CR-8
-#define BOARD_RAMPS_CREALITY 1135 // Creality: CR10S, CR20, CR-X
-#define BOARD_RAMPS_DAGOMA 1136 // Dagoma F5
-#define BOARD_FYSETC_F6_13 1137 // FYSETC F6 1.3
-#define BOARD_FYSETC_F6_14 1138 // FYSETC F6 1.4
-#define BOARD_DUPLICATOR_I3_PLUS 1139 // Wanhao Duplicator i3 Plus
-#define BOARD_VORON 1140 // VORON Design
-#define BOARD_TRONXY_V3_1_0 1141 // Tronxy TRONXY-V3-1.0
-#define BOARD_Z_BOLT_X_SERIES 1142 // Z-Bolt X Series
-#define BOARD_TT_OSCAR 1143 // TT OSCAR
-#define BOARD_OVERLORD 1144 // Overlord/Overlord Pro
-#define BOARD_HJC2560C_REV1 1145 // ADIMLab Gantry v1
-#define BOARD_HJC2560C_REV2 1146 // ADIMLab Gantry v2
-#define BOARD_TANGO 1147 // BIQU Tango V1
-#define BOARD_MKS_GEN_L_V2 1148 // MKS GEN L V2
+#define BOARD_MKS_BASE_14 1106 // MKS BASE v1.4 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_15 1107 // MKS BASE v1.5 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_16 1108 // MKS BASE v1.6 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_HEROIC 1109 // MKS BASE 1.0 with Heroic HR4982 stepper drivers
+#define BOARD_MKS_GEN_13 1110 // MKS GEN v1.3 or 1.4
+#define BOARD_MKS_GEN_L 1111 // MKS GEN L
+#define BOARD_KFB_2 1112 // BigTreeTech or BIQU KFB2.0
+#define BOARD_ZRIB_V20 1113 // zrib V2.0 control board (Chinese knock off RAMPS replica)
+#define BOARD_FELIX2 1114 // Felix 2.0+ Electronics Board (RAMPS like)
+#define BOARD_RIGIDBOARD 1115 // Invent-A-Part RigidBoard
+#define BOARD_RIGIDBOARD_V2 1116 // Invent-A-Part RigidBoard V2
+#define BOARD_SAINSMART_2IN1 1117 // Sainsmart 2-in-1 board
+#define BOARD_ULTIMAKER 1118 // Ultimaker
+#define BOARD_ULTIMAKER_OLD 1119 // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+#define BOARD_AZTEEG_X3 1120 // Azteeg X3
+#define BOARD_AZTEEG_X3_PRO 1121 // Azteeg X3 Pro
+#define BOARD_ULTIMAIN_2 1122 // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
+#define BOARD_RUMBA 1123 // Rumba
+#define BOARD_RUMBA_RAISE3D 1124 // Raise3D N series Rumba derivative
+#define BOARD_RL200 1125 // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
+#define BOARD_FORMBOT_TREX2PLUS 1126 // Formbot T-Rex 2 Plus
+#define BOARD_FORMBOT_TREX3 1127 // Formbot T-Rex 3
+#define BOARD_FORMBOT_RAPTOR 1128 // Formbot Raptor
+#define BOARD_FORMBOT_RAPTOR2 1129 // Formbot Raptor 2
+#define BOARD_BQ_ZUM_MEGA_3D 1130 // bq ZUM Mega 3D
+#define BOARD_MAKEBOARD_MINI 1131 // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
+#define BOARD_TRIGORILLA_13 1132 // TriGorilla Anycubic version 1.3-based on RAMPS EFB
+#define BOARD_TRIGORILLA_14 1133 // ... Ver 1.4
+#define BOARD_TRIGORILLA_14_11 1134 // ... Rev 1.1 (new servo pin order)
+#define BOARD_RAMPS_ENDER_4 1135 // Creality: Ender-4, CR-8
+#define BOARD_RAMPS_CREALITY 1136 // Creality: CR10S, CR20, CR-X
+#define BOARD_RAMPS_DAGOMA 1137 // Dagoma F5
+#define BOARD_FYSETC_F6_13 1138 // FYSETC F6 1.3
+#define BOARD_FYSETC_F6_14 1139 // FYSETC F6 1.4
+#define BOARD_DUPLICATOR_I3_PLUS 1140 // Wanhao Duplicator i3 Plus
+#define BOARD_VORON 1141 // VORON Design
+#define BOARD_TRONXY_V3_1_0 1142 // Tronxy TRONXY-V3-1.0
+#define BOARD_Z_BOLT_X_SERIES 1143 // Z-Bolt X Series
+#define BOARD_TT_OSCAR 1144 // TT OSCAR
+#define BOARD_OVERLORD 1145 // Overlord/Overlord Pro
+#define BOARD_HJC2560C_REV1 1146 // ADIMLab Gantry v1
+#define BOARD_HJC2560C_REV2 1147 // ADIMLab Gantry v2
+#define BOARD_TANGO 1148 // BIQU Tango V1
+#define BOARD_MKS_GEN_L_V2 1149 // MKS GEN L V2
+#define BOARD_COPYMASTER_3D 1150 // Copymaster 3D
//
// RAMBo and derivatives
@@ -140,6 +142,9 @@
#define BOARD_EINSTART_S 1319 // Einstart retrofit
#define BOARD_WANHAO_ONEPLUS 1320 // Wanhao 0ne+ i3 Mini
#define BOARD_LEAPFROG_XEED2015 1321 // Leapfrog Xeed 2015
+#define BOARD_PICA_REVB 1322 // PICA Shield (original version)
+#define BOARD_PICA 1323 // PICA Shield (rev C or later)
+#define BOARD_INTAMSYS40 1324 // Intamsys 4.0 (Funmat HT)
//
// ATmega1281, ATmega2561
@@ -208,9 +213,9 @@
#define BOARD_BIQU_B300_V1_0 2009 // BIQU B300_V1.0 (Power outputs: Hotend0, Fan, Bed, SPI Driver)
#define BOARD_MKS_SGEN_L 2010 // MKS-SGen-L (Power outputs: Hotend0, Hotend1, Bed, Fan)
#define BOARD_GMARSH_X6_REV1 2011 // GMARSH X6 board, revision 1 prototype
-#define BOARD_BIGTREE_SKR_V1_1 2012 // BigTreeTech SKR v1.1 (Power outputs: Hotend0, Hotend1, Fan, Bed)
-#define BOARD_BIGTREE_SKR_V1_3 2013 // BigTreeTech SKR v1.3 (Power outputs: Hotend0, Hotend1, Fan, Bed)
-#define BOARD_BIGTREE_SKR_V1_4 2014 // BigTreeTech SKR v1.4 (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_1 2012 // BigTreeTech SKR v1.1 (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_3 2013 // BigTreeTech SKR v1.3 (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_4 2014 // BigTreeTech SKR v1.4 (Power outputs: Hotend0, Hotend1, Fan, Bed)
//
// LPC1769 ARM Cortex M3
@@ -224,7 +229,7 @@
#define BOARD_COHESION3D_MINI 2505 // Cohesion3D Mini
#define BOARD_SMOOTHIEBOARD 2506 // Smoothieboard
#define BOARD_TH3D_EZBOARD 2507 // TH3D EZBoard v1.0
-#define BOARD_BIGTREE_SKR_V1_4_TURBO 2508 // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_4_TURBO 2508 // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
//
// SAM3X8E ARM Cortex M3
@@ -281,10 +286,10 @@
#define BOARD_MKS_ROBIN_LITE 4009 // MKS Robin Lite/Lite2 (STM32F103RCT6)
#define BOARD_MKS_ROBIN_LITE3 4010 // MKS Robin Lite3 (STM32F103RCT6)
#define BOARD_MKS_ROBIN_PRO 4011 // MKS Robin Pro (STM32F103ZET6)
-#define BOARD_BIGTREE_SKR_MINI_V1_1 4012 // BigTreeTech SKR Mini v1.1 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_V1_1 4012 // BigTreeTech SKR Mini v1.1 (STM32F103RC)
#define BOARD_BTT_SKR_MINI_E3_V1_0 4013 // BigTreeTech SKR Mini E3 (STM32F103RC)
#define BOARD_BTT_SKR_MINI_E3_V1_2 4014 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
-#define BOARD_BIGTREE_SKR_E3_DIP 4015 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
+#define BOARD_BTT_SKR_E3_DIP 4015 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
#define BOARD_JGAURORA_A5S_A1 4016 // JGAurora A5S A1 (STM32F103ZET6)
#define BOARD_FYSETC_AIO_II 4017 // FYSETC AIO_II
#define BOARD_FYSETC_CHEETAH 4018 // FYSETC Cheetah
@@ -294,7 +299,6 @@
#define BOARD_GTM32_MINI_A30 4022 // STM32F103VET6 controller
#define BOARD_GTM32_REV_B 4023 // STM32F103VET6 controller
-
//
// ARM Cortex-M4F
//
@@ -309,18 +313,20 @@
#define BOARD_BEAST 4200 // STM32F4xxVxT6 Libmaple-based STM32F4 controller
#define BOARD_GENERIC_STM32F4 4201 // STM32 STM32GENERIC-based STM32F4 controller
#define BOARD_ARMED 4202 // Arm'ed STM32F4-based controller
-#define BOARD_RUMBA32 4203 // RUMBA32 STM32F4-based controller
-#define BOARD_BLACK_STM32F407VE 4204 // BLACK_STM32F407VE
-#define BOARD_BLACK_STM32F407ZE 4205 // BLACK_STM32F407ZE
-#define BOARD_STEVAL_3DP001V1 4206 // STEVAL-3DP001V1 3D PRINTER BOARD
-#define BOARD_BIGTREE_SKR_PRO_V1_1 4207 // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
-#define BOARD_BIGTREE_BTT002_V1_0 4208 // BigTreeTech BTT002 v1.0 (STM32F407VE)
-#define BOARD_LERDGE_K 4209 // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_X 4210 // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D 4211 // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6 4212 // FYSETC S6 board
-#define BOARD_FLYF407ZG 4213 // FLYF407ZG board (STM32F407ZG)
-#define BOARD_MKS_ROBIN2 4214 // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_RUMBA32_AUS3D 4203 // RUMBA32 STM32F446VET6 based controller from Aus3D
+#define BOARD_RUMBA32_MKS 4204 // RUMBA32 STM32F446VET6 based controller from Makerbase
+#define BOARD_BLACK_STM32F407VE 4205 // BLACK_STM32F407VE
+#define BOARD_BLACK_STM32F407ZE 4206 // BLACK_STM32F407ZE
+#define BOARD_STEVAL_3DP001V1 4207 // STEVAL-3DP001V1 3D PRINTER BOARD
+#define BOARD_BTT_SKR_PRO_V1_1 4208 // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
+#define BOARD_BTT_BTT002_V1_0 4209 // BigTreeTech BTT002 v1.0 (STM32F407VE)
+#define BOARD_BTT_GTR_V1_0 4210 // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_LERDGE_K 4211 // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_X 4212 // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D 4213 // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6 4214 // FYSETC S6 board
+#define BOARD_FLYF407ZG 4215 // FLYF407ZG board (STM32F407ZG)
+#define BOARD_MKS_ROBIN2 4216 // MKS_ROBIN2 (STM32F407ZE)
//
// ARM Cortex M7
@@ -332,9 +338,15 @@
//
// Espressif ESP32 WiFi
//
-#define BOARD_ESPRESSIF_ESP32 6000
-#define BOARD_MRR_ESPA 6001
-#define BOARD_MRR_ESPE 6002
+#define BOARD_ESPRESSIF_ESP32 6000 // Generic ESP32
+#define BOARD_MRR_ESPA 6001 // MRR ESPA board based on ESP32 (native pins only)
+#define BOARD_MRR_ESPE 6002 // MRR ESPE board based on ESP32 (with I2S stepper stream)
+#define BOARD_E4D_BOX 6003 // E4d@BOX
+
+//
+// SAMD51 ARM Cortex M4
+//
+#define BOARD_AGCM4_RAMPS_144 6100 // RAMPS 1.4.4
//
// Simulations
diff --git a/Marlin/src/core/debug_out.h b/Marlin/src/core/debug_out.h
index 07bdad7ff2..4b2cdf9f77 100644
--- a/Marlin/src/core/debug_out.h
+++ b/Marlin/src/core/debug_out.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index a89578f529..833899bdcb 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,7 +21,10 @@
*/
#pragma once
-#include "../inc/MarlinConfigPre.h"
+//
+// Included by MarlinConfigPre.h ahead of Configuration_adv.h.
+// Don't use #if in this file for anything not defined early!
+//
#define _A4988 0x4988
#define _A5984 0x5984
@@ -52,114 +55,124 @@
#define _TMC5160_STANDALONE 0x5160B
#define _DRIVER_ID(V) _CAT(_, V)
-#define _AXIS_DRIVER_TYPE(A,T) (_DRIVER_ID(A##_DRIVER_TYPE) == _CAT(_, T))
+#define _AXIS_DRIVER_TYPE(A,T) (_DRIVER_ID(A##_DRIVER_TYPE) == _DRIVER_ID(T))
#define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T)
#define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)
#define AXIS_DRIVER_TYPE_Z(T) _AXIS_DRIVER_TYPE(Z,T)
-#if EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE)
- #define AXIS_DRIVER_TYPE_X2(T) _AXIS_DRIVER_TYPE(X2,T)
-#else
- #define AXIS_DRIVER_TYPE_X2(T) false
-#endif
+
+#define AXIS_DRIVER_TYPE_X2(T) (EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE) && _AXIS_DRIVER_TYPE(X2,T))
#define AXIS_DRIVER_TYPE_Y2(T) (ENABLED(Y_DUAL_STEPPER_DRIVERS) && _AXIS_DRIVER_TYPE(Y2,T))
#define AXIS_DRIVER_TYPE_Z2(T) (NUM_Z_STEPPER_DRIVERS >= 2 && _AXIS_DRIVER_TYPE(Z2,T))
#define AXIS_DRIVER_TYPE_Z3(T) (NUM_Z_STEPPER_DRIVERS >= 3 && _AXIS_DRIVER_TYPE(Z3,T))
#define AXIS_DRIVER_TYPE_Z4(T) (NUM_Z_STEPPER_DRIVERS >= 4 && _AXIS_DRIVER_TYPE(Z4,T))
-#define AXIS_DRIVER_TYPE_E0(T) (E_STEPPERS > 0 && _AXIS_DRIVER_TYPE(E0,T))
-#define AXIS_DRIVER_TYPE_E1(T) (E_STEPPERS > 1 && _AXIS_DRIVER_TYPE(E1,T))
-#define AXIS_DRIVER_TYPE_E2(T) (E_STEPPERS > 2 && _AXIS_DRIVER_TYPE(E2,T))
-#define AXIS_DRIVER_TYPE_E3(T) (E_STEPPERS > 3 && _AXIS_DRIVER_TYPE(E3,T))
-#define AXIS_DRIVER_TYPE_E4(T) (E_STEPPERS > 4 && _AXIS_DRIVER_TYPE(E4,T))
-#define AXIS_DRIVER_TYPE_E5(T) (E_STEPPERS > 5 && _AXIS_DRIVER_TYPE(E5,T))
-#define AXIS_DRIVER_TYPE_E6(T) (E_STEPPERS > 6 && _AXIS_DRIVER_TYPE(E6,T))
-#define AXIS_DRIVER_TYPE_E7(T) (E_STEPPERS > 7 && _AXIS_DRIVER_TYPE(E7,T))
+
+#define AXIS_DRIVER_TYPE_E(N,T) (E_STEPPERS > N && _AXIS_DRIVER_TYPE(E##N,T))
+#define AXIS_DRIVER_TYPE_E0(T) AXIS_DRIVER_TYPE_E(0,T)
+#define AXIS_DRIVER_TYPE_E1(T) AXIS_DRIVER_TYPE_E(1,T)
+#define AXIS_DRIVER_TYPE_E2(T) AXIS_DRIVER_TYPE_E(2,T)
+#define AXIS_DRIVER_TYPE_E3(T) AXIS_DRIVER_TYPE_E(3,T)
+#define AXIS_DRIVER_TYPE_E4(T) AXIS_DRIVER_TYPE_E(4,T)
+#define AXIS_DRIVER_TYPE_E5(T) AXIS_DRIVER_TYPE_E(5,T)
+#define AXIS_DRIVER_TYPE_E6(T) AXIS_DRIVER_TYPE_E(6,T)
+#define AXIS_DRIVER_TYPE_E7(T) AXIS_DRIVER_TYPE_E(7,T)
#define AXIS_DRIVER_TYPE(A,T) AXIS_DRIVER_TYPE_##A(T)
-#define HAS_E_DRIVER(T) ( AXIS_DRIVER_TYPE_E0(T) || AXIS_DRIVER_TYPE_E1(T) \
- || AXIS_DRIVER_TYPE_E2(T) || AXIS_DRIVER_TYPE_E3(T) \
- || AXIS_DRIVER_TYPE_E4(T) || AXIS_DRIVER_TYPE_E5(T) \
- || AXIS_DRIVER_TYPE_E6(T) || AXIS_DRIVER_TYPE_E7(T) )
+#define _OR_ADTE(N,T) || AXIS_DRIVER_TYPE_E(N,T)
+#define HAS_E_DRIVER(T) (0 RREPEAT2(E_STEPPERS, _OR_ADTE, T))
-#define HAS_DRIVER(T) ( AXIS_DRIVER_TYPE_X(T) || AXIS_DRIVER_TYPE_X2(T) \
- || AXIS_DRIVER_TYPE_Y(T) || AXIS_DRIVER_TYPE_Y2(T) \
- || AXIS_DRIVER_TYPE_Z(T) || AXIS_DRIVER_TYPE_Z2(T) \
- || AXIS_DRIVER_TYPE_Z3(T) || AXIS_DRIVER_TYPE_Z4(T) \
- || HAS_E_DRIVER(T) )
+#define HAS_DRIVER(T) ( AXIS_DRIVER_TYPE_X(T) || AXIS_DRIVER_TYPE_Y(T) || AXIS_DRIVER_TYPE_Z(T) \
+ || AXIS_DRIVER_TYPE_X2(T) || AXIS_DRIVER_TYPE_Y2(T) || AXIS_DRIVER_TYPE_Z2(T) \
+ || AXIS_DRIVER_TYPE_Z3(T) || AXIS_DRIVER_TYPE_Z4(T) || HAS_E_DRIVER(T) )
// Test for supported TMC drivers that require advanced configuration
// Does not match standalone configurations
-#define HAS_TRINAMIC ( HAS_DRIVER(TMC2130) \
- || HAS_DRIVER(TMC2160) \
- || HAS_DRIVER(TMC2208) \
- || HAS_DRIVER(TMC2209) \
- || HAS_DRIVER(TMC2660) \
- || HAS_DRIVER(TMC5130) \
- || HAS_DRIVER(TMC5160) )
+#if ( HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) \
+ || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209) \
+ || HAS_DRIVER(TMC2660) \
+ || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160) )
+ #define HAS_TRINAMIC_CONFIG 1
+#endif
-#define HAS_TRINAMIC_STANDALONE ( HAS_DRIVER(TMC2130_STANDALONE) \
- || HAS_DRIVER(TMC2208_STANDALONE) \
- || HAS_DRIVER(TMC2209_STANDALONE) \
- || HAS_DRIVER(TMC26X_STANDALONE) \
- || HAS_DRIVER(TMC2660_STANDALONE) \
- || HAS_DRIVER(TMC5130_STANDALONE) \
- || HAS_DRIVER(TMC5160_STANDALONE) \
- || HAS_DRIVER(TMC2160_STANDALONE) )
+#define HAS_TRINAMIC HAS_TRINAMIC_CONFIG
-#define HAS_TMCX1X0 ( HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) \
- || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160))
+#if ( HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2160_STANDALONE) \
+ || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC2209_STANDALONE) \
+ || HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE) \
+ || HAS_DRIVER(TMC5130_STANDALONE) || HAS_DRIVER(TMC5160_STANDALONE) )
+ #define HAS_TRINAMIC_STANDALONE 1
+#endif
-#define HAS_TMC220x (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209))
+#if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160)
+ #define HAS_TMCX1X0 1
+#endif
-#define AXIS_IS_TMC(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
- || AXIS_DRIVER_TYPE(A,TMC2160) \
- || AXIS_DRIVER_TYPE(A,TMC2208) \
- || AXIS_DRIVER_TYPE(A,TMC2209) \
+#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
+ #define HAS_TMC220x 1
+#endif
+
+#define AXIS_IS_TMC(A) ( AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+ || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
|| AXIS_DRIVER_TYPE(A,TMC2660) \
- || AXIS_DRIVER_TYPE(A,TMC5130) \
- || AXIS_DRIVER_TYPE(A,TMC5160) )
+ || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
// Test for a driver that uses SPI - this allows checking whether a _CS_ pin
// is considered sensitive
-#define AXIS_HAS_SPI(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
- || AXIS_DRIVER_TYPE(A,TMC2160) \
+#define AXIS_HAS_SPI(A) ( AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
|| AXIS_DRIVER_TYPE(A,TMC2660) \
- || AXIS_DRIVER_TYPE(A,TMC5130) \
- || AXIS_DRIVER_TYPE(A,TMC5160) )
+ || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
-#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) \
- || AXIS_DRIVER_TYPE(A,TMC2209) )
+#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) )
-#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
+#define AXIS_HAS_RXTX AXIS_HAS_UART
-#define AXIS_HAS_STALLGUARD(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
- || AXIS_DRIVER_TYPE(A,TMC2160) \
+#define AXIS_HAS_SW_SERIAL(A) ( AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL) )
+
+#define AXIS_HAS_STALLGUARD(A) ( AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
|| AXIS_DRIVER_TYPE(A,TMC2209) \
|| AXIS_DRIVER_TYPE(A,TMC2660) \
- || AXIS_DRIVER_TYPE(A,TMC5130) \
- || AXIS_DRIVER_TYPE(A,TMC5160) )
+ || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
-#define AXIS_HAS_STEALTHCHOP(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
- || AXIS_DRIVER_TYPE(A,TMC2160) \
- || AXIS_DRIVER_TYPE(A,TMC2208) \
+#define AXIS_HAS_STEALTHCHOP(A) ( AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+ || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
+ || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
+
+#define AXIS_HAS_SG_RESULT(A) ( AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+ || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) )
+
+#define AXIS_HAS_COOLSTEP(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
|| AXIS_DRIVER_TYPE(A,TMC2209) \
- || AXIS_DRIVER_TYPE(A,TMC5130) \
- || AXIS_DRIVER_TYPE(A,TMC5160) )
+ || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
-#define ANY_AXIS_HAS(T) ( AXIS_HAS_##T(X) || AXIS_HAS_##T(X2) \
- || AXIS_HAS_##T(Y) || AXIS_HAS_##T(Y2) \
- || AXIS_HAS_##T(Z) || AXIS_HAS_##T(Z2) \
- || AXIS_HAS_##T(Z3) \
- || AXIS_HAS_##T(E0) || AXIS_HAS_##T(E1) \
- || AXIS_HAS_##T(E2) || AXIS_HAS_##T(E3) \
- || AXIS_HAS_##T(E4) || AXIS_HAS_##T(E5) \
- || AXIS_HAS_##T(E6) || AXIS_HAS_##T(E7) )
+#define _OR_EAH(N,T) || AXIS_HAS_##T(E##N)
+#define E_AXIS_HAS(T) (0 _OR_EAH(0,T) _OR_EAH(1,T) _OR_EAH(2,T) _OR_EAH(3,T) _OR_EAH(4,T) _OR_EAH(5,T) _OR_EAH(6,T) _OR_EAH(7,T))
-#define HAS_STEALTHCHOP ANY_AXIS_HAS(STEALTHCHOP)
-#define HAS_STALLGUARD ANY_AXIS_HAS(STALLGUARD)
-#define TMC_HAS_SPI ANY_AXIS_HAS(SPI)
-#define TMC_HAS_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL)
+#define ANY_AXIS_HAS(T) ( AXIS_HAS_##T(X) || AXIS_HAS_##T(Y) || AXIS_HAS_##T(Z) \
+ || AXIS_HAS_##T(X2) || AXIS_HAS_##T(Y2) || AXIS_HAS_##T(Z2) \
+ || AXIS_HAS_##T(Z3) || AXIS_HAS_##T(Z4) || E_AXIS_HAS(T) )
+
+#if ANY_AXIS_HAS(STEALTHCHOP)
+ #define HAS_STEALTHCHOP 1
+#endif
+#if ANY_AXIS_HAS(STALLGUARD)
+ #define HAS_STALLGUARD 1
+#endif
+#if ANY_AXIS_HAS(SG_RESULT)
+ #define HAS_SG_RESULT 1
+#endif
+#if ANY_AXIS_HAS(COOLSTEP)
+ #define HAS_COOLSTEP 1
+#endif
+#if ANY_AXIS_HAS(RXTX)
+ #define HAS_TMC_UART 1
+#endif
+#if ANY_AXIS_HAS(SPI)
+ #define HAS_TMC_SPI 1
+#endif
+
+// Defines that can't be evaluated now
+#define HAS_TMC_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL)
//
// Stretching 'drivers.h' to include LPC/SAMD51 SD options
@@ -170,7 +183,11 @@
#define _SDCARD_ID(V) _CAT(_SDCARD_, V)
#define SD_CONNECTION_IS(V) (_SDCARD_ID(SDCARD_CONNECTION) == _SDCARD_ID(V))
-#define HAS_L64XX (HAS_DRIVER(L6470) || HAS_DRIVER(L6474) || HAS_DRIVER(L6480) || HAS_DRIVER(POWERSTEP01))
-#define HAS_L64XX_NOT_L6474 (HAS_L64XX && !HAS_DRIVER(L6474))
+#if HAS_DRIVER(L6470) || HAS_DRIVER(L6474) || HAS_DRIVER(L6480) || HAS_DRIVER(POWERSTEP01)
+ #define HAS_L64XX 1
+#endif
+#if HAS_L64XX && !HAS_DRIVER(L6474)
+ #define HAS_L64XX_NOT_L6474 1
+#endif
#define AXIS_IS_L64XX(A) (AXIS_DRIVER_TYPE_##A(L6470) || AXIS_DRIVER_TYPE_##A(L6474) || AXIS_DRIVER_TYPE_##A(L6480) || AXIS_DRIVER_TYPE_##A(POWERSTEP01))
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index fe279bae89..f58ace7709 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -97,6 +97,210 @@
// #define STRING_SPLASH_LINE3 WEBSITE_URL
//#endif
+//
+// Common Serial Console Messages
+// Don't change these strings because serial hosts look for them.
+//
+
+#define STR_ENQUEUEING "enqueueing \""
+#define STR_POWERUP "PowerUp"
+#define STR_EXTERNAL_RESET " External Reset"
+#define STR_BROWNOUT_RESET " Brown out Reset"
+#define STR_WATCHDOG_RESET " Watchdog Reset"
+#define STR_SOFTWARE_RESET " Software Reset"
+#define STR_AUTHOR " | Author: "
+#define STR_CONFIGURATION_VER " Last Updated: "
+#define STR_FREE_MEMORY " Free Memory: "
+#define STR_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
+#define STR_OK "ok"
+#define STR_WAIT "wait"
+#define STR_STATS "Stats: "
+#define STR_FILE_SAVED "Done saving file."
+#define STR_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
+#define STR_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
+#define STR_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: "
+#define STR_FILE_PRINTED "Done printing file"
+#define STR_BEGIN_FILE_LIST "Begin file list"
+#define STR_END_FILE_LIST "End file list"
+#define STR_INVALID_EXTRUDER "Invalid extruder"
+#define STR_INVALID_E_STEPPER "Invalid E stepper"
+#define STR_E_STEPPER_NOT_SPECIFIED "E stepper not specified"
+#define STR_INVALID_SOLENOID "Invalid solenoid"
+#define STR_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
+#define STR_COUNT_X " Count X:"
+#define STR_COUNT_A " Count A:"
+#define STR_WATCHDOG_FIRED "Watchdog timeout. Reset required."
+#define STR_ERR_KILLED "Printer halted. kill() called!"
+#define STR_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
+#define STR_BUSY_PROCESSING "busy: processing"
+#define STR_BUSY_PAUSED_FOR_USER "busy: paused for user"
+#define STR_BUSY_PAUSED_FOR_INPUT "busy: paused for input"
+#define STR_Z_MOVE_COMP "Z_move_comp"
+#define STR_RESEND "Resend: "
+#define STR_UNKNOWN_COMMAND "Unknown command: \""
+#define STR_ACTIVE_EXTRUDER "Active Extruder: "
+#define STR_X_MIN "x_min"
+#define STR_X_MAX "x_max"
+#define STR_X2_MIN "x2_min"
+#define STR_X2_MAX "x2_max"
+#define STR_Y_MIN "y_min"
+#define STR_Y_MAX "y_max"
+#define STR_Y2_MIN "y2_min"
+#define STR_Y2_MAX "y2_max"
+#define STR_Z_MIN "z_min"
+#define STR_Z_MAX "z_max"
+#define STR_Z2_MIN "z2_min"
+#define STR_Z2_MAX "z2_max"
+#define STR_Z3_MIN "z3_min"
+#define STR_Z3_MAX "z3_max"
+#define STR_Z4_MIN "z4_min"
+#define STR_Z4_MAX "z4_max"
+#define STR_Z_PROBE "z_probe"
+#define STR_FILAMENT_RUNOUT_SENSOR "filament"
+#define STR_PROBE_OFFSET "Probe Offset"
+#define STR_SKEW_MIN "min_skew_factor: "
+#define STR_SKEW_MAX "max_skew_factor: "
+#define STR_ERR_MATERIAL_INDEX "M145 S out of range (0-1)"
+#define STR_ERR_M421_PARAMETERS "M421 incorrect parameter usage"
+#define STR_ERR_BAD_PLANE_MODE "G5 requires XY plane mode"
+#define STR_ERR_MESH_XY "Mesh point cannot be resolved"
+#define STR_ERR_ARC_ARGS "G2/G3 bad parameters"
+#define STR_ERR_PROTECTED_PIN "Protected Pin"
+#define STR_ERR_M420_FAILED "Failed to enable Bed Leveling"
+#define STR_ERR_M428_TOO_FAR "Too far from reference point"
+#define STR_ERR_M303_DISABLED "PIDTEMP disabled"
+#define STR_M119_REPORT "Reporting endstop status"
+#define STR_ON "ON"
+#define STR_OFF "OFF"
+#define STR_ENDSTOP_HIT "TRIGGERED"
+#define STR_ENDSTOP_OPEN "open"
+#define STR_HOTEND_OFFSET "Hotend offsets:"
+#define STR_DUPLICATION_MODE "Duplication mode: "
+#define STR_SOFT_ENDSTOPS "Soft endstops: "
+#define STR_SOFT_MIN " Min: "
+#define STR_SOFT_MAX " Max: "
+
+#define STR_SAVED_POS "Position saved"
+#define STR_RESTORING_POS "Restoring position"
+#define STR_INVALID_POS_SLOT "Invalid slot. Total: "
+
+#define STR_SD_CANT_OPEN_SUBDIR "Cannot open subdir "
+#define STR_SD_INIT_FAIL "SD init fail"
+#define STR_SD_VOL_INIT_FAIL "volume.init failed"
+#define STR_SD_OPENROOT_FAIL "openRoot failed"
+#define STR_SD_CARD_OK "SD card ok"
+#define STR_SD_WORKDIR_FAIL "workDir open failed"
+#define STR_SD_OPEN_FILE_FAIL "open failed, File: "
+#define STR_SD_FILE_OPENED "File opened: "
+#define STR_SD_SIZE " Size: "
+#define STR_SD_FILE_SELECTED "File selected"
+#define STR_SD_WRITE_TO_FILE "Writing to file: "
+#define STR_SD_PRINTING_BYTE "SD printing byte "
+#define STR_SD_NOT_PRINTING "Not SD printing"
+#define STR_SD_ERR_WRITE_TO_FILE "error writing to file"
+#define STR_SD_ERR_READ "SD read error"
+#define STR_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
+
+#define STR_ENDSTOPS_HIT "endstops hit: "
+#define STR_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
+#define STR_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
+#define STR_ERR_HOTEND_TOO_COLD "Hotend too cold"
+#define STR_ERR_Z_HOMING_SER "Home XY first"
+#define STR_ERR_EEPROM_WRITE "Error writing to EEPROM!"
+
+#define STR_FILAMENT_CHANGE_HEAT_LCD "Press button to heat nozzle"
+#define STR_FILAMENT_CHANGE_INSERT_LCD "Insert filament and press button"
+#define STR_FILAMENT_CHANGE_WAIT_LCD "Press button to resume"
+#define STR_FILAMENT_CHANGE_HEAT_M108 "Send M108 to heat nozzle"
+#define STR_FILAMENT_CHANGE_INSERT_M108 "Insert filament and send M108"
+#define STR_FILAMENT_CHANGE_WAIT_M108 "Send M108 to resume"
+
+#define STR_STOP_BLTOUCH "!! STOP called because of BLTouch error - restart with M999"
+#define STR_STOP_UNHOMED "!! STOP called because of unhomed error - restart with M999"
+#define STR_KILL_INACTIVE_TIME "!! KILL caused by too much inactive time - current command: "
+#define STR_KILL_BUTTON "!! KILL caused by KILL button/pin"
+
+// temperature.cpp strings
+#define STR_PID_AUTOTUNE_PREFIX "PID Autotune"
+#define STR_PID_AUTOTUNE_START STR_PID_AUTOTUNE_PREFIX " start"
+#define STR_PID_AUTOTUNE_FAILED STR_PID_AUTOTUNE_PREFIX " failed!"
+#define STR_PID_BAD_EXTRUDER_NUM STR_PID_AUTOTUNE_FAILED " Bad extruder number"
+#define STR_PID_TEMP_TOO_HIGH STR_PID_AUTOTUNE_FAILED " Temperature too high"
+#define STR_PID_TIMEOUT STR_PID_AUTOTUNE_FAILED " timeout"
+#define STR_BIAS " bias: "
+#define STR_D_COLON " d: "
+#define STR_T_MIN " min: "
+#define STR_T_MAX " max: "
+#define STR_KU " Ku: "
+#define STR_TU " Tu: "
+#define STR_CLASSIC_PID " Classic PID "
+#define STR_KP " Kp: "
+#define STR_KI " Ki: "
+#define STR_KD " Kd: "
+#define STR_PID_AUTOTUNE_FINISHED STR_PID_AUTOTUNE_PREFIX " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
+#define STR_PID_DEBUG " PID_DEBUG "
+#define STR_PID_DEBUG_INPUT ": Input "
+#define STR_PID_DEBUG_OUTPUT " Output "
+#define STR_PID_DEBUG_PTERM " pTerm "
+#define STR_PID_DEBUG_ITERM " iTerm "
+#define STR_PID_DEBUG_DTERM " dTerm "
+#define STR_PID_DEBUG_CTERM " cTerm "
+#define STR_INVALID_EXTRUDER_NUM " - Invalid extruder number !"
+
+#define STR_HEATER_BED "bed"
+#define STR_HEATER_CHAMBER "chamber"
+
+#define STR_STOPPED_HEATER ", system stopped! Heater_ID: "
+#define STR_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !"
+#define STR_T_HEATING_FAILED "Heating failed"
+#define STR_T_THERMAL_RUNAWAY "Thermal Runaway"
+#define STR_T_MAXTEMP "MAXTEMP triggered"
+#define STR_T_MINTEMP "MINTEMP triggered"
+#define STR_ERR_PROBING_FAILED "Probing Failed"
+#define STR_ZPROBE_OUT_SER "Z Probe Past Bed"
+
+// Debug
+#define STR_DEBUG_PREFIX "DEBUG:"
+#define STR_DEBUG_OFF "off"
+#define STR_DEBUG_ECHO "ECHO"
+#define STR_DEBUG_INFO "INFO"
+#define STR_DEBUG_ERRORS "ERRORS"
+#define STR_DEBUG_DRYRUN "DRYRUN"
+#define STR_DEBUG_COMMUNICATION "COMMUNICATION"
+#define STR_DEBUG_LEVELING "LEVELING"
+
+// LCD Menu Messages
+
+#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/langdata_##M.h)
+#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
+
+#define LANGUAGE_INCL_(M) STRINGIFY_(../lcd/language/language_##M.h)
+#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M)
+
+#define STR_X "X"
+#define STR_Y "Y"
+#define STR_Z "Z"
+#define STR_E "E"
+#if IS_KINEMATIC
+ #define STR_A "A"
+ #define STR_B "B"
+ #define STR_C "C"
+#else
+ #define STR_A "X"
+ #define STR_B "Y"
+ #define STR_C "Z"
+#endif
+#define STR_X2 "X2"
+#define STR_Y2 "Y2"
+#define STR_Z2 "Z2"
+#define STR_Z3 "Z3"
+#define STR_Z4 "Z4"
+
+#define LCD_STR_A STR_A
+#define LCD_STR_B STR_B
+#define LCD_STR_C STR_C
+#define LCD_STR_E STR_E
+
#if HAS_CHARACTER_LCD
// Custom characters defined in the first 8 characters of the LCD
@@ -135,213 +339,6 @@
#endif
-// Common LCD messages
-
- /* nothing here yet */
-
-// Common serial messages
-#define MSG_MARLIN "Marlin"
-
-// Serial Console Messages (do not translate those!)
-
-#define MSG_ENQUEUEING "enqueueing \""
-#define MSG_POWERUP "PowerUp"
-#define MSG_EXTERNAL_RESET " External Reset"
-#define MSG_BROWNOUT_RESET " Brown out Reset"
-#define MSG_WATCHDOG_RESET " Watchdog Reset"
-#define MSG_SOFTWARE_RESET " Software Reset"
-#define MSG_AUTHOR " | Author: "
-#define MSG_CONFIGURATION_VER " Last Updated: "
-#define MSG_FREE_MEMORY " Free Memory: "
-#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
-#define MSG_OK "ok"
-#define MSG_WAIT "wait"
-#define MSG_STATS "Stats: "
-#define MSG_FILE_SAVED "Done saving file."
-#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
-#define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
-#define MSG_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: "
-#define MSG_FILE_PRINTED "Done printing file"
-#define MSG_BEGIN_FILE_LIST "Begin file list"
-#define MSG_END_FILE_LIST "End file list"
-#define MSG_INVALID_EXTRUDER "Invalid extruder"
-#define MSG_INVALID_E_STEPPER "Invalid E stepper"
-#define MSG_E_STEPPER_NOT_SPECIFIED "E stepper not specified"
-#define MSG_INVALID_SOLENOID "Invalid solenoid"
-#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
-#define MSG_COUNT_X " Count X:"
-#define MSG_COUNT_A " Count A:"
-#define MSG_WATCHDOG_FIRED "Watchdog timeout. Reset required."
-#define MSG_ERR_KILLED "Printer halted. kill() called!"
-#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-#define MSG_BUSY_PROCESSING "busy: processing"
-#define MSG_BUSY_PAUSED_FOR_USER "busy: paused for user"
-#define MSG_BUSY_PAUSED_FOR_INPUT "busy: paused for input"
-#define MSG_Z_MOVE_COMP "Z_move_comp"
-#define MSG_RESEND "Resend: "
-#define MSG_UNKNOWN_COMMAND "Unknown command: \""
-#define MSG_ACTIVE_EXTRUDER "Active Extruder: "
-#define MSG_X_MIN "x_min"
-#define MSG_X_MAX "x_max"
-#define MSG_X2_MIN "x2_min"
-#define MSG_X2_MAX "x2_max"
-#define MSG_Y_MIN "y_min"
-#define MSG_Y_MAX "y_max"
-#define MSG_Y2_MIN "y2_min"
-#define MSG_Y2_MAX "y2_max"
-#define MSG_Z_MIN "z_min"
-#define MSG_Z_MAX "z_max"
-#define MSG_Z2_MIN "z2_min"
-#define MSG_Z2_MAX "z2_max"
-#define MSG_Z3_MIN "z3_min"
-#define MSG_Z3_MAX "z3_max"
-#define MSG_Z4_MIN "z4_min"
-#define MSG_Z4_MAX "z4_max"
-#define MSG_Z_PROBE "z_probe"
-#define MSG_FILAMENT_RUNOUT_SENSOR "filament"
-#define MSG_PROBE_OFFSET "Probe Offset"
-#define MSG_SKEW_MIN "min_skew_factor: "
-#define MSG_SKEW_MAX "max_skew_factor: "
-#define MSG_ERR_MATERIAL_INDEX "M145 S out of range (0-1)"
-#define MSG_ERR_M421_PARAMETERS "M421 incorrect parameter usage"
-#define MSG_ERR_BAD_PLANE_MODE "G5 requires XY plane mode"
-#define MSG_ERR_MESH_XY "Mesh point cannot be resolved"
-#define MSG_ERR_ARC_ARGS "G2/G3 bad parameters"
-#define MSG_ERR_PROTECTED_PIN "Protected Pin"
-#define MSG_ERR_M420_FAILED "Failed to enable Bed Leveling"
-#define MSG_ERR_M428_TOO_FAR "Too far from reference point"
-#define MSG_ERR_M303_DISABLED "PIDTEMP disabled"
-#define MSG_M119_REPORT "Reporting endstop status"
-#define MSG_ON "ON"
-#define MSG_OFF "OFF"
-#define MSG_ENDSTOP_HIT "TRIGGERED"
-#define MSG_ENDSTOP_OPEN "open"
-#define MSG_HOTEND_OFFSET "Hotend offsets:"
-#define MSG_DUPLICATION_MODE "Duplication mode: "
-#define MSG_SOFT_ENDSTOPS "Soft endstops: "
-#define MSG_SOFT_MIN " Min: "
-#define MSG_SOFT_MAX " Max: "
-
-#define MSG_SD_CANT_OPEN_SUBDIR "Cannot open subdir "
-#define MSG_SD_INIT_FAIL "SD init fail"
-#define MSG_SD_VOL_INIT_FAIL "volume.init failed"
-#define MSG_SD_OPENROOT_FAIL "openRoot failed"
-#define MSG_SD_CARD_OK "SD card ok"
-#define MSG_SD_WORKDIR_FAIL "workDir open failed"
-#define MSG_SD_OPEN_FILE_FAIL "open failed, File: "
-#define MSG_SD_FILE_OPENED "File opened: "
-#define MSG_SD_SIZE " Size: "
-#define MSG_SD_FILE_SELECTED "File selected"
-#define MSG_SD_WRITE_TO_FILE "Writing to file: "
-#define MSG_SD_PRINTING_BYTE "SD printing byte "
-#define MSG_SD_NOT_PRINTING "Not SD printing"
-#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file"
-#define MSG_SD_ERR_READ "SD read error"
-#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
-
-#define MSG_STEPPER_TOO_HIGH "Steprate too high: "
-#define MSG_ENDSTOPS_HIT "endstops hit: "
-#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
-#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
-#define MSG_ERR_HOTEND_TOO_COLD "Hotend too cold"
-#define MSG_ERR_Z_HOMING_SER "Home XY first"
-#define MSG_ERR_EEPROM_WRITE "Error writing to EEPROM!"
-
-#define MSG_FILAMENT_CHANGE_HEAT_LCD "Press button to heat nozzle"
-#define MSG_FILAMENT_CHANGE_INSERT_LCD "Insert filament and press button"
-#define MSG_FILAMENT_CHANGE_WAIT_LCD "Press button to resume"
-#define MSG_FILAMENT_CHANGE_HEAT_M108 "Send M108 to heat nozzle"
-#define MSG_FILAMENT_CHANGE_INSERT_M108 "Insert filament and send M108"
-#define MSG_FILAMENT_CHANGE_WAIT_M108 "Send M108 to resume"
-
-#define MSG_STOP_BLTOUCH "!! STOP called because of BLTouch error - restart with M999"
-#define MSG_STOP_UNHOMED "!! STOP called because of unhomed error - restart with M999"
-#define MSG_KILL_INACTIVE_TIME "!! KILL caused by too much inactive time - current command: "
-#define MSG_KILL_BUTTON "!! KILL caused by KILL button/pin"
-
-// temperature.cpp strings
-#define MSG_PID_AUTOTUNE_PREFIX "PID Autotune"
-#define MSG_PID_AUTOTUNE_START MSG_PID_AUTOTUNE_PREFIX " start"
-#define MSG_PID_AUTOTUNE_FAILED MSG_PID_AUTOTUNE_PREFIX " failed!"
-#define MSG_PID_BAD_EXTRUDER_NUM MSG_PID_AUTOTUNE_FAILED " Bad extruder number"
-#define MSG_PID_TEMP_TOO_HIGH MSG_PID_AUTOTUNE_FAILED " Temperature too high"
-#define MSG_PID_TIMEOUT MSG_PID_AUTOTUNE_FAILED " timeout"
-#define MSG_BIAS " bias: "
-#define MSG_D " d: "
-#define MSG_T_MIN " min: "
-#define MSG_T_MAX " max: "
-#define MSG_KU " Ku: "
-#define MSG_TU " Tu: "
-#define MSG_CLASSIC_PID " Classic PID "
-#define MSG_KP " Kp: "
-#define MSG_KI " Ki: "
-#define MSG_KD " Kd: "
-#define MSG_AT " @:"
-#define MSG_PID_AUTOTUNE_FINISHED MSG_PID_AUTOTUNE_PREFIX " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
-#define MSG_PID_DEBUG " PID_DEBUG "
-#define MSG_PID_DEBUG_INPUT ": Input "
-#define MSG_PID_DEBUG_OUTPUT " Output "
-#define MSG_PID_DEBUG_PTERM " pTerm "
-#define MSG_PID_DEBUG_ITERM " iTerm "
-#define MSG_PID_DEBUG_DTERM " dTerm "
-#define MSG_PID_DEBUG_CTERM " cTerm "
-#define MSG_INVALID_EXTRUDER_NUM " - Invalid extruder number !"
-
-#define MSG_HEATER_BED "bed"
-#define MSG_HEATER_CHAMBER "chamber"
-
-#define MSG_STOPPED_HEATER ", system stopped! Heater_ID: "
-#define MSG_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !"
-#define MSG_T_HEATING_FAILED "Heating failed"
-#define MSG_T_THERMAL_RUNAWAY "Thermal Runaway"
-#define MSG_T_MAXTEMP "MAXTEMP triggered"
-#define MSG_T_MINTEMP "MINTEMP triggered"
-#define MSG_ERR_PROBING_FAILED "Probing Failed"
-#define MSG_ZPROBE_OUT_SER "Z Probe Past Bed"
-
-// Debug
-#define MSG_DEBUG_PREFIX "DEBUG:"
-#define MSG_DEBUG_OFF "off"
-#define MSG_DEBUG_ECHO "ECHO"
-#define MSG_DEBUG_INFO "INFO"
-#define MSG_DEBUG_ERRORS "ERRORS"
-#define MSG_DEBUG_DRYRUN "DRYRUN"
-#define MSG_DEBUG_COMMUNICATION "COMMUNICATION"
-#define MSG_DEBUG_LEVELING "LEVELING"
-
-// LCD Menu Messages
-
-#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/langdata_##M.h)
-#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
-
-#define LANGUAGE_INCL_(M) STRINGIFY_(../lcd/language/language_##M.h)
-#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M)
-
-// Never translate these strings
-#define MSG_X "X"
-#define MSG_Y "Y"
-#define MSG_Z "Z"
-#define MSG_E "E"
-#if IS_KINEMATIC
- #define MSG_A "A"
- #define MSG_B "B"
- #define MSG_C "C"
-#else
- #define MSG_A "X"
- #define MSG_B "Y"
- #define MSG_C "Z"
-#endif
-#define MSG_X2 "X2"
-#define MSG_Y2 "Y2"
-#define MSG_Z2 "Z2"
-#define MSG_Z3 "Z3"
-#define MSG_Z4 "Z4"
-
-#define LCD_STR_A MSG_A
-#define LCD_STR_B MSG_B
-#define LCD_STR_C MSG_C
-#define LCD_STR_E MSG_E
-
/**
* Tool indexes for LCD display only
*
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index f3c9f3a818..899baf7359 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,6 +21,10 @@
*/
#pragma once
+#if !defined(__has_include)
+ #define __has_include(...) 1
+#endif
+
#define ABCE 4
#define XYZE 4
#define ABC 3
@@ -29,12 +33,23 @@
#define _AXIS(A) (A##_AXIS)
-#define _XMIN_ 100
-#define _YMIN_ 200
-#define _ZMIN_ 300
-#define _XMAX_ 101
-#define _YMAX_ 201
-#define _ZMAX_ 301
+#define _XMIN_ 100
+#define _YMIN_ 200
+#define _ZMIN_ 300
+#define _XMAX_ 101
+#define _YMAX_ 201
+#define _ZMAX_ 301
+#define _XDIAG_ 102
+#define _YDIAG_ 202
+#define _ZDIAG_ 302
+#define _E0DIAG_ 400
+#define _E1DIAG_ 401
+#define _E2DIAG_ 402
+#define _E3DIAG_ 403
+#define _E4DIAG_ 404
+#define _E5DIAG_ 405
+#define _E6DIAG_ 406
+#define _E7DIAG_ 407
#define _FORCE_INLINE_ __attribute__((__always_inline__)) __inline__
#define FORCE_INLINE __attribute__((always_inline)) inline
@@ -166,18 +181,26 @@
// Macros to support option testing
#define _CAT(a,V...) a##V
#define CAT(a,V...) _CAT(a,V)
-#define SWITCH_ENABLED_false 0
-#define SWITCH_ENABLED_true 1
-#define SWITCH_ENABLED_0 0
-#define SWITCH_ENABLED_1 1
-#define SWITCH_ENABLED_0x0 0
-#define SWITCH_ENABLED_0x1 1
-#define SWITCH_ENABLED_ 1
-#define _ENA_1(O) _CAT(SWITCH_ENABLED_, O)
-#define _DIS_1(O) !_ENA_1(O)
+
+#define _ISENA_ ~,1
+#define _ISENA_1 ~,1
+#define _ISENA_0x1 ~,1
+#define _ISENA_true ~,1
+#define _ISENA(V...) IS_PROBE(V)
+
+#define _ENA_1(O) _ISENA(CAT(_IS,CAT(ENA_, O)))
+#define _DIS_1(O) NOT(_ENA_1(O))
#define ENABLED(V...) DO(ENA,&&,V)
#define DISABLED(V...) DO(DIS,&&,V)
+#define TERN(O,A,B) _TERN(_ENA_1(O),B,A) // OPTION converted to '0' or '1'
+#define TERN0(O,A) _TERN(_ENA_1(O),0,A) // OPTION converted to A or '0'
+#define TERN1(O,A) _TERN(_ENA_1(O),1,A) // OPTION converted to A or '1'
+#define TERN_(O,A) _TERN(_ENA_1(O),,A) // OPTION converted to A or ''
+#define _TERN(E,V...) __TERN(_CAT(T_,E),V) // Prepend 'T_' to get 'T_0' or 'T_1'
+#define __TERN(T,V...) ___TERN(_CAT(_NO,T),V) // Prepend '_NO' to get '_NOT_0' or '_NOT_1'
+#define ___TERN(P,V...) THIRD(P,V) // If first argument has a comma, A. Else B.
+
#define ANY(V...) !DISABLED(V)
#define NONE(V...) DISABLED(V)
#define ALL(V...) ENABLED(V)
@@ -185,12 +208,14 @@
#define EITHER(V1,V2) ANY(V1,V2)
// Macros to support pins/buttons exist testing
-#define _PINEX_1(PN) (defined(PN##_PIN) && PN##_PIN >= 0)
-#define PIN_EXISTS(V...) DO(PINEX,&&,V)
+#define PIN_EXISTS(PN) (defined(PN##_PIN) && PN##_PIN >= 0)
+#define _PINEX_1 PIN_EXISTS
+#define PINS_EXIST(V...) DO(PINEX,&&,V)
#define ANY_PIN(V...) DO(PINEX,||,V)
-#define _BTNEX_1(BN) (defined(BTN_##BN) && BTN_##BN >= 0)
-#define BUTTON_EXISTS(V...) DO(BTNEX,&&,V)
+#define BUTTON_EXISTS(BN) (defined(BTN_##BN) && BTN_##BN >= 0)
+#define _BTNEX_1 BUTTON_EXISTS
+#define BUTTONS_EXIST(V...) DO(BTNEX,&&,V)
#define ANY_BUTTON(V...) DO(BTNEX,||,V)
#define WITHIN(N,L,H) ((N) >= (L) && (N) <= (H))
@@ -230,6 +255,11 @@
#define _JOIN_1(O) (O)
#define JOIN_N(N,C,V...) (DO(JOIN,C,LIST_N(N,V)))
+#define LOOP_S_LE_N(VAR, S, N) for (uint8_t VAR=(S); VAR<=(N); VAR++)
+#define LOOP_S_L_N(VAR, S, N) for (uint8_t VAR=(S); VAR<(N); VAR++)
+#define LOOP_LE_N(VAR, N) LOOP_S_LE_N(VAR, 0, N)
+#define LOOP_L_N(VAR, N) LOOP_S_L_N(VAR, 0, N)
+
#define NOOP (void(0))
#define CEILING(x,y) (((x) + (y) - 1) / (y))
@@ -377,8 +407,9 @@
//
// Primitives supporting precompiler REPEAT
//
-#define FIRST(a,...) a
-#define SECOND(a,b,...) b
+#define FIRST(a,...) a
+#define SECOND(a,b,...) b
+#define THIRD(a,b,c,...) c
// Defer expansion
#define EMPTY()
@@ -446,3 +477,21 @@
// Repeat a macro passing 0...N-1 plus additional arguments.
#define REPEAT2_S(S,N,OP,V...) EVAL(_REPEAT2(S,SUB##S(N),OP,V))
#define REPEAT2(N,OP,V...) REPEAT2_S(0,N,OP,V)
+
+// Use RREPEAT macros with REPEAT macros for nesting
+#define _RREPEAT(_RPT_I,_RPT_N,_RPT_OP) \
+ _RPT_OP(_RPT_I) \
+ IF_ELSE(SUB1(_RPT_N)) \
+ ( DEFER2(__RREPEAT)()(ADD1(_RPT_I),SUB1(_RPT_N),_RPT_OP) ) \
+ ( /* Do nothing */ )
+#define __RREPEAT() _RREPEAT
+#define _RREPEAT2(_RPT_I,_RPT_N,_RPT_OP,V...) \
+ _RPT_OP(_RPT_I,V) \
+ IF_ELSE(SUB1(_RPT_N)) \
+ ( DEFER2(__RREPEAT2)()(ADD1(_RPT_I),SUB1(_RPT_N),_RPT_OP,V) ) \
+ ( /* Do nothing */ )
+#define __RREPEAT2() _RREPEAT2
+#define RREPEAT_S(S,N,OP) EVAL1024(_RREPEAT(S,SUB##S(N),OP))
+#define RREPEAT(N,OP) RREPEAT_S(0,N,OP)
+#define RREPEAT2_S(S,N,OP,V...) EVAL1024(_RREPEAT2(S,SUB##S(N),OP,V))
+#define RREPEAT2(N,OP,V...) RREPEAT2_S(0,N,OP,V)
diff --git a/Marlin/src/core/millis_t.h b/Marlin/src/core/millis_t.h
index 7ff231f827..39ea17b9f0 100644
--- a/Marlin/src/core/millis_t.h
+++ b/Marlin/src/core/millis_t.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 534d94f00a..304aa09a8a 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,7 +29,7 @@ static const char errormagic[] PROGMEM = "Error:";
static const char echomagic[] PROGMEM = "echo:";
#if NUM_SERIAL > 1
- int8_t serial_port_index = SERIAL_PORT;
+ int8_t serial_port_index = 0;
#endif
void serialprintPGM(PGM_P str) {
@@ -54,7 +54,7 @@ void serial_ternary(const bool onoff, PGM_P const pre, PGM_P const on, PGM_P con
serialprintPGM(onoff ? on : off);
if (post) serialprintPGM(post);
}
-void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(MSG_ON) : PSTR(MSG_OFF)); }
+void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(STR_ON) : PSTR(STR_OFF)); }
void serialprintln_onoff(const bool onoff) { serialprint_onoff(onoff); SERIAL_EOL(); }
void serialprint_truefalse(const bool tf) { serialprintPGM(tf ? PSTR("true") : PSTR("false")); }
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 1e1eb8c623..812ff5471f 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -260,8 +260,8 @@ extern uint8_t marlin_debug_flags;
#define SERIAL_ERROR_START() serial_error_start()
#define SERIAL_EOL() SERIAL_CHAR('\n')
-#define SERIAL_ECHO_MSG(S) do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPGM(S); }while(0)
-#define SERIAL_ERROR_MSG(S) do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPGM(S); }while(0)
+#define SERIAL_ECHO_MSG(V...) do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
+#define SERIAL_ERROR_MSG(V...) do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPAIR(V); }while(0)
#define SERIAL_ECHO_SP(C) serial_spaces(C)
@@ -292,7 +292,6 @@ void serialprint_truefalse(const bool tf);
void serial_spaces(uint8_t count);
void print_bin(const uint16_t val);
-
void print_xyz(const float &x, const float &y, const float &z, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
inline void print_xyz(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 97ce5af5ee..1212eb5ba2 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,7 +24,7 @@
#include
#include
-#include "millis_t.h"
+#include "../inc/MarlinConfigPre.h"
class __FlashStringHelper;
typedef const __FlashStringHelper *progmem_str;
@@ -50,12 +50,6 @@ enum AxisEnum : uint8_t {
//
// Loop over XYZE axes
//
-
-#define LOOP_S_LE_N(VAR, S, N) for (uint8_t VAR=(S); VAR<=(N); VAR++)
-#define LOOP_S_L_N(VAR, S, N) for (uint8_t VAR=(S); VAR<(N); VAR++)
-#define LOOP_LE_N(VAR, N) LOOP_S_LE_N(VAR, 0, N)
-#define LOOP_L_N(VAR, N) LOOP_S_L_N(VAR, 0, N)
-
#define LOOP_XYZ(VAR) LOOP_S_LE_N(VAR, X_AXIS, Z_AXIS)
#define LOOP_XYZE(VAR) LOOP_S_LE_N(VAR, X_AXIS, E_AXIS)
#define LOOP_XYZE_N(VAR) LOOP_S_L_N(VAR, X_AXIS, XYZE_N)
@@ -187,6 +181,12 @@ struct XYval {
};
FI void set(const T px) { x = px; }
FI void set(const T px, const T py) { x = px; y = py; }
+ FI void set(const T (&arr)[XY]) { x = arr[0]; y = arr[1]; }
+ FI void set(const T (&arr)[XYZ]) { x = arr[0]; y = arr[1]; }
+ FI void set(const T (&arr)[XYZE]) { x = arr[0]; y = arr[1]; }
+ #if XYZE_N > XYZE
+ FI void set(const T (&arr)[XYZE_N]) { x = arr[0]; y = arr[1]; }
+ #endif
FI void reset() { x = y = 0; }
FI T magnitude() const { return (T)sqrtf(x*x + y*y); }
FI operator T* () { return pos; }
@@ -197,6 +197,8 @@ struct XYval {
FI XYval asInt() const { return { int16_t(x), int16_t(y) }; }
FI XYval asLong() { return { int32_t(x), int32_t(y) }; }
FI XYval asLong() const { return { int32_t(x), int32_t(y) }; }
+ FI XYval ROUNDL() { return { int32_t(LROUND(x)), int32_t(LROUND(y)) }; }
+ FI XYval ROUNDL() const { return { int32_t(LROUND(x)), int32_t(LROUND(y)) }; }
FI XYval asFloat() { return { float(x), float(y) }; }
FI XYval asFloat() const { return { float(x), float(y) }; }
FI XYval reciprocal() const { return { _RECIP(x), _RECIP(y) }; }
@@ -290,6 +292,12 @@ struct XYZval {
FI void set(const T px, const T py) { x = px; y = py; }
FI void set(const T px, const T py, const T pz) { x = px; y = py; z = pz; }
FI void set(const XYval pxy, const T pz) { x = pxy.x; y = pxy.y; z = pz; }
+ FI void set(const T (&arr)[XY]) { x = arr[0]; y = arr[1]; }
+ FI void set(const T (&arr)[XYZ]) { x = arr[0]; y = arr[1]; z = arr[2]; }
+ FI void set(const T (&arr)[XYZE]) { x = arr[0]; y = arr[1]; z = arr[2]; }
+ #if XYZE_N > XYZE
+ FI void set(const T (&arr)[XYZE_N]) { x = arr[0]; y = arr[1]; z = arr[2]; }
+ #endif
FI void reset() { x = y = z = 0; }
FI T magnitude() const { return (T)sqrtf(x*x + y*y + z*z); }
FI operator T* () { return pos; }
@@ -300,6 +308,8 @@ struct XYZval {
FI XYZval asInt() const { return { int16_t(x), int16_t(y), int16_t(z) }; }
FI XYZval asLong() { return { int32_t(x), int32_t(y), int32_t(z) }; }
FI XYZval asLong() const { return { int32_t(x), int32_t(y), int32_t(z) }; }
+ FI XYZval ROUNDL() { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)) }; }
+ FI XYZval ROUNDL() const { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)) }; }
FI XYZval asFloat() { return { float(x), float(y), float(z) }; }
FI XYZval asFloat() const { return { float(x), float(y), float(z) }; }
FI XYZval reciprocal() const { return { _RECIP(x), _RECIP(y), _RECIP(z) }; }
@@ -397,12 +407,20 @@ struct XYZEval {
FI void set(const XYval pxy, const T pz, const T pe) { x = pxy.x; y = pxy.y; z = pz; e = pe; }
FI void set(const XYval pxy, const XYval pze) { x = pxy.x; y = pxy.y; z = pze.z; e = pze.e; }
FI void set(const XYZval pxyz, const T pe) { x = pxyz.x; y = pxyz.y; z = pxyz.z; e = pe; }
+ FI void set(const T (&arr)[XY]) { x = arr[0]; y = arr[1]; }
+ FI void set(const T (&arr)[XYZ]) { x = arr[0]; y = arr[1]; z = arr[2]; }
+ FI void set(const T (&arr)[XYZE]) { x = arr[0]; y = arr[1]; z = arr[2]; e = arr[3]; }
+ #if XYZE_N > XYZE
+ FI void set(const T (&arr)[XYZE_N]) { x = arr[0]; y = arr[1]; z = arr[2]; e = arr[3]; }
+ #endif
FI XYZEval copy() const { return *this; }
FI XYZEval ABS() const { return { T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(e)) }; }
FI XYZEval asInt() { return { int16_t(x), int16_t(y), int16_t(z), int16_t(e) }; }
FI XYZEval asInt() const { return { int16_t(x), int16_t(y), int16_t(z), int16_t(e) }; }
- FI XYZEval asLong() const { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
FI XYZEval asLong() { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
+ FI XYZEval asLong() const { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
+ FI XYZEval ROUNDL() { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(e)) }; }
+ FI XYZEval ROUNDL() const { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(e)) }; }
FI XYZEval asFloat() { return { float(x), float(y), float(z), float(e) }; }
FI XYZEval asFloat() const { return { float(x), float(y), float(z), float(e) }; }
FI XYZEval reciprocal() const { return { _RECIP(x), _RECIP(y), _RECIP(z), _RECIP(e) }; }
@@ -483,3 +501,4 @@ struct XYZEval {
#undef FI
const xyze_char_t axis_codes { 'X', 'Y', 'Z', 'E' };
+#define XYZ_CHAR(A) ('X' + char(A))
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 16d0ea17c1..5e159af581 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,6 +35,18 @@ void safe_delay(millis_t ms) {
thermalManager.manage_heater(); // This keeps us safe if too many small safe_delay() calls are made
}
+// A delay to provide brittle hosts time to receive bytes
+#if ENABLED(SERIAL_OVERRUN_PROTECTION)
+
+ #include "../gcode/gcode.h" // for set_autoreport_paused
+
+ void serial_delay(const millis_t ms) {
+ const bool was = gcode.set_autoreport_paused(true);
+ safe_delay(ms);
+ gcode.set_autoreport_paused(was);
+ }
+#endif
+
#if ENABLED(DEBUG_LEVELING_FEATURE)
#include "../module/probe.h"
@@ -45,99 +57,63 @@ void safe_delay(millis_t ms) {
void log_machine_info() {
SERIAL_ECHOLNPGM("Machine Type: "
- #if ENABLED(DELTA)
- "Delta"
- #elif IS_SCARA
- "SCARA"
- #elif IS_CORE
- "Core"
- #else
- "Cartesian"
- #endif
+ TERN(DELTA, "Delta", "")
+ TERN(IS_SCARA, "SCARA", "")
+ TERN(IS_CORE, "Core", "")
+ TERN(IS_CARTESIAN, "Cartesian", "")
);
SERIAL_ECHOLNPGM("Probe: "
- #if ENABLED(PROBE_MANUALLY)
- "PROBE_MANUALLY"
- #elif ENABLED(NOZZLE_AS_PROBE)
- "NOZZLE_AS_PROBE"
- #elif ENABLED(FIX_MOUNTED_PROBE)
- "FIX_MOUNTED_PROBE"
- #elif ENABLED(BLTOUCH)
- "BLTOUCH"
- #elif HAS_Z_SERVO_PROBE
- "SERVO PROBE"
- #elif ENABLED(TOUCH_MI_PROBE)
- "TOUCH_MI_PROBE"
- #elif ENABLED(Z_PROBE_SLED)
- "Z_PROBE_SLED"
- #elif ENABLED(Z_PROBE_ALLEN_KEY)
- "Z_PROBE_ALLEN_KEY"
- #elif ENABLED(SOLENOID_PROBE)
- "SOLENOID_PROBE"
- #else
- "NONE"
- #endif
+ TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "")
+ TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "")
+ TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "")
+ TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "")
+ TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "")
+ TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "")
+ TERN(Z_PROBE_ALLEN_KEY, "Z_PROBE_ALLEN_KEY", "")
+ TERN(SOLENOID_PROBE, "SOLENOID_PROBE", "")
+ TERN(PROBE_SELECTED, "", "NONE")
);
#if HAS_BED_PROBE
#if !HAS_PROBE_XY_OFFSET
- SERIAL_ECHOPAIR("Probe Offset X0 Y0 Z", probe_offset.z, " (");
+ SERIAL_ECHOPAIR("Probe Offset X0 Y0 Z", probe.offset.z, " (");
#else
- SERIAL_ECHOPAIR_P(PSTR("Probe Offset X"), probe_offset.x, SP_Y_STR, probe_offset.y, SP_Z_STR, probe_offset.z);
- if (probe_offset.x > 0)
+ SERIAL_ECHOPAIR_P(PSTR("Probe Offset X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR, probe.offset.z);
+ if (probe.offset_xy.x > 0)
SERIAL_ECHOPGM(" (Right");
- else if (probe_offset.x < 0)
+ else if (probe.offset_xy.x < 0)
SERIAL_ECHOPGM(" (Left");
- else if (probe_offset.y != 0)
+ else if (probe.offset_xy.y != 0)
SERIAL_ECHOPGM(" (Middle");
else
SERIAL_ECHOPGM(" (Aligned With");
- if (probe_offset.y > 0) {
- #if IS_SCARA
- SERIAL_ECHOPGM("-Distal");
- #else
- SERIAL_ECHOPGM("-Back");
- #endif
- }
- else if (probe_offset.y < 0) {
- #if IS_SCARA
- SERIAL_ECHOPGM("-Proximal");
- #else
- SERIAL_ECHOPGM("-Front");
- #endif
- }
- else if (probe_offset.x != 0)
+ if (probe.offset_xy.y > 0)
+ serialprintPGM(ENABLED(IS_SCARA) ? PSTR("-Distal") : PSTR("-Back"));
+ else if (probe.offset_xy.y < 0)
+ serialprintPGM(ENABLED(IS_SCARA) ? PSTR("-Proximal") : PSTR("-Front"));
+ else if (probe.offset_xy.x != 0)
SERIAL_ECHOPGM("-Center");
SERIAL_ECHOPGM(" & ");
#endif
- if (probe_offset.z < 0)
- SERIAL_ECHOPGM("Below");
- else if (probe_offset.z > 0)
- SERIAL_ECHOPGM("Above");
- else
- SERIAL_ECHOPGM("Same Z as");
+ serialprintPGM(probe.offset.z < 0 ? PSTR("Below") : probe.offset.z > 0 ? PSTR("Above") : PSTR("Same Z as"));
SERIAL_ECHOLNPGM(" Nozzle)");
#endif
#if HAS_ABL_OR_UBL
- SERIAL_ECHOLNPGM("Auto Bed Leveling: "
- #if ENABLED(AUTO_BED_LEVELING_LINEAR)
- "LINEAR"
- #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
- "BILINEAR"
- #elif ENABLED(AUTO_BED_LEVELING_3POINT)
- "3POINT"
- #elif ENABLED(AUTO_BED_LEVELING_UBL)
- "UBL"
- #endif
+ SERIAL_ECHOPGM("Auto Bed Leveling: "
+ TERN(AUTO_BED_LEVELING_LINEAR, "LINEAR", "")
+ TERN(AUTO_BED_LEVELING_BILINEAR, "BILINEAR", "")
+ TERN(AUTO_BED_LEVELING_3POINT, "3POINT", "")
+ TERN(AUTO_BED_LEVELING_UBL, "UBL", "")
);
+
if (planner.leveling_active) {
SERIAL_ECHOLNPGM(" (enabled)");
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
@@ -148,7 +124,7 @@ void safe_delay(millis_t ms) {
SERIAL_ECHOPGM("ABL Adjustment X");
LOOP_XYZ(a) {
float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a];
- SERIAL_CHAR(' ', 'X' + char(a));
+ SERIAL_CHAR(' ', XYZ_CHAR(a));
if (v > 0) SERIAL_CHAR('+');
SERIAL_ECHO(v);
}
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index f430da50d6..0c2e91d31f 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,18 +23,16 @@
#include "../inc/MarlinConfigPre.h"
#include "../core/types.h"
+#include "../core/millis_t.h"
// Delay that ensures heaters and watchdog are kept alive
void safe_delay(millis_t ms);
-// A delay to provide brittle hosts time to receive bytes
-inline void serial_delay(const millis_t ms) {
- #if ENABLED(SERIAL_OVERRUN_PROTECTION)
- safe_delay(ms);
- #else
- UNUSED(ms);
- #endif
-}
+#if ENABLED(SERIAL_OVERRUN_PROTECTION)
+ void serial_delay(const millis_t ms);
+#else
+ inline void serial_delay(const millis_t) {}
+#endif
#if GRID_MAX_POINTS_X && GRID_MAX_POINTS_Y
@@ -73,7 +71,7 @@ public:
inline void restore() { ref_ = val_; }
};
-#define REMEMBER(N,X,V...) const restorer restorer_##N(X, ##V)
+#define REMEMBER(N,X,V...) restorer restorer_##N(X, ##V)
#define RESTORE(N) restorer_##N.restore()
// Converts from an uint8_t in the range of 0-255 to an uint8_t
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index 510950095f..5d2dc47bee 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,50 +35,35 @@
Babystep babystep;
-volatile int16_t Babystep::steps[BS_TODO_AXIS(Z_AXIS) + 1];
+volatile int16_t Babystep::steps[BS_AXIS_IND(Z_AXIS) + 1];
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
- int16_t Babystep::axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1];
+ int16_t Babystep::axis_total[BS_TOTAL_IND(Z_AXIS) + 1];
#endif
int16_t Babystep::accum;
void Babystep::step_axis(const AxisEnum axis) {
- const int16_t curTodo = steps[BS_TODO_AXIS(axis)]; // get rid of volatile for performance
+ const int16_t curTodo = steps[BS_AXIS_IND(axis)]; // get rid of volatile for performance
if (curTodo) {
- stepper.babystep((AxisEnum)axis, curTodo > 0);
- if (curTodo > 0) steps[BS_TODO_AXIS(axis)]--; else steps[BS_TODO_AXIS(axis)]++;
+ stepper.do_babystep((AxisEnum)axis, curTodo > 0);
+ if (curTodo > 0) steps[BS_AXIS_IND(axis)]--; else steps[BS_AXIS_IND(axis)]++;
}
}
-void Babystep::task() {
- #if EITHER(BABYSTEP_XY, I2C_POSITION_ENCODERS)
- LOOP_XYZ(axis) step_axis((AxisEnum)axis);
- #else
- step_axis(Z_AXIS);
- #endif
-}
-
void Babystep::add_mm(const AxisEnum axis, const float &mm) {
add_steps(axis, mm * planner.settings.axis_steps_per_mm[axis]);
}
void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
- #if ENABLED(BABYSTEP_WITHOUT_HOMING)
- #define CAN_BABYSTEP(AXIS) true
- #else
- extern uint8_t axis_known_position;
- #define CAN_BABYSTEP(AXIS) TEST(axis_known_position, AXIS)
- #endif
-
- if (!CAN_BABYSTEP(axis)) return;
+ if (DISABLED(BABYSTEP_WITHOUT_HOMING) && !TEST(axis_known_position, axis)) return;
accum += distance; // Count up babysteps for the UI
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
- axis_total[BS_TOTAL_AXIS(axis)] += distance;
+ axis_total[BS_TOTAL_IND(axis)] += distance;
#endif
#if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
- #define BSA_ENABLE(AXIS) do{ switch (AXIS) { case X_AXIS: enable_X(); break; case Y_AXIS: enable_Y(); break; case Z_AXIS: enable_Z(); break; default: break; } }while(0)
+ #define BSA_ENABLE(AXIS) do{ switch (AXIS) { case X_AXIS: ENABLE_AXIS_X(); break; case Y_AXIS: ENABLE_AXIS_Y(); break; case Z_AXIS: ENABLE_AXIS_Z(); break; default: break; } }while(0)
#else
#define BSA_ENABLE(AXIS) NOOP
#endif
@@ -120,11 +105,15 @@ void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
#else
BSA_ENABLE(Z_AXIS);
#endif
- steps[BS_TODO_AXIS(axis)] += distance;
+ steps[BS_AXIS_IND(axis)] += distance;
#endif
#if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
gcode.reset_stepper_timeout();
#endif
+
+ #if ENABLED(INTEGRATED_BABYSTEPPING)
+ if (has_steps()) stepper.initiateBabystepping();
+ #endif
}
#endif // BABYSTEPPING
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index fbf04a03f9..287664502c 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,39 +23,61 @@
#include "../inc/MarlinConfigPre.h"
-#if IS_CORE || EITHER(BABYSTEP_XY, I2C_POSITION_ENCODERS)
- #define BS_TODO_AXIS(A) A
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+ #define BABYSTEPS_PER_SEC 1000UL
+ #define BABYSTEP_TICKS ((STEPPER_TIMER_RATE) / (BABYSTEPS_PER_SEC))
#else
- #define BS_TODO_AXIS(A) 0
+ #define BABYSTEPS_PER_SEC 976UL
+ #define BABYSTEP_TICKS ((TEMP_TIMER_RATE) / (BABYSTEPS_PER_SEC))
+#endif
+
+#if IS_CORE || EITHER(BABYSTEP_XY, I2C_POSITION_ENCODERS)
+ #define BS_AXIS_IND(A) A
+ #define BS_AXIS(I) AxisEnum(I)
+#else
+ #define BS_AXIS_IND(A) 0
+ #define BS_AXIS(I) Z_AXIS
#endif
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
#if ENABLED(BABYSTEP_XY)
- #define BS_TOTAL_AXIS(A) A
+ #define BS_TOTAL_IND(A) A
#else
- #define BS_TOTAL_AXIS(A) 0
+ #define BS_TOTAL_IND(A) 0
#endif
#endif
class Babystep {
public:
- static volatile int16_t steps[BS_TODO_AXIS(Z_AXIS) + 1];
+ static volatile int16_t steps[BS_AXIS_IND(Z_AXIS) + 1];
static int16_t accum; // Total babysteps in current edit
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
- static int16_t axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1]; // Total babysteps since G28
+ static int16_t axis_total[BS_TOTAL_IND(Z_AXIS) + 1]; // Total babysteps since G28
static inline void reset_total(const AxisEnum axis) {
if (true
#if ENABLED(BABYSTEP_XY)
&& axis == Z_AXIS
#endif
- ) axis_total[BS_TOTAL_AXIS(axis)] = 0;
+ ) axis_total[BS_TOTAL_IND(axis)] = 0;
}
#endif
static void add_steps(const AxisEnum axis, const int16_t distance);
static void add_mm(const AxisEnum axis, const float &mm);
- static void task();
+
+ static inline bool has_steps() {
+ return steps[BS_AXIS_IND(X_AXIS)] || steps[BS_AXIS_IND(Y_AXIS)] || steps[BS_AXIS_IND(Z_AXIS)];
+ }
+
+ //
+ // Called by the Temperature or Stepper ISR to
+ // apply accumulated babysteps to the axes.
+ //
+ static inline void task() {
+ LOOP_LE_N(i, BS_AXIS_IND(Z_AXIS)) step_axis(BS_AXIS(i));
+ }
+
private:
static void step_axis(const AxisEnum axis);
};
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 43e6d36bec..bc33ae3185 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -113,7 +113,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
error_correction = 0; // Don't take up any backlash in this segment, as it would subtract steps
}
#endif
- // Making a correction reduces the residual error and modifies delta_mm
+ // Making a correction reduces the residual error and adds block steps
if (error_correction) {
block->steps[axis] += ABS(error_correction);
residual_error[axis] -= error_correction;
diff --git a/Marlin/src/feature/backlash.h b/Marlin/src/feature/backlash.h
index 0ded86565b..20666c540b 100644
--- a/Marlin/src/feature/backlash.h
+++ b/Marlin/src/feature/backlash.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/baricuda.cpp b/Marlin/src/feature/baricuda.cpp
index 82e0a5f14f..3899348548 100644
--- a/Marlin/src/feature/baricuda.cpp
+++ b/Marlin/src/feature/baricuda.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,7 +20,7 @@
*
*/
-#include "../inc/MarlinConfig.h"
+#include "../inc/MarlinConfigPre.h"
#if ENABLED(BARICUDA)
diff --git a/Marlin/src/feature/baricuda.h b/Marlin/src/feature/baricuda.h
index 778d2bef0a..567d2253e6 100644
--- a/Marlin/src/feature/baricuda.h
+++ b/Marlin/src/feature/baricuda.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index 738a9526f6..33c9cbdfde 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,7 +32,7 @@
#include "../../../core/debug_out.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
xy_pos_t bilinear_grid_spacing, bilinear_start;
@@ -43,6 +43,7 @@ bed_mesh_t z_values;
* Extrapolate a single point from its neighbors
*/
static void extrapolate_one_point(const uint8_t x, const uint8_t y, const int8_t xdir, const int8_t ydir) {
+ if (!isnan(z_values[x][y])) return;
if (DEBUGGING(LEVELING)) {
DEBUG_ECHOPGM("Extrapolate [");
if (x < 10) DEBUG_CHAR(' ');
@@ -54,10 +55,6 @@ static void extrapolate_one_point(const uint8_t x, const uint8_t y, const int8_t
DEBUG_CHAR(ydir ? (ydir > 0 ? '+' : '-') : ' ');
DEBUG_ECHOLNPGM("]");
}
- if (!isnan(z_values[x][y])) {
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(" (done)");
- return; // Don't overwrite good values.
- }
// Get X neighbors, Y neighbors, and XY neighbors
const uint8_t x1 = x + xdir, y1 = y + ydir, x2 = x1 + xdir, y2 = y1 + ydir;
@@ -118,8 +115,8 @@ void extrapolate_unprobed_bed_level() {
ylen = ctry1;
#endif
- for (uint8_t xo = 0; xo <= xlen; xo++)
- for (uint8_t yo = 0; yo <= ylen; yo++) {
+ LOOP_LE_N(xo, xlen)
+ LOOP_LE_N(yo, ylen) {
uint8_t x2 = ctrx2 + xo, y2 = ctry2 + yo;
#ifndef HALF_IN_X
const uint8_t x1 = ctrx1 - xo;
@@ -212,8 +209,8 @@ void print_bilinear_leveling_grid() {
static float bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const float &tx, const float &ty) {
float row[4], column[4];
- for (uint8_t i = 0; i < 4; i++) {
- for (uint8_t j = 0; j < 4; j++) {
+ LOOP_L_N(i, 4) {
+ LOOP_L_N(j, 4) {
column[j] = bed_level_virt_coord(i + x - 1, j + y - 1);
}
row[i] = bed_level_virt_cmr(column, 1, ty);
@@ -224,11 +221,11 @@ void print_bilinear_leveling_grid() {
void bed_level_virt_interpolate() {
bilinear_grid_spacing_virt = bilinear_grid_spacing / (BILINEAR_SUBDIVISIONS);
bilinear_grid_factor_virt = bilinear_grid_spacing_virt.reciprocal();
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t ty = 0; ty < BILINEAR_SUBDIVISIONS; ty++)
- for (uint8_t tx = 0; tx < BILINEAR_SUBDIVISIONS; tx++) {
- if ((ty && y == GRID_MAX_POINTS_Y - 1) || (tx && x == GRID_MAX_POINTS_X - 1))
+ LOOP_L_N(y, GRID_MAX_POINTS_Y)
+ LOOP_L_N(x, GRID_MAX_POINTS_X)
+ LOOP_L_N(ty, BILINEAR_SUBDIVISIONS)
+ LOOP_L_N(tx, BILINEAR_SUBDIVISIONS) {
+ if ((ty && y == (GRID_MAX_POINTS_Y) - 1) || (tx && x == (GRID_MAX_POINTS_X) - 1))
continue;
z_values_virt[x * (BILINEAR_SUBDIVISIONS) + tx][y * (BILINEAR_SUBDIVISIONS) + ty] =
bed_level_virt_2cmr(
diff --git a/Marlin/src/feature/bedlevel/abl/abl.h b/Marlin/src/feature/bedlevel/abl/abl.h
index 15e988fe0a..312dc0db80 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.h
+++ b/Marlin/src/feature/bedlevel/abl/abl.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 9aa3ae0a57..63493712a8 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,7 +43,7 @@
#include "../../core/debug_out.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../lcd/extensible_ui/ui_api.h"
+ #include "../../lcd/extui/ui_api.h"
#endif
bool leveling_is_valid() {
@@ -143,13 +143,12 @@ void reset_bed_level() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
bilinear_start.reset();
bilinear_grid_spacing.reset();
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
- z_values[x][y] = NAN;
- #if ENABLED(EXTENSIBLE_UI)
- ExtUI::onMeshUpdate(x, y, 0);
- #endif
- }
+ GRID_LOOP(x, y) {
+ z_values[x][y] = NAN;
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onMeshUpdate(x, y, 0);
+ #endif
+ }
#elif ABL_PLANAR
planner.bed_level_matrix.set_to_identity();
#endif
@@ -173,7 +172,7 @@ void reset_bed_level() {
*/
void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, element_2d_fn fn) {
#ifndef SCAD_MESH_OUTPUT
- for (uint8_t x = 0; x < sx; x++) {
+ LOOP_L_N(x, sx) {
serial_spaces(precision + (x < 10 ? 3 : 2));
SERIAL_ECHO(int(x));
}
@@ -182,14 +181,14 @@ void reset_bed_level() {
#ifdef SCAD_MESH_OUTPUT
SERIAL_ECHOLNPGM("measured_z = ["); // open 2D array
#endif
- for (uint8_t y = 0; y < sy; y++) {
+ LOOP_L_N(y, sy) {
#ifdef SCAD_MESH_OUTPUT
SERIAL_ECHOPGM(" ["); // open sub-array
#else
if (y < 10) SERIAL_CHAR(' ');
SERIAL_ECHO(int(y));
#endif
- for (uint8_t x = 0; x < sx; x++) {
+ LOOP_L_N(x, sx) {
SERIAL_CHAR(' ');
const float offset = fn(x, y);
if (!isnan(offset)) {
@@ -202,7 +201,7 @@ void reset_bed_level() {
SERIAL_CHAR(' ');
SERIAL_ECHOPGM("NAN");
#else
- for (uint8_t i = 0; i < precision + 3; i++)
+ LOOP_L_N(i, precision + 3)
SERIAL_CHAR(i ? '=' : ' ');
#endif
}
diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index 6ba0948880..fd3ed82e52 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
index af9c671d6a..7439c3fcd3 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,7 +29,7 @@
#include "../../../module/motion.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
mesh_bed_leveling mbl;
@@ -40,9 +40,9 @@
mesh_bed_leveling::index_to_ypos[GRID_MAX_POINTS_Y];
mesh_bed_leveling::mesh_bed_leveling() {
- for (uint8_t i = 0; i < GRID_MAX_POINTS_X; ++i)
+ LOOP_L_N(i, GRID_MAX_POINTS_X)
index_to_xpos[i] = MESH_MIN_X + i * (MESH_X_DIST);
- for (uint8_t i = 0; i < GRID_MAX_POINTS_Y; ++i)
+ LOOP_L_N(i, GRID_MAX_POINTS_Y)
index_to_ypos[i] = MESH_MIN_Y + i * (MESH_Y_DIST);
reset();
}
@@ -51,9 +51,7 @@
z_offset = 0;
ZERO(z_values);
#if ENABLED(EXTENSIBLE_UI)
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- ExtUI::onMeshUpdate(x, y, 0);
+ GRID_LOOP(x, y) ExtUI::onMeshUpdate(x, y, 0);
#endif
}
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
index 3009f4aea4..3a1cbaccb0 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -52,9 +52,7 @@ public:
static void reset();
FORCE_INLINE static bool has_mesh() {
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- if (z_values[x][y]) return true;
+ GRID_LOOP(x, y) if (z_values[x][y]) return true;
return false;
}
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index adafc6a194..8ef2ad564c 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,13 +28,16 @@
unified_bed_leveling ubl;
+ #include "../../../MarlinCore.h"
+ #include "../../../gcode/gcode.h"
+
#include "../../../module/configuration_store.h"
#include "../../../module/planner.h"
#include "../../../module/motion.h"
#include "../../../module/probe.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
#include "math.h"
@@ -46,7 +49,7 @@
void unified_bed_leveling::report_current_mesh() {
if (!leveling_is_valid()) return;
SERIAL_ECHO_MSG(" G29 I99");
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
+ LOOP_L_N(x, GRID_MAX_POINTS_X)
for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
if (!isnan(z_values[x][y])) {
SERIAL_ECHO_START();
@@ -98,9 +101,7 @@
storage_slot = -1;
ZERO(z_values);
#if ENABLED(EXTENSIBLE_UI)
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- ExtUI::onMeshUpdate(x, y, 0);
+ GRID_LOOP(x, y) ExtUI::onMeshUpdate(x, y, 0);
#endif
if (was_enabled) report_current_position();
}
@@ -111,13 +112,11 @@
}
void unified_bed_leveling::set_all_mesh_points_to_value(const float value) {
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
- z_values[x][y] = value;
- #if ENABLED(EXTENSIBLE_UI)
- ExtUI::onMeshUpdate(x, y, value);
- #endif
- }
+ GRID_LOOP(x, y) {
+ z_values[x][y] = value;
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onMeshUpdate(x, y, value);
+ #endif
}
}
@@ -151,9 +150,7 @@
* 4: Compact Human-Readable
*/
void unified_bed_leveling::display_map(const int map_type) {
- #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
- suspend_auto_report = true;
- #endif
+ const bool was = gcode.set_autoreport_paused(true);
constexpr uint8_t eachsp = 1 + 6 + 1, // [-3.567]
twixt = eachsp * (GRID_MAX_POINTS_X) - 9 * 2; // Leading 4sp, Coordinates 9sp each
@@ -173,10 +170,10 @@
serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
}
- // Add XY probe offset from extruder because probe_at_point() subtracts them when
+ // Add XY probe offset from extruder because probe.probe_at_point() subtracts them when
// moving to the XY position to be measured. This ensures better agreement between
// the current Z position after G28 and the mesh values.
- const xy_int8_t curr = closest_indexes(xy_pos_t(current_position) + probe_offset_xy);
+ const xy_int8_t curr = closest_indexes(xy_pos_t(current_position) + probe.offset_xy);
if (!lcd) SERIAL_EOL();
for (int8_t j = GRID_MAX_POINTS_Y - 1; j >= 0; j--) {
@@ -189,7 +186,7 @@
}
// Row Values (I indexes)
- for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
+ LOOP_L_N(i, GRID_MAX_POINTS_X) {
// Opening Brace or Space
const bool is_current = i == curr.x && j == curr.y;
@@ -229,9 +226,7 @@
SERIAL_EOL();
}
- #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
- suspend_auto_report = false;
- #endif
+ gcode.set_autoreport_paused(was);
}
bool unified_bed_leveling::sanity_check() {
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 2202bb6524..9e227f02d9 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -298,9 +298,7 @@ class unified_bed_leveling {
#endif
static inline bool mesh_is_valid() {
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- if (isnan(z_values[x][y])) return false;
+ GRID_LOOP(x, y) if (isnan(z_values[x][y])) return false;
return true;
}
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 203d7c7150..217d894543 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,7 +27,7 @@
#include "../bedlevel.h"
#include "../../../MarlinCore.h"
- #include "../../../HAL/shared/persistent_store_api.h"
+ #include "../../../HAL/shared/eeprom_api.h"
#include "../../../libs/hex_print_routines.h"
#include "../../../module/configuration_store.h"
#include "../../../lcd/ultralcd.h"
@@ -38,7 +38,7 @@
#include "../../../gcode/gcode.h"
#include "../../../libs/least_squares_fit.h"
- #if ENABLED(DUAL_X_CARRIAGE)
+ #if HOTENDS > 1
#include "../../../module/tool_change.h"
#endif
@@ -46,7 +46,7 @@
#include "../../../core/debug_out.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
#include
@@ -305,12 +305,15 @@
const int8_t p_val = parser.intval('P', -1);
const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen('J');
+ #if HOTENDS > 1
+ const uint8_t old_tool_index = active_extruder;
+ #endif
// Check for commands that require the printer to be homed
if (may_move) {
planner.synchronize();
if (axes_need_homing()) gcode.home_all_axes();
- #if ENABLED(DUAL_X_CARRIAGE)
+ #if HOTENDS > 1
if (active_extruder != 0) tool_change(0);
#endif
}
@@ -362,25 +365,23 @@
#endif
case 0:
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) { // Create a bowl shape - similar to
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { // a poorly calibrated Delta.
- const float p1 = 0.5f * (GRID_MAX_POINTS_X) - x,
- p2 = 0.5f * (GRID_MAX_POINTS_Y) - y;
- z_values[x][y] += 2.0f * HYPOT(p1, p2);
- #if ENABLED(EXTENSIBLE_UI)
- ExtUI::onMeshUpdate(x, y, z_values[x][y]);
- #endif
- }
+ GRID_LOOP(x, y) { // Create a bowl shape similar to a poorly-calibrated Delta
+ const float p1 = 0.5f * (GRID_MAX_POINTS_X) - x,
+ p2 = 0.5f * (GRID_MAX_POINTS_Y) - y;
+ z_values[x][y] += 2.0f * HYPOT(p1, p2);
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+ #endif
}
break;
case 1:
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) { // Create a diagonal line several Mesh cells thick that is raised
+ LOOP_L_N(x, GRID_MAX_POINTS_X) { // Create a diagonal line several Mesh cells thick that is raised
z_values[x][x] += 9.999f;
- z_values[x][x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1] += 9.999f; // We want the altered line several mesh points thick
+ z_values[x][x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1] += 9.999f; // We want the altered line several mesh points thick
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onMeshUpdate(x, x, z_values[x][x]);
- ExtUI::onMeshUpdate(x, (x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1), z_values[x][x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1]);
+ ExtUI::onMeshUpdate(x, (x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1), z_values[x][x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1]);
#endif
}
@@ -450,7 +451,7 @@
SERIAL_ECHO(g29_pos.y);
SERIAL_ECHOLNPGM(").\n");
}
- const xy_pos_t near = g29_pos + probe_offset_xy;
+ const xy_pos_t near = g29_pos + probe.offset_xy;
probe_entire_mesh(near, parser.seen('T'), parser.seen('E'), parser.seen('U'));
report_current_position();
@@ -464,7 +465,7 @@
//
// Manually Probe Mesh in areas that can't be reached by the probe
//
- SERIAL_ECHOLNPGM("Manually probing unreachable mesh locations.");
+ SERIAL_ECHOLNPGM("Manually probing unreachable points.");
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
if (parser.seen('C') && !xy_seen) {
@@ -480,8 +481,8 @@
#if IS_KINEMATIC
X_HOME_POS, Y_HOME_POS
#else
- probe_offset_xy.x > 0 ? X_BED_SIZE : 0,
- probe_offset_xy.y < 0 ? Y_BED_SIZE : 0
+ probe.offset_xy.x > 0 ? X_BED_SIZE : 0,
+ probe.offset_xy.y < 0 ? Y_BED_SIZE : 0
#endif
);
}
@@ -534,9 +535,7 @@
if (cpos.x < 0) {
// No more REAL INVALID mesh points to populate, so we ASSUME
// user meant to populate ALL INVALID mesh points to value
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- if (isnan(z_values[x][y])) z_values[x][y] = g29_constant;
+ GRID_LOOP(x, y) if (isnan(z_values[x][y])) z_values[x][y] = g29_constant;
break; // No more invalid Mesh Points to populate
}
else {
@@ -684,18 +683,20 @@
UNUSED(probe_deployed);
#endif
+ #if HOTENDS > 1
+ tool_change(old_tool_index);
+ #endif
return;
}
void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const float value) {
float sum = 0;
int n = 0;
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- if (!isnan(z_values[x][y])) {
- sum += z_values[x][y];
- n++;
- }
+ GRID_LOOP(x, y)
+ if (!isnan(z_values[x][y])) {
+ sum += z_values[x][y];
+ n++;
+ }
const float mean = sum / n;
@@ -703,10 +704,9 @@
// Sum the squares of difference from mean
//
float sum_of_diff_squared = 0;
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- if (!isnan(z_values[x][y]))
- sum_of_diff_squared += sq(z_values[x][y] - mean);
+ GRID_LOOP(x, y)
+ if (!isnan(z_values[x][y]))
+ sum_of_diff_squared += sq(z_values[x][y] - mean);
SERIAL_ECHOLNPAIR("# of samples: ", n);
SERIAL_ECHOLNPAIR_F("Mean Mesh Height: ", mean, 6);
@@ -715,34 +715,32 @@
SERIAL_ECHOLNPAIR_F("Standard Deviation: ", sigma, 6);
if (cflag)
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- if (!isnan(z_values[x][y])) {
- z_values[x][y] -= mean + value;
- #if ENABLED(EXTENSIBLE_UI)
- ExtUI::onMeshUpdate(x, y, z_values[x][y]);
- #endif
- }
- }
-
- void unified_bed_leveling::shift_mesh_height() {
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
+ GRID_LOOP(x, y)
if (!isnan(z_values[x][y])) {
- z_values[x][y] += g29_constant;
+ z_values[x][y] -= mean + value;
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onMeshUpdate(x, y, z_values[x][y]);
#endif
}
}
+ void unified_bed_leveling::shift_mesh_height() {
+ GRID_LOOP(x, y)
+ if (!isnan(z_values[x][y])) {
+ z_values[x][y] += g29_constant;
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+ #endif
+ }
+ }
+
#if HAS_BED_PROBE
/**
* Probe all invalidated locations of the mesh that can be reached by the probe.
* This attempts to fill in locations closest to the nozzle's start location first.
*/
void unified_bed_leveling::probe_entire_mesh(const xy_pos_t &near, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) {
- DEPLOY_PROBE(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
+ probe.deploy(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
#if HAS_LCD_MENU
ui.capture();
@@ -768,7 +766,7 @@
ui.wait_for_release();
ui.quick_feedback();
ui.release();
- STOW_PROBE(); // Release UI before stow to allow for PAUSE_BEFORE_DEPLOY_STOW
+ probe.stow(); // Release UI before stow to allow for PAUSE_BEFORE_DEPLOY_STOW
return restore_ubl_active_state_and_leave();
}
#endif
@@ -778,7 +776,7 @@
: find_closest_mesh_point_of_type(INVALID, near, true);
if (best.pos.x >= 0) { // mesh point found and is reachable by probe
- const float measured_z = probe_at_point(
+ const float measured_z = probe.probe_at_point(
best.meshpos(),
stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level
);
@@ -794,20 +792,20 @@
#if HAS_LCD_MENU
ui.release();
#endif
- STOW_PROBE(); // Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
+ probe.stow(); // Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
#if HAS_LCD_MENU
ui.capture();
#endif
#ifdef Z_AFTER_PROBING
- move_z_after_probing();
+ probe.move_z_after_probing();
#endif
restore_ubl_active_state_and_leave();
do_blocking_move_to_xy(
- constrain(near.x - probe_offset_xy.x, MESH_MIN_X, MESH_MAX_X),
- constrain(near.y - probe_offset_xy.y, MESH_MIN_Y, MESH_MAX_Y)
+ constrain(near.x - probe.offset_xy.x, MESH_MIN_X, MESH_MAX_X),
+ constrain(near.y - probe.offset_xy.y, MESH_MIN_Y, MESH_MAX_Y)
);
}
@@ -907,7 +905,7 @@
ui.return_to_status();
mesh_index_pair location;
- xy_int8_t &lpos = location.pos;
+ const xy_int8_t &lpos = location.pos;
do {
location = find_closest_mesh_point_of_type(INVALID, pos);
// It doesn't matter if the probe can't reach the NAN location. This is a manual probe.
@@ -1006,7 +1004,7 @@
#endif
MeshFlags done_flags{0};
- xy_int8_t &lpos = location.pos;
+ const xy_int8_t &lpos = location.pos;
do {
location = find_closest_mesh_point_of_type(SET_IN_BITMAP, pos, false, &done_flags);
@@ -1237,52 +1235,46 @@
mesh_index_pair farthest { -1, -1, -99999.99 };
- for (int8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
- for (int8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
+ GRID_LOOP(i, j) {
+ if (!isnan(z_values[i][j])) continue; // Skip valid mesh points
- if (isnan(z_values[i][j])) { // Invalid mesh point?
+ // Skip unreachable points
+ if (!probe.can_reach(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
+ continue;
- // Skip points the probe can't reach
- if (!position_is_reachable_by_probe(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
- continue;
+ found_a_NAN = true;
- found_a_NAN = true;
+ xy_int8_t near { -1, -1 };
+ float d1, d2 = 99999.9f;
+ GRID_LOOP(k, l) {
+ if (isnan(z_values[k][l])) continue;
- xy_int8_t near { -1, -1 };
- float d1, d2 = 99999.9f;
- for (int8_t k = 0; k < GRID_MAX_POINTS_X; k++) {
- for (int8_t l = 0; l < GRID_MAX_POINTS_Y; l++) {
- if (!isnan(z_values[k][l])) {
- found_a_real = true;
+ found_a_real = true;
- // Add in a random weighting factor that scrambles the probing of the
- // last half of the mesh (when every unprobed mesh point is one index
- // from a probed location).
+ // Add in a random weighting factor that scrambles the probing of the
+ // last half of the mesh (when every unprobed mesh point is one index
+ // from a probed location).
- d1 = HYPOT(i - k, j - l) + (1.0f / ((millis() % 47) + 13));
+ d1 = HYPOT(i - k, j - l) + (1.0f / ((millis() % 47) + 13));
- if (d1 < d2) { // Invalid mesh point (i,j) is closer to the defined point (k,l)
- d2 = d1;
- near.set(i, j);
- }
- }
- }
- }
-
- //
- // At this point d2 should have the near defined mesh point to invalid mesh point (i,j)
- //
-
- if (found_a_real && near.x >= 0 && d2 > farthest.distance) {
- farthest.pos = near; // Found an invalid location farther from the defined mesh point
- farthest.distance = d2;
- }
+ if (d1 < d2) { // Invalid mesh point (i,j) is closer to the defined point (k,l)
+ d2 = d1;
+ near.set(i, j);
}
- } // for j
- } // for i
+ }
+
+ //
+ // At this point d2 should have the near defined mesh point to invalid mesh point (i,j)
+ //
+
+ if (found_a_real && near.x >= 0 && d2 > farthest.distance) {
+ farthest.pos = near; // Found an invalid location farther from the defined mesh point
+ farthest.distance = d2;
+ }
+ } // GRID_LOOP
if (!found_a_real && found_a_NAN) { // if the mesh is totally unpopulated, start the probing
- farthest.pos.set(GRID_MAX_POINTS_X / 2, GRID_MAX_POINTS_Y / 2);
+ farthest.pos.set((GRID_MAX_POINTS_X) / 2, (GRID_MAX_POINTS_Y) / 2);
farthest.distance = 1;
}
return farthest;
@@ -1294,40 +1286,38 @@
closest.distance = -99999.9f;
// Get the reference position, either nozzle or probe
- const xy_pos_t ref = probe_relative ? pos + probe_offset_xy : pos;
+ const xy_pos_t ref = probe_relative ? pos + probe.offset_xy : pos;
float best_so_far = 99999.99f;
- for (int8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
- for (int8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
- if ( (type == (isnan(z_values[i][j]) ? INVALID : REAL))
- || (type == SET_IN_BITMAP && !done_flags->marked(i, j))
- ) {
- // Found a Mesh Point of the specified type!
- const xy_pos_t mpos = { mesh_index_to_xpos(i), mesh_index_to_ypos(j) };
+ GRID_LOOP(i, j) {
+ if ( (type == (isnan(z_values[i][j]) ? INVALID : REAL))
+ || (type == SET_IN_BITMAP && !done_flags->marked(i, j))
+ ) {
+ // Found a Mesh Point of the specified type!
+ const xy_pos_t mpos = { mesh_index_to_xpos(i), mesh_index_to_ypos(j) };
- // If using the probe as the reference there are some unreachable locations.
- // Also for round beds, there are grid points outside the bed the nozzle can't reach.
- // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
+ // If using the probe as the reference there are some unreachable locations.
+ // Also for round beds, there are grid points outside the bed the nozzle can't reach.
+ // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
- if (probe_relative ? !position_is_reachable_by_probe(mpos) : !position_is_reachable(mpos))
- continue;
+ if (!(probe_relative ? probe.can_reach(mpos) : position_is_reachable(mpos)))
+ continue;
- // Reachable. Check if it's the best_so_far location to the nozzle.
+ // Reachable. Check if it's the best_so_far location to the nozzle.
- const xy_pos_t diff = current_position - mpos;
- const float distance = (ref - mpos).magnitude() + diff.magnitude() * 0.1f;
+ const xy_pos_t diff = current_position - mpos;
+ const float distance = (ref - mpos).magnitude() + diff.magnitude() * 0.1f;
- // factor in the distance from the current location for the normal case
- // so the nozzle isn't running all over the bed.
- if (distance < best_so_far) {
- best_so_far = distance; // Found a closer location with the desired value type.
- closest.pos.set(i, j);
- closest.distance = best_so_far;
- }
+ // factor in the distance from the current location for the normal case
+ // so the nozzle isn't running all over the bed.
+ if (distance < best_so_far) {
+ best_so_far = distance; // Found a closer location with the desired value type.
+ closest.pos.set(i, j);
+ closest.distance = best_so_far;
}
- } // for j
- } // for i
+ }
+ } // GRID_LOOP
return closest;
}
@@ -1367,7 +1357,7 @@
info3 PROGMEM = { GRID_MAX_POINTS_X - 1, 0, 0, GRID_MAX_POINTS_Y, true }; // Right side of the mesh looking left
static const smart_fill_info * const info[] PROGMEM = { &info0, &info1, &info2, &info3 };
- for (uint8_t i = 0; i < COUNT(info); ++i) {
+ LOOP_L_N(i, COUNT(info)) {
const smart_fill_info *f = (smart_fill_info*)pgm_read_ptr(&info[i]);
const int8_t sx = pgm_read_byte(&f->sx), sy = pgm_read_byte(&f->sy),
ex = pgm_read_byte(&f->ex), ey = pgm_read_byte(&f->ey);
@@ -1393,13 +1383,13 @@
#include "../../../libs/vector_3.h"
void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) {
- const float x_min = probe_min_x(), x_max = probe_max_x(),
- y_min = probe_min_y(), y_max = probe_max_y(),
+ const float x_min = probe.min_x(), x_max = probe.max_x(),
+ y_min = probe.min_y(), y_max = probe.max_y(),
dx = (x_max - x_min) / (g29_grid_size - 1),
dy = (y_max - y_min) / (g29_grid_size - 1);
xy_float_t points[3];
- get_three_probe_points(points);
+ probe.get_three_points(points);
float measured_z;
bool abort_flag = false;
@@ -1417,7 +1407,7 @@
ui.status_printf_P(0, PSTR(S_FMT " 1/3"), GET_TEXT(MSG_LCD_TILTING_MESH));
#endif
- measured_z = probe_at_point(points[0], PROBE_PT_RAISE, g29_verbose_level);
+ measured_z = probe.probe_at_point(points[0], PROBE_PT_RAISE, g29_verbose_level);
if (isnan(measured_z))
abort_flag = true;
else {
@@ -1438,7 +1428,7 @@
ui.status_printf_P(0, PSTR(S_FMT " 2/3"), GET_TEXT(MSG_LCD_TILTING_MESH));
#endif
- measured_z = probe_at_point(points[1], PROBE_PT_RAISE, g29_verbose_level);
+ measured_z = probe.probe_at_point(points[1], PROBE_PT_RAISE, g29_verbose_level);
#ifdef VALIDATE_MESH_TILT
z2 = measured_z;
#endif
@@ -1460,7 +1450,7 @@
ui.status_printf_P(0, PSTR(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH));
#endif
- measured_z = probe_at_point(points[2], PROBE_PT_STOW, g29_verbose_level);
+ measured_z = probe.probe_at_point(points[2], PROBE_PT_STOW, g29_verbose_level);
#ifdef VALIDATE_MESH_TILT
z3 = measured_z;
#endif
@@ -1476,9 +1466,9 @@
}
}
- STOW_PROBE();
+ probe.stow();
#ifdef Z_AFTER_PROBING
- move_z_after_probing();
+ probe.move_z_after_probing();
#endif
if (abort_flag) {
@@ -1490,12 +1480,13 @@
bool zig_zag = false;
- uint16_t total_points = g29_grid_size * g29_grid_size, point_num = 1;
+ const uint16_t total_points = sq(g29_grid_size);
+ uint16_t point_num = 1;
xy_pos_t rpos;
- for (uint8_t ix = 0; ix < g29_grid_size; ix++) {
+ LOOP_L_N(ix, g29_grid_size) {
rpos.x = x_min + ix * dx;
- for (int8_t iy = 0; iy < g29_grid_size; iy++) {
+ LOOP_L_N(iy, g29_grid_size) {
rpos.y = y_min + dy * (zig_zag ? g29_grid_size - 1 - iy : iy);
if (!abort_flag) {
@@ -1504,7 +1495,7 @@
ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_LCD_TILTING_MESH), point_num, total_points);
#endif
- measured_z = probe_at_point(rpos, parser.seen('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level); // TODO: Needs error handling
+ measured_z = probe.probe_at_point(rpos, parser.seen('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level); // TODO: Needs error handling
abort_flag = isnan(measured_z);
@@ -1523,7 +1514,7 @@
}
#endif
- measured_z -= get_z_correction(rpos) /* + probe_offset.z */ ;
+ measured_z -= get_z_correction(rpos) /* + probe.offset.z */ ;
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_F(" final >>>---> ", measured_z, 7);
@@ -1540,9 +1531,9 @@
zig_zag ^= true;
}
}
- STOW_PROBE();
+ probe.stow();
#ifdef Z_AFTER_PROBING
- move_z_after_probing();
+ probe.move_z_after_probing();
#endif
if (abort_flag || finish_incremental_LSF(&lsf_results)) {
@@ -1563,39 +1554,37 @@
matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
- for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
- for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
- float mx = mesh_index_to_xpos(i),
- my = mesh_index_to_ypos(j),
- mz = z_values[i][j];
+ GRID_LOOP(i, j) {
+ float mx = mesh_index_to_xpos(i),
+ my = mesh_index_to_ypos(j),
+ mz = z_values[i][j];
- if (DEBUGGING(LEVELING)) {
- DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
- DEBUG_CHAR(',');
- DEBUG_ECHO_F(my, 7);
- DEBUG_CHAR(',');
- DEBUG_ECHO_F(mz, 7);
- DEBUG_ECHOPGM("] ---> ");
- DEBUG_DELAY(20);
- }
-
- apply_rotation_xyz(rotation, mx, my, mz);
-
- if (DEBUGGING(LEVELING)) {
- DEBUG_ECHOPAIR_F("after rotation = [", mx, 7);
- DEBUG_CHAR(',');
- DEBUG_ECHO_F(my, 7);
- DEBUG_CHAR(',');
- DEBUG_ECHO_F(mz, 7);
- DEBUG_ECHOLNPGM("]");
- DEBUG_DELAY(20);
- }
-
- z_values[i][j] = mz - lsf_results.D;
- #if ENABLED(EXTENSIBLE_UI)
- ExtUI::onMeshUpdate(i, j, z_values[i][j]);
- #endif
+ if (DEBUGGING(LEVELING)) {
+ DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
+ DEBUG_CHAR(',');
+ DEBUG_ECHO_F(my, 7);
+ DEBUG_CHAR(',');
+ DEBUG_ECHO_F(mz, 7);
+ DEBUG_ECHOPGM("] ---> ");
+ DEBUG_DELAY(20);
}
+
+ apply_rotation_xyz(rotation, mx, my, mz);
+
+ if (DEBUGGING(LEVELING)) {
+ DEBUG_ECHOPAIR_F("after rotation = [", mx, 7);
+ DEBUG_CHAR(',');
+ DEBUG_ECHO_F(my, 7);
+ DEBUG_CHAR(',');
+ DEBUG_ECHO_F(mz, 7);
+ DEBUG_ECHOLNPGM("]");
+ DEBUG_DELAY(20);
+ }
+
+ z_values[i][j] = mz - lsf_results.D;
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onMeshUpdate(i, j, z_values[i][j]);
+ #endif
}
if (DEBUGGING(LEVELING)) {
@@ -1622,14 +1611,14 @@
* numbers for those locations should be 0.
*/
#ifdef VALIDATE_MESH_TILT
- auto d_from = []() { DEBUG_ECHOPGM("D from "); };
+ auto d_from = []{ DEBUG_ECHOPGM("D from "); };
auto normed = [&](const xy_pos_t &pos, const float &zadd) {
return normal.x * pos.x + normal.y * pos.y + zadd;
};
auto debug_pt = [](PGM_P const pre, const xy_pos_t &pos, const float &zadd) {
d_from(); serialprintPGM(pre);
DEBUG_ECHO_F(normed(pos, zadd), 6);
- DEBUG_ECHOLNPAIR_F(" Z error: ", zadd - get_z_correction(pos), 6);
+ DEBUG_ECHOLNPAIR_F(" Z error = ", zadd - get_z_correction(pos), 6);
};
debug_pt(PSTR("1st point: "), probe_pt[0], normal.z * z1);
debug_pt(PSTR("2nd point: "), probe_pt[1], normal.z * z2);
@@ -1638,7 +1627,7 @@
DEBUG_ECHOLNPAIR_F("0 : ", normed(safe_homing_xy, 0), 6);
d_from(); DEBUG_ECHOPGM("safe home with Z=");
DEBUG_ECHOLNPAIR_F("mesh value ", normed(safe_homing_xy, get_z_correction(safe_homing_xy)), 6);
- DEBUG_ECHOPAIR(" Z error: (", Z_SAFE_HOMING_X_POINT, ",", Z_SAFE_HOMING_Y_POINT);
+ DEBUG_ECHOPAIR(" Z error = (", Z_SAFE_HOMING_X_POINT, ",", Z_SAFE_HOMING_Y_POINT);
DEBUG_ECHOLNPAIR_F(") = ", get_z_correction(safe_homing_xy), 6);
#endif
} // DEBUGGING(LEVELING)
@@ -1655,7 +1644,7 @@
// being extrapolated so that nearby points will have greater influence on
// the point being extrapolated. Then extrapolate the mesh point from WLSF.
- static_assert(GRID_MAX_POINTS_Y <= 16, "GRID_MAX_POINTS_Y too big");
+ static_assert((GRID_MAX_POINTS_Y) <= 16, "GRID_MAX_POINTS_Y too big");
uint16_t bitmap[GRID_MAX_POINTS_X] = { 0 };
struct linear_fit_data lsf_results;
@@ -1663,23 +1652,20 @@
const float weight_scaled = weight_factor * _MAX(MESH_X_DIST, MESH_Y_DIST);
- for (uint8_t jx = 0; jx < GRID_MAX_POINTS_X; jx++)
- for (uint8_t jy = 0; jy < GRID_MAX_POINTS_Y; jy++)
- if (!isnan(z_values[jx][jy]))
- SBI(bitmap[jx], jy);
+ GRID_LOOP(jx, jy) if (!isnan(z_values[jx][jy])) SBI(bitmap[jx], jy);
xy_pos_t ppos;
- for (uint8_t ix = 0; ix < GRID_MAX_POINTS_X; ix++) {
+ LOOP_L_N(ix, GRID_MAX_POINTS_X) {
ppos.x = mesh_index_to_xpos(ix);
- for (uint8_t iy = 0; iy < GRID_MAX_POINTS_Y; iy++) {
+ LOOP_L_N(iy, GRID_MAX_POINTS_Y) {
ppos.y = mesh_index_to_ypos(iy);
if (isnan(z_values[ix][iy])) {
// undefined mesh point at (ppos.x,ppos.y), compute weighted LSF from original valid mesh points.
incremental_LSF_reset(&lsf_results);
xy_pos_t rpos;
- for (uint8_t jx = 0; jx < GRID_MAX_POINTS_X; jx++) {
+ LOOP_L_N(jx, GRID_MAX_POINTS_X) {
rpos.x = mesh_index_to_xpos(jx);
- for (uint8_t jy = 0; jy < GRID_MAX_POINTS_Y; jy++) {
+ LOOP_L_N(jy, GRID_MAX_POINTS_Y) {
if (TEST(bitmap[jx], jy)) {
rpos.y = mesh_index_to_ypos(jy);
const float rz = z_values[jx][jy],
@@ -1728,7 +1714,7 @@
adjust_mesh_to_mean(g29_c_flag, g29_constant);
#if HAS_BED_PROBE
- SERIAL_ECHOLNPAIR_F("Probe Offset M851 Z", probe_offset.z, 7);
+ SERIAL_ECHOLNPAIR_F("Probe Offset M851 Z", probe.offset.z, 7);
#endif
SERIAL_ECHOLNPAIR("MESH_MIN_X " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50);
@@ -1741,7 +1727,7 @@
SERIAL_ECHOLNPAIR("MESH_Y_DIST ", MESH_Y_DIST); serial_delay(50);
SERIAL_ECHOPGM("X-Axis Mesh Points at: ");
- for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
+ LOOP_L_N(i, GRID_MAX_POINTS_X) {
SERIAL_ECHO_F(LOGICAL_X_POSITION(mesh_index_to_xpos(i)), 3);
SERIAL_ECHOPGM(" ");
serial_delay(25);
@@ -1749,7 +1735,7 @@
SERIAL_EOL();
SERIAL_ECHOPGM("Y-Axis Mesh Points at: ");
- for (uint8_t i = 0; i < GRID_MAX_POINTS_Y; i++) {
+ LOOP_L_N(i, GRID_MAX_POINTS_Y) {
SERIAL_ECHO_F(LOGICAL_Y_POSITION(mesh_index_to_ypos(i)), 3);
SERIAL_ECHOPGM(" ");
serial_delay(25);
@@ -1834,13 +1820,12 @@
SERIAL_ECHOLNPAIR("Subtracting mesh in slot ", g29_storage_slot, " from current mesh.");
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
- z_values[x][y] -= tmp_z_values[x][y];
- #if ENABLED(EXTENSIBLE_UI)
- ExtUI::onMeshUpdate(x, y, z_values[x][y]);
- #endif
- }
+ GRID_LOOP(x, y) {
+ z_values[x][y] -= tmp_z_values[x][y];
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+ #endif
+ }
}
#endif // UBL_DEVEL_DEBUGGING
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index f464d0fd6f..5364108240 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/binary_protocol.cpp b/Marlin/src/feature/binary_protocol.cpp
index 81ccbfbe32..e555c0c463 100644
--- a/Marlin/src/feature/binary_protocol.cpp
+++ b/Marlin/src/feature/binary_protocol.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/binary_protocol.h b/Marlin/src/feature/binary_protocol.h
index 0025fbe138..978d6a2c02 100644
--- a/Marlin/src/feature/binary_protocol.h
+++ b/Marlin/src/feature/binary_protocol.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -242,7 +242,7 @@ public:
uint8_t protocol() { return (meta >> 4) & 0xF; }
uint8_t type() { return meta & 0xF; }
void reset() { token = 0; sync = 0; meta = 0; size = 0; checksum = 0; }
- uint8_t data[1];
+ uint8_t data[2];
};
union Footer {
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 64c052269b..efe575ec63 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -73,20 +73,12 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
);
}
- const bool should_set = last_written_mode != (false
- #if ENABLED(BLTOUCH_SET_5V_MODE)
- || true
- #endif
- );
+ const bool should_set = last_written_mode != ENABLED(BLTOUCH_SET_5V_MODE);
#endif
if (should_set && set_voltage)
- mode_conv_proc((false
- #if ENABLED(BLTOUCH_SET_5V_MODE)
- || true
- #endif
- ));
+ mode_conv_proc(ENABLED(BLTOUCH_SET_5V_MODE));
}
void BLTouch::clear() {
@@ -124,7 +116,7 @@ bool BLTouch::deploy_proc() {
// The deploy might have failed or the probe is actually triggered (nozzle too low?) again
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Recovery Failed");
- SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH); // Tell the user something is wrong, needs action
+ SERIAL_ERROR_MSG(STR_STOP_BLTOUCH); // Tell the user something is wrong, needs action
stop(); // but it's not too bad, no need to kill, allow restart
return true; // Tell our caller we goofed in case he cares to know
@@ -169,7 +161,7 @@ bool BLTouch::stow_proc() {
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Recovery Failed");
- SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH); // Tell the user something is wrong, needs action
+ SERIAL_ERROR_MSG(STR_STOP_BLTOUCH); // Tell the user something is wrong, needs action
stop(); // but it's not too bad, no need to kill, allow restart
return true; // Tell our caller we goofed in case he cares to know
diff --git a/Marlin/src/feature/bltouch.h b/Marlin/src/feature/bltouch.h
index 9f27962229..af75fb8b29 100644
--- a/Marlin/src/feature/bltouch.h
+++ b/Marlin/src/feature/bltouch.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -91,20 +91,18 @@ public:
FORCE_INLINE static void mode_conv_5V() { mode_conv_proc(true); }
FORCE_INLINE static void mode_conv_OD() { mode_conv_proc(false); }
+ static bool triggered();
+
private:
FORCE_INLINE static bool _deploy_query_alarm() { return command(BLTOUCH_DEPLOY, BLTOUCH_DEPLOY_DELAY); }
FORCE_INLINE static bool _stow_query_alarm() { return command(BLTOUCH_STOW, BLTOUCH_STOW_DELAY); }
static void clear();
static bool command(const BLTCommand cmd, const millis_t &ms);
- static bool triggered();
static bool deploy_proc();
static bool stow_proc();
static bool status_proc();
static void mode_conv_proc(const bool M5V);
};
-// Deploy/stow angles for use by servo.cpp / servo.h
-#define BLTOUCH_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
-
extern BLTouch bltouch;
diff --git a/Marlin/src/feature/cancel_object.cpp b/Marlin/src/feature/cancel_object.cpp
index a066815e85..e2ee645215 100644
--- a/Marlin/src/feature/cancel_object.cpp
+++ b/Marlin/src/feature/cancel_object.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/cancel_object.h b/Marlin/src/feature/cancel_object.h
index f32283b46d..41bbfb70fc 100644
--- a/Marlin/src/feature/cancel_object.h
+++ b/Marlin/src/feature/cancel_object.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index bdc2898baf..a135cac418 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -58,7 +58,7 @@ void update_case_light() {
if (case_light_arg_flag && case_light_on)
case_light_brightness = case_light_brightness_sav; // restore last brightens if this is an S1 argument
- #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) || NONE(CASE_LIGHT_USE_NEOPIXEL, CASE_LIGHT_NO_BRIGHTNESS)
+ #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) || DISABLED(CASE_LIGHT_NO_BRIGHTNESS)
const uint8_t i = case_light_on ? case_light_brightness : 0, n10ct = INVERT_CASE_LIGHT ? 255 - i : i;
#endif
diff --git a/Marlin/src/feature/caselight.h b/Marlin/src/feature/caselight.h
index 322898d065..de77f0696b 100644
--- a/Marlin/src/feature/caselight.h
+++ b/Marlin/src/feature/caselight.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/closedloop.cpp b/Marlin/src/feature/closedloop.cpp
index e04014ba60..b777243481 100644
--- a/Marlin/src/feature/closedloop.cpp
+++ b/Marlin/src/feature/closedloop.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/closedloop.h b/Marlin/src/feature/closedloop.h
index 952d3dcbec..7e5594447d 100644
--- a/Marlin/src/feature/closedloop.h
+++ b/Marlin/src/feature/closedloop.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 57b552f9b0..0746700407 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,60 +24,80 @@
#if ENABLED(USE_CONTROLLER_FAN)
+#include "controllerfan.h"
#include "../module/stepper/indirection.h"
#include "../module/temperature.h"
-uint8_t controllerfan_speed;
+ControllerFan controllerFan;
-void controllerfan_update() {
- static millis_t lastMotorOn = 0, // Last time a motor was turned on
+uint8_t ControllerFan::speed;
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+ controllerFan_settings_t ControllerFan::settings; // {0}
+#endif
+
+void ControllerFan::setup() {
+ SET_OUTPUT(CONTROLLER_FAN_PIN);
+ init();
+}
+
+void ControllerFan::set_fan_speed(const uint8_t s) {
+ speed = s < (CONTROLLERFAN_SPEED_MIN) ? 0 : s; // Fan OFF below minimum
+}
+
+void ControllerFan::update() {
+ static millis_t lastMotorOn = 0, // Last time a motor was turned on
nextMotorCheck = 0; // Last time the state was checked
const millis_t ms = millis();
if (ELAPSED(ms, nextMotorCheck)) {
nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
- const bool xory = X_ENABLE_READ() == bool(X_ENABLE_ON) || Y_ENABLE_READ() == bool(Y_ENABLE_ON);
+ #define MOTOR_IS_ON(A,B) (A##_ENABLE_READ() == bool(B##_ENABLE_ON))
+ #define _OR_ENABLED_E(N) || MOTOR_IS_ON(E##N,E)
- // If any of the drivers or the bed are enabled...
- if (xory || Z_ENABLE_READ() == bool(Z_ENABLE_ON)
+ const bool motor_on = MOTOR_IS_ON(Z,Z)
+ #if HAS_Z2_ENABLE
+ || MOTOR_IS_ON(Z2,Z)
+ #endif
+ #if HAS_Z3_ENABLE
+ || MOTOR_IS_ON(Z3,Z)
+ #endif
+ #if HAS_Z4_ENABLE
+ || MOTOR_IS_ON(Z4,Z)
+ #endif
+ || (DISABLED(CONTROLLER_FAN_USE_Z_ONLY) && (
+ MOTOR_IS_ON(X,X) || MOTOR_IS_ON(Y,Y)
+ #if HAS_X2_ENABLE
+ || MOTOR_IS_ON(X2,X)
+ #endif
+ #if HAS_Y2_ENABLE
+ || MOTOR_IS_ON(Y2,Y)
+ #endif
+ #if E_STEPPERS
+ REPEAT(E_STEPPERS, _OR_ENABLED_E)
+ #endif
+ )
+ )
+ ;
+
+ // If any of the drivers or the heated bed are enabled...
+ if (motor_on
#if HAS_HEATED_BED
|| thermalManager.temp_bed.soft_pwm_amount > 0
#endif
- #if HAS_X2_ENABLE
- || X2_ENABLE_READ() == bool(X_ENABLE_ON)
- #endif
- #if HAS_Y2_ENABLE
- || Y2_ENABLE_READ() == bool(Y_ENABLE_ON)
- #endif
- #if HAS_Z2_ENABLE
- || Z2_ENABLE_READ() == bool(Z_ENABLE_ON)
- #endif
- #if HAS_Z3_ENABLE
- || Z3_ENABLE_READ() == bool(Z_ENABLE_ON)
- #endif
- #if HAS_Z4_ENABLE
- || Z4_ENABLE_READ() == bool(Z_ENABLE_ON)
- #endif
- #if E_STEPPERS
- #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == bool(E_ENABLE_ON)
- REPEAT(E_STEPPERS, _OR_ENABLED_E)
- #endif
- ) {
- lastMotorOn = ms; //... set time to NOW so the fan will turn on
- }
+ ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
- // Fan off if no steppers have been enabled for CONTROLLERFAN_SECS seconds
- controllerfan_speed = (!lastMotorOn || ELAPSED(ms, lastMotorOn + (CONTROLLERFAN_SECS) * 1000UL)) ? 0 : (
- #ifdef CONTROLLERFAN_SPEED_Z_ONLY
- xory ? CONTROLLERFAN_SPEED : CONTROLLERFAN_SPEED_Z_ONLY
- #else
- CONTROLLERFAN_SPEED
- #endif
+ // Fan Settings. Set fan > 0:
+ // - If AutoMode is on and steppers have been enabled for CONTROLLERFAN_IDLE_TIME seconds.
+ // - If System is on idle and idle fan speed settings is activated.
+ set_fan_speed(
+ settings.auto_mode && lastMotorOn && PENDING(ms, lastMotorOn + settings.duration * 1000UL)
+ ? settings.active_speed : settings.idle_speed
);
// Allow digital or PWM fan output (see M42 handling)
- WRITE(CONTROLLER_FAN_PIN, controllerfan_speed);
- analogWrite(pin_t(CONTROLLER_FAN_PIN), controllerfan_speed);
+ WRITE(CONTROLLER_FAN_PIN, speed);
+ analogWrite(pin_t(CONTROLLER_FAN_PIN), speed);
}
}
diff --git a/Marlin/src/feature/controllerfan.h b/Marlin/src/feature/controllerfan.h
index d68393a4b0..cd56ff8ced 100644
--- a/Marlin/src/feature/controllerfan.h
+++ b/Marlin/src/feature/controllerfan.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,4 +21,56 @@
*/
#pragma once
-void controllerfan_update();
+#include "../inc/MarlinConfigPre.h"
+
+typedef struct {
+ uint8_t active_speed, // 0-255 (fullspeed); Speed with enabled stepper motors
+ idle_speed; // 0-255 (fullspeed); Speed after idle period with all motors are disabled
+ uint16_t duration; // Duration in seconds for the fan to run after all motors are disabled
+ bool auto_mode; // Default true
+} controllerFan_settings_t;
+
+#ifndef CONTROLLERFAN_SPEED_ACTIVE
+ #define CONTROLLERFAN_SPEED_ACTIVE 255
+#endif
+#ifndef CONTROLLERFAN_SPEED_IDLE
+ #define CONTROLLERFAN_SPEED_IDLE 0
+#endif
+#ifndef CONTROLLERFAN_IDLE_TIME
+ #define CONTROLLERFAN_IDLE_TIME 60
+#endif
+
+static constexpr controllerFan_settings_t controllerFan_defaults = {
+ CONTROLLERFAN_SPEED_ACTIVE,
+ CONTROLLERFAN_SPEED_IDLE,
+ CONTROLLERFAN_IDLE_TIME,
+ true
+};
+
+#if ENABLED(USE_CONTROLLER_FAN)
+
+class ControllerFan {
+ private:
+ static uint8_t speed;
+ static void set_fan_speed(const uint8_t s);
+
+ public:
+ #if ENABLED(CONTROLLER_FAN_EDITABLE)
+ static controllerFan_settings_t settings;
+ #else
+ static const controllerFan_settings_t constexpr &settings = controllerFan_defaults;
+ #endif
+ static inline bool state() { return speed > 0; }
+ static inline void init() { reset(); }
+ static inline void reset() {
+ #if ENABLED(CONTROLLER_FAN_EDITABLE)
+ settings = controllerFan_defaults;
+ #endif
+ }
+ static void setup();
+ static void update();
+};
+
+extern ControllerFan controllerFan;
+
+#endif
diff --git a/Marlin/src/feature/dac/dac_dac084s085.h b/Marlin/src/feature/dac/dac_dac084s085.h
index 09d5bb857d..cccc9cbd45 100644
--- a/Marlin/src/feature/dac/dac_dac084s085.h
+++ b/Marlin/src/feature/dac/dac_dac084s085.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
index 9efb9943a7..39f873f0cb 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.cpp
+++ b/Marlin/src/feature/dac/dac_mcp4728.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/dac_mcp4728.h b/Marlin/src/feature/dac/dac_mcp4728.h
index f25310f7ca..8e8b25ca69 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.h
+++ b/Marlin/src/feature/dac/dac_mcp4728.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index 320e88c69c..c8c1cb2494 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -88,11 +88,11 @@ void dac_print_values() {
SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(
- " X:", dac_perc(X_AXIS), " (", dac_amps(X_AXIS), ")"
- " Y:", dac_perc(Y_AXIS), " (", dac_amps(Y_AXIS), ")"
- " Z:", dac_perc(Z_AXIS), " (", dac_amps(Z_AXIS), ")"
- " E:", dac_perc(E_AXIS), " (", dac_amps(E_AXIS), ")"
+ SERIAL_ECHOLNPAIR_P(
+ SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")")
+ SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")")
+ SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")")
+ SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")")
);
}
diff --git a/Marlin/src/feature/dac/stepper_dac.h b/Marlin/src/feature/dac/stepper_dac.h
index 3496ebec48..3e77d471a6 100644
--- a/Marlin/src/feature/dac/stepper_dac.h
+++ b/Marlin/src/feature/dac/stepper_dac.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/digipot/digipot.h b/Marlin/src/feature/digipot/digipot.h
index 03c9854153..b7c0b65036 100644
--- a/Marlin/src/feature/digipot/digipot.h
+++ b/Marlin/src/feature/digipot/digipot.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
index 86eeab63b4..ebfbee794a 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,8 +24,8 @@
#if BOTH(DIGIPOT_I2C, DIGIPOT_MCP4018)
-#include "Stream.h"
-#include "utility/twi.h"
+#include
+#include
#include //https://github.com/stawel/SlowSoftI2CMaster
// Settings for the I2C based DIGIPOT (MCP4018) based on WT150
@@ -92,11 +92,11 @@ void digipot_i2c_set_current(const uint8_t channel, const float current) {
void digipot_i2c_init() {
static const float digipot_motor_current[] PROGMEM = DIGIPOT_I2C_MOTOR_CURRENTS;
- for (uint8_t i = 0; i < DIGIPOT_I2C_NUM_CHANNELS; i++)
+ LOOP_L_N(i, DIGIPOT_I2C_NUM_CHANNELS)
pots[i].i2c_init();
// setup initial currents as defined in Configuration_adv.h
- for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++)
+ LOOP_L_N(i, COUNT(digipot_motor_current))
digipot_i2c_set_current(i, pgm_read_float(&digipot_motor_current[i]));
}
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index 48b4d154be..79bb6eb3c2 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,7 +24,7 @@
#if ENABLED(DIGIPOT_I2C) && DISABLED(DIGIPOT_MCP4018)
-#include "Stream.h"
+#include
#include
#if MB(MKS_SBASE)
@@ -83,7 +83,7 @@ void digipot_i2c_init() {
#endif
// setup initial currents as defined in Configuration_adv.h
static const float digipot_motor_current[] PROGMEM = DIGIPOT_I2C_MOTOR_CURRENTS;
- for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++)
+ LOOP_L_N(i, COUNT(digipot_motor_current))
digipot_i2c_set_current(i, pgm_read_float(&digipot_motor_current[i]));
}
diff --git a/Marlin/src/feature/emergency_parser.cpp b/Marlin/src/feature/e_parser.cpp
similarity index 92%
rename from Marlin/src/feature/emergency_parser.cpp
rename to Marlin/src/feature/e_parser.cpp
index 97ab967028..e7d79bf745 100644
--- a/Marlin/src/feature/emergency_parser.cpp
+++ b/Marlin/src/feature/e_parser.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,7 +28,7 @@
#if ENABLED(EMERGENCY_PARSER)
-#include "emergency_parser.h"
+#include "e_parser.h"
// Static data members
bool EmergencyParser::killed_by_M112, // = false
diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/e_parser.h
similarity index 95%
rename from Marlin/src/feature/emergency_parser.h
rename to Marlin/src/feature/e_parser.h
index e9ce0f6645..41261402a1 100644
--- a/Marlin/src/feature/emergency_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -75,10 +75,11 @@ public:
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) {
- case ' ': break;
+ case ' ': case '\n': case '\r': break;
case 'N': state = EP_N; break;
case 'M': state = EP_M; break;
default: state = EP_IGNORE;
@@ -164,11 +165,11 @@ public:
#endif
case EP_IGNORE:
- if (c == '\n') state = EP_RESET;
+ if (ISEOL(c)) state = EP_RESET;
break;
default:
- if (c == '\n') {
+ if (ISEOL(c)) {
if (enabled) switch (state) {
case EP_M108: wait_for_user = wait_for_heatup = false; break;
case EP_M112: killed_by_M112 = true; break;
diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/encoder_i2c.cpp
similarity index 96%
rename from Marlin/src/feature/I2CPositionEncoder.cpp
rename to Marlin/src/feature/encoder_i2c.cpp
index c3b182c72a..a70227a270 100644
--- a/Marlin/src/feature/I2CPositionEncoder.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,7 +32,7 @@
#if ENABLED(I2C_POSITION_ENCODERS)
-#include "I2CPositionEncoder.h"
+#include "encoder_i2c.h"
#include "../module/temperature.h"
#include "../module/stepper.h"
@@ -162,15 +162,17 @@ void I2CPositionEncoder::update() {
if (errIdx == 0) {
// In order to correct for "error" but avoid correcting for noise and non-skips
// it must be > threshold and have a difference average of < 10 and be < 2000 steps
- if (ABS(error) > threshold * planner.settings.axis_steps_per_mm[encoderAxis] &&
- diffSum < 10 * (I2CPE_ERR_ARRAY_SIZE - 1) && ABS(error) < 2000) { // Check for persistent error (skip)
+ if (ABS(error) > threshold * planner.settings.axis_steps_per_mm[encoderAxis]
+ && diffSum < 10 * (I2CPE_ERR_ARRAY_SIZE - 1)
+ && ABS(error) < 2000
+ ) { // Check for persistent error (skip)
errPrst[errPrstIdx++] = error; // Error must persist for I2CPE_ERR_PRST_ARRAY_SIZE error cycles. This also serves to improve the average accuracy
if (errPrstIdx >= I2CPE_ERR_PRST_ARRAY_SIZE) {
float sumP = 0;
LOOP_L_N(i, I2CPE_ERR_PRST_ARRAY_SIZE) sumP += errPrst[i];
const int32_t errorP = int32_t(sumP * RECIPROCAL(I2CPE_ERR_PRST_ARRAY_SIZE));
SERIAL_ECHO(axis_codes[encoderAxis]);
- SERIAL_ECHOLNPAIR(" - err detected: ", errorP * planner.steps_to_mm[encoderAxis], "mm; correcting!");
+ SERIAL_ECHOLNPAIR(" : CORRECT ERR ", errorP * planner.steps_to_mm[encoderAxis], "mm");
babystep.add_steps(encoderAxis, -LROUND(errorP));
errPrstIdx = 0;
}
@@ -189,7 +191,8 @@ void I2CPositionEncoder::update() {
if (ABS(error) > I2CPE_ERR_CNT_THRESH * planner.settings.axis_steps_per_mm[encoderAxis]) {
const millis_t ms = millis();
if (ELAPSED(ms, nextErrorCountTime)) {
- SERIAL_ECHOLNPAIR("Large error on ", axis_codes[encoderAxis], " axis. error: ", (int)error, "; diffSum: ", diffSum);
+ SERIAL_ECHO(axis_codes[encoderAxis]);
+ SERIAL_ECHOLNPAIR(" : LARGE ERR ", int(error), "; diffSum=", diffSum);
errorCount++;
nextErrorCountTime = ms + I2CPE_ERR_CNT_DEBOUNCE_MS;
}
@@ -243,17 +246,14 @@ bool I2CPositionEncoder::passes_test(const bool report) {
}
float I2CPositionEncoder::get_axis_error_mm(const bool report) {
- float target, actual, error;
-
- target = planner.get_axis_position_mm(encoderAxis);
- actual = mm_from_count(position);
- error = actual - target;
-
- if (ABS(error) > 10000) error = 0; // ?
+ const float target = planner.get_axis_position_mm(encoderAxis),
+ actual = mm_from_count(position),
+ diff = actual - target,
+ error = ABS(diff) > 10000 ? 0 : diff; // Huge error is a bad reading
if (report) {
SERIAL_ECHO(axis_codes[encoderAxis]);
- SERIAL_ECHOLNPAIR(" axis target: ", target, ", actual: ", actual, ", error : ",error);
+ SERIAL_ECHOLNPAIR(" axis target=", target, "mm; actual=", actual, "mm; err=", error, "mm");
}
return error;
@@ -278,21 +278,25 @@ int32_t I2CPositionEncoder::get_axis_error_steps(const bool report) {
//convert both 'ticks' into same units / base
encoderCountInStepperTicksScaled = LROUND((stepperTicksPerUnit * encoderTicks) / encoderTicksPerUnit);
- int32_t target = stepper.position(encoderAxis),
- error = (encoderCountInStepperTicksScaled - target);
+ const int32_t target = stepper.position(encoderAxis);
+ int32_t error = encoderCountInStepperTicksScaled - target;
//suppress discontinuities (might be caused by bad I2C readings...?)
const bool suppressOutput = (ABS(error - errorPrev) > 100);
- if (report) {
- SERIAL_ECHO(axis_codes[encoderAxis]);
- SERIAL_ECHOLNPAIR(" axis target: ", target, ", actual: ", encoderCountInStepperTicksScaled, ", error : ", error);
- if (suppressOutput) SERIAL_ECHOLNPGM("Discontinuity detected, suppressing error.");
- }
-
errorPrev = error;
- return (suppressOutput ? 0 : error);
+ if (report) {
+ SERIAL_ECHO(axis_codes[encoderAxis]);
+ SERIAL_ECHOLNPAIR(" axis target=", target, "; actual=", encoderCountInStepperTicksScaled, "; err=", error);
+ }
+
+ if (suppressOutput) {
+ if (report) SERIAL_ECHOLNPGM("!Discontinuity. Suppressing error.");
+ error = 0;
+ }
+
+ return error;
}
int32_t I2CPositionEncoder::get_raw_count() {
diff --git a/Marlin/src/feature/I2CPositionEncoder.h b/Marlin/src/feature/encoder_i2c.h
similarity index 99%
rename from Marlin/src/feature/I2CPositionEncoder.h
rename to Marlin/src/feature/encoder_i2c.h
index 25350b2787..0665ee809d 100644
--- a/Marlin/src/feature/I2CPositionEncoder.h
+++ b/Marlin/src/feature/encoder_i2c.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/fanmux.cpp b/Marlin/src/feature/fanmux.cpp
index 6c7b56ac54..b90c72c648 100644
--- a/Marlin/src/feature/fanmux.cpp
+++ b/Marlin/src/feature/fanmux.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/fanmux.h b/Marlin/src/feature/fanmux.h
index 492b9fd785..2e54144478 100644
--- a/Marlin/src/feature/fanmux.h
+++ b/Marlin/src/feature/fanmux.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/filwidth.cpp b/Marlin/src/feature/filwidth.cpp
index fb685bddc1..4357d39fe0 100644
--- a/Marlin/src/feature/filwidth.cpp
+++ b/Marlin/src/feature/filwidth.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,7 +42,7 @@ int8_t FilamentWidthSensor::ratios[MAX_MEASUREMENT_DELAY + 1], // Ring
void FilamentWidthSensor::init() {
const int8_t ratio = sample_to_size_ratio();
- for (uint8_t i = 0; i < COUNT(ratios); ++i) ratios[i] = ratio;
+ LOOP_L_N(i, COUNT(ratios)) ratios[i] = ratio;
index_r = index_w = 0;
}
diff --git a/Marlin/src/feature/filwidth.h b/Marlin/src/feature/filwidth.h
index 7255428fdf..335a49b74f 100644
--- a/Marlin/src/feature/filwidth.h
+++ b/Marlin/src/feature/filwidth.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 896e602950..7d756ac6d0 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -73,7 +73,7 @@ void FWRetract::reset() {
settings.swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP;
current_hop = 0.0;
- for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+ LOOP_L_N(i, EXTRUDERS) {
retracted[i] = false;
#if EXTRUDERS > 1
retracted_swap[i] = false;
@@ -117,7 +117,7 @@ void FWRetract::retract(const bool retracting
" swapping ", swapping,
" active extruder ", active_extruder
);
- for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+ LOOP_L_N(i, EXTRUDERS) {
SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
#if EXTRUDERS > 1
SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
@@ -201,7 +201,7 @@ void FWRetract::retract(const bool retracting
SERIAL_ECHOLNPAIR("retracting ", retracting);
SERIAL_ECHOLNPAIR("swapping ", swapping);
SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
- for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+ LOOP_L_N(i, EXTRUDERS) {
SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
#if EXTRUDERS > 1
SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index 374667513d..e08f8f03af 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index 30ec8bfb1d..2108f4e7f4 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -64,7 +64,8 @@ void host_action(const char * const pstr, const bool eol) {
#if ENABLED(HOST_PROMPT_SUPPORT)
- const char CONTINUE_STR[] PROGMEM = "Continue";
+ const char CONTINUE_STR[] PROGMEM = "Continue",
+ DISMISS_STR[] PROGMEM = "Dismiss";
#if HAS_RESUME_CONTINUE
extern bool wait_for_user;
@@ -84,70 +85,78 @@ void host_action(const char * const pstr, const bool eol) {
if (eol) SERIAL_EOL();
}
- void host_action_prompt_plus(const char * const ptype, const char * const pstr, const bool eol=true) {
+ void host_action_prompt_plus(const char * const ptype, const char * const pstr, const char extra_char='\0') {
host_action_prompt(ptype, false);
SERIAL_CHAR(' ');
serialprintPGM(pstr);
- if (eol) SERIAL_EOL();
+ if (extra_char != '\0') SERIAL_CHAR(extra_char);
+ SERIAL_EOL();
+ }
+ void host_action_prompt_begin(const PromptReason reason, const char * const pstr, const char extra_char/*='\0'*/) {
+ host_action_prompt_end();
+ host_prompt_reason = reason;
+ host_action_prompt_plus(PSTR("begin"), pstr, extra_char);
}
- void host_action_prompt_begin(const char * const pstr, const bool eol/*=true*/) { host_action_prompt_plus(PSTR("begin"), pstr, eol); }
void host_action_prompt_button(const char * const pstr) { host_action_prompt_plus(PSTR("button"), pstr); }
void host_action_prompt_end() { host_action_prompt(PSTR("end")); }
void host_action_prompt_show() { host_action_prompt(PSTR("show")); }
- void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const pbtn/*=nullptr*/) {
- host_prompt_reason = reason;
- host_action_prompt_end();
- host_action_prompt_begin(pstr);
- if (pbtn) host_action_prompt_button(pbtn);
+ void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const btn1/*=nullptr*/, const char * const btn2/*=nullptr*/) {
+ host_action_prompt_begin(reason, pstr);
+ if (btn1) host_action_prompt_button(btn1);
+ if (btn2) host_action_prompt_button(btn2);
host_action_prompt_show();
}
- inline void say_m876_response(const char * const pstr) {
- SERIAL_ECHOPGM("M876 Responding PROMPT_");
- serialprintPGM(pstr);
- SERIAL_EOL();
+ void filament_load_host_prompt() {
+ const bool disable_to_continue = (false
+ #if HAS_FILAMENT_SENSOR
+ || runout.filament_ran_out
+ #endif
+ );
+ host_prompt_do(PROMPT_FILAMENT_RUNOUT, PSTR("Paused"), PSTR("PurgeMore"),
+ disable_to_continue ? PSTR("DisableRunout") : CONTINUE_STR
+ );
}
+ //
+ // Handle responses from the host, such as:
+ // - Filament runout responses: Purge More, Continue
+ // - General "Continue" response
+ // - Resume Print response
+ // - Dismissal of info
+ //
void host_response_handler(const uint8_t response) {
#ifdef DEBUG_HOST_ACTIONS
- SERIAL_ECHOLNPAIR("M876 Handle Reason: ", host_prompt_reason);
- SERIAL_ECHOLNPAIR("M876 Handle Response: ", response);
+ static const char m876_prefix[] PROGMEM = "M876 Handle Re";
+ serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("ason: ", host_prompt_reason);
+ serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("sponse: ", response);
#endif
const char *msg = PSTR("UNKNOWN STATE");
const PromptReason hpr = host_prompt_reason;
- host_prompt_reason = PROMPT_NOT_DEFINED;
+ host_prompt_reason = PROMPT_NOT_DEFINED; // Reset now ahead of logic
switch (hpr) {
case PROMPT_FILAMENT_RUNOUT:
msg = PSTR("FILAMENT_RUNOUT");
- if (response == 0) {
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
- #endif
- host_action_prompt_end(); // Close current prompt
- host_action_prompt_begin(PSTR("Paused"));
- host_action_prompt_button(PSTR("Purge More"));
- if (false
- #if HAS_FILAMENT_SENSOR
- || runout.filament_ran_out
+ switch (response) {
+
+ case 0: // "Purge More" button
+ #if HAS_LCD_MENU && ENABLED(ADVANCED_PAUSE_FEATURE)
+ pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE; // Simulate menu selection (menu exits, doesn't extrude more)
#endif
- )
- host_action_prompt_button(PSTR("DisableRunout"));
- else {
- host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
- host_action_prompt_button(CONTINUE_STR);
- }
- host_action_prompt_show();
- }
- else if (response == 1) {
- #if HAS_FILAMENT_SENSOR
- if (runout.filament_ran_out) {
- runout.enabled = false;
- runout.reset();
- }
- #endif
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
- #endif
+ filament_load_host_prompt(); // Initiate another host prompt. (NOTE: The loop in load_filament may also do this!)
+ break;
+
+ case 1: // "Continue" / "Disable Runout" button
+ #if HAS_LCD_MENU && ENABLED(ADVANCED_PAUSE_FEATURE)
+ pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT; // Simulate menu selection
+ #endif
+ #if HAS_FILAMENT_SENSOR
+ if (runout.filament_ran_out) { // Disable a triggered sensor
+ runout.enabled = false;
+ runout.reset();
+ }
+ #endif
+ break;
}
break;
case PROMPT_USER_CONTINUE:
@@ -168,7 +177,9 @@ void host_action(const char * const pstr, const bool eol) {
break;
default: break;
}
- say_m876_response(msg);
+ SERIAL_ECHOPGM("M876 Responding PROMPT_");
+ serialprintPGM(msg);
+ SERIAL_EOL();
}
#endif // HOST_PROMPT_SUPPORT
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 57af59eb2e..3667b7f430 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,7 +46,7 @@ void host_action(const char * const pstr, const bool eol=true);
#if ENABLED(HOST_PROMPT_SUPPORT)
- extern const char CONTINUE_STR[];
+ extern const char CONTINUE_STR[], DISMISS_STR[];
enum PromptReason : uint8_t {
PROMPT_NOT_DEFINED,
@@ -61,13 +61,15 @@ void host_action(const char * const pstr, const bool eol=true);
void host_response_handler(const uint8_t response);
void host_action_notify(const char * const message);
- void host_action_prompt_begin(const char * const pstr, const bool eol=true);
+ void host_action_prompt_begin(const PromptReason reason, const char * const pstr, const char extra_char='\0');
void host_action_prompt_button(const char * const pstr);
void host_action_prompt_end();
void host_action_prompt_show();
- void host_prompt_do(const PromptReason type, const char * const pstr, const char * const pbtn=nullptr);
- inline void host_prompt_open(const PromptReason reason, const char * const pstr, const char * const pbtn=nullptr) {
- if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, pstr, pbtn);
+ void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const btn1=nullptr, const char * const btn2=nullptr);
+ inline void host_prompt_open(const PromptReason reason, const char * const pstr, const char * const btn1=nullptr, const char * const btn2=nullptr) {
+ if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, pstr, btn1, btn2);
}
+ void filament_load_host_prompt();
+
#endif
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index acf6c13a10..66afb63b05 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@
Joystick joystick;
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
#if HAS_JOY_ADC_X
@@ -164,7 +164,7 @@ Joystick joystick;
LOOP_XYZ(i) if (norm_jog[i]) {
move_dist[i] = seg_time * norm_jog[i] *
#if ENABLED(EXTENSIBLE_UI)
- MMM_TO_MMS(manual_feedrate_mm_m[i]);
+ manual_feedrate_mm_s[i];
#else
planner.settings.max_feedrate_mm_s[i];
#endif
@@ -173,6 +173,7 @@ Joystick joystick;
if (!UNEAR_ZERO(hypot2)) {
current_position += move_dist;
+ apply_motion_limits(current_position);
const float length = sqrt(hypot2);
injecting_now = true;
planner.buffer_line(current_position, length / seg_time, active_extruder, length);
diff --git a/Marlin/src/feature/joystick.h b/Marlin/src/feature/joystick.h
index 50196374a7..12f9554a71 100644
--- a/Marlin/src/feature/joystick.h
+++ b/Marlin/src/feature/joystick.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/blinkm.cpp b/Marlin/src/feature/leds/blinkm.cpp
index 0c5b15befd..1c7ceeb669 100644
--- a/Marlin/src/feature/leds/blinkm.cpp
+++ b/Marlin/src/feature/leds/blinkm.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/blinkm.h b/Marlin/src/feature/leds/blinkm.h
index 231dbe810e..c7c099d3a8 100644
--- a/Marlin/src/feature/leds/blinkm.h
+++ b/Marlin/src/feature/leds/blinkm.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 210aeef092..995693ffc5 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 14a50cb06f..22184381fc 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,6 +33,7 @@
#include "neopixel.h"
#endif
+// A white component can be passed
#define HAS_WHITE_LED EITHER(RGBW_LED, NEOPIXEL_LED)
/**
@@ -137,7 +138,7 @@ typedef struct LEDColor {
#define LEDColorBlue() LEDColor( 0, 0, 255)
#define LEDColorIndigo() LEDColor( 0, 255, 255)
#define LEDColorViolet() LEDColor(255, 0, 255)
-#if HAS_WHITE_LED
+#if HAS_WHITE_LED && DISABLED(RGB_LED)
#define LEDColorWhite() LEDColor( 0, 0, 0, 255)
#else
#define LEDColorWhite() LEDColor(255, 255, 255)
diff --git a/Marlin/src/feature/leds/neopixel.cpp b/Marlin/src/feature/leds/neopixel.cpp
index a3ceacb42c..892ebe15cb 100644
--- a/Marlin/src/feature/leds/neopixel.cpp
+++ b/Marlin/src/feature/leds/neopixel.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index e0a3d7c389..11e435b830 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/pca9632.cpp b/Marlin/src/feature/leds/pca9632.cpp
index fc0da10f70..af9e39b863 100644
--- a/Marlin/src/feature/leds/pca9632.cpp
+++ b/Marlin/src/feature/leds/pca9632.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/pca9632.h b/Marlin/src/feature/leds/pca9632.h
index 2abdf7c7af..749230f652 100644
--- a/Marlin/src/feature/leds/pca9632.h
+++ b/Marlin/src/feature/leds/pca9632.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/printer_event_leds.cpp b/Marlin/src/feature/leds/printer_event_leds.cpp
index 3ce7a1af21..70eee76b30 100644
--- a/Marlin/src/feature/leds/printer_event_leds.cpp
+++ b/Marlin/src/feature/leds/printer_event_leds.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/printer_event_leds.h b/Marlin/src/feature/leds/printer_event_leds.h
index f59d6c699c..d2888705e7 100644
--- a/Marlin/src/feature/leds/printer_event_leds.h
+++ b/Marlin/src/feature/leds/printer_event_leds.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -56,7 +56,7 @@ public:
#endif
#if HAS_TEMP_HOTEND || HAS_HEATED_BED
- static inline void onHeatingDone() { leds.set_color(LEDColorWhite()); }
+ static inline void onHeatingDone() { leds.set_white(); }
static inline void onPidTuningDone(LEDColor c) { leds.set_color(c); }
#endif
diff --git a/Marlin/src/feature/leds/tempstat.cpp b/Marlin/src/feature/leds/tempstat.cpp
index f19ae0f092..2d7afdcf9e 100644
--- a/Marlin/src/feature/leds/tempstat.cpp
+++ b/Marlin/src/feature/leds/tempstat.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/tempstat.h b/Marlin/src/feature/leds/tempstat.h
index 834f2e491f..fefe776cfd 100644
--- a/Marlin/src/feature/leds/tempstat.h
+++ b/Marlin/src/feature/leds/tempstat.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/max7219.cpp
similarity index 84%
rename from Marlin/src/feature/Max7219_Debug_LEDs.cpp
rename to Marlin/src/feature/max7219.cpp
index 63013057bc..a012aeb5fa 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -41,31 +41,23 @@
#define MAX7219_ERRORS // Disable to save 406 bytes of Program Memory
-#include "Max7219_Debug_LEDs.h"
+#include "max7219.h"
#include "../module/planner.h"
#include "../module/stepper.h"
#include "../MarlinCore.h"
#include "../HAL/shared/Delay.h"
-#define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1)
+#if ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1
+ #define HAS_SIDE_BY_SIDE 1
+#endif
#if _ROT == 0 || _ROT == 180
- #if HAS_SIDE_BY_SIDE
- #define MAX7219_X_LEDS 8
- #define MAX7219_Y_LEDS MAX7219_LINES
- #else
- #define MAX7219_Y_LEDS 8
- #define MAX7219_X_LEDS MAX7219_LINES
- #endif
+ #define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
+ #define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
#elif _ROT == 90 || _ROT == 270
- #if HAS_SIDE_BY_SIDE
- #define MAX7219_Y_LEDS 8
- #define MAX7219_X_LEDS MAX7219_LINES
- #else
- #define MAX7219_X_LEDS 8
- #define MAX7219_Y_LEDS MAX7219_LINES
- #endif
+ #define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
+ #define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
#else
#error "MAX7219_ROTATE must be a multiple of +/- 90°."
#endif
@@ -73,6 +65,7 @@
Max7219 max7219;
uint8_t Max7219::led_line[MAX7219_LINES]; // = { 0 };
+uint8_t Max7219::suspended; // = 0;
#define LINE_REG(Q) (max7219_reg_digit0 + ((Q) & 0x7))
@@ -125,10 +118,10 @@ uint8_t Max7219::led_line[MAX7219_LINES]; // = { 0 };
#define SIG_DELAY() DELAY_US(1) // Approximate a 1µs delay on 32-bit ARM
#undef CRITICAL_SECTION_START
#undef CRITICAL_SECTION_END
- #define CRITICAL_SECTION_START NOOP
- #define CRITICAL_SECTION_END NOOP
+ #define CRITICAL_SECTION_START() NOOP
+ #define CRITICAL_SECTION_END() NOOP
#else
- #define SIG_DELAY() DELAY_NS(188) // Delay for 0.1875µs (16MHz AVR) or 0.15µs (20MHz AVR)
+ #define SIG_DELAY() DELAY_NS(250)
#endif
void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/*=-1*/) {
@@ -154,7 +147,7 @@ void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/
*/
inline uint32_t flipped(const uint32_t bits, const uint8_t n_bytes) {
uint32_t mask = 1, outbits = 0;
- for (uint8_t b = 0; b < n_bytes * 8; b++) {
+ LOOP_L_N(b, n_bytes * 8) {
outbits <<= 1;
if (bits & mask) outbits |= 1;
mask <<= 1;
@@ -163,7 +156,7 @@ inline uint32_t flipped(const uint32_t bits, const uint8_t n_bytes) {
}
void Max7219::noop() {
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
SIG_DELAY();
WRITE(MAX7219_DIN_PIN, LOW);
for (uint8_t i = 16; i--;) {
@@ -174,11 +167,11 @@ void Max7219::noop() {
WRITE(MAX7219_CLK_PIN, HIGH);
SIG_DELAY();
}
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
}
void Max7219::putbyte(uint8_t data) {
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
for (uint8_t i = 8; i--;) {
SIG_DELAY();
WRITE(MAX7219_CLK_PIN, LOW); // tick
@@ -189,7 +182,7 @@ void Max7219::putbyte(uint8_t data) {
SIG_DELAY();
data <<= 1;
}
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
}
void Max7219::pulse_load() {
@@ -202,16 +195,17 @@ void Max7219::pulse_load() {
void Max7219::send(const uint8_t reg, const uint8_t data) {
SIG_DELAY();
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
SIG_DELAY();
putbyte(reg); // specify register
SIG_DELAY();
putbyte(data); // put data
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
}
// Send out a single native row of bits to just one unit
void Max7219::refresh_unit_line(const uint8_t line) {
+ if (suspended) return;
#if MAX7219_NUMBER_UNITS == 1
send(LINE_REG(line), led_line[line]);
#else
@@ -223,6 +217,7 @@ void Max7219::refresh_unit_line(const uint8_t line) {
// Send out a single native row of bits to all units
void Max7219::refresh_line(const uint8_t line) {
+ if (suspended) return;
#if MAX7219_NUMBER_UNITS == 1
refresh_unit_line(line);
#else
@@ -241,9 +236,9 @@ void Max7219::set(const uint8_t line, const uint8_t bits) {
// Draw an integer with optional leading zeros and optional decimal point
void Max7219::print(const uint8_t start, int16_t value, uint8_t size, const bool leadzero=false, bool dec=false) {
+ if (suspended) return;
constexpr uint8_t led_numeral[10] = { 0x7E, 0x60, 0x6D, 0x79, 0x63, 0x5B, 0x5F, 0x70, 0x7F, 0x7A },
led_decimal = 0x80, led_minus = 0x01;
-
bool blank = false, neg = value < 0;
if (neg) value *= -1;
while (size--) {
@@ -295,6 +290,7 @@ void Max7219::led_toggle(const uint8_t x, const uint8_t y) {
}
void Max7219::send_row(const uint8_t row) {
+ if (suspended) return;
#if _ROT == 0 || _ROT == 180 // Native Lines are horizontal too
#if MAX7219_X_LEDS <= 8
refresh_unit_line(LED_IND(0, row)); // A single unit line
@@ -308,6 +304,7 @@ void Max7219::send_row(const uint8_t row) {
}
void Max7219::send_column(const uint8_t col) {
+ if (suspended) return;
#if _ROT == 90 || _ROT == 270 // Native Lines are vertical too
#if MAX7219_Y_LEDS <= 8
refresh_unit_line(LED_IND(col, 0)); // A single unit line
@@ -332,25 +329,25 @@ void Max7219::fill() {
void Max7219::clear_row(const uint8_t row) {
if (row >= MAX7219_Y_LEDS) return error(PSTR("clear_row"), row);
- for (uint8_t x = 0; x < MAX7219_X_LEDS; x++) CLR_7219(x, row);
+ LOOP_L_N(x, MAX7219_X_LEDS) CLR_7219(x, row);
send_row(row);
}
void Max7219::clear_column(const uint8_t col) {
if (col >= MAX7219_X_LEDS) return error(PSTR("set_column"), col);
- for (uint8_t y = 0; y < MAX7219_Y_LEDS; y++) CLR_7219(col, y);
+ LOOP_L_N(y, MAX7219_Y_LEDS) CLR_7219(col, y);
send_column(col);
}
/**
* Plot the low order bits of val to the specified row of the matrix.
- * With 4 Max7219 units in the chain, it's possible to set 32 bits at once with
- * one call to the function (if rotated 90° or 180°).
+ * With 4 Max7219 units in the chain, it's possible to set 32 bits at
+ * once with a single call to the function (if rotated 90° or 270°).
*/
void Max7219::set_row(const uint8_t row, const uint32_t val) {
if (row >= MAX7219_Y_LEDS) return error(PSTR("set_row"), row);
uint32_t mask = _BV32(MAX7219_X_LEDS - 1);
- for (uint8_t x = 0; x < MAX7219_X_LEDS; x++) {
+ LOOP_L_N(x, MAX7219_X_LEDS) {
if (val & mask) SET_7219(x, row); else CLR_7219(x, row);
mask >>= 1;
}
@@ -359,13 +356,13 @@ void Max7219::set_row(const uint8_t row, const uint32_t val) {
/**
* Plot the low order bits of val to the specified column of the matrix.
- * With 4 Max7219 units in the chain, it's possible to set 32 bits at once with
- * one call to the function (if rotated 90° or 180°).
+ * With 4 Max7219 units in the chain, it's possible to set 32 bits at
+ * once with a single call to the function (if rotated 0° or 180°).
*/
void Max7219::set_column(const uint8_t col, const uint32_t val) {
if (col >= MAX7219_X_LEDS) return error(PSTR("set_column"), col);
uint32_t mask = _BV32(MAX7219_Y_LEDS - 1);
- for (uint8_t y = 0; y < MAX7219_Y_LEDS; y++) {
+ LOOP_L_N(y, MAX7219_Y_LEDS) {
if (val & mask) SET_7219(col, y); else CLR_7219(col, y);
mask >>= 1;
}
@@ -430,58 +427,106 @@ void Max7219::set_columns_32bits(const uint8_t x, uint32_t val) {
// Initialize the Max7219
void Max7219::register_setup() {
- for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+ LOOP_L_N(i, MAX7219_NUMBER_UNITS)
send(max7219_reg_scanLimit, 0x07);
pulse_load(); // Tell the chips to load the clocked out data
- for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+ LOOP_L_N(i, MAX7219_NUMBER_UNITS)
send(max7219_reg_decodeMode, 0x00); // Using an led matrix (not digits)
pulse_load(); // Tell the chips to load the clocked out data
- for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+ LOOP_L_N(i, MAX7219_NUMBER_UNITS)
send(max7219_reg_shutdown, 0x01); // Not in shutdown mode
pulse_load(); // Tell the chips to load the clocked out data
- for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+ LOOP_L_N(i, MAX7219_NUMBER_UNITS)
send(max7219_reg_displayTest, 0x00); // No display test
pulse_load(); // Tell the chips to load the clocked out data
- for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+ LOOP_L_N(i, MAX7219_NUMBER_UNITS)
send(max7219_reg_intensity, 0x01 & 0x0F); // The first 0x0F is the value you can set
// Range: 0x00 to 0x0F
pulse_load(); // Tell the chips to load the clocked out data
}
#ifdef MAX7219_INIT_TEST
-#if MAX7219_INIT_TEST == 2
- #define MAX7219_LEDS (MAX7219_X_LEDS * MAX7219_Y_LEDS)
+ uint8_t test_mode = 0;
+ millis_t next_patt_ms;
+ bool patt_on;
- void Max7219::spiral(const bool on, const uint16_t del) {
- constexpr int8_t way[][2] = { { 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 } };
- int8_t px = 0, py = 0, dir = 0;
- for (IF<(MAX7219_LEDS > 255), uint16_t, uint8_t>::type i = MAX7219_LEDS; i--;) {
- led_set(px, py, on);
- delay(del);
- const int8_t x = px + way[dir][0], y = py + way[dir][1];
- if (!WITHIN(x, 0, MAX7219_X_LEDS - 1) || !WITHIN(y, 0, MAX7219_Y_LEDS - 1) || BIT_7219(x, y) == on)
- dir = (dir + 1) & 0x3;
- px += way[dir][0];
- py += way[dir][1];
+ #if MAX7219_INIT_TEST == 2
+
+ #define MAX7219_LEDS (MAX7219_X_LEDS * MAX7219_Y_LEDS)
+
+ constexpr millis_t pattern_delay = 4;
+
+ int8_t spiralx, spiraly, spiral_dir;
+ IF<(MAX7219_LEDS > 255), uint16_t, uint8_t>::type spiral_count;
+
+ void Max7219::test_pattern() {
+ constexpr int8_t way[][2] = { { 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 } };
+ led_set(spiralx, spiraly, patt_on);
+ const int8_t x = spiralx + way[spiral_dir][0], y = spiraly + way[spiral_dir][1];
+ if (!WITHIN(x, 0, MAX7219_X_LEDS - 1) || !WITHIN(y, 0, MAX7219_Y_LEDS - 1) || BIT_7219(x, y) == patt_on)
+ spiral_dir = (spiral_dir + 1) & 0x3;
+ spiralx += way[spiral_dir][0];
+ spiraly += way[spiral_dir][1];
+ if (!spiral_count--) {
+ if (!patt_on)
+ test_mode = 0;
+ else {
+ spiral_count = MAX7219_LEDS;
+ spiralx = spiraly = spiral_dir = 0;
+ patt_on = false;
+ }
+ }
}
+
+ #else
+
+ constexpr millis_t pattern_delay = 20;
+ int8_t sweep_count, sweepx, sweep_dir;
+
+ void Max7219::test_pattern() {
+ set_column(sweepx, patt_on ? 0xFFFFFFFF : 0x00000000);
+ sweepx += sweep_dir;
+ if (!WITHIN(sweepx, 0, MAX7219_X_LEDS - 1)) {
+ if (!patt_on) {
+ sweep_dir *= -1;
+ sweepx += sweep_dir;
+ }
+ else
+ sweepx -= MAX7219_X_LEDS * sweep_dir;
+ patt_on ^= true;
+ next_patt_ms += 100;
+ if (++test_mode > 4) test_mode = 0;
+ }
+ }
+
+ #endif
+
+ void Max7219::run_test_pattern() {
+ const millis_t ms = millis();
+ if (PENDING(ms, next_patt_ms)) return;
+ next_patt_ms = ms + pattern_delay;
+ test_pattern();
}
-#else
-
- void Max7219::sweep(const int8_t dir, const uint16_t ms, const bool on) {
- uint8_t x = dir > 0 ? 0 : MAX7219_X_LEDS - 1;
- for (uint8_t i = MAX7219_X_LEDS; i--; x += dir) {
- set_column(x, on ? 0xFFFFFFFF : 0x00000000);
- delay(ms);
- }
+ void Max7219::start_test_pattern() {
+ clear();
+ test_mode = 1;
+ patt_on = true;
+ #if MAX7219_INIT_TEST == 2
+ spiralx = spiraly = spiral_dir = 0;
+ spiral_count = MAX7219_LEDS;
+ #else
+ sweep_dir = 1;
+ sweepx = 0;
+ sweep_count = MAX7219_X_LEDS;
+ #endif
}
-#endif
#endif // MAX7219_INIT_TEST
void Max7219::init() {
@@ -492,26 +537,14 @@ void Max7219::init() {
register_setup();
- for (uint8_t i = 0; i <= 7; i++) { // Empty registers to turn all LEDs off
+ LOOP_LE_N(i, 7) { // Empty registers to turn all LEDs off
led_line[i] = 0x00;
send(max7219_reg_digit0 + i, 0);
pulse_load(); // Tell the chips to load the clocked out data
}
#ifdef MAX7219_INIT_TEST
- #if MAX7219_INIT_TEST == 2
- spiral(true, 8);
- delay(150);
- spiral(false, 8);
- #else
- // Do an aesthetically-pleasing pattern to fully test the Max7219 module and LEDs.
- // Light up and turn off columns, both forward and backward.
- sweep(1, 20, true);
- sweep(1, 20, false);
- delay(150);
- sweep(-1, 20, true);
- sweep(-1, 20, false);
- #endif
+ start_test_pattern();
#endif
}
@@ -574,14 +607,14 @@ void Max7219::idle_tasks() {
#define MAX7219_USE_HEAD (defined(MAX7219_DEBUG_PLANNER_HEAD) || defined(MAX7219_DEBUG_PLANNER_QUEUE))
#define MAX7219_USE_TAIL (defined(MAX7219_DEBUG_PLANNER_TAIL) || defined(MAX7219_DEBUG_PLANNER_QUEUE))
#if MAX7219_USE_HEAD || MAX7219_USE_TAIL
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
#if MAX7219_USE_HEAD
const uint8_t head = planner.block_buffer_head;
#endif
#if MAX7219_USE_TAIL
const uint8_t tail = planner.block_buffer_tail;
#endif
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
#endif
#if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
@@ -604,6 +637,13 @@ void Max7219::idle_tasks() {
register_setup();
}
+ #ifdef MAX7219_INIT_TEST
+ if (test_mode) {
+ run_test_pattern();
+ return;
+ }
+ #endif
+
#if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
if (do_blink) {
led_toggle(MAX7219_X_LEDS - 1, MAX7219_Y_LEDS - 1);
@@ -649,6 +689,12 @@ void Max7219::idle_tasks() {
last_depth = current_depth;
}
#endif
+
+ // After resume() automatically do a refresh()
+ if (suspended == 0x80) {
+ suspended = 0;
+ refresh();
+ }
}
#endif // MAX7219_DEBUG
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.h b/Marlin/src/feature/max7219.h
similarity index 91%
rename from Marlin/src/feature/Max7219_Debug_LEDs.h
rename to Marlin/src/feature/max7219.h
index 9462fb23d9..19170b2d59 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.h
+++ b/Marlin/src/feature/max7219.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -88,6 +88,12 @@ public:
// Refresh all units
static inline void refresh() { for (uint8_t i = 0; i < 8; i++) refresh_line(i); }
+ // Suspend / resume updates to the LED unit
+ // Use these methods to speed up multiple changes
+ // or to apply updates from interrupt context.
+ static inline void suspend() { suspended++; }
+ static inline void resume() { suspended--; suspended |= 0x80; }
+
// Update a single native line on all units
static void refresh_line(const uint8_t line);
@@ -126,6 +132,7 @@ public:
static void idle_tasks();
private:
+ static uint8_t suspended;
static void error(const char * const func, const int32_t v1, const int32_t v2=-1);
static void noop();
static void set(const uint8_t line, const uint8_t bits);
@@ -136,11 +143,9 @@ private:
static void quantity16(const uint8_t y, const uint8_t ov, const uint8_t nv);
#ifdef MAX7219_INIT_TEST
- #if MAX7219_INIT_TEST == 2
- static void spiral(const bool on, const uint16_t del);
- #else
- static void sweep(const int8_t dir, const uint16_t ms, const bool on);
- #endif
+ static void test_pattern();
+ static void run_test_pattern();
+ static void start_test_pattern();
#endif
};
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index dbdd9558aa..d6ae2bb629 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -98,13 +98,13 @@ void Mixer::normalize(const uint8_t tool_index) {
void Mixer::reset_vtools() {
// Virtual Tools 0, 1, 2, 3 = Filament 1, 2, 3, 4, etc.
// Every virtual tool gets a pure filament
- for (uint8_t t = 0; t < MIXING_VIRTUAL_TOOLS && t < MIXING_STEPPERS; t++)
+ LOOP_L_N(t, MIXING_VIRTUAL_TOOLS && t < MIXING_STEPPERS)
MIXER_STEPPER_LOOP(i)
color[t][i] = (t == i) ? COLOR_A_MASK : 0;
// Remaining virtual tools are 100% filament 1
#if MIXING_VIRTUAL_TOOLS > MIXING_STEPPERS
- for (uint8_t t = MIXING_STEPPERS; t < MIXING_VIRTUAL_TOOLS; t++)
+ LOOP_S_L_N(t, MIXING_STEPPERS, MIXING_VIRTUAL_TOOLS)
MIXER_STEPPER_LOOP(i)
color[t][i] = (i == 0) ? COLOR_A_MASK : 0;
#endif
diff --git a/Marlin/src/feature/mixing.h b/Marlin/src/feature/mixing.h
index 095f22d13b..da5240995c 100644
--- a/Marlin/src/feature/mixing.h
+++ b/Marlin/src/feature/mixing.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/mmu2/mmu2.cpp
similarity index 96%
rename from Marlin/src/feature/prusa_MMU2/mmu2.cpp
rename to Marlin/src/feature/mmu2/mmu2.cpp
index 0e25c86708..4506883f46 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp
+++ b/Marlin/src/feature/mmu2/mmu2.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,7 +43,7 @@ MMU2 mmu2;
#endif
#if ENABLED(EXTENSIBLE_UI)
- #include "../../lcd/extensible_ui/ui_api.h"
+ #include "../../lcd/extui/ui_api.h"
#endif
#define DEBUG_OUT ENABLED(MMU2_DEBUG)
@@ -381,7 +381,7 @@ bool MMU2::rx_str_P(const char* str) {
void MMU2::tx_str_P(const char* str) {
clear_rx_buffer();
uint8_t len = strlen_P(str);
- for (uint8_t i = 0; i < len; i++) mmuSerial.write(pgm_read_byte(str++));
+ LOOP_L_N(i, len) mmuSerial.write(pgm_read_byte(str++));
rx_buffer[0] = '\0';
last_request = millis();
}
@@ -392,7 +392,7 @@ void MMU2::tx_str_P(const char* str) {
void MMU2::tx_printf_P(const char* format, int argument = -1) {
clear_rx_buffer();
uint8_t len = sprintf_P(tx_buffer, format, argument);
- for (uint8_t i = 0; i < len; i++) mmuSerial.write(tx_buffer[i]);
+ LOOP_L_N(i, len) mmuSerial.write(tx_buffer[i]);
rx_buffer[0] = '\0';
last_request = millis();
}
@@ -403,7 +403,7 @@ void MMU2::tx_printf_P(const char* format, int argument = -1) {
void MMU2::tx_printf_P(const char* format, int argument1, int argument2) {
clear_rx_buffer();
uint8_t len = sprintf_P(tx_buffer, format, argument1, argument2);
- for (uint8_t i = 0; i < len; i++) mmuSerial.write(tx_buffer[i]);
+ LOOP_L_N(i, len) mmuSerial.write(tx_buffer[i]);
rx_buffer[0] = '\0';
last_request = millis();
}
@@ -448,7 +448,7 @@ void MMU2::tool_change(uint8_t index) {
if (index != extruder) {
- disable_E0();
+ DISABLE_AXIS_E0();
ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
command(MMU_CMD_T0 + index);
@@ -459,10 +459,10 @@ void MMU2::tool_change(uint8_t index) {
extruder = index; //filament change is finished
active_extruder = 0;
- enable_E0();
+ ENABLE_AXIS_E0();
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, int(extruder));
+ SERIAL_ECHOLNPAIR(STR_ACTIVE_EXTRUDER, int(extruder));
ui.reset_status();
}
@@ -497,13 +497,13 @@ void MMU2::tool_change(const char* special) {
case 'x': {
planner.synchronize();
uint8_t index = mmu2_choose_filament();
- disable_E0();
+ DISABLE_AXIS_E0();
command(MMU_CMD_T0 + index);
manage_response(true, true);
command(MMU_CMD_C0);
mmu_loop();
- enable_E0();
+ ENABLE_AXIS_E0();
extruder = index;
active_extruder = 0;
} break;
@@ -697,7 +697,7 @@ void MMU2::filament_runout() {
LCD_MESSAGEPGM(MSG_MMU2_EJECTING_FILAMENT);
- enable_E0();
+ ENABLE_AXIS_E0();
current_position.e -= MMU2_FILAMENTCHANGE_EJECT_FEED;
line_to_current_position(2500 / 60);
planner.synchronize();
@@ -707,14 +707,13 @@ void MMU2::filament_runout() {
if (recover) {
LCD_MESSAGEPGM(MSG_MMU2_EJECT_RECOVER);
BUZZ(200, 404);
- wait_for_user = true;
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR);
#endif
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover"));
#endif
- while (wait_for_user) idle();
+ wait_for_user_response();
BUZZ(200, 404);
BUZZ(200, 404);
@@ -731,7 +730,7 @@ void MMU2::filament_runout() {
BUZZ(200, 404);
- disable_E0();
+ DISABLE_AXIS_E0();
return true;
}
@@ -776,11 +775,11 @@ void MMU2::filament_runout() {
void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
planner.synchronize();
- enable_E0();
+ ENABLE_AXIS_E0();
const E_Step* step = sequence;
- for (uint8_t i = 0; i < steps; i++) {
+ LOOP_L_N(i, steps) {
const float es = pgm_read_float(&(step->extrude));
const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
@@ -794,7 +793,7 @@ void MMU2::filament_runout() {
step++;
}
- disable_E0();
+ DISABLE_AXIS_E0();
}
#endif // HAS_LCD_MENU && MMU2_MENUS
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.h b/Marlin/src/feature/mmu2/mmu2.h
similarity index 97%
rename from Marlin/src/feature/prusa_MMU2/mmu2.h
rename to Marlin/src/feature/mmu2/mmu2.h
index 9628c4be7f..970b0b4338 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.h
+++ b/Marlin/src/feature/mmu2/mmu2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/prusa_MMU2/serial-protocol.md b/Marlin/src/feature/mmu2/serial-protocol.md
similarity index 100%
rename from Marlin/src/feature/prusa_MMU2/serial-protocol.md
rename to Marlin/src/feature/mmu2/serial-protocol.md
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 10a1ba6a96..9c615b6ff8 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -50,7 +50,7 @@
#endif
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
#include "../core/language.h"
@@ -67,9 +67,10 @@
static xyze_pos_t resume_position;
-PauseMode pause_mode = PAUSE_MODE_PAUSE_PRINT;
-
-PauseMenuResponse pause_menu_response;
+#if HAS_LCD_MENU
+ PauseMenuResponse pause_menu_response;
+ PauseMode pause_mode = PAUSE_MODE_PAUSE_PRINT;
+#endif
fil_change_settings_t fc_settings[EXTRUDERS];
@@ -85,7 +86,11 @@ fil_change_settings_t fc_settings[EXTRUDERS];
#if HAS_BUZZER
static void filament_change_beep(const int8_t max_beep_count, const bool init=false) {
- if (pause_mode == PAUSE_MODE_PAUSE_PRINT) return;
+
+ #if HAS_LCD_MENU
+ if (pause_mode == PAUSE_MODE_PAUSE_PRINT) return;
+ #endif
+
static millis_t next_buzz = 0;
static int8_t runout_beep = 0;
@@ -115,7 +120,7 @@ static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) {
#if ENABLED(PREVENT_COLD_EXTRUSION)
if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder)) {
- SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
+ SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
return false;
}
#endif
@@ -129,15 +134,6 @@ static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) {
return thermalManager.wait_for_hotend(active_extruder);
}
-void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s) {
- #if HAS_FILAMENT_SENSOR
- runout.reset();
- #endif
- current_position.e += length / planner.e_factor[active_extruder];
- line_to_current_position(fr_mm_s);
- planner.synchronize();
-}
-
/**
* Load filament into the hotend
*
@@ -170,7 +166,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
#if HAS_LCD_MENU
if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_INSERT, mode);
#endif
- SERIAL_ECHO_MSG(_PMSG(MSG_FILAMENT_CHANGE_INSERT));
+ SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_INSERT));
#if HAS_BUZZER
filament_change_beep(max_beep_count, true);
@@ -179,18 +175,13 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
#endif
KEEPALIVE_STATE(PAUSED_FOR_USER);
- wait_for_user = true; // LCD click or M108 will clear this
#if ENABLED(HOST_PROMPT_SUPPORT)
const char tool = '0'
#if NUM_RUNOUT_SENSORS > 1
+ active_extruder
#endif
;
- host_prompt_reason = PROMPT_USER_CONTINUE;
- host_action_prompt_end();
- host_action_prompt_begin(PSTR("Load Filament T"), false);
- SERIAL_CHAR(tool);
- SERIAL_EOL();
+ host_action_prompt_begin(PROMPT_USER_CONTINUE, PSTR("Load Filament T"), tool);
host_action_prompt_button(CONTINUE_STR);
host_action_prompt_show();
#endif
@@ -201,7 +192,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
#if HAS_BUZZER
filament_change_beep(max_beep_count);
#endif
- idle(true);
+ idle_no_sleep();
}
}
@@ -217,7 +208,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
#endif
// Slow Load filament
- if (slow_load_length) do_pause_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
+ if (slow_load_length) unscaled_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
// Fast Load Filament
if (fast_load_length) {
@@ -226,7 +217,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
planner.settings.retract_acceleration = FILAMENT_CHANGE_FAST_LOAD_ACCEL;
#endif
- do_pause_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE);
+ unscaled_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE);
#if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0
planner.settings.retract_acceleration = saved_acceleration;
@@ -245,15 +236,15 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_PURGE);
#endif
- wait_for_user = true;
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purge Running..."), CONTINUE_STR);
+ host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR);
#endif
#if ENABLED(EXTENSIBLE_UI)
- ExtUI::onUserConfirmRequired_P(PSTR("Filament Purge Running..."));
+ ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging..."));
#endif
+ wait_for_user = true; // A click or M108 breaks the purge_length loop
for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
- do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
+ unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
wait_for_user = false;
#else
@@ -266,34 +257,20 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
#endif
// Extrude filament to get into hotend
- do_pause_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
+ unscaled_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
}
- // Show "Purge More" / "Resume" menu and wait for reply
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
- host_action_prompt_end(); // Close current prompt
- host_action_prompt_begin(PSTR("Paused"));
- host_action_prompt_button(PSTR("PurgeMore"));
- if (false
- #if HAS_FILAMENT_SENSOR
- || runout.filament_ran_out
- #endif
- )
- host_action_prompt_button(PSTR("DisableRunout"));
- else {
- host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
- host_action_prompt_button(CONTINUE_STR);
- }
- host_action_prompt_show();
+ filament_load_host_prompt(); // Initiate another host prompt. (NOTE: host_response_handler may also do this!)
#endif
#if HAS_LCD_MENU
if (show_lcd) {
+ // Show "Purge More" / "Resume" menu and wait for reply
KEEPALIVE_STATE(PAUSED_FOR_USER);
wait_for_user = false;
lcd_pause_show_message(PAUSE_MESSAGE_OPTION);
- while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle(true);
+ while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle_no_sleep();
}
#endif
@@ -345,13 +322,13 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
#endif
// Retract filament
- do_pause_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier);
+ unscaled_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier);
// Wait for filament to cool
safe_delay(FILAMENT_UNLOAD_PURGE_DELAY);
// Quickly purge
- do_pause_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier,
+ unscaled_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier,
(FILAMENT_UNLOAD_PURGE_FEEDRATE) * mix_multiplier);
// Unload filament
@@ -360,7 +337,7 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
planner.settings.retract_acceleration = FILAMENT_CHANGE_UNLOAD_ACCEL;
#endif
- do_pause_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier);
+ unscaled_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier);
#if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0
planner.settings.retract_acceleration = saved_acceleration;
@@ -409,11 +386,11 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
#endif
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_open(PROMPT_INFO, PSTR("Pause"), PSTR("Dismiss"));
+ host_prompt_open(PROMPT_INFO, PSTR("Pause"), DISMISS_STR);
#endif
if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
- SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
+ SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
#if HAS_LCD_MENU
if (show_lcd) { // Show status screen
@@ -450,7 +427,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
// Initial retract before move to filament change position
if (retract && thermalManager.hotEnoughToExtrude(active_extruder))
- do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
+ unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
// Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos)
if (!axes_need_homing())
@@ -493,7 +470,7 @@ void show_continue_prompt(const bool is_reload) {
lcd_pause_show_message(is_reload ? PAUSE_MESSAGE_INSERT : PAUSE_MESSAGE_WAITING);
#endif
SERIAL_ECHO_START();
- serialprintPGM(is_reload ? PSTR(_PMSG(MSG_FILAMENT_CHANGE_INSERT) "\n") : PSTR(_PMSG(MSG_FILAMENT_CHANGE_WAIT) "\n"));
+ serialprintPGM(is_reload ? PSTR(_PMSG(STR_FILAMENT_CHANGE_INSERT) "\n") : PSTR(_PMSG(STR_FILAMENT_CHANGE_WAIT) "\n"));
}
void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
@@ -521,13 +498,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
// Wait for filament insert by user and press button
KEEPALIVE_STATE(PAUSED_FOR_USER);
- wait_for_user = true; // LCD click or M108 will clear this
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Nozzle Parked"), CONTINUE_STR);
#endif
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onUserConfirmRequired_P(PSTR("Nozzle Parked"));
#endif
+ wait_for_user = true; // LCD click or M108 will clear this
while (wait_for_user) {
#if HAS_BUZZER
filament_change_beep(max_beep_count);
@@ -543,7 +520,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
#if HAS_LCD_MENU
lcd_pause_show_message(PAUSE_MESSAGE_HEAT);
#endif
- SERIAL_ECHO_MSG(_PMSG(MSG_FILAMENT_CHANGE_HEAT));
+ SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_HEAT));
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("HeaterTimeout"), PSTR("Reheat"));
@@ -553,8 +530,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
ExtUI::onUserConfirmRequired_P(PSTR("HeaterTimeout"));
#endif
- // Wait for LCD click or M108
- while (wait_for_user) idle(true);
+ wait_for_user_response(0, true); // Wait for LCD click or M108
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_INFO, PSTR("Reheating"));
@@ -564,7 +540,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
#endif
// Re-enable the heaters if they timed out
- HOTEND_LOOP() thermalManager.reset_heater_idle_timer(e);
+ HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);
// Wait for the heaters to reach the target temperatures
ensure_safe_temperature();
@@ -589,8 +565,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
filament_change_beep(max_beep_count, true);
#endif
}
-
- idle(true);
+ idle_no_sleep();
}
#if ENABLED(DUAL_X_CARRIAGE)
active_extruder = saved_ext;
@@ -633,7 +608,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
bool nozzle_timed_out = false;
HOTEND_LOOP() {
nozzle_timed_out |= thermalManager.hotend_idle[e].timed_out;
- thermalManager.reset_heater_idle_timer(e);
+ thermalManager.reset_hotend_idle_timer(e);
}
if (nozzle_timed_out || thermalManager.hotEnoughToExtrude(active_extruder)) // Load the new filament
@@ -647,11 +622,11 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
#if ENABLED(FWRETRACT)
// If retracted before goto pause
if (fwretract.retracted[active_extruder])
- do_pause_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
+ unscaled_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
#endif
// If resume_position is negative
- if (resume_position.e < 0) do_pause_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
+ if (resume_position.e < 0) unscaled_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
// Move XY to starting position, then Z
do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE));
@@ -660,7 +635,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE));
#if ADVANCED_PAUSE_RESUME_PRIME != 0
- do_pause_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
+ unscaled_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
#endif
// Now all extrusion positions are resumed and ready to be confirmed
@@ -680,7 +655,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
--did_pause_print;
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_open(PROMPT_INFO, PSTR("Resuming"), PSTR("Dismiss"));
+ host_prompt_open(PROMPT_INFO, PSTR("Resuming"), DISMISS_STR);
#endif
#if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index 42f70cc601..f1c8eed4d3 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -59,14 +59,15 @@ enum PauseMessage : char {
PAUSE_MESSAGE_HEATING
};
-enum PauseMenuResponse : char {
- PAUSE_RESPONSE_WAIT_FOR,
- PAUSE_RESPONSE_EXTRUDE_MORE,
- PAUSE_RESPONSE_RESUME_PRINT
-};
-
-extern PauseMode pause_mode;
-extern PauseMenuResponse pause_menu_response;
+#if HAS_LCD_MENU
+ enum PauseMenuResponse : char {
+ PAUSE_RESPONSE_WAIT_FOR,
+ PAUSE_RESPONSE_EXTRUDE_MORE,
+ PAUSE_RESPONSE_RESUME_PRINT
+ };
+ extern PauseMenuResponse pause_menu_response;
+ extern PauseMode pause_mode;
+#endif
extern fil_change_settings_t fc_settings[EXTRUDERS];
@@ -82,8 +83,6 @@ extern uint8_t did_pause_print;
#define DXC_PASS
#endif
-void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s);
-
bool pause_print(const float &retract, const xyz_pos_t &park_point, const float &unload_length=0, const bool show_lcd=false DXC_PARAMS);
void wait_for_confirmation(const bool is_reload=false, const int8_t max_beep_count=0 DXC_PARAMS);
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 4a61f8a412..1fa751811e 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,8 +46,8 @@ bool Power::is_power_needed() {
HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
#endif
- #if ENABLED(AUTO_POWER_CONTROLLERFAN, USE_CONTROLLER_FAN) && HAS_CONTROLLER_FAN
- if (controllerfan_speed) return true;
+ #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
+ if (controllerFan.state()) return true;
#endif
#if ENABLED(AUTO_POWER_CHAMBER_FAN)
@@ -108,7 +108,7 @@ void Power::power_on() {
if (!powersupply_on) {
PSU_PIN_ON();
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
delay(PSU_POWERUP_DELAY); // Wait for power to settle
restore_stepper_drivers();
#endif
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 1e42365b45..0bad7736ef 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/powerloss.cpp
similarity index 97%
rename from Marlin/src/feature/power_loss_recovery.cpp
rename to Marlin/src/feature/powerloss.cpp
index 0cf0fc5885..bb0062d4ec 100644
--- a/Marlin/src/feature/power_loss_recovery.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,7 +28,7 @@
#if ENABLED(POWER_LOSS_RECOVERY)
-#include "power_loss_recovery.h"
+#include "powerloss.h"
#include "../core/macros.h"
bool PrintJobRecovery::enabled; // Initialized by settings.load()
@@ -100,13 +100,11 @@ void PrintJobRecovery::changed() {
* If a saved state exists send 'M1000 S' to initiate job recovery.
*/
void PrintJobRecovery::check() {
- if (enabled) {
- if (!card.isMounted()) card.mount();
- if (card.isMounted()) {
- load();
- if (!valid()) return purge();
- queue.inject_P(PSTR("M1000 S"));
- }
+ //if (!card.isMounted()) card.mount();
+ if (card.isMounted()) {
+ load();
+ if (!valid()) return purge();
+ queue.inject_P(PSTR("M1000 S"));
}
}
@@ -141,7 +139,7 @@ void PrintJobRecovery::prepare() {
/**
* Save the current machine state to the power-loss recovery file
*/
-void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*=true*/) {
+void PrintJobRecovery::save(const bool force/*=false*/) {
#if SAVE_INFO_INTERVAL_MS > 0
static millis_t next_save_ms; // = 0
@@ -393,7 +391,7 @@ void PrintJobRecovery::resume() {
// Restore retract and hop state
#if ENABLED(FWRETRACT)
- for (uint8_t e = 0; e < EXTRUDERS; e++) {
+ LOOP_L_N(e, EXTRUDERS) {
if (info.retract[e] != 0.0) {
fwretract.current_retract[e] = info.retract[e];
fwretract.retracted[e] = true;
diff --git a/Marlin/src/feature/power_loss_recovery.h b/Marlin/src/feature/powerloss.h
similarity index 95%
rename from Marlin/src/feature/power_loss_recovery.h
rename to Marlin/src/feature/powerloss.h
index 24e24e9e20..0496560785 100644
--- a/Marlin/src/feature/power_loss_recovery.h
+++ b/Marlin/src/feature/powerloss.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -159,14 +159,7 @@ class PrintJobRecovery {
static inline void cancel() { purge(); card.autostart_index = 0; }
static void load();
- static void save(const bool force=
- #if ENABLED(SAVE_EACH_CMD_MODE)
- true
- #else
- false
- #endif
- , const bool save_queue=true
- );
+ static void save(const bool force=ENABLED(SAVE_EACH_CMD_MODE));
#if PIN_EXISTS(POWER_LOSS)
static inline void outage() {
diff --git a/Marlin/src/feature/probe_temp_compensation.cpp b/Marlin/src/feature/probe_temp_comp.cpp
similarity index 96%
rename from Marlin/src/feature/probe_temp_compensation.cpp
rename to Marlin/src/feature/probe_temp_comp.cpp
index 5d266e1d3c..6b787f420a 100644
--- a/Marlin/src/feature/probe_temp_compensation.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,7 +24,7 @@
#if ENABLED(PROBE_TEMP_COMPENSATION)
-#include "probe_temp_compensation.h"
+#include "probe_temp_comp.h"
#include
ProbeTempComp temp_comp;
@@ -54,7 +54,7 @@ uint8_t ProbeTempComp::calib_idx; // = 0
float ProbeTempComp::init_measurement; // = 0.0
void ProbeTempComp::clear_offsets(const TempSensorID tsi) {
- for (uint8_t i = 0; i < cali_info[tsi].measurements; ++i)
+ LOOP_L_N(i, cali_info[tsi].measurements)
sensor_z_offsets[tsi][i] = 0;
calib_idx = 0;
}
@@ -66,7 +66,7 @@ bool ProbeTempComp::set_offset(const TempSensorID tsi, const uint8_t idx, const
}
void ProbeTempComp::print_offsets() {
- for (uint8_t s = 0; s < TSI_COUNT; s++) {
+ LOOP_L_N(s, TSI_COUNT) {
float temp = cali_info[s].start_temp;
for (int16_t i = -1; i < cali_info[s].measurements; ++i) {
serialprintPGM(s == TSI_BED ? PSTR("Bed") :
@@ -198,7 +198,7 @@ bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d
sum_x2 = sq(start_temp),
sum_xy = 0, sum_y = 0;
- for (uint8_t i = 0; i < calib_idx; ++i) {
+ LOOP_L_N(i, calib_idx) {
const float xi = start_temp + (i + 1) * res_temp,
yi = static_cast(data[i]);
sum_x += xi;
diff --git a/Marlin/src/feature/probe_temp_compensation.h b/Marlin/src/feature/probe_temp_comp.h
similarity index 81%
rename from Marlin/src/feature/probe_temp_compensation.h
rename to Marlin/src/feature/probe_temp_comp.h
index 64f8cc7a06..2ed10eeb99 100644
--- a/Marlin/src/feature/probe_temp_compensation.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -48,25 +48,25 @@ class ProbeTempComp {
public:
static constexpr temp_calib_t cali_info_init[TSI_COUNT] = {
- { 30, 10, 5, 30 + 10 * 5 }, // Probe
- { 60, 10, 5, 60 + 10 * 5 }, // Bed
+ { 10, 5, 30, 30 + 10 * 5 }, // Probe
+ { 10, 5, 60, 60 + 10 * 5 }, // Bed
#if ENABLED(USE_TEMP_EXT_COMPENSATION)
- { 180, 5, 20, 180 + 5 * 20 } // Extruder
+ { 20, 5, 180, 180 + 5 * 20 } // Extruder
#endif
};
static const temp_calib_t cali_info[TSI_COUNT];
// Where to park nozzle to wait for probe cooldown
- static constexpr xyz_pos_t park_point = { PTC_PARK_POS_X, PTC_PARK_POS_Y, PTC_PARK_POS_Z };
+ static constexpr float park_point_x = PTC_PARK_POS_X,
+ park_point_y = PTC_PARK_POS_Y,
+ park_point_z = PTC_PARK_POS_Z,
+ // XY coordinates of nozzle for probing the bed
+ measure_point_x = PTC_PROBE_POS_X, // Coordinates to probe
+ measure_point_y = PTC_PROBE_POS_Y;
+ //measure_point_x = 12.0f, // Coordinates to probe on MK52 magnetic heatbed
+ //measure_point_y = 7.3f;
static constexpr int max_bed_temp = PTC_MAX_BED_TEMP, // Max temperature to avoid heating errors
-
- // XY coordinates of nozzle for probing the bed
- measure_point_x = PTC_PROBE_POS_X, // X-coordinate to probe
- measure_point_y = PTC_PROBE_POS_Y, // Y-coordinate to probe
- //measure_point_x = 12.0f, // X-coordinate to probe on MK52 magnetic heatbed
- //measure_point_y = 7.3f, // Y-coordinate to probe on MK52 magnetic heatbed
-
probe_calib_bed_temp = max_bed_temp, // Bed temperature while calibrating probe
bed_calib_probe_temp = 30; // Probe temperature while calibrating bed
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 700854ad2d..bd4a653e99 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -69,7 +69,7 @@ void FilamentSensorBase::filament_present(const uint8_t extruder) {
#endif
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
void event_filament_runout() {
@@ -92,11 +92,7 @@ void event_filament_runout() {
//action:out_of_filament
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
- host_action_prompt_end();
- host_action_prompt_begin(PSTR("FilamentRunout T"), false);
- SERIAL_CHAR(tool);
- SERIAL_EOL();
+ host_action_prompt_begin(PROMPT_FILAMENT_RUNOUT, PSTR("FilamentRunout T"), tool);
host_action_prompt_show();
#endif
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index d49fb77fe3..b975551c6e 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,7 +34,7 @@
#include "../inc/MarlinConfig.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -139,56 +139,28 @@ class FilamentSensorBase {
#define INIT_RUNOUT_PIN(P) SET_INPUT(P)
#endif
- INIT_RUNOUT_PIN(FIL_RUNOUT_PIN);
- #if NUM_RUNOUT_SENSORS > 1
- INIT_RUNOUT_PIN(FIL_RUNOUT2_PIN);
- #if NUM_RUNOUT_SENSORS > 2
- INIT_RUNOUT_PIN(FIL_RUNOUT3_PIN);
- #if NUM_RUNOUT_SENSORS > 3
- INIT_RUNOUT_PIN(FIL_RUNOUT4_PIN);
- #if NUM_RUNOUT_SENSORS > 4
- INIT_RUNOUT_PIN(FIL_RUNOUT5_PIN);
- #if NUM_RUNOUT_SENSORS > 5
- INIT_RUNOUT_PIN(FIL_RUNOUT6_PIN);
- #endif
- #endif
- #endif
- #endif
- #endif
+ #define _INIT_RUNOUT(N) INIT_RUNOUT_PIN(FIL_RUNOUT##N##_PIN);
+ REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _INIT_RUNOUT)
+ #undef _INIT_RUNOUT
}
// Return a bitmask of runout pin states
static inline uint8_t poll_runout_pins() {
- return (
- (READ(FIL_RUNOUT_PIN ) ? _BV(0) : 0)
- #if NUM_RUNOUT_SENSORS > 1
- | (READ(FIL_RUNOUT2_PIN) ? _BV(1) : 0)
- #if NUM_RUNOUT_SENSORS > 2
- | (READ(FIL_RUNOUT3_PIN) ? _BV(2) : 0)
- #if NUM_RUNOUT_SENSORS > 3
- | (READ(FIL_RUNOUT4_PIN) ? _BV(3) : 0)
- #if NUM_RUNOUT_SENSORS > 4
- | (READ(FIL_RUNOUT5_PIN) ? _BV(4) : 0)
- #if NUM_RUNOUT_SENSORS > 5
- | (READ(FIL_RUNOUT6_PIN) ? _BV(5) : 0)
- #endif
- #endif
- #endif
- #endif
- #endif
- );
+ #define _OR_RUNOUT(N) | (READ(FIL_RUNOUT##N##_PIN) ? _BV((N) - 1) : 0)
+ return (0 REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _OR_RUNOUT));
+ #undef _OR_RUNOUT
}
// Return a bitmask of runout flag states (1 bits always indicates runout)
static inline uint8_t poll_runout_states() {
- return poll_runout_pins() ^ uint8_t(
+ return (poll_runout_pins()
#if DISABLED(FIL_RUNOUT_INVERTING)
- _BV(NUM_RUNOUT_SENSORS) - 1
- #else
- 0
+ ^ uint8_t(_BV(NUM_RUNOUT_SENSORS) - 1)
#endif
);
}
+
+ #undef INIT_RUNOUT_PIN
};
#if ENABLED(FILAMENT_MOTION_SENSOR)
@@ -212,7 +184,7 @@ class FilamentSensorBase {
#ifdef FILAMENT_RUNOUT_SENSOR_DEBUG
if (change) {
SERIAL_ECHOPGM("Motion detected:");
- for (uint8_t e = 0; e < NUM_RUNOUT_SENSORS; e++)
+ LOOP_L_N(e, NUM_RUNOUT_SENSORS)
if (TEST(change, e)) SERIAL_CHAR(' ', '0' + e);
SERIAL_EOL();
}
diff --git a/Marlin/src/feature/snmm.cpp b/Marlin/src/feature/snmm.cpp
index 8cfe3bf51a..e994028d9e 100644
--- a/Marlin/src/feature/snmm.cpp
+++ b/Marlin/src/feature/snmm.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/snmm.h b/Marlin/src/feature/snmm.h
index f54211a21d..671542e3bf 100644
--- a/Marlin/src/feature/snmm.h
+++ b/Marlin/src/feature/snmm.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/solenoid.cpp b/Marlin/src/feature/solenoid.cpp
index c25e2e5dab..d53118fdd4 100644
--- a/Marlin/src/feature/solenoid.cpp
+++ b/Marlin/src/feature/solenoid.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -67,7 +67,7 @@ static void set_solenoid(const uint8_t num, const bool active) {
break;
#endif
default:
- SERIAL_ECHO_MSG(MSG_INVALID_SOLENOID);
+ SERIAL_ECHO_MSG(STR_INVALID_SOLENOID);
break;
}
}
diff --git a/Marlin/src/feature/solenoid.h b/Marlin/src/feature/solenoid.h
index db94c4fe2b..5a503b1056 100644
--- a/Marlin/src/feature/solenoid.h
+++ b/Marlin/src/feature/solenoid.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 775e7a864a..0567ba5d3e 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 26d7c301b4..ea035299be 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 340855a6da..bfc2e1a555 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
#include "../inc/MarlinConfig.h"
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "tmc_util.h"
#include "../MarlinCore.h"
@@ -281,6 +281,10 @@
}
}
+ #else
+
+ #define step_current_down(...)
+
#endif
template
@@ -288,7 +292,7 @@
TMC_driver_data data = get_driver_data(st);
if (data.drv_status == 0xFFFFFFFF || data.drv_status == 0x0) return false;
- bool did_step_down = false;
+ bool should_step_down = false;
if (need_update_error_counters) {
if (data.is_ot /* | data.s2ga | data.s2gb*/) st.error_count++;
@@ -308,10 +312,8 @@
#if CURRENT_STEP_DOWN > 0
// Decrease current if is_otpw is true and driver is enabled and there's been more than 4 warnings
- if (data.is_otpw && st.otpw_count > 4 && st.isEnabled()) {
- step_current_down(st);
- did_step_down = true;
- }
+ if (data.is_otpw && st.otpw_count > 4 && st.isEnabled())
+ should_step_down = true;
#endif
if (data.is_otpw) {
@@ -325,7 +327,7 @@
if (need_debug_reporting) report_polled_driver_data(st, data);
#endif
- return did_step_down;
+ return should_step_down;
}
void monitor_tmc_drivers() {
@@ -437,6 +439,12 @@
#if AXIS_IS_TMC(E5)
(void)monitor_tmc_driver(stepperE5, need_update_error_counters, need_debug_reporting);
#endif
+ #if AXIS_IS_TMC(E6)
+ (void)monitor_tmc_driver(stepperE6, need_update_error_counters, need_debug_reporting);
+ #endif
+ #if AXIS_IS_TMC(E7)
+ (void)monitor_tmc_driver(stepperE7, need_update_error_counters, need_debug_reporting);
+ #endif
#if ENABLED(TMC_DEBUG)
if (need_debug_reporting) SERIAL_EOL();
@@ -621,6 +629,15 @@
default: break;
}
}
+
+ #if HAS_DRIVER(TMC2209)
+ static void _tmc_parse_drv_status(TMC2209Stepper &st, const TMC_drv_status_enum i) {
+ switch (i) {
+ case TMC_SG_RESULT: SERIAL_PRINT(st.SG_RESULT(), DEC); break;
+ default: _tmc_parse_drv_status(static_cast(st), i); break;
+ }
+ }
+ #endif
#endif
#if HAS_DRIVER(TMC2660)
@@ -706,13 +723,13 @@
SERIAL_CHAR('\t');
switch (i) {
case TMC_DRV_CODES: st.printLabel(); break;
- case TMC_STST: if (st.stst()) SERIAL_CHAR('*'); break;
- case TMC_OLB: if (st.olb()) SERIAL_CHAR('*'); break;
- case TMC_OLA: if (st.ola()) SERIAL_CHAR('*'); break;
- case TMC_S2GB: if (st.s2gb()) SERIAL_CHAR('*'); break;
- case TMC_S2GA: if (st.s2ga()) SERIAL_CHAR('*'); break;
- case TMC_DRV_OTPW: if (st.otpw()) SERIAL_CHAR('*'); break;
- case TMC_OT: if (st.ot()) SERIAL_CHAR('*'); break;
+ case TMC_STST: if (!st.stst()) SERIAL_CHAR('*'); break;
+ case TMC_OLB: if (st.olb()) SERIAL_CHAR('*'); break;
+ case TMC_OLA: if (st.ola()) SERIAL_CHAR('*'); break;
+ case TMC_S2GB: if (st.s2gb()) SERIAL_CHAR('*'); break;
+ case TMC_S2GA: if (st.s2ga()) SERIAL_CHAR('*'); break;
+ case TMC_DRV_OTPW: if (st.otpw()) SERIAL_CHAR('*'); break;
+ case TMC_OT: if (st.ot()) SERIAL_CHAR('*'); break;
case TMC_DRV_STATUS_HEX: {
const uint32_t drv_status = st.DRV_STATUS();
SERIAL_CHAR('\t');
@@ -780,6 +797,12 @@
#if AXIS_IS_TMC(E5)
tmc_status(stepperE5, i);
#endif
+ #if AXIS_IS_TMC(E6)
+ tmc_status(stepperE6, i);
+ #endif
+ #if AXIS_IS_TMC(E7)
+ tmc_status(stepperE7, i);
+ #endif
}
SERIAL_EOL();
@@ -838,6 +861,12 @@
#if AXIS_IS_TMC(E5)
tmc_parse_drv_status(stepperE5, i);
#endif
+ #if AXIS_IS_TMC(E6)
+ tmc_parse_drv_status(stepperE6, i);
+ #endif
+ #if AXIS_IS_TMC(E7)
+ tmc_parse_drv_status(stepperE7, i);
+ #endif
}
SERIAL_EOL();
@@ -871,24 +900,24 @@
TMC_REPORT("stealthChop", TMC_STEALTHCHOP);
TMC_REPORT("msteps\t", TMC_MICROSTEPS);
TMC_REPORT("tstep\t", TMC_TSTEP);
- TMC_REPORT("pwm\nthreshold", TMC_TPWMTHRS);
+ TMC_REPORT("PWM thresh.", TMC_TPWMTHRS);
TMC_REPORT("[mm/s]\t", TMC_TPWMTHRS_MMS);
TMC_REPORT("OT prewarn", TMC_OTPW);
#if ENABLED(MONITOR_DRIVER_STATUS)
- TMC_REPORT("OT prewarn has\n"
- "been triggered", TMC_OTPW_TRIGGERED);
+ TMC_REPORT("triggered\n OTP\t", TMC_OTPW_TRIGGERED);
#endif
TMC_REPORT("off time", TMC_TOFF);
TMC_REPORT("blank time", TMC_TBL);
- TMC_REPORT("hysteresis\n-end\t", TMC_HEND);
- TMC_REPORT("-start\t", TMC_HSTRT);
+ TMC_REPORT("hysteresis\n -end\t", TMC_HEND);
+ TMC_REPORT(" -start\t", TMC_HSTRT);
TMC_REPORT("Stallguard thrs", TMC_SGT);
-
DRV_REPORT("DRVSTATUS", TMC_DRV_CODES);
- #if HAS_TMCX1X0
- DRV_REPORT("stallguard\t", TMC_STALLGUARD);
+ #if HAS_TMCX1X0 || HAS_TMC220x
DRV_REPORT("sg_result", TMC_SG_RESULT);
- DRV_REPORT("fsactive\t", TMC_FSACTIVE);
+ #endif
+ #if HAS_TMCX1X0
+ DRV_REPORT("stallguard", TMC_STALLGUARD);
+ DRV_REPORT("fsactive", TMC_FSACTIVE);
#endif
DRV_REPORT("stst\t", TMC_STST);
DRV_REPORT("olb\t", TMC_OLB);
@@ -925,7 +954,7 @@
static void tmc_get_ic_registers(TMC2208Stepper, const TMC_get_registers_enum) { SERIAL_CHAR('\t'); }
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
template
static void tmc_get_registers(TMC &st, const TMC_get_registers_enum i) {
switch (i) {
@@ -1016,6 +1045,12 @@
#if AXIS_IS_TMC(E5)
tmc_get_registers(stepperE5, i);
#endif
+ #if AXIS_IS_TMC(E6)
+ tmc_get_registers(stepperE6, i);
+ #endif
+ #if AXIS_IS_TMC(E7)
+ tmc_get_registers(stepperE7, i);
+ #endif
}
SERIAL_EOL();
@@ -1061,8 +1096,11 @@
}
bool tmc_enable_stallguard(TMC2209Stepper &st) {
+ const bool stealthchop_was_enabled = !st.en_spreadCycle();
+
st.TCOOLTHRS(0xFFFFF);
- return !st.en_spreadCycle();
+ st.en_spreadCycle(false);
+ return stealthchop_was_enabled;
}
void tmc_disable_stallguard(TMC2209Stepper &st, const bool restore_stealth) {
st.en_spreadCycle(!restore_stealth);
@@ -1077,7 +1115,7 @@
#endif // USE_SENSORLESS
-#if TMC_HAS_SPI
+#if HAS_TMC_SPI
#define SET_CS_PIN(st) OUT_WRITE(st##_CS_PIN, HIGH)
void tmc_init_cs_pins() {
#if AXIS_HAS_SPI(X)
@@ -1122,8 +1160,14 @@
#if AXIS_HAS_SPI(E5)
SET_CS_PIN(E5);
#endif
+ #if AXIS_HAS_SPI(E6)
+ SET_CS_PIN(E6);
+ #endif
+ #if AXIS_HAS_SPI(E7)
+ SET_CS_PIN(E7);
+ #endif
}
-#endif // TMC_HAS_SPI
+#endif // HAS_TMC_SPI
template
static bool test_connection(TMC &st) {
@@ -1202,9 +1246,15 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
#if AXIS_IS_TMC(E5)
axis_connection += test_connection(stepperE5);
#endif
+ #if AXIS_IS_TMC(E6)
+ axis_connection += test_connection(stepperE6);
+ #endif
+ #if AXIS_IS_TMC(E7)
+ axis_connection += test_connection(stepperE7);
+ #endif
}
- if (axis_connection) ui.set_status_P(GET_TEXT(MSG_ERROR_TMC));
+ if (axis_connection) LCD_MESSAGEPGM(MSG_ERROR_TMC);
}
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index a6d4447d45..ccae8b660c 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,7 +24,7 @@
#include "../inc/MarlinConfig.h"
#include "../lcd/ultralcd.h"
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include
#include "../module/planner.h"
@@ -110,6 +110,7 @@ class TMCMarlin : public TMC, public TMCStorage {
inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); }
inline bool get_stealthChop_status() { return this->en_pwm_mode(); }
#endif
+
#if ENABLED(HYBRID_THRESHOLD)
uint32_t get_pwm_thrs() {
return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -121,6 +122,7 @@ class TMCMarlin : public TMC, public TMCStorage {
#endif
}
#endif
+
#if USE_SENSORLESS
inline int16_t homing_threshold() { return TMC::sgt(); }
void homing_threshold(int16_t sgt_val) {
@@ -149,6 +151,7 @@ class TMCMarlin : public TMC, public TMCStorage {
static constexpr int8_t sgt_min = -64,
sgt_max = 63;
};
+
template
class TMCMarlin : public TMC2208Stepper, public TMCStorage {
public:
@@ -172,6 +175,7 @@ class TMCMarlin : public TMC220
inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
#endif
+
#if ENABLED(HYBRID_THRESHOLD)
uint32_t get_pwm_thrs() {
return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -217,6 +221,7 @@ class TMCMarlin : public TMC220
inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
#endif
+
#if ENABLED(HYBRID_THRESHOLD)
uint32_t get_pwm_thrs() {
return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -391,8 +396,8 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
#endif // USE_SENSORLESS
-#if TMC_HAS_SPI
+#if HAS_TMC_SPI
void tmc_init_cs_pins();
#endif
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/feature/touch/xpt2046.cpp b/Marlin/src/feature/touch/xpt2046.cpp
index b0ab10e7ce..26e25950d8 100644
--- a/Marlin/src/feature/touch/xpt2046.cpp
+++ b/Marlin/src/feature/touch/xpt2046.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/feature/touch/xpt2046.h b/Marlin/src/feature/touch/xpt2046.h
index 384d7904bd..7f8eece1f4 100644
--- a/Marlin/src/feature/touch/xpt2046.h
+++ b/Marlin/src/feature/touch/xpt2046.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index f4fe512cdf..9dbb1deb4f 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -49,37 +49,27 @@ void TWIBus::address(const uint8_t adr) {
addr = adr;
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("address"), adr);
- #endif
+ debug(PSTR("address"), adr);
}
void TWIBus::addbyte(const char c) {
if (buffer_s >= COUNT(buffer)) return;
buffer[buffer_s++] = c;
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("addbyte"), c);
- #endif
+ debug(PSTR("addbyte"), c);
}
void TWIBus::addbytes(char src[], uint8_t bytes) {
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("addbytes"), bytes);
- #endif
+ debug(PSTR("addbytes"), bytes);
while (bytes--) addbyte(*src++);
}
void TWIBus::addstring(char str[]) {
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("addstring"), str);
- #endif
+ debug(PSTR("addstring"), str);
while (char c = *str++) addbyte(c);
}
void TWIBus::send() {
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("send"), addr);
- #endif
+ debug(PSTR("send"), addr);
Wire.beginTransmission(I2C_ADDRESS(addr));
Wire.write(buffer, buffer_s);
@@ -89,37 +79,33 @@ void TWIBus::send() {
}
// static
-void TWIBus::echoprefix(uint8_t bytes, const char prefix[], uint8_t adr) {
+void TWIBus::echoprefix(uint8_t bytes, const char pref[], uint8_t adr) {
SERIAL_ECHO_START();
- serialprintPGM(prefix);
+ serialprintPGM(pref);
SERIAL_ECHOPAIR(": from:", adr, " bytes:", bytes, " data:");
}
// static
-void TWIBus::echodata(uint8_t bytes, const char prefix[], uint8_t adr) {
- echoprefix(bytes, prefix, adr);
+void TWIBus::echodata(uint8_t bytes, const char pref[], uint8_t adr) {
+ echoprefix(bytes, pref, adr);
while (bytes-- && Wire.available()) SERIAL_CHAR(Wire.read());
SERIAL_EOL();
}
-void TWIBus::echobuffer(const char prefix[], uint8_t adr) {
- echoprefix(buffer_s, prefix, adr);
- for (uint8_t i = 0; i < buffer_s; i++) SERIAL_CHAR(buffer[i]);
+void TWIBus::echobuffer(const char pref[], uint8_t adr) {
+ echoprefix(buffer_s, pref, adr);
+ LOOP_L_N(i, buffer_s) SERIAL_CHAR(buffer[i]);
SERIAL_EOL();
}
bool TWIBus::request(const uint8_t bytes) {
if (!addr) return false;
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("request"), bytes);
- #endif
+ debug(PSTR("request"), bytes);
// requestFrom() is a blocking function
if (Wire.requestFrom(addr, bytes) == 0) {
- #if ENABLED(DEBUG_TWIBUS)
- debug("request fail", addr);
- #endif
+ debug("request fail", addr);
return false;
}
@@ -127,9 +113,7 @@ bool TWIBus::request(const uint8_t bytes) {
}
void TWIBus::relay(const uint8_t bytes) {
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("relay"), bytes);
- #endif
+ debug(PSTR("relay"), bytes);
if (request(bytes))
echodata(bytes, PSTR("i2c-reply"), addr);
@@ -141,9 +125,7 @@ uint8_t TWIBus::capture(char *dst, const uint8_t bytes) {
while (count < bytes && Wire.available())
dst[count++] = Wire.read();
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("capture"), count);
- #endif
+ debug(PSTR("capture"), count);
return count;
}
@@ -156,16 +138,12 @@ void TWIBus::flush() {
#if I2C_SLAVE_ADDRESS > 0
void TWIBus::receive(uint8_t bytes) {
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("receive"), bytes);
- #endif
+ debug(PSTR("receive"), bytes);
echodata(bytes, PSTR("i2c-receive"), 0);
}
void TWIBus::reply(char str[]/*=nullptr*/) {
- #if ENABLED(DEBUG_TWIBUS)
- debug(PSTR("reply"), str);
- #endif
+ debug(PSTR("reply"), str);
if (str) {
reset();
diff --git a/Marlin/src/feature/twibus.h b/Marlin/src/feature/twibus.h
index 211711ba85..2c1b20da51 100644
--- a/Marlin/src/feature/twibus.h
+++ b/Marlin/src/feature/twibus.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -223,7 +223,6 @@ class TWIBus {
#endif
#if ENABLED(DEBUG_TWIBUS)
-
/**
* @brief Prints a debug message
* @details Prints a simple debug message "TWIBus::function: value"
@@ -233,6 +232,10 @@ class TWIBus {
static void debug(const char func[], char c);
static void debug(const char func[], char adr[]);
static inline void debug(const char func[], uint8_t v) { debug(func, (uint32_t)v); }
-
+ #else
+ static inline void debug(const char[], uint32_t) {}
+ static inline void debug(const char[], char) {}
+ static inline void debug(const char[], char[]) {}
+ static inline void debug(const char[], uint8_t) {}
#endif
};
diff --git a/Marlin/src/feature/z_stepper_align.cpp b/Marlin/src/feature/z_stepper_align.cpp
new file mode 100644
index 0000000000..6fccff7cc9
--- /dev/null
+++ b/Marlin/src/feature/z_stepper_align.cpp
@@ -0,0 +1,137 @@
+/**
+ * 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 .
+ *
+ */
+
+/**
+ * feature/z_stepper_align.cpp
+ */
+
+#include "../inc/MarlinConfigPre.h"
+
+#if ENABLED(Z_STEPPER_AUTO_ALIGN)
+
+#include "z_stepper_align.h"
+#include "../module/probe.h"
+
+ZStepperAlign z_stepper_align;
+
+xy_pos_t ZStepperAlign::xy[NUM_Z_STEPPER_DRIVERS];
+
+#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ xy_pos_t ZStepperAlign::stepper_xy[NUM_Z_STEPPER_DRIVERS];
+#endif
+
+void ZStepperAlign::reset_to_default() {
+ #ifdef Z_STEPPER_ALIGN_XY
+
+ constexpr xy_pos_t xy_init[] = Z_STEPPER_ALIGN_XY;
+ static_assert(COUNT(xy_init) == NUM_Z_STEPPER_DRIVERS,
+ "Z_STEPPER_ALIGN_XY requires "
+ #if NUM_Z_STEPPER_DRIVERS == 4
+ "four {X,Y} entries (Z, Z2, Z3, and Z4)."
+ #elif NUM_Z_STEPPER_DRIVERS == 3
+ "three {X,Y} entries (Z, Z2, and Z3)."
+ #else
+ "two {X,Y} entries (Z and Z2)."
+ #endif
+ );
+
+ constexpr xyz_pos_t dpo = NOZZLE_TO_PROBE_OFFSET;
+
+ #define LTEST(N) (xy_init[N].x >= _MAX(X_MIN_BED + MIN_PROBE_EDGE_LEFT, X_MIN_POS + dpo.x) - 0.00001f)
+ #define RTEST(N) (xy_init[N].x <= _MIN(X_MAX_BED - MIN_PROBE_EDGE_RIGHT, X_MAX_POS + dpo.x) + 0.00001f)
+ #define FTEST(N) (xy_init[N].y >= _MAX(Y_MIN_BED + MIN_PROBE_EDGE_FRONT, Y_MIN_POS + dpo.y) - 0.00001f)
+ #define BTEST(N) (xy_init[N].y <= _MIN(Y_MAX_BED - MIN_PROBE_EDGE_BACK, Y_MAX_POS + dpo.y) + 0.00001f)
+
+ static_assert(LTEST(0) && RTEST(0), "The 1st Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+ static_assert(FTEST(0) && BTEST(0), "The 1st Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+ static_assert(LTEST(1) && RTEST(1), "The 2nd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+ static_assert(FTEST(1) && BTEST(1), "The 2nd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+ #if NUM_Z_STEPPER_DRIVERS >= 3
+ static_assert(LTEST(2) && RTEST(2), "The 3rd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+ static_assert(FTEST(2) && BTEST(2), "The 3rd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+ #if NUM_Z_STEPPER_DRIVERS >= 4
+ static_assert(LTEST(3) && RTEST(3), "The 4th Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+ static_assert(FTEST(3) && BTEST(3), "The 4th Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+ #endif
+ #endif
+
+ #else // !defined(Z_STEPPER_ALIGN_XY)
+
+ const xy_pos_t xy_init[] = {
+ #if NUM_Z_STEPPER_DRIVERS >= 3 // First probe point...
+ #if !Z_STEPPERS_ORIENTATION
+ { probe.min_x(), probe.min_y() }, // SW
+ #elif Z_STEPPERS_ORIENTATION == 1
+ { probe.min_x(), probe.max_y() }, // NW
+ #elif Z_STEPPERS_ORIENTATION == 2
+ { probe.max_x(), probe.max_y() }, // NE
+ #elif Z_STEPPERS_ORIENTATION == 3
+ { probe.max_x(), probe.min_y() }, // SE
+ #else
+ #error "Z_STEPPERS_ORIENTATION must be from 0 to 3 (first point SW, NW, NE, SE)."
+ #endif
+ #if NUM_Z_STEPPER_DRIVERS == 4 // 3 more points...
+ #if !Z_STEPPERS_ORIENTATION
+ { probe.min_x(), probe.max_y() }, { probe.max_x(), probe.max_y() }, { probe.max_x(), probe.min_y() } // SW
+ #elif Z_STEPPERS_ORIENTATION == 1
+ { probe.max_x(), probe.max_y() }, { probe.max_x(), probe.min_y() }, { probe.min_x(), probe.min_y() } // NW
+ #elif Z_STEPPERS_ORIENTATION == 2
+ { probe.max_x(), probe.min_y() }, { probe.min_x(), probe.min_y() }, { probe.min_x(), probe.max_y() } // NE
+ #elif Z_STEPPERS_ORIENTATION == 3
+ { probe.min_x(), probe.min_y() }, { probe.min_x(), probe.max_y() }, { probe.max_x(), probe.max_y() } // SE
+ #endif
+ #elif !Z_STEPPERS_ORIENTATION // or 2 more points...
+ { probe.max_x(), probe.min_y() }, { X_CENTER, probe.max_y() } // SW
+ #elif Z_STEPPERS_ORIENTATION == 1
+ { probe.min_x(), probe.min_y() }, { probe.max_x(), Y_CENTER } // NW
+ #elif Z_STEPPERS_ORIENTATION == 2
+ { probe.min_x(), probe.max_y() }, { X_CENTER, probe.min_y() } // NE
+ #elif Z_STEPPERS_ORIENTATION == 3
+ { probe.max_x(), probe.max_y() }, { probe.min_x(), Y_CENTER } // SE
+ #endif
+ #elif Z_STEPPERS_ORIENTATION
+ { X_CENTER, probe.min_y() }, { X_CENTER, probe.max_y() }
+ #else
+ { probe.min_x(), Y_CENTER }, { probe.max_x(), Y_CENTER }
+ #endif
+ };
+
+ #endif // !defined(Z_STEPPER_ALIGN_XY)
+
+ COPY(xy, xy_init);
+
+ #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ constexpr xy_pos_t stepper_xy_init[] = Z_STEPPER_ALIGN_STEPPER_XY;
+ static_assert(
+ COUNT(stepper_xy_init) == NUM_Z_STEPPER_DRIVERS,
+ "Z_STEPPER_ALIGN_STEPPER_XY requires "
+ #if NUM_Z_STEPPER_DRIVERS == 4
+ "four {X,Y} entries (Z, Z2, Z3, and Z4)."
+ #elif NUM_Z_STEPPER_DRIVERS == 3
+ "three {X,Y} entries (Z, Z2, and Z3)."
+ #endif
+ );
+ COPY(stepper_xy, stepper_xy_init);
+ #endif
+}
+
+#endif // Z_STEPPER_AUTO_ALIGN
diff --git a/Marlin/src/feature/z_stepper_align.h b/Marlin/src/feature/z_stepper_align.h
new file mode 100644
index 0000000000..ade3d6b575
--- /dev/null
+++ b/Marlin/src/feature/z_stepper_align.h
@@ -0,0 +1,41 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * feature/z_stepper_align.h
+ */
+
+#include "../inc/MarlinConfig.h"
+
+class ZStepperAlign {
+ public:
+ static xy_pos_t xy[NUM_Z_STEPPER_DRIVERS];
+
+ #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ static xy_pos_t stepper_xy[NUM_Z_STEPPER_DRIVERS];
+ #endif
+
+ static void reset_to_default();
+};
+
+extern ZStepperAlign z_stepper_align;
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 611538a909..28fdf581ff 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,13 +43,16 @@
#include "../../lcd/ultralcd.h"
#define EXTRUSION_MULTIPLIER 1.0
-#define RETRACTION_MULTIPLIER 1.0
#define PRIME_LENGTH 10.0
#define OOZE_AMOUNT 0.3
#define INTERSECTION_CIRCLE_RADIUS 5
#define CROSSHAIRS_SIZE 3
+#ifndef G26_RETRACT_MULTIPLIER
+ #define G26_RETRACT_MULTIPLIER 1.0 // x 1mm
+#endif
+
#ifndef G26_XY_FEEDRATE
#define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE() / 3.0)
#endif
@@ -154,7 +157,7 @@ float g26_extrusion_multiplier,
g26_layer_height,
g26_prime_length;
-xy_pos_t g26_pos; // = { 0, 0 }
+xy_pos_t g26_xy_pos; // = { 0, 0 }
int16_t g26_bed_temp,
g26_hotend_temp;
@@ -184,29 +187,27 @@ mesh_index_pair find_closest_circle_to_print(const xy_pos_t &pos) {
out_point.pos = -1;
- for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
- for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
- if (!circle_flags.marked(i, j)) {
- // We found a circle that needs to be printed
- const xy_pos_t m = { _GET_MESH_X(i), _GET_MESH_Y(j) };
+ GRID_LOOP(i, j) {
+ if (!circle_flags.marked(i, j)) {
+ // We found a circle that needs to be printed
+ const xy_pos_t m = { _GET_MESH_X(i), _GET_MESH_Y(j) };
- // Get the distance to this intersection
- float f = (pos - m).magnitude();
+ // Get the distance to this intersection
+ float f = (pos - m).magnitude();
- // It is possible that we are being called with the values
- // to let us find the closest circle to the start position.
- // But if this is not the case, add a small weighting to the
- // distance calculation to help it choose a better place to continue.
- f += (g26_pos - m).magnitude() / 15.0f;
+ // It is possible that we are being called with the values
+ // to let us find the closest circle to the start position.
+ // But if this is not the case, add a small weighting to the
+ // distance calculation to help it choose a better place to continue.
+ f += (g26_xy_pos - m).magnitude() / 15.0f;
- // Add the specified amount of Random Noise to our search
- if (random_deviation > 1.0) f += random(0.0, random_deviation);
+ // Add the specified amount of Random Noise to our search
+ if (random_deviation > 1.0) f += random(0.0, random_deviation);
- if (f < closest) {
- closest = f; // Found a closer un-printed location
- out_point.pos.set(i, j); // Save its data
- out_point.distance = closest;
- }
+ if (f < closest) {
+ closest = f; // Found a closer un-printed location
+ out_point.pos.set(i, j); // Save its data
+ out_point.distance = closest;
}
}
}
@@ -305,51 +306,49 @@ inline bool look_for_lines_to_connect() {
xyz_pos_t s, e;
s.z = e.z = g26_layer_height;
- for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
- for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
+ GRID_LOOP(i, j) {
- #if HAS_LCD_MENU
- if (user_canceled()) return true;
- #endif
+ #if HAS_LCD_MENU
+ if (user_canceled()) return true;
+ #endif
- if (i < GRID_MAX_POINTS_X) { // Can't connect to anything farther to the right than GRID_MAX_POINTS_X.
+ if (i < (GRID_MAX_POINTS_X)) { // Can't connect to anything farther to the right than GRID_MAX_POINTS_X.
// Already a half circle at the edge of the bed.
- if (circle_flags.marked(i, j) && circle_flags.marked(i + 1, j)) { // Test whether a leftward line can be done
- if (!horizontal_mesh_line_flags.marked(i, j)) {
- // Two circles need a horizontal line to connect them
- s.x = _GET_MESH_X( i ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
- e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
+ if (circle_flags.marked(i, j) && circle_flags.marked(i + 1, j)) { // Test whether a leftward line can be done
+ if (!horizontal_mesh_line_flags.marked(i, j)) {
+ // Two circles need a horizontal line to connect them
+ s.x = _GET_MESH_X( i ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
+ e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
- LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
- s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
- LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
+ LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
+ s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
+ LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
+
+ if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+ print_line_from_here_to_there(s, e);
+
+ horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
+ }
+ }
+
+ if (j < (GRID_MAX_POINTS_Y)) { // Can't connect to anything further back than GRID_MAX_POINTS_Y.
+ // Already a half circle at the edge of the bed.
+
+ if (circle_flags.marked(i, j) && circle_flags.marked(i, j + 1)) { // Test whether a downward line can be done
+ if (!vertical_mesh_line_flags.marked(i, j)) {
+ // Two circles that need a vertical line to connect them
+ s.y = _GET_MESH_Y( j ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
+ e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
+
+ s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
+ LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
+ LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
print_line_from_here_to_there(s, e);
- horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
- }
- }
-
- if (j < GRID_MAX_POINTS_Y) { // Can't connect to anything further back than GRID_MAX_POINTS_Y.
- // Already a half circle at the edge of the bed.
-
- if (circle_flags.marked(i, j) && circle_flags.marked(i, j + 1)) { // Test whether a downward line can be done
- if (!vertical_mesh_line_flags.marked(i, j)) {
- // Two circles that need a vertical line to connect them
- s.y = _GET_MESH_Y( j ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
- e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
-
- s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
- LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
- LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
-
- if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
- print_line_from_here_to_there(s, e);
-
- vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
- }
+ vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
}
}
}
@@ -509,7 +508,7 @@ void GcodeSuite::G26() {
if (parser.seenval('T')) tool_change(parser.value_int());
g26_extrusion_multiplier = EXTRUSION_MULTIPLIER;
- g26_retraction_multiplier = RETRACTION_MULTIPLIER;
+ g26_retraction_multiplier = G26_RETRACT_MULTIPLIER;
g26_layer_height = MESH_TEST_LAYER_HEIGHT;
g26_prime_length = PRIME_LENGTH;
g26_bed_temp = MESH_TEST_BED_TEMP;
@@ -625,9 +624,9 @@ void GcodeSuite::G26() {
return;
}
- g26_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
- parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
- if (!position_is_reachable(g26_pos.x, g26_pos.y)) {
+ g26_xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
+ parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
+ if (!position_is_reachable(g26_xy_pos)) {
SERIAL_ECHOLNPGM("?Specified X,Y coordinate out of bounds.");
return;
}
@@ -637,10 +636,8 @@ void GcodeSuite::G26() {
*/
set_bed_leveling_enabled(!parser.seen('D'));
- if (current_position.z < Z_CLEARANCE_BETWEEN_PROBES) {
+ if (current_position.z < Z_CLEARANCE_BETWEEN_PROBES)
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
- current_position = destination;
- }
#if DISABLED(NO_VOLUMETRICS)
bool volumetric_was_enabled = parser.volumetric_enabled;
@@ -694,7 +691,7 @@ void GcodeSuite::G26() {
#error "A_CNT must be a positive value. Please change A_INT."
#endif
float trig_table[A_CNT];
- for (uint8_t i = 0; i < A_CNT; i++)
+ LOOP_L_N(i, A_CNT)
trig_table[i] = INTERSECTION_CIRCLE_RADIUS * cos(RADIANS(i * A_INT));
#endif // !ARC_SUPPORT
@@ -702,12 +699,12 @@ void GcodeSuite::G26() {
mesh_index_pair location;
do {
// Find the nearest confluence
- location = find_closest_circle_to_print(g26_continue_with_closest ? xy_pos_t(current_position) : g26_pos);
+ location = find_closest_circle_to_print(g26_continue_with_closest ? xy_pos_t(current_position) : g26_xy_pos);
if (location.valid()) {
const xy_pos_t circle = _GET_MESH_POS(location.pos);
- // If this mesh location is outside the printable_radius, skip it.
+ // If this mesh location is outside the printable radius, skip it.
if (!position_is_reachable(circle)) continue;
// Determine where to start and end the circle,
@@ -833,12 +830,9 @@ void GcodeSuite::G26() {
retract_filament(destination);
destination.z = Z_CLEARANCE_BETWEEN_PROBES;
+ move_to(destination, 0); // Raise the nozzle
- move_to(destination, 0); // Raise the nozzle
-
- destination.set(g26_pos.x, g26_pos.y); // Move back to the starting position
- //destination.z = Z_CLEARANCE_BETWEEN_PROBES; // Keep the nozzle where it is
-
+ destination = g26_xy_pos; // Move back to the starting XY position
move_to(destination, 0); // Move back to the starting position
#if DISABLED(NO_VOLUMETRICS)
diff --git a/Marlin/src/gcode/bedlevel/G42.cpp b/Marlin/src/gcode/bedlevel/G42.cpp
index 28752cab8d..139bd1bb66 100644
--- a/Marlin/src/gcode/bedlevel/G42.cpp
+++ b/Marlin/src/gcode/bedlevel/G42.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,7 +27,7 @@
#include "../gcode.h"
#include "../../MarlinCore.h" // for IsRunning()
#include "../../module/motion.h"
-#include "../../module/probe.h" // for probe_offset
+#include "../../module/probe.h" // for probe.offset
#include "../../feature/bedlevel/bedlevel.h"
/**
@@ -41,7 +41,7 @@ void GcodeSuite::G42() {
const int8_t iy = hasJ ? parser.value_int() : 0;
if ((hasI && !WITHIN(ix, 0, GRID_MAX_POINTS_X - 1)) || (hasJ && !WITHIN(iy, 0, GRID_MAX_POINTS_Y - 1))) {
- SERIAL_ECHOLNPGM(MSG_ERR_MESH_XY);
+ SERIAL_ECHOLNPGM(STR_ERR_MESH_XY);
return;
}
@@ -53,8 +53,8 @@ void GcodeSuite::G42() {
#if HAS_PROBE_XY_OFFSET
if (parser.boolval('P')) {
- if (hasI) destination.x -= probe_offset_xy.x;
- if (hasJ) destination.y -= probe_offset_xy.y;
+ if (hasI) destination.x -= probe.offset_xy.x;
+ if (hasJ) destination.y -= probe.offset_xy.y;
}
#endif
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 9e96b456e3..d042ace8da 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,7 +34,7 @@
#endif
#if ENABLED(EXTENSIBLE_UI)
- #include "../../lcd/extensible_ui/ui_api.h"
+ #include "../../lcd/extui/ui_api.h"
#endif
//#define M420_C_USE_MEAN
@@ -64,20 +64,19 @@ void GcodeSuite::M420() {
#if ENABLED(MARLIN_DEV_MODE)
if (parser.intval('S') == 2) {
- const float x_min = probe_min_x(), x_max = probe_max_x(),
- y_min = probe_min_y(), y_max = probe_max_y();
+ const float x_min = probe.min_x(), x_max = probe.max_x(),
+ y_min = probe.min_y(), y_max = probe.max_y();
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
bilinear_start.set(x_min, y_min);
bilinear_grid_spacing.set((x_max - x_min) / (GRID_MAX_POINTS_X - 1),
(y_max - y_min) / (GRID_MAX_POINTS_Y - 1));
#endif
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
- Z_VALUES(x, y) = 0.001 * random(-200, 200);
- #if ENABLED(EXTENSIBLE_UI)
- ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y));
- #endif
- }
+ GRID_LOOP(x, y) {
+ Z_VALUES(x, y) = 0.001 * random(-200, 200);
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y));
+ #endif
+ }
SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
SERIAL_ECHOPAIR(" (", x_min);
SERIAL_CHAR(','); SERIAL_ECHO(y_min);
@@ -235,7 +234,7 @@ void GcodeSuite::M420() {
// Error if leveling failed to enable or reenable
if (to_enable && !planner.leveling_active)
- SERIAL_ERROR_MSG(MSG_ERR_M420_FAILED);
+ SERIAL_ERROR_MSG(STR_ERR_M420_FAILED);
SERIAL_ECHO_START();
SERIAL_ECHOPGM("Bed Leveling ");
@@ -247,7 +246,7 @@ void GcodeSuite::M420() {
if (planner.z_fade_height > 0.0)
SERIAL_ECHOLN(planner.z_fade_height);
else
- SERIAL_ECHOLNPGM(MSG_OFF);
+ SERIAL_ECHOLNPGM(STR_OFF);
#endif
// Report change in position
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 7cbaefbf23..de69545983 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@
#include "../../queue.h"
#if ENABLED(PROBE_TEMP_COMPENSATION)
- #include "../../../feature/probe_temp_compensation.h"
+ #include "../../../feature/probe_temp_comp.h"
#include "../../../module/temperature.h"
#endif
@@ -57,7 +57,7 @@
#include "../../../core/debug_out.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
#if HOTENDS > 1
@@ -269,7 +269,7 @@ G29_TYPE GcodeSuite::G29() {
#endif
vector_3 points[3];
- get_three_probe_points(points);
+ probe.get_three_points(points);
#endif // AUTO_BED_LEVELING_3POINT
@@ -392,8 +392,8 @@ G29_TYPE GcodeSuite::G29() {
xy_probe_feedrate_mm_s = MMM_TO_MMS(parser.linearval('S', XY_PROBE_SPEED));
- const float x_min = probe_min_x(), x_max = probe_max_x(),
- y_min = probe_min_y(), y_max = probe_max_y();
+ const float x_min = probe.min_x(), x_max = probe.max_x(),
+ y_min = probe.min_y(), y_max = probe.max_y();
if (parser.seen('H')) {
const int16_t size = (int16_t)parser.value_linear_units();
@@ -417,17 +417,7 @@ G29_TYPE GcodeSuite::G29() {
);
}
- if (
- #if IS_SCARA || ENABLED(DELTA)
- !position_is_reachable_by_probe(probe_position_lf.x, 0)
- || !position_is_reachable_by_probe(probe_position_rb.x, 0)
- || !position_is_reachable_by_probe(0, probe_position_lf.y)
- || !position_is_reachable_by_probe(0, probe_position_rb.y)
- #else
- !position_is_reachable_by_probe(probe_position_lf)
- || !position_is_reachable_by_probe(probe_position_rb)
- #endif
- ) {
+ if (!probe.good_bounds(probe_position_lf, probe_position_rb)) {
SERIAL_ECHOLNPGM("? (L,R,F,B) out of bounds.");
G29_RETURN(false);
}
@@ -452,7 +442,7 @@ G29_TYPE GcodeSuite::G29() {
#if HAS_BED_PROBE
// Deploy the probe. Probe will raise if needed.
- if (DEPLOY_PROBE()) {
+ if (probe.deploy()) {
set_bed_leveling_enabled(abl_should_enable);
G29_RETURN(false);
}
@@ -704,7 +694,7 @@ G29_TYPE GcodeSuite::G29() {
#if IS_KINEMATIC
// Avoid probing outside the round or hexagonal area
- if (!position_is_reachable_by_probe(probePos)) continue;
+ if (!probe.can_reach(probePos)) continue;
#endif
if (verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", int(pt_index), "/", int(GRID_MAX_POINTS), ".");
@@ -712,7 +702,7 @@ G29_TYPE GcodeSuite::G29() {
ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), int(pt_index), int(GRID_MAX_POINTS));
#endif
- measured_z = faux ? 0.001f * random(-100, 101) : probe_at_point(probePos, raise_after, verbose_level);
+ measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(probePos, raise_after, verbose_level);
if (isnan(measured_z)) {
set_bed_leveling_enabled(abl_should_enable);
@@ -756,7 +746,7 @@ G29_TYPE GcodeSuite::G29() {
// Probe at 3 arbitrary points
- for (uint8_t i = 0; i < 3; ++i) {
+ LOOP_L_N(i, 3) {
if (verbose_level) SERIAL_ECHOLNPAIR("Probing point ", int(i), "/3.");
#if HAS_DISPLAY
ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i));
@@ -764,7 +754,7 @@ G29_TYPE GcodeSuite::G29() {
// Retain the last probe position
probePos = points[i];
- measured_z = faux ? 0.001 * random(-100, 101) : probe_at_point(probePos, raise_after, verbose_level);
+ measured_z = faux ? 0.001 * random(-100, 101) : probe.probe_at_point(probePos, raise_after, verbose_level);
if (isnan(measured_z)) {
set_bed_leveling_enabled(abl_should_enable);
break;
@@ -788,7 +778,7 @@ G29_TYPE GcodeSuite::G29() {
#endif
// Stow the probe. No raise for FIX_MOUNTED_PROBE.
- if (STOW_PROBE()) {
+ if (probe.stow()) {
set_bed_leveling_enabled(abl_should_enable);
measured_z = NAN;
}
@@ -871,7 +861,7 @@ G29_TYPE GcodeSuite::G29() {
auto print_topo_map = [&](PGM_P const title, const bool get_min) {
serialprintPGM(title);
for (int8_t yy = abl_grid_points.y - 1; yy >= 0; yy--) {
- for (uint8_t xx = 0; xx < abl_grid_points.x; xx++) {
+ LOOP_L_N(xx, abl_grid_points.x) {
const int ind = indexIntoAB[xx][yy];
xyz_float_t tmp = { eqnAMatrix[ind + 0 * abl_points],
eqnAMatrix[ind + 1 * abl_points], 0 };
@@ -923,8 +913,8 @@ G29_TYPE GcodeSuite::G29() {
planner.force_unapply_leveling(converted); // use conversion machinery
// Use the last measured distance to the bed, if possible
- if ( NEAR(current_position.x, probePos.x - probe_offset_xy.x)
- && NEAR(current_position.y, probePos.y - probe_offset_xy.y)
+ if ( NEAR(current_position.x, probePos.x - probe.offset_xy.x)
+ && NEAR(current_position.y, probePos.y - probe.offset_xy.y)
) {
const float simple_z = current_position.z - measured_z;
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probed Z", simple_z, " Matrix Z", converted.z, " Discrepancy ", simple_z - converted.z);
@@ -944,7 +934,12 @@ G29_TYPE GcodeSuite::G29() {
// Unapply the offset because it is going to be immediately applied
// and cause compensation movement in Z
- current_position.z -= bilinear_z_offset(current_position);
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+ const float fade_scaling_factor = planner.fade_scaling_factor_for_z(current_position.z);
+ #else
+ constexpr float fade_scaling_factor = 1.0f;
+ #endif
+ current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position);
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(" corrected Z:", current_position.z);
}
@@ -958,13 +953,11 @@ G29_TYPE GcodeSuite::G29() {
// Restore state after probing
if (!faux) restore_feedrate_and_scaling();
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G29");
-
- if (planner.leveling_active)
- sync_plan_position();
+ // Sync the planner from the current_position
+ if (planner.leveling_active) sync_plan_position();
#if HAS_BED_PROBE && defined(Z_AFTER_PROBING)
- move_z_after_probing();
+ probe.move_z_after_probing();
#endif
#ifdef Z_PROBE_END_SCRIPT
@@ -975,6 +968,8 @@ G29_TYPE GcodeSuite::G29() {
report_current_position();
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G29");
+
G29_RETURN(isnan(measured_z));
}
diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index b9470528a1..3cd2673d66 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,7 +32,7 @@
#include "../../../feature/bedlevel/bedlevel.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
/**
@@ -50,9 +50,9 @@ void GcodeSuite::M421() {
hasQ = !hasZ && parser.seen('Q');
if (!hasI || !hasJ || !(hasZ || hasQ))
- SERIAL_ERROR_MSG(MSG_ERR_M421_PARAMETERS);
+ SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
else if (!WITHIN(ix, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(iy, 0, GRID_MAX_POINTS_Y - 1))
- SERIAL_ERROR_MSG(MSG_ERR_MESH_XY);
+ SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
else {
z_values[ix][iy] = parser.value_linear_units() + (hasQ ? z_values[ix][iy] : 0);
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 92d95f169b..6c8fafe23f 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,7 +39,7 @@
#include "../../../module/stepper.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
// Save 130 bytes with non-duplication of PSTR
diff --git a/Marlin/src/gcode/bedlevel/mbl/M421.cpp b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
index f07cafebf8..3997e5ad59 100644
--- a/Marlin/src/gcode/bedlevel/mbl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -49,9 +49,9 @@ void GcodeSuite::M421() {
const bool hasZ = parser.seen('Z'), hasQ = !hasZ && parser.seen('Q');
if (int(hasI && hasJ) + int(hasX && hasY) != 1 || !(hasZ || hasQ))
- SERIAL_ERROR_MSG(MSG_ERR_M421_PARAMETERS);
+ SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
else if (ix < 0 || iy < 0)
- SERIAL_ERROR_MSG(MSG_ERR_MESH_XY);
+ SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
else
mbl.set_z(ix, iy, parser.value_linear_units() + (hasQ ? mbl.z_values[ix][iy] : 0));
}
diff --git a/Marlin/src/gcode/bedlevel/ubl/G29.cpp b/Marlin/src/gcode/bedlevel/ubl/G29.cpp
index c0f8f20439..7b42e6dddf 100644
--- a/Marlin/src/gcode/bedlevel/ubl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/G29.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index 153e6018aa..bd65c21ad3 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,7 +32,7 @@
#include "../../../feature/bedlevel/bedlevel.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
/**
@@ -57,9 +57,9 @@ void GcodeSuite::M421() {
if (hasC) ij = ubl.find_closest_mesh_point_of_type(REAL, current_position);
if (int(hasC) + int(hasI && hasJ) != 1 || !(hasZ || hasQ || hasN))
- SERIAL_ERROR_MSG(MSG_ERR_M421_PARAMETERS);
+ SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
else if (!WITHIN(ij.x, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(ij.y, 0, GRID_MAX_POINTS_Y - 1))
- SERIAL_ERROR_MSG(MSG_ERR_MESH_XY);
+ SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
else {
float &zval = ubl.z_values[ij.x][ij.y];
zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 6d87e6f932..fafce9a896 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -62,13 +62,7 @@
current_position.set(0.0, 0.0);
sync_plan_position();
- const int x_axis_home_dir =
- #if ENABLED(DUAL_X_CARRIAGE)
- x_home_dir(active_extruder)
- #else
- home_dir(X_AXIS)
- #endif
- ;
+ const int x_axis_home_dir = x_home_dir(active_extruder);
const float mlx = max_length(X_AXIS),
mly = max_length(Y_AXIS),
@@ -118,7 +112,7 @@
// Disallow Z homing if X or Y are unknown
if (!TEST(axis_known_position, X_AXIS) || !TEST(axis_known_position, Y_AXIS)) {
LCD_MESSAGEPGM(MSG_ERR_Z_HOMING);
- SERIAL_ECHO_MSG(MSG_ERR_Z_HOMING_SER);
+ SERIAL_ECHO_MSG(STR_ERR_Z_HOMING_SER);
return;
}
@@ -133,7 +127,7 @@
destination.set(safe_homing_xy, current_position.z);
#if HOMING_Z_WITH_PROBE
- destination -= probe_offset_xy;
+ destination -= probe.offset_xy;
#endif
if (position_is_reachable(destination)) {
@@ -154,7 +148,7 @@
}
else {
LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
- SERIAL_ECHO_MSG(MSG_ZPROBE_OUT_SER);
+ SERIAL_ECHO_MSG(STR_ZPROBE_OUT_SER);
}
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< home_z_safely");
@@ -208,7 +202,7 @@
* Z Home to the Z endstop
*
*/
-void GcodeSuite::G28(const bool always_home_all) {
+void GcodeSuite::G28() {
if (DEBUGGING(LEVELING)) {
DEBUG_ECHOLNPGM(">>> G28");
log_machine_info();
@@ -261,28 +255,28 @@ void GcodeSuite::G28(const bool always_home_all) {
#define HAS_HOMING_CURRENT (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2))
#if HAS_HOMING_CURRENT
- auto debug_current = [](const char * const s, const int16_t a, const int16_t b){
- DEBUG_ECHO(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
+ auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b){
+ serialprintPGM(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
};
#if HAS_CURRENT_HOME(X)
const int16_t tmc_save_current_X = stepperX.getMilliamps();
stepperX.rms_current(X_CURRENT_HOME);
- if (DEBUGGING(LEVELING)) debug_current("X", tmc_save_current_X, X_CURRENT_HOME);
+ if (DEBUGGING(LEVELING)) debug_current(PSTR("X"), tmc_save_current_X, X_CURRENT_HOME);
#endif
#if HAS_CURRENT_HOME(X2)
const int16_t tmc_save_current_X2 = stepperX2.getMilliamps();
stepperX2.rms_current(X2_CURRENT_HOME);
- if (DEBUGGING(LEVELING)) debug_current("X2", tmc_save_current_X2, X2_CURRENT_HOME);
+ if (DEBUGGING(LEVELING)) debug_current(PSTR("X2"), tmc_save_current_X2, X2_CURRENT_HOME);
#endif
#if HAS_CURRENT_HOME(Y)
const int16_t tmc_save_current_Y = stepperY.getMilliamps();
stepperY.rms_current(Y_CURRENT_HOME);
- if (DEBUGGING(LEVELING)) debug_current("Y", tmc_save_current_Y, Y_CURRENT_HOME);
+ if (DEBUGGING(LEVELING)) debug_current(PSTR("Y"), tmc_save_current_Y, Y_CURRENT_HOME);
#endif
#if HAS_CURRENT_HOME(Y2)
const int16_t tmc_save_current_Y2 = stepperY2.getMilliamps();
stepperY2.rms_current(Y2_CURRENT_HOME);
- if (DEBUGGING(LEVELING)) debug_current("Y2", tmc_save_current_Y2, Y2_CURRENT_HOME);
+ if (DEBUGGING(LEVELING)) debug_current(PSTR("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
#endif
#endif
@@ -308,8 +302,9 @@ void GcodeSuite::G28(const bool always_home_all) {
#if ENABLED(DELTA)
+ constexpr bool doZ = true; // for NANODLP_Z_SYNC if your DLP is on a DELTA
+
home_delta();
- UNUSED(always_home_all);
#if ENABLED(IMPROVE_HOMING_RELIABILITY)
end_slow_homing(slow_homing);
@@ -318,7 +313,7 @@ void GcodeSuite::G28(const bool always_home_all) {
#else // NOT DELTA
const bool homeX = parser.seen('X'), homeY = parser.seen('Y'), homeZ = parser.seen('Z'),
- home_all = always_home_all || (homeX == homeY && homeX == homeZ),
+ home_all = homeX == homeY && homeX == homeZ, // All or None
doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ;
destination = current_position;
@@ -329,12 +324,10 @@ void GcodeSuite::G28(const bool always_home_all) {
#endif
- const float z_homing_height = (
- #if ENABLED(UNKNOWN_Z_NO_RAISE)
- !TEST(axis_known_position, Z_AXIS) ? 0 :
- #endif
- (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT)
- );
+ const float z_homing_height =
+ (DISABLED(UNKNOWN_Z_NO_RAISE) || TEST(axis_known_position, Z_AXIS))
+ ? (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT)
+ : 0;
if (z_homing_height && (doX || doY)) {
// Raise Z before homing any other axes and z is not already high enough (never lower z)
@@ -352,22 +345,11 @@ void GcodeSuite::G28(const bool always_home_all) {
#endif
// Home Y (before X)
- #if ENABLED(HOME_Y_BEFORE_X)
-
- if (doY
- #if ENABLED(CODEPENDENT_XY_HOMING)
- || doX
- #endif
- ) homeaxis(Y_AXIS);
-
- #endif
+ if (ENABLED(HOME_Y_BEFORE_X) && (doY || (ENABLED(CODEPENDENT_XY_HOMING) && doX)))
+ homeaxis(Y_AXIS);
// Home X
- if (doX
- #if ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X)
- || doY
- #endif
- ) {
+ if (doX || (doY && ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X))) {
#if ENABLED(DUAL_X_CARRIAGE)
@@ -395,9 +377,8 @@ void GcodeSuite::G28(const bool always_home_all) {
}
// Home Y (after X)
- #if DISABLED(HOME_Y_BEFORE_X)
- if (doY) homeaxis(Y_AXIS);
- #endif
+ if (DISABLED(HOME_Y_BEFORE_X) && doY)
+ homeaxis(Y_AXIS);
#if ENABLED(IMPROVE_HOMING_RELIABILITY)
end_slow_homing(slow_homing);
@@ -405,6 +386,7 @@ void GcodeSuite::G28(const bool always_home_all) {
// Home Z last if homing towards the bed
#if Z_HOME_DIR < 0
+
if (doZ) {
#if ENABLED(BLTOUCH)
bltouch.init();
@@ -416,10 +398,17 @@ void GcodeSuite::G28(const bool always_home_all) {
#endif
#if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
- move_z_after_probing();
+ #if Z_AFTER_HOMING > Z_AFTER_PROBING
+ do_blocking_move_to_z(Z_AFTER_HOMING);
+ #else
+ probe.move_z_after_probing();
+ #endif
+ #elif defined(Z_AFTER_HOMING)
+ do_blocking_move_to_z(Z_AFTER_HOMING);
#endif
} // doZ
+
#endif // Z_HOME_DIR < 0
sync_plan_position();
@@ -478,7 +467,7 @@ void GcodeSuite::G28(const bool always_home_all) {
do_blocking_move_to_z(delta_clip_start_height);
#endif
- #if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G28)
+ #if ENABLED(RESTORE_LEVELING_AFTER_G28)
set_bed_leveling_enabled(leveling_was_active);
#endif
@@ -486,12 +475,7 @@ void GcodeSuite::G28(const bool always_home_all) {
// Restore the active tool after homing
#if HOTENDS > 1 && (DISABLED(DELTA) || ENABLED(DELTA_HOME_TO_SAFE_ZONE))
- #if EITHER(PARKING_EXTRUDER, DUAL_X_CARRIAGE)
- #define NO_FETCH false // fetch the previous toolhead
- #else
- #define NO_FETCH true
- #endif
- tool_change(old_tool_index, NO_FETCH);
+ tool_change(old_tool_index, NONE(PARKING_EXTRUDER, DUAL_X_CARRIAGE)); // Do move if one of these
#endif
#if HAS_HOMING_CURRENT
@@ -514,15 +498,8 @@ void GcodeSuite::G28(const bool always_home_all) {
report_current_position();
- #if ENABLED(NANODLP_Z_SYNC)
- #if ENABLED(NANODLP_ALL_AXIS)
- #define _HOME_SYNC true // For any axis, output sync text.
- #else
- #define _HOME_SYNC doZ // Only for Z-axis
- #endif
- if (_HOME_SYNC)
- SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
- #endif
+ if (ENABLED(NANODLP_Z_SYNC) && (doZ || ENABLED(NANODLP_ALL_AXIS)))
+ SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G28");
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 1931d226af..ac2cdf7d4d 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -100,7 +100,7 @@ void ac_cleanup(
do_blocking_move_to_z(delta_clip_start_height);
#endif
#if HAS_BED_PROBE
- STOW_PROBE();
+ probe.stow();
#endif
restore_feedrate_and_scaling();
#if HOTENDS > 1
@@ -190,7 +190,7 @@ static float std_dev_points(float z_pt[NPP + 1], const bool _0p_cal, const bool
*/
static float calibration_probe(const xy_pos_t &xy, const bool stow) {
#if HAS_BED_PROBE
- return probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true);
+ return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true, false);
#else
UNUSED(stow);
return lcd_probe_pt(xy);
@@ -439,7 +439,6 @@ void GcodeSuite::G33() {
_opposite_results = (_4p_calibration && !towers_set) || probe_points >= 3,
_endstop_results = probe_points != 1 && probe_points != -1 && probe_points != 0,
_angle_results = probe_points >= 3 && towers_set;
- static const char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
int8_t iterations = 0;
float test_precision,
zero_std_dev = (verbose_level ? 999.0f : 0.0f), // 0.0 in dry-run mode : forced end
@@ -625,8 +624,7 @@ void GcodeSuite::G33() {
sprintf_P(&mess[15], PSTR("%03i.x"), (int)LROUND(zero_std_dev_min));
ui.set_status(mess);
print_calibration_settings(_endstop_results, _angle_results);
- serialprintPGM(save_message);
- SERIAL_EOL();
+ SERIAL_ECHOLNPGM("Save with M500 and/or copy to Configuration.h");
}
else { // !end iterations
char mess[15];
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 2c284de681..d1b828d079 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,6 +24,8 @@
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
+#include "../../feature/z_stepper_align.h"
+
#include "../gcode.h"
#include "../../module/planner.h"
#include "../../module/stepper.h"
@@ -45,68 +47,6 @@
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
#include "../../core/debug_out.h"
-//
-// Sanity check G34 / M422 settings
-//
-constexpr xy_pos_t test_z_stepper_align_xy[] = Z_STEPPER_ALIGN_XY;
-
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-
- static_assert(COUNT(test_z_stepper_align_xy) >= NUM_Z_STEPPER_DRIVERS,
- "Z_STEPPER_ALIGN_XY requires at least three {X,Y} entries (Z, Z2, Z3, ...)."
- );
-
- constexpr float test_z_stepper_align_stepper_xy[][XY] = Z_STEPPER_ALIGN_STEPPER_XY;
- static_assert(
- COUNT(test_z_stepper_align_stepper_xy) == NUM_Z_STEPPER_DRIVERS,
- "Z_STEPPER_ALIGN_STEPPER_XY requires three {X,Y} entries (one per Z stepper)."
- );
-
-#else
-
- static_assert(COUNT(test_z_stepper_align_xy) == NUM_Z_STEPPER_DRIVERS,
- #if NUM_Z_STEPPER_DRIVERS == 4
- "Z_STEPPER_ALIGN_XY requires four {X,Y} entries (Z, Z2, Z3, and Z4)."
- #elif NUM_Z_STEPPER_DRIVERS == 3
- "Z_STEPPER_ALIGN_XY requires three {X,Y} entries (Z, Z2, and Z3)."
- #else
- "Z_STEPPER_ALIGN_XY requires two {X,Y} entries (Z and Z2)."
- #endif
- );
-
-#endif
-
-constexpr xyz_pos_t dpo = NOZZLE_TO_PROBE_OFFSET;
-
-#define LTEST(N) (test_z_stepper_align_xy[N].x >= _MAX(X_MIN_BED + MIN_PROBE_EDGE_LEFT, X_MIN_POS + dpo.x) - 0.00001f)
-#define RTEST(N) (test_z_stepper_align_xy[N].x <= _MIN(X_MAX_BED - MIN_PROBE_EDGE_RIGHT, X_MAX_POS + dpo.x) + 0.00001f)
-#define FTEST(N) (test_z_stepper_align_xy[N].y >= _MAX(Y_MIN_BED + MIN_PROBE_EDGE_FRONT, Y_MIN_POS + dpo.y) - 0.00001f)
-#define BTEST(N) (test_z_stepper_align_xy[N].y <= _MIN(Y_MAX_BED - MIN_PROBE_EDGE_BACK, Y_MAX_POS + dpo.y) + 0.00001f)
-
-static_assert(LTEST(0) && RTEST(0), "The 1st Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
-static_assert(FTEST(0) && BTEST(0), "The 1st Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
-static_assert(LTEST(1) && RTEST(1), "The 2nd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
-static_assert(FTEST(1) && BTEST(1), "The 2nd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
-#if NUM_Z_STEPPER_DRIVERS >= 3
- static_assert(LTEST(2) && RTEST(2), "The 3rd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
- static_assert(FTEST(2) && BTEST(2), "The 3rd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
- #if NUM_Z_STEPPER_DRIVERS >= 4
- static_assert(LTEST(3) && RTEST(3), "The 4th Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
- static_assert(FTEST(3) && BTEST(3), "The 4th Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
- #endif
-#endif
-
-//
-// G34 / M422 shared data
-//
-static xy_pos_t z_stepper_align_pos[] = Z_STEPPER_ALIGN_XY;
-
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
- static xy_pos_t z_stepper_align_stepper_pos[] = Z_STEPPER_ALIGN_STEPPER_XY;
-#endif
-
-#define G34_PROBE_COUNT COUNT(z_stepper_align_pos)
-
inline void set_all_z_lock(const bool lock) {
stepper.set_z_lock(lock);
stepper.set_z2_lock(lock);
@@ -124,6 +64,7 @@ inline void set_all_z_lock(const bool lock) {
* I
* T
* A
+ * R points based on current probe offsets
*/
void GcodeSuite::G34() {
if (DEBUGGING(LEVELING)) {
@@ -134,7 +75,9 @@ void GcodeSuite::G34() {
do { // break out on error
#if NUM_Z_STEPPER_DRIVERS == 4
- SERIAL_ECHOLNPGM("Quad Z Stepper Leveling not Yet Supported");
+ SERIAL_ECHOLNPGM("Alignment for 4 steppers is Experimental!");
+ #elif NUM_Z_STEPPER_DRIVERS > 4
+ SERIAL_ECHOLNPGM("Alignment not supported for over 4 steppers");
break;
#endif
@@ -161,6 +104,8 @@ void GcodeSuite::G34() {
}
#endif
+ if (parser.seen('R')) z_stepper_align.reset_to_default();
+
const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE;
// Wait for planner moves to finish!
@@ -199,13 +144,18 @@ void GcodeSuite::G34() {
// Compute a worst-case clearance height to probe from. After the first
// iteration this will be re-calculated based on the actual bed position
- float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * (
+ auto magnitude2 = [&](const uint8_t i, const uint8_t j) {
+ const xy_pos_t diff = z_stepper_align.xy[i] - z_stepper_align.xy[j];
+ return HYPOT2(diff.x, diff.y);
+ };
+ float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * SQRT(
#if NUM_Z_STEPPER_DRIVERS == 3
- SQRT(_MAX(HYPOT2(z_stepper_align_pos[0].x - z_stepper_align_pos[0].y, z_stepper_align_pos[1].x - z_stepper_align_pos[1].y),
- HYPOT2(z_stepper_align_pos[1].x - z_stepper_align_pos[1].y, z_stepper_align_pos[2].x - z_stepper_align_pos[2].y),
- HYPOT2(z_stepper_align_pos[2].x - z_stepper_align_pos[2].y, z_stepper_align_pos[0].x - z_stepper_align_pos[0].y)))
+ _MAX(magnitude2(0, 1), magnitude2(1, 2), magnitude2(2, 0))
+ #elif NUM_Z_STEPPER_DRIVERS == 4
+ _MAX(magnitude2(0, 1), magnitude2(1, 2), magnitude2(2, 3),
+ magnitude2(3, 0), magnitude2(0, 2), magnitude2(1, 3))
#else
- HYPOT(z_stepper_align_pos[0].x - z_stepper_align_pos[0].y, z_stepper_align_pos[1].x - z_stepper_align_pos[1].y)
+ magnitude2(0, 1)
#endif
);
@@ -213,34 +163,55 @@ void GcodeSuite::G34() {
if (!all_axes_known()) home_all_axes();
// Move the Z coordinate realm towards the positive - dirty trick
- current_position.z -= z_probe * 0.5f;
+ current_position.z += z_probe * 0.5f;
+ sync_plan_position();
+ // Now, the Z origin lies below the build plate. That allows to probe deeper, before run_z_probe throws an error.
+ // This hack is un-done at the end of G34 - either by re-homing, or by using the probed heights of the last iteration.
- float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f),
- z_measured[G34_PROBE_COUNT] = { 0 },
+ #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f, 10000.0f);
+ #else
+ float last_z_align_level_indicator = 10000.0f;
+ #endif
+ float z_measured[NUM_Z_STEPPER_DRIVERS] = { 0 },
z_maxdiff = 0.0f,
amplification = z_auto_align_amplification;
+ // These are needed after the for-loop
uint8_t iteration;
bool err_break = false;
+ float z_measured_min;
+
+ #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ bool adjustment_reverse = false;
+ #endif
+
+ // 'iteration' is declared above and is also used after the for-loop.
+ // *not* the same as LOOP_L_N(iteration, z_auto_align_iterations)
for (iteration = 0; iteration < z_auto_align_iterations; ++iteration) {
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
SERIAL_ECHOLNPAIR("\nITERATION: ", int(iteration + 1));
// Initialize minimum value
- float z_measured_min = 100000.0f,
- z_measured_max = -100000.0f;
+ z_measured_min = 100000.0f;
+ float z_measured_max = -100000.0f;
// Probe all positions (one per Z-Stepper)
- for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i) {
+ LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
// iteration odd/even --> downward / upward stepper sequence
- const uint8_t iprobe = (iteration & 1) ? G34_PROBE_COUNT - 1 - i : i;
+ const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
// Safe clearance even on an incline
- if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
+ if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
+
+ if (DEBUGGING(LEVELING))
+ DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
// Probe a Z height for each stepper.
- const float z_probed_height = probe_at_point(z_stepper_align_pos[iprobe], raise_after, 0, true);
+ // Probing sanity check is disabled, as it would trigger even in normal cases because
+ // current_position.z has been manually altered in the "dirty trick" above.
+ const float z_probed_height = probe.probe_at_point(z_stepper_align.xy[iprobe], raise_after, 0, true, false);
if (isnan(z_probed_height)) {
SERIAL_ECHOLNPGM("Probing failed.");
err_break = true;
@@ -279,15 +250,15 @@ void GcodeSuite::G34() {
// This allows the actual adjustment logic to be shared by both algorithms.
linear_fit_data lfd;
incremental_LSF_reset(&lfd);
- for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i) {
- SERIAL_ECHOLNPAIR("PROBEPT_", int(i + 1), ": ", z_measured[i]);
- incremental_LSF(&lfd, z_stepper_align_pos[i], z_measured[i]);
+ LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+ SERIAL_ECHOLNPAIR("PROBEPT_", int(i), ": ", z_measured[i]);
+ incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
}
finish_incremental_LSF(&lfd);
z_measured_min = 100000.0f;
- for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
- z_measured[i] = -(lfd.A * z_stepper_align_stepper_pos[i].x + lfd.B * z_stepper_align_stepper_pos[i].y);
+ LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+ z_measured[i] = -(lfd.A * z_stepper_align.stepper_xy[i].x + lfd.B * z_stepper_align.stepper_xy[i].y + lfd.D);
z_measured_min = _MIN(z_measured_min, z_measured[i]);
}
@@ -302,30 +273,54 @@ void GcodeSuite::G34() {
#endif
);
- // The following correction actions are to be enabled for select Z-steppers only
- stepper.set_separate_multi_axis(true);
+ #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ // Check if the applied corrections go in the correct direction.
+ // Calculate the sum of the absolute deviations from the mean of the probe measurements.
+ // Compare to the last iteration to ensure it's getting better.
- bool success_break = true;
- // Correct the individual stepper offsets
- for (uint8_t zstepper = 0; zstepper < NUM_Z_STEPPER_DRIVERS; ++zstepper) {
- // Calculate current stepper move
- const float z_align_move = z_measured[zstepper] - z_measured_min,
- z_align_abs = ABS(z_align_move);
+ // Calculate mean value as a reference
+ float z_measured_mean = 0.0f;
+ LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS) z_measured_mean += z_measured[zstepper];
+ z_measured_mean /= NUM_Z_STEPPER_DRIVERS;
- #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
- // Optimize one iteration's correction based on the first measurements
- if (z_align_abs > 0.0f) amplification = iteration == 1 ? _MIN(last_z_align_move[zstepper] / z_align_abs, 2.0f) : z_auto_align_amplification;
- #endif
+ // Calculate the sum of the absolute deviations from the mean value
+ float z_align_level_indicator = 0.0f;
+ LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS)
+ z_align_level_indicator += ABS(z_measured[zstepper] - z_measured_mean);
- // Check for less accuracy compared to last move
- if (last_z_align_move[zstepper] < z_align_abs - 1.0) {
+ // If it's getting worse, stop and throw an error
+ if (last_z_align_level_indicator < z_align_level_indicator * 0.7f) {
SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
err_break = true;
break;
}
- // Remember the alignment for the next iteration
- last_z_align_move[zstepper] = z_align_abs;
+ last_z_align_level_indicator = z_align_level_indicator;
+ #endif
+
+ // The following correction actions are to be enabled for select Z-steppers only
+ stepper.set_separate_multi_axis(true);
+
+ bool success_break = true;
+ // Correct the individual stepper offsets
+ LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS) {
+ // Calculate current stepper move
+ float z_align_move = z_measured[zstepper] - z_measured_min;
+ const float z_align_abs = ABS(z_align_move);
+
+ #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ // Optimize one iteration's correction based on the first measurements
+ if (z_align_abs) amplification = (iteration == 1) ? _MIN(last_z_align_move[zstepper] / z_align_abs, 2.0f) : z_auto_align_amplification;
+
+ // Check for less accuracy compared to last move
+ if (last_z_align_move[zstepper] < z_align_abs * 0.7f) {
+ SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
+ adjustment_reverse = !adjustment_reverse;
+ }
+
+ // Remember the alignment for the next iteration
+ last_z_align_move[zstepper] = z_align_abs;
+ #endif
// Stop early if all measured points achieve accuracy target
if (z_align_abs > z_auto_align_accuracy) success_break = false;
@@ -337,11 +332,21 @@ void GcodeSuite::G34() {
switch (zstepper) {
case 0: stepper.set_z_lock(false); break;
case 1: stepper.set_z2_lock(false); break;
- #if NUM_Z_STEPPER_DRIVERS == 3
+ #if NUM_Z_STEPPER_DRIVERS >= 3
case 2: stepper.set_z3_lock(false); break;
#endif
+ #if NUM_Z_STEPPER_DRIVERS == 4
+ case 3: stepper.set_z4_lock(false); break;
+ #endif
}
+ #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ // Decreasing accuracy was detected so move was inverted.
+ // Will match reversed Z steppers on dual steppers. Triple will need more work to map.
+ if (adjustment_reverse)
+ z_align_move = -z_align_move;
+ #endif
+
// Do a move to correct part of the misalignment for the current stepper
do_blocking_move_to_z(amplification * z_align_move + current_position.z);
} // for (zstepper)
@@ -356,36 +361,39 @@ void GcodeSuite::G34() {
} // for (iteration)
- if (err_break) { SERIAL_ECHOLNPGM("G34 aborted."); break; }
+ if (err_break)
+ SERIAL_ECHOLNPGM("G34 aborted.");
+ else {
+ SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " of ", int(z_auto_align_iterations));
+ SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
+ }
- SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " iterations of ", int(z_auto_align_iterations));
- SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
+ // Stow the probe, as the last call to probe.probe_at_point(...) left
+ // the probe deployed if it was successful.
+ probe.stow();
+
+ #if ENABLED(HOME_AFTER_G34)
+ // After this operation the z position needs correction
+ set_axis_not_trusted(Z_AXIS);
+ // Home Z after the alignment procedure
+ process_subcommands_now_P(PSTR("G28Z"));
+ #else
+ // Use the probed height from the last iteration to determine the Z height.
+ // z_measured_min is used, because all steppers are aligned to z_measured_min.
+ // Ideally, this would be equal to the 'z_probe * 0.5f' which was added earlier.
+ current_position.z -= z_measured_min - (float)Z_CLEARANCE_BETWEEN_PROBES;
+ sync_plan_position();
+ #endif
// Restore the active tool after homing
#if HOTENDS > 1
- tool_change(old_tool_index, (
- #if ENABLED(PARKING_EXTRUDER)
- false // Fetch the previous toolhead
- #else
- true
- #endif
- ));
+ tool_change(old_tool_index, DISABLED(PARKING_EXTRUDER)); // Fetch previous tool for parking extruder
#endif
#if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G34)
set_bed_leveling_enabled(leveling_was_active);
#endif
- // After this operation the z position needs correction
- set_axis_is_not_at_home(Z_AXIS);
-
- // Stow the probe, as the last call to probe_at_point(...) left
- // the probe deployed if it was successful.
- STOW_PROBE();
-
- // Home Z after the alignment procedure
- process_subcommands_now_P(PSTR("G28 Z"));
-
}while(0);
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G34");
@@ -404,14 +412,22 @@ void GcodeSuite::G34() {
* S and W require an X and/or Y parameter
* X : X position to set (Unchanged if omitted)
* Y : Y position to set (Unchanged if omitted)
+ *
+ * R : Recalculate points based on current probe offsets
*/
void GcodeSuite::M422() {
+
+ if (parser.seen('R')) {
+ z_stepper_align.reset_to_default();
+ return;
+ }
+
if (!parser.seen_any()) {
- for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i)
- SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + 1, SP_X_STR, z_stepper_align_pos[i].x, SP_Y_STR, z_stepper_align_pos[i].y);
+ LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
+ SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), int(i + 1), SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
- for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i)
- SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + 1, SP_X_STR, z_stepper_align_stepper_pos[i].x, SP_Y_STR, z_stepper_align_stepper_pos[i].y);
+ LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
+ SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), int(i + 1), SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
#endif
return;
}
@@ -427,9 +443,9 @@ void GcodeSuite::M422() {
xy_pos_t *pos_dest = (
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
- !is_probe_point ? z_stepper_align_stepper_pos :
+ !is_probe_point ? z_stepper_align.stepper_xy :
#endif
- z_stepper_align_pos
+ z_stepper_align.xy
);
if (!is_probe_point
@@ -451,7 +467,7 @@ void GcodeSuite::M422() {
int8_t position_index;
if (is_probe_point) {
position_index = parser.intval('S') - 1;
- if (!WITHIN(position_index, 0, int8_t(G34_PROBE_COUNT) - 1)) {
+ if (!WITHIN(position_index, 0, int8_t(NUM_Z_STEPPER_DRIVERS) - 1)) {
SERIAL_ECHOLNPGM("?(S) Z-ProbePosition index invalid.");
return;
}
@@ -472,11 +488,11 @@ void GcodeSuite::M422() {
};
if (is_probe_point) {
- if (!position_is_reachable_by_probe(pos.x, Y_CENTER)) {
+ if (!probe.can_reach(pos.x, Y_CENTER)) {
SERIAL_ECHOLNPGM("?(X) out of bounds.");
return;
}
- if (!position_is_reachable_by_probe(pos)) {
+ if (!probe.can_reach(pos)) {
SERIAL_ECHOLNPGM("?(Y) out of bounds.");
return;
}
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 28a3276dfd..42c56fe51d 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,6 +37,21 @@
#include "../../module/endstops.h"
#include "../../feature/bedlevel/bedlevel.h"
+#if !AXIS_CAN_CALIBRATE(X)
+ #undef CALIBRATION_MEASURE_LEFT
+ #undef CALIBRATION_MEASURE_RIGHT
+#endif
+
+#if !AXIS_CAN_CALIBRATE(Y)
+ #undef CALIBRATION_MEASURE_FRONT
+ #undef CALIBRATION_MEASURE_BACK
+#endif
+
+#if !AXIS_CAN_CALIBRATE(Z)
+ #undef CALIBRATION_MEASURE_AT_TOP_EDGES
+#endif
+
+
/**
* G425 backs away from the calibration object by various distances
* depending on the confidence level:
@@ -56,8 +71,12 @@
#define CALIBRATION_MEASUREMENT_CERTAIN 0.5 // mm
#endif
-#define HAS_X_CENTER BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
-#define HAS_Y_CENTER BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+#if BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
+ #define HAS_X_CENTER 1
+#endif
+#if BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+ #define HAS_Y_CENTER 1
+#endif
enum side_t : uint8_t { TOP, RIGHT, FRONT, LEFT, BACK, NUM_SIDES };
@@ -120,7 +139,7 @@ inline void park_above_object(measurements_t &m, const float uncertainty) {
#if HAS_HOTEND_OFFSET
inline void normalize_hotend_offsets() {
- for (uint8_t e = 1; e < HOTENDS; e++)
+ LOOP_S_L_N(e, 1, HOTENDS)
hotend_offset[e] -= hotend_offset[0];
hotend_offset[0].reset();
}
@@ -128,13 +147,15 @@ inline void park_above_object(measurements_t &m, const float uncertainty) {
#endif
inline bool read_calibration_pin() {
- #if HAS_CALIBRATION_PIN
- return (READ(CALIBRATION_PIN) != CALIBRATION_PIN_INVERTING);
- #elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
- return (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING);
- #else
- return (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING);
- #endif
+ return (
+ #if PIN_EXISTS(CALIBRATION)
+ READ(CALIBRATION_PIN) != CALIBRATION_PIN_INVERTING
+ #elif HAS_CUSTOM_PROBE_PIN
+ READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING
+ #else
+ READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING
+ #endif
+ );
}
/**
@@ -201,42 +222,52 @@ inline float measure(const AxisEnum axis, const int dir, const bool stop_state,
inline void probe_side(measurements_t &m, const float uncertainty, const side_t side, const bool probe_top_at_edge=false) {
const xyz_float_t dimensions = CALIBRATION_OBJECT_DIMENSIONS;
AxisEnum axis;
- float dir;
+ float dir = 1;
park_above_object(m, uncertainty);
switch (side) {
- case TOP: {
- const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
- m.obj_center.z = measurement - dimensions.z / 2;
- m.obj_side[TOP] = measurement;
- return;
- }
- case RIGHT: axis = X_AXIS; dir = -1; break;
- case FRONT: axis = Y_AXIS; dir = 1; break;
- case LEFT: axis = X_AXIS; dir = 1; break;
- case BACK: axis = Y_AXIS; dir = -1; break;
+ #if AXIS_CAN_CALIBRATE(Z)
+ case TOP: {
+ const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
+ m.obj_center.z = measurement - dimensions.z / 2;
+ m.obj_side[TOP] = measurement;
+ return;
+ }
+ #endif
+ #if AXIS_CAN_CALIBRATE(X)
+ case LEFT: axis = X_AXIS; break;
+ case RIGHT: axis = X_AXIS; dir = -1; break;
+ #endif
+ #if AXIS_CAN_CALIBRATE(Y)
+ case FRONT: axis = Y_AXIS; break;
+ case BACK: axis = Y_AXIS; dir = -1; break;
+ #endif
default: return;
}
if (probe_top_at_edge) {
- // Probe top nearest the side we are probing
- current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]);
- calibration_move();
- m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
- m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2;
+ #if AXIS_CAN_CALIBRATE(Z)
+ // Probe top nearest the side we are probing
+ current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]);
+ calibration_move();
+ m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
+ m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2;
+ #endif
}
- // Move to safe distance to the side of the calibration object
- current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty);
- calibration_move();
+ if (AXIS_CAN_CALIBRATE(X) && axis == X_AXIS || AXIS_CAN_CALIBRATE(Y) && axis == Y_AXIS) {
+ // Move to safe distance to the side of the calibration object
+ current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty);
+ calibration_move();
- // Plunge below the side of the calibration object and measure
- current_position.z = m.obj_side[TOP] - CALIBRATION_NOZZLE_TIP_HEIGHT * 0.7;
- calibration_move();
- const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty);
- m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2);
- m.obj_side[side] = measurement;
+ // Plunge below the side of the calibration object and measure
+ current_position.z = m.obj_side[TOP] - (CALIBRATION_NOZZLE_TIP_HEIGHT) * 0.7f;
+ calibration_move();
+ const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty);
+ m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2);
+ m.obj_side[side] = measurement;
+ }
}
/**
@@ -246,7 +277,7 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
* uncertainty in - How far away from the calibration object to begin probing
*/
inline void probe_sides(measurements_t &m, const float uncertainty) {
- #ifdef CALIBRATION_MEASURE_AT_TOP_EDGES
+ #if ENABLED(CALIBRATION_MEASURE_AT_TOP_EDGES)
constexpr bool probe_top_at_edge = true;
#else
// Probing at the exact center only works if the center is flat. Probing on a washer
@@ -255,18 +286,18 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
probe_side(m, uncertainty, TOP);
#endif
- #ifdef CALIBRATION_MEASURE_RIGHT
+ #if ENABLED(CALIBRATION_MEASURE_RIGHT)
probe_side(m, uncertainty, RIGHT, probe_top_at_edge);
#endif
- #ifdef CALIBRATION_MEASURE_FRONT
+ #if ENABLED(CALIBRATION_MEASURE_FRONT)
probe_side(m, uncertainty, FRONT, probe_top_at_edge);
#endif
- #ifdef CALIBRATION_MEASURE_LEFT
+ #if ENABLED(CALIBRATION_MEASURE_LEFT)
probe_side(m, uncertainty, LEFT, probe_top_at_edge);
#endif
- #ifdef CALIBRATION_MEASURE_BACK
+ #if ENABLED(CALIBRATION_MEASURE_BACK)
probe_side(m, uncertainty, BACK, probe_top_at_edge);
#endif
@@ -307,7 +338,9 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
#if ENABLED(CALIBRATION_REPORTING)
inline void report_measured_faces(const measurements_t &m) {
SERIAL_ECHOLNPGM("Sides:");
- SERIAL_ECHOLNPAIR(" Top: ", m.obj_side[TOP]);
+ #if AXIS_CAN_CALIBRATE(Z)
+ SERIAL_ECHOLNPAIR(" Top: ", m.obj_side[TOP]);
+ #endif
#if ENABLED(CALIBRATION_MEASURE_LEFT)
SERIAL_ECHOLNPAIR(" Left: ", m.obj_side[LEFT]);
#endif
@@ -337,19 +370,25 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
inline void report_measured_backlash(const measurements_t &m) {
SERIAL_ECHOLNPGM("Backlash:");
- #if ENABLED(CALIBRATION_MEASURE_LEFT)
- SERIAL_ECHOLNPAIR(" Left: ", m.backlash[LEFT]);
+ #if AXIS_CAN_CALIBRATE(X)
+ #if ENABLED(CALIBRATION_MEASURE_LEFT)
+ SERIAL_ECHOLNPAIR(" Left: ", m.backlash[LEFT]);
+ #endif
+ #if ENABLED(CALIBRATION_MEASURE_RIGHT)
+ SERIAL_ECHOLNPAIR(" Right: ", m.backlash[RIGHT]);
+ #endif
#endif
- #if ENABLED(CALIBRATION_MEASURE_RIGHT)
- SERIAL_ECHOLNPAIR(" Right: ", m.backlash[RIGHT]);
+ #if AXIS_CAN_CALIBRATE(Y)
+ #if ENABLED(CALIBRATION_MEASURE_FRONT)
+ SERIAL_ECHOLNPAIR(" Front: ", m.backlash[FRONT]);
+ #endif
+ #if ENABLED(CALIBRATION_MEASURE_BACK)
+ SERIAL_ECHOLNPAIR(" Back: ", m.backlash[BACK]);
+ #endif
#endif
- #if ENABLED(CALIBRATION_MEASURE_FRONT)
- SERIAL_ECHOLNPAIR(" Front: ", m.backlash[FRONT]);
+ #if AXIS_CAN_CALIBRATE(Z)
+ SERIAL_ECHOLNPAIR(" Top: ", m.backlash[TOP]);
#endif
- #if ENABLED(CALIBRATION_MEASURE_BACK)
- SERIAL_ECHOLNPAIR(" Back: ", m.backlash[BACK]);
- #endif
- SERIAL_ECHOLNPAIR(" Top: ", m.backlash[TOP]);
SERIAL_EOL();
}
@@ -363,7 +402,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
#if HAS_Y_CENTER
SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.pos_error.y);
#endif
- SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+ if (AXIS_CAN_CALIBRATE(Z)) SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
SERIAL_EOL();
}
@@ -387,7 +426,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
// This function requires normalize_hotend_offsets() to be called
//
inline void report_hotend_offsets() {
- for (uint8_t e = 1; e < HOTENDS; e++)
+ LOOP_S_L_N(e, 1, HOTENDS)
SERIAL_ECHOLNPAIR_P(PSTR("T"), int(e), PSTR(" Hotend Offset X"), hotend_offset[e].x, SP_Y_STR, hotend_offset[e].y, SP_Z_STR, hotend_offset[e].z);
}
#endif
@@ -411,6 +450,7 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
probe_sides(m, uncertainty);
#if ENABLED(BACKLASH_GCODE)
+
#if HAS_X_CENTER
backlash.distance_mm.x = (m.backlash[LEFT] + m.backlash[RIGHT]) / 2;
#elif ENABLED(CALIBRATION_MEASURE_LEFT)
@@ -427,18 +467,18 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
backlash.distance_mm.y = m.backlash[BACK];
#endif
- backlash.distance_mm.z = m.backlash[TOP];
+ if (AXIS_CAN_CALIBRATE(Z)) backlash.distance_mm.z = m.backlash[TOP];
#endif
}
#if ENABLED(BACKLASH_GCODE)
// Turn on backlash compensation and move in all
- // directions to take up any backlash
+ // allowed directions to take up any backlash
{
// New scope for TEMPORARY_BACKLASH_CORRECTION
TEMPORARY_BACKLASH_CORRECTION(all_on);
TEMPORARY_BACKLASH_SMOOTHING(0.0f);
- const xyz_float_t move = { 3, 3, 3 };
+ const xyz_float_t move = { AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3 };
current_position += move; calibration_move();
current_position -= move; calibration_move();
}
@@ -476,26 +516,18 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const
// Adjust the hotend offset
#if HAS_HOTEND_OFFSET
- #if HAS_X_CENTER
- hotend_offset[extruder].x += m.pos_error.x;
- #endif
- #if HAS_Y_CENTER
- hotend_offset[extruder].y += m.pos_error.y;
- #endif
- hotend_offset[extruder].z += m.pos_error.z;
+ if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) hotend_offset[extruder].x += m.pos_error.x;
+ if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) hotend_offset[extruder].y += m.pos_error.y;
+ if (AXIS_CAN_CALIBRATE(Z)) hotend_offset[extruder].z += m.pos_error.z;
normalize_hotend_offsets();
#endif
// Correct for positional error, so the object
// is at the known actual spot
planner.synchronize();
- #if HAS_X_CENTER
- update_measurements(m, X_AXIS);
- #endif
- #if HAS_Y_CENTER
- update_measurements(m, Y_AXIS);
- #endif
- update_measurements(m, Z_AXIS);
+ if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) update_measurements(m, X_AXIS);
+ if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) update_measurements(m, Y_AXIS);
+ if (AXIS_CAN_CALIBRATE(Z)) update_measurements(m, Z_AXIS);
sync_plan_position();
}
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 0e0899fa7a..c878f83a17 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,7 +35,7 @@
#include "../../feature/bedlevel/bedlevel.h"
#include "../../module/temperature.h"
#include "../../module/probe.h"
-#include "../../feature/probe_temp_compensation.h"
+#include "../../feature/probe_temp_comp.h"
/**
* G76: calibrate probe and/or bed temperature offsets
@@ -86,142 +86,115 @@ void GcodeSuite::G76() {
return;
#endif
+ auto report_temps = [](millis_t &ntr, millis_t timeout=0) {
+ idle_no_sleep();
+ const millis_t ms = millis();
+ if (ELAPSED(ms, ntr)) {
+ ntr = ms + 1000;
+ thermalManager.print_heater_states(active_extruder);
+ }
+ return (timeout && ELAPSED(ms, timeout));
+ };
+
+ auto wait_for_temps = [&](const float tb, const float tp, millis_t &ntr, const millis_t timeout=0) {
+ SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
+ while (fabs(thermalManager.degBed() - tb) > 0.1f || thermalManager.degProbe() > tp)
+ if (report_temps(ntr, timeout)) return true;
+ return false;
+ };
+
+ auto g76_probe = [](const xy_pos_t &xypos) {
+ do_blocking_move_to_z(5.0); // Raise nozzle before probing
+ const float measured_z = probe.probe_at_point(xypos, PROBE_PT_NONE, 0, false); // verbose=0, probe_relative=false
+ if (isnan(measured_z))
+ SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
+ else
+ SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+ return measured_z;
+ };
+
#if ENABLED(BLTOUCH)
// Make sure any BLTouch error condition is cleared
bltouch_command(BLTOUCH_RESET, BLTOUCH_RESET_DELAY);
set_bltouch_deployed(false);
#endif
- bool do_bed_cal = parser.boolval('B'),
- do_probe_cal = parser.boolval('P');
- if (!do_bed_cal && !do_probe_cal)
- do_bed_cal = do_probe_cal = true;
+ bool do_bed_cal = parser.boolval('B'), do_probe_cal = parser.boolval('P');
+ if (!do_bed_cal && !do_probe_cal) do_bed_cal = do_probe_cal = true;
// Synchronize with planner
planner.synchronize();
- // Report temperatures every second and handle heating timeouts
- millis_t next_temp_report = millis() + 1000;
+ const xyz_pos_t parkpos = { temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z };
+ const xy_pos_t ppos = { temp_comp.measure_point_x, temp_comp.measure_point_y };
if (do_bed_cal || do_probe_cal) {
// Ensure park position is reachable
- if (!position_is_reachable(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y)
- || !(WITHIN(ProbeTempComp::park_point.z, Z_MIN_POS - 0.001f, Z_MAX_POS + 0.001f))
- ) {
- SERIAL_ECHOLNPGM("!Park position unreachable - aborting.");
- return;
+ bool reachable = position_is_reachable(parkpos) || WITHIN(parkpos.z, Z_MIN_POS - fslop, Z_MAX_POS + fslop);
+ if (!reachable)
+ SERIAL_ECHOLNPGM("!Park");
+ else {
+ // Ensure probe position is reachable
+ reachable = probe.can_reach(ppos);
+ if (!reachable) SERIAL_ECHOLNPGM("!Probe");
}
- // Ensure probe position is reachable
- destination.set(
- temp_comp.measure_point_x - probe_offset.x,
- temp_comp.measure_point_y - probe_offset.y
- );
- if (!position_is_reachable_by_probe(destination)) {
- SERIAL_ECHOLNPGM("!Probe position unreachable - aborting.");
+
+ if (!reachable) {
+ SERIAL_ECHOLNPGM(" position unreachable - aborting.");
return;
}
- G28(true);
+ process_subcommands_now_P(PSTR("G28"));
}
+ remember_feedrate_scaling_off();
+
+ // Nozzle position based on probe position
+ const xy_pos_t noz_pos = ppos - probe.offset_xy;
+
/******************************************
* Calibrate bed temperature offsets
******************************************/
+ // Report temperatures every second and handle heating timeouts
+ millis_t next_temp_report = millis() + 1000;
+
if (do_bed_cal) {
uint16_t target_bed = temp_comp.cali_info_init[TSI_BED].start_temp,
target_probe = temp_comp.bed_calib_probe_temp;
- SERIAL_ECHOLNPGM("Waiting for printer to cool down.");
- while (thermalManager.degBed() > target_bed
- || thermalManager.degProbe() > target_probe
- ) {
- idle(
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- true
- #endif
- );
- const millis_t ms = millis();
- if (ELAPSED(ms, next_temp_report)) {
- thermalManager.print_heater_states(active_extruder);
- next_temp_report = ms + 1000;
- }
- }
+ SERIAL_ECHOLNPGM("Waiting for cooling.");
+ while (thermalManager.degBed() > target_bed || thermalManager.degProbe() > target_probe)
+ report_temps(next_temp_report);
// Disable leveling so it won't mess with us
#if HAS_LEVELING
set_bed_leveling_enabled(false);
#endif
- bool timeout = false;
- while (true) {
+ for (;;) {
thermalManager.setTargetBed(target_bed);
- SERIAL_ECHOLNPAIR("Target Bed: ", target_bed, "; Probe: ", target_probe);
+ SERIAL_ECHOLNPAIR("Target Bed:", target_bed, " Probe:", target_probe);
// Park nozzle
- do_blocking_move_to(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y, ProbeTempComp::park_point.z);
+ do_blocking_move_to(parkpos);
// Wait for heatbed to reach target temp and probe to cool below target temp
- SERIAL_ECHOLNPGM("Waiting for bed and probe to reach target temp.");
- const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
- while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1 || thermalManager.degProbe() > target_probe) {
- idle(
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- true
- #endif
- );
- const millis_t ms = millis();
- if (ELAPSED(ms, next_temp_report)) {
- thermalManager.print_heater_states(active_extruder);
- next_temp_report = ms + 1000;
- }
- if (ELAPSED(ms, probe_timeout_ms)) {
- SERIAL_ECHOLNPGM("!Bed heating timeout.");
- timeout = true;
- break;
- }
- }
-
- if (timeout) break;
-
- // Move probe to probing point and wait for probe to reach target temp
- destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y, 0.5);
- do_blocking_move_to(destination.x, destination.y, destination.z);
- SERIAL_ECHOLNPGM("Waiting for probe heating.");
- while (thermalManager.degProbe() < target_probe) {
- idle(
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- true
- #endif
- );
- const millis_t ms = millis();
- if (ELAPSED(ms, next_temp_report)) {
- thermalManager.print_heater_states(active_extruder);
- next_temp_report = ms + 1000;
- }
- }
-
- // Raise nozzle before probing
- destination.z = 5.0;
- do_blocking_move_to_z(destination.z);
-
- // Do a single probe
- remember_feedrate_scaling_off();
- const float measured_z = probe_at_point(
- destination.x + probe_offset.x,
- destination.y + probe_offset.y,
- PROBE_PT_NONE
- );
- restore_feedrate_and_scaling();
-
- if (isnan(measured_z)) {
- SERIAL_ECHOLNPGM("!Received NAN measurement - aborting.");
+ if (wait_for_temps(target_bed, target_probe, next_temp_report, millis() + 900UL * 1000UL)) {
+ SERIAL_ECHOLNPGM("!Bed heating timeout.");
break;
}
- else
- SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+
+ // Move the nozzle to the probing point and wait for the probe to reach target temp
+ do_blocking_move_to_xy(noz_pos);
+ SERIAL_ECHOLNPGM("Waiting for probe heating.");
+ while (thermalManager.degProbe() < target_probe)
+ report_temps(next_temp_report);
+
+ const float measured_z = g76_probe(noz_pos);
+ if (isnan(measured_z)) break;
if (target_bed == temp_comp.cali_info_init[TSI_BED].start_temp)
temp_comp.prepare_new_calibration(measured_z);
@@ -236,7 +209,7 @@ void GcodeSuite::G76() {
if (temp_comp.finish_calibration(TSI_BED))
SERIAL_ECHOLNPGM("Successfully calibrated bed.");
else
- SERIAL_ECHOLNPGM("!Failed to calibrated bed - reset calibration values.");
+ SERIAL_ECHOLNPGM("!Failed to calibrate bed. Values reset.");
// Cleanup
thermalManager.setTargetBed(0);
@@ -252,27 +225,16 @@ void GcodeSuite::G76() {
if (do_probe_cal) {
// Park nozzle
- do_blocking_move_to(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y, ProbeTempComp::park_point.z);
+ do_blocking_move_to(parkpos);
// Initialize temperatures
- uint16_t target_bed = temp_comp.probe_calib_bed_temp,
- target_probe = temp_comp.cali_info_init[TSI_BED].start_temp;
+ const uint16_t target_bed = temp_comp.probe_calib_bed_temp;
thermalManager.setTargetBed(target_bed);
- SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
- while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
- || thermalManager.degProbe() > target_probe
- ) {
- idle(
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- true
- #endif
- );
- const millis_t ms = millis();
- if (ELAPSED(ms, next_temp_report)) {
- thermalManager.print_heater_states(active_extruder);
- next_temp_report = ms + 1000;
- }
- }
+
+ uint16_t target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
+
+ // Wait for heatbed to reach target temp and probe to cool below target temp
+ wait_for_temps(target_bed, target_probe, next_temp_report);
// Disable leveling so it won't mess with us
#if HAS_LEVELING
@@ -280,72 +242,39 @@ void GcodeSuite::G76() {
#endif
bool timeout = false;
- while (true) {
+ for (;;) {
// Move probe to probing point and wait for it to reach target temperature
- destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y, 0.5);
- do_blocking_move_to(destination);
-
- SERIAL_ECHOLNPAIR(
- "Bed temp: ", target_bed,
- "; Probe temp: ", target_probe,
- " Waiting for probe heating."
- );
+ do_blocking_move_to_xy(noz_pos);
+ SERIAL_ECHOLNPAIR("Waiting for probe heating. Bed:", target_bed, " Probe:", target_probe);
const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
while (thermalManager.degProbe() < target_probe) {
- idle(
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- true
- #endif
- );
- const millis_t ms = millis();
- if (ELAPSED(ms, next_temp_report)) {
- thermalManager.print_heater_states(active_extruder);
- next_temp_report = ms + 1000;
- }
- if (ELAPSED(ms, probe_timeout_ms)) {
- SERIAL_ECHOLNPGM("!Probe heating aborted due to timeout.");
+ if (report_temps(next_temp_report, probe_timeout_ms)) {
+ SERIAL_ECHOLNPGM("!Probe heating timed out.");
timeout = true;
break;
}
}
-
if (timeout) break;
- // Raise nozzle before probing
- destination.z = 5.0;
- do_blocking_move_to_z(destination.z);
+ const float measured_z = g76_probe(noz_pos);
+ if (isnan(measured_z)) break;
- // Do a single probe
- remember_feedrate_scaling_off();
- const float measured_z = probe_at_point(
- destination.x + probe_offset.x,
- destination.y + probe_offset.y,
- PROBE_PT_NONE
- );
- restore_feedrate_and_scaling();
-
- if (isnan(measured_z)) {
- SERIAL_ECHOLNPGM("!Received NAN measurement - aborting.");
- break;
- }
- else
- SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
-
- if (target_probe == temp_comp.cali_info_init[TSI_BED].start_temp)
+ if (target_probe == temp_comp.cali_info_init[TSI_PROBE].start_temp)
temp_comp.prepare_new_calibration(measured_z);
else
temp_comp.push_back_new_measurement(TSI_PROBE, measured_z);
- target_probe += temp_comp.cali_info_init[TSI_BED].temp_res;
- if (target_probe > temp_comp.cali_info_init[TSI_BED].end_temp) break;
+ target_probe += temp_comp.cali_info_init[TSI_PROBE].temp_res;
+ if (target_probe > temp_comp.cali_info_init[TSI_PROBE].end_temp) break;
}
SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
if (temp_comp.finish_calibration(TSI_PROBE))
- SERIAL_ECHOLNPGM("Successfully calibrated probe.");
+ SERIAL_ECHOPGM("Successfully calibrated");
else
- SERIAL_ECHOLNPGM("!Failed to calibrated probe.");
+ SERIAL_ECHOPGM("!Failed to calibrate");
+ SERIAL_ECHOLNPGM(" probe.");
// Cleanup
thermalManager.setTargetBed(0);
@@ -356,6 +285,8 @@ void GcodeSuite::G76() {
SERIAL_ECHOLNPGM("Final compensation values:");
temp_comp.print_offsets();
} // do_probe_cal
+
+ restore_feedrate_and_scaling();
}
/**
diff --git a/Marlin/src/gcode/calibrate/M100.cpp b/Marlin/src/gcode/calibrate/M100.cpp
index a77583c6e1..6b8a0de528 100644
--- a/Marlin/src/gcode/calibrate/M100.cpp
+++ b/Marlin/src/gcode/calibrate/M100.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -158,14 +158,14 @@ inline int32_t count_test_bytes(const char * const start_free_memory) {
while (start_free_memory < end_free_memory) {
print_hex_address(start_free_memory); // Print the address
SERIAL_CHAR(':');
- for (uint8_t i = 0; i < 16; i++) { // and 16 data bytes
+ LOOP_L_N(i, 16) { // and 16 data bytes
if (i == 8) SERIAL_CHAR('-');
print_hex_byte(start_free_memory[i]);
SERIAL_CHAR(' ');
}
serial_delay(25);
SERIAL_CHAR('|'); // Point out non test bytes
- for (uint8_t i = 0; i < 16; i++) {
+ LOOP_L_N(i, 16) {
char ccc = (char)start_free_memory[i]; // cast to char before automatically casting to char on assignment, in case the compiler is broken
ccc = (ccc == TEST_BYTE) ? ' ' : '?';
SERIAL_CHAR(ccc);
diff --git a/Marlin/src/gcode/calibrate/M12.cpp b/Marlin/src/gcode/calibrate/M12.cpp
index 2474c4bc41..26f15bb892 100644
--- a/Marlin/src/gcode/calibrate/M12.cpp
+++ b/Marlin/src/gcode/calibrate/M12.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index a83ccd65c1..980152a4b1 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -47,7 +47,7 @@ void GcodeSuite::M425() {
bool noArgs = true;
LOOP_XYZ(a) {
- if (parser.seen(axis_codes[a])) {
+ if (CAN_CALIBRATE(a) && parser.seen(XYZ_CHAR(a))) {
planner.synchronize();
backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
noArgs = false;
@@ -74,8 +74,8 @@ void GcodeSuite::M425() {
SERIAL_ECHOLNPGM("active:");
SERIAL_ECHOLNPAIR(" Correction Amount/Fade-out: F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
SERIAL_ECHOPGM(" Backlash Distance (mm): ");
- LOOP_XYZ(a) {
- SERIAL_CHAR(' ', axis_codes[a]);
+ LOOP_XYZ(a) if (CAN_CALIBRATE(a)) {
+ SERIAL_CHAR(' ', XYZ_CHAR(a));
SERIAL_ECHO(backlash.distance_mm[a]);
SERIAL_EOL();
}
@@ -87,8 +87,8 @@ void GcodeSuite::M425() {
#if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
SERIAL_ECHOPGM(" Average measured backlash (mm):");
if (backlash.has_any_measurement()) {
- LOOP_XYZ(a) if (backlash.has_measurement(AxisEnum(a))) {
- SERIAL_CHAR(' ', axis_codes[a]);
+ LOOP_XYZ(a) if (CAN_CALIBRATE(a) && backlash.has_measurement(AxisEnum(a))) {
+ SERIAL_CHAR(' ', XYZ_CHAR(a));
SERIAL_ECHO(backlash.get_measurement(AxisEnum(a)));
}
}
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index f111de4b17..c1e8b0e9f8 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -53,6 +53,9 @@
*
* This function requires the machine to be homed before invocation.
*/
+
+extern const char SP_Y_STR[];
+
void GcodeSuite::M48() {
if (axis_unhomed_error()) return;
@@ -77,11 +80,11 @@ void GcodeSuite::M48() {
xy_float_t next_pos = current_position;
const xy_pos_t probe_pos = {
- parser.linearval('X', next_pos.x + probe_offset_xy.x),
- parser.linearval('Y', next_pos.y + probe_offset_xy.y)
+ parser.linearval('X', next_pos.x + probe.offset_xy.x), // If no X use the probe's current X position
+ parser.linearval('Y', next_pos.y + probe.offset_xy.y) // If no Y, ditto
};
- if (!position_is_reachable_by_probe(probe_pos)) {
+ if (!probe.can_reach(probe_pos)) {
SERIAL_ECHOLNPGM("? (X,Y) out of bounds.");
return;
}
@@ -117,13 +120,13 @@ void GcodeSuite::M48() {
float mean = 0.0, sigma = 0.0, min = 99999.9, max = -99999.9, sample_set[n_samples];
// Move to the first point, deploy, and probe
- const float t = probe_at_point(probe_pos, raise_after, verbose_level);
+ const float t = probe.probe_at_point(probe_pos, raise_after, verbose_level);
bool probing_good = !isnan(t);
if (probing_good) {
randomSeed(millis());
- for (uint8_t n = 0; n < n_samples; n++) {
+ LOOP_L_N(n, n_samples) {
#if HAS_SPI_LCD
// Display M48 progress in the status bar
ui.status_printf_P(0, PSTR(S_FMT ": %d/%d"), GET_TEXT(MSG_M48_POINT), int(n + 1), int(n_samples));
@@ -146,7 +149,7 @@ void GcodeSuite::M48() {
SERIAL_ECHOLNPGM("CW");
}
- for (uint8_t l = 0; l < n_legs - 1; l++) {
+ LOOP_L_N(l, n_legs - 1) {
float delta_angle;
if (schizoid_flag) {
@@ -166,7 +169,7 @@ void GcodeSuite::M48() {
while (angle < 0.0) angle += 360.0; // outside of this range. It looks like they behave correctly with
// numbers outside of the range, but just to be safe we clamp them.
- const xy_pos_t noz_pos = probe_pos - probe_offset_xy;
+ const xy_pos_t noz_pos = probe_pos - probe.offset_xy;
next_pos.set(noz_pos.x + cos(RADIANS(angle)) * radius,
noz_pos.y + sin(RADIANS(angle)) * radius);
@@ -176,7 +179,7 @@ void GcodeSuite::M48() {
#else
// If we have gone out too far, we can do a simple fix and scale the numbers
// back in closer to the origin.
- while (!position_is_reachable_by_probe(next_pos)) {
+ while (!probe.can_reach(next_pos)) {
next_pos *= 0.8f;
if (verbose_level > 3)
SERIAL_ECHOLNPAIR_P(PSTR("Moving inward: X"), next_pos.x, SP_Y_STR, next_pos.y);
@@ -191,7 +194,7 @@ void GcodeSuite::M48() {
} // n_legs
// Probe a single point
- sample_set[n] = probe_at_point(probe_pos, raise_after, 0);
+ sample_set[n] = probe.probe_at_point(probe_pos, raise_after, 0);
// Break the loop if the probe fails
probing_good = !isnan(sample_set[n]);
@@ -201,7 +204,7 @@ void GcodeSuite::M48() {
* Get the current mean for the data points we have so far
*/
float sum = 0.0;
- for (uint8_t j = 0; j <= n; j++) sum += sample_set[j];
+ LOOP_LE_N(j, n) sum += sample_set[j];
mean = sum / (n + 1);
NOMORE(min, sample_set[n]);
@@ -212,7 +215,7 @@ void GcodeSuite::M48() {
* data points we have so far
*/
sum = 0.0;
- for (uint8_t j = 0; j <= n; j++)
+ LOOP_LE_N(j, n)
sum += sq(sample_set[j] - mean);
sigma = SQRT(sum / (n + 1));
@@ -235,7 +238,7 @@ void GcodeSuite::M48() {
} // n_samples loop
}
- STOW_PROBE();
+ probe.stow();
if (probing_good) {
SERIAL_ECHOLNPGM("Finished!");
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index 6234265b3d..0436736b4a 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index ea429875c5..721cbcfaa0 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,10 +40,10 @@
void GcodeSuite::M666() {
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> M666");
LOOP_XYZ(i) {
- if (parser.seen(axis_codes[i])) {
+ if (parser.seen(XYZ_CHAR(i))) {
const float v = parser.value_linear_units();
if (v * Z_HOME_DIR <= 0) delta_endstop_adj[i] = v;
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", axis_codes[i], "] = ", delta_endstop_adj[i]);
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", XYZ_CHAR(i), "] = ", delta_endstop_adj[i]);
}
}
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< M666");
@@ -94,13 +94,8 @@
SERIAL_ECHOPAIR(" Y2:", endstops.y2_endstop_adj);
#endif
#if ENABLED(Z_MULTI_ENDSTOPS)
- SERIAL_ECHOPAIR(" Z2:", endstops.z2_endstop_adj);
- #if NUM_Z_STEPPER_DRIVERS >= 3
- SERIAL_ECHOPAIR(" Z3:", endstops.z3_endstop_adj);
- #if NUM_Z_STEPPER_DRIVERS >= 4
- SERIAL_ECHOPAIR(" Z4:", endstops.z4_endstop_adj);
- #endif
- #endif
+ #define _ECHO_ZADJ(N) SERIAL_ECHOPAIR(" Z" STRINGIFY(N) ":", endstops.z##N##_endstop_adj);
+ REPEAT_S(2, INCREMENT(NUM_Z_STEPPER_DRIVERS), _ECHO_ZADJ)
#endif
SERIAL_EOL();
}
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index 4bb068e5b2..865b03def3 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -82,7 +82,7 @@ void GcodeSuite::M852() {
#endif
if (badval)
- SERIAL_ECHOLNPGM(MSG_SKEW_MIN " " STRINGIFY(SKEW_FACTOR_MIN) " " MSG_SKEW_MAX " " STRINGIFY(SKEW_FACTOR_MAX));
+ SERIAL_ECHOLNPGM(STR_SKEW_MIN " " STRINGIFY(SKEW_FACTOR_MIN) " " STR_SKEW_MAX " " STRINGIFY(SKEW_FACTOR_MAX));
// When skew is changed the current position changes
if (setval) {
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 594813e038..b9192198bd 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -41,8 +41,9 @@
// setting any extruder filament size disables volumetric on the assumption that
// slicers either generate in extruder values as cubic mm or as as filament feeds
// for all extruders
- if ( (parser.volumetric_enabled = (parser.value_linear_units() != 0)) )
- planner.set_filament_size(target_extruder, parser.value_linear_units());
+ const float dval = parser.value_linear_units();
+ if ( (parser.volumetric_enabled = (dval != 0)) )
+ planner.set_filament_size(target_extruder, dval);
}
planner.calculate_volumetric_multipliers();
}
@@ -95,7 +96,7 @@ void GcodeSuite::M204() {
if (!parser.seen("PRST")) {
SERIAL_ECHOPAIR("Acceleration: P", planner.settings.acceleration);
SERIAL_ECHOPAIR(" R", planner.settings.retract_acceleration);
- SERIAL_ECHOLNPAIR(" T", planner.settings.travel_acceleration);
+ SERIAL_ECHOLNPAIR_P(SP_T_STR, planner.settings.travel_acceleration);
}
else {
//planner.synchronize();
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 57178950cb..44e69c4298 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@ void M217_report(const bool eeprom=false) {
serialprintPGM(eeprom ? PSTR(" M217") : PSTR("Toolchange:"));
SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length));
SERIAL_ECHOPAIR_P(SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime));
- SERIAL_ECHOPAIR(" P", LINEAR_UNIT(toolchange_settings.prime_speed));
+ SERIAL_ECHOPAIR_P(SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed));
#if ENABLED(TOOLCHANGE_PARK)
diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp
index 790d7714a3..5c7d5eac71 100644
--- a/Marlin/src/gcode/config/M218.cpp
+++ b/Marlin/src/gcode/config/M218.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -50,7 +50,7 @@ void GcodeSuite::M218() {
if (!parser.seen("XYZ")) {
SERIAL_ECHO_START();
- SERIAL_ECHOPGM(MSG_HOTEND_OFFSET);
+ SERIAL_ECHOPGM(STR_HOTEND_OFFSET);
HOTEND_LOOP() {
SERIAL_CHAR(' ');
SERIAL_ECHO(hotend_offset[e].x);
diff --git a/Marlin/src/gcode/config/M220.cpp b/Marlin/src/gcode/config/M220.cpp
index 3710a30ab9..f24c11e23d 100644
--- a/Marlin/src/gcode/config/M220.cpp
+++ b/Marlin/src/gcode/config/M220.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,6 +29,8 @@
* Parameters
* S : Set the feed rate percentage factor
*
+ * Report the current speed percentage factor if no parameter is specified
+ *
* With PRUSA_MMU2...
* B : Flag to back up the current factor
* R : Flag to restore the last-saved factor
@@ -43,4 +45,9 @@ void GcodeSuite::M220() {
if (parser.seenval('S')) feedrate_percentage = parser.value_int();
+ if (!parser.seen_any()) {
+ SERIAL_ECHOPAIR("FR:", feedrate_percentage);
+ SERIAL_CHAR('%');
+ SERIAL_EOL();
+ }
}
diff --git a/Marlin/src/gcode/config/M221.cpp b/Marlin/src/gcode/config/M221.cpp
index a7a48c3730..8522b544fc 100644
--- a/Marlin/src/gcode/config/M221.cpp
+++ b/Marlin/src/gcode/config/M221.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index a694cb2df4..e925cd5b12 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,6 +30,12 @@ void GcodeSuite::M281() {
if (!parser.seenval('P')) return;
const int servo_index = parser.value_int();
if (WITHIN(servo_index, 0, NUM_SERVOS - 1)) {
+ #if ENABLED(BLTOUCH)
+ if (servo_index == Z_PROBE_SERVO_NR) {
+ SERIAL_ERROR_MSG("BLTouch angles can't be changed.");
+ return;
+ }
+ #endif
bool angle_change = false;
if (parser.seen('L')) {
servo_angles[servo_index][0] = parser.value_int();
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index 0449293bf5..54d32c8650 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -68,7 +68,7 @@ void GcodeSuite::M301() {
SERIAL_ECHO_START();
#if ENABLED(PID_PARAMS_PER_HOTEND)
SERIAL_ECHOPAIR(" e:", e); // specify extruder in serial output
- #endif // PID_PARAMS_PER_HOTEND
+ #endif
SERIAL_ECHOPAIR(" p:", PID_PARAM(Kp, e),
" i:", unscalePID_i(PID_PARAM(Ki, e)),
" d:", unscalePID_d(PID_PARAM(Kd, e)));
@@ -82,7 +82,7 @@ void GcodeSuite::M301() {
SERIAL_EOL();
}
else
- SERIAL_ERROR_MSG(MSG_INVALID_EXTRUDER);
+ SERIAL_ERROR_MSG(STR_INVALID_EXTRUDER);
}
#endif // PIDTEMP
diff --git a/Marlin/src/gcode/config/M302.cpp b/Marlin/src/gcode/config/M302.cpp
index 891f3c8258..aa178ea206 100644
--- a/Marlin/src/gcode/config/M302.cpp
+++ b/Marlin/src/gcode/config/M302.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index 3048c228d5..2a85149424 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,6 +27,13 @@
#include "../gcode.h"
#include "../../module/temperature.h"
+/**
+ * M304 - Set and/or Report the current Bed PID values
+ *
+ * P - Set the P value
+ * I - Set the I value
+ * D - Set the D value
+ */
void GcodeSuite::M304() {
if (parser.seen('P')) thermalManager.temp_bed.pid.Kp = parser.value_float();
if (parser.seen('I')) thermalManager.temp_bed.pid.Ki = scalePID_i(parser.value_float());
diff --git a/Marlin/src/gcode/config/M305.cpp b/Marlin/src/gcode/config/M305.cpp
index b697540986..d45e18f1b3 100644
--- a/Marlin/src/gcode/config/M305.cpp
+++ b/Marlin/src/gcode/config/M305.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -71,7 +71,7 @@ void GcodeSuite::M305() {
SERIAL_ECHO_MSG("!Invalid Steinhart-Hart C coeff. (-0.01 < C < +0.01)");
} // If not setting then report parameters
else if (t_index < 0) { // ...all user thermistors
- for (uint8_t i = 0; i < USER_THERMISTORS; i++)
+ LOOP_L_N(i, USER_THERMISTORS)
thermalManager.log_user_thermistor(i);
}
else // ...one user thermistor
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 5937b4c721..baf5efb137 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,7 +43,7 @@
#endif
#if ENABLED(EXTENSIBLE_UI)
- #include "../../lcd/extensible_ui/ui_api.h"
+ #include "../../lcd/extui/ui_api.h"
#endif
#ifndef GET_PIN_MAP_PIN_M43
@@ -57,16 +57,21 @@ inline void toggle_pins() {
end = PARSED_PIN_INDEX('L', NUM_DIGITAL_PINS - 1),
wait = parser.intval('W', 500);
- for (uint8_t i = start; i <= end; i++) {
+ LOOP_S_LE_N(i, start, end) {
pin_t pin = GET_PIN_MAP_PIN_M43(i);
if (!VALID_PIN(pin)) continue;
if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) {
- report_pin_state_extended(pin, ignore_protection, true, "Untouched ");
+ report_pin_state_extended(pin, ignore_protection, true, PSTR("Untouched "));
SERIAL_EOL();
}
else {
watchdog_refresh();
- report_pin_state_extended(pin, ignore_protection, true, "Pulsing ");
+ report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing "));
+ #ifdef __STM32F1__
+ const auto prior_mode = _GET_MODE(i);
+ #else
+ const bool prior_mode = GET_PINMODE(pin);
+ #endif
#if AVR_AT90USB1286_FAMILY // Teensy IDEs don't know about these pins so must use FASTIO
if (pin == TEENSY_E2) {
SET_OUTPUT(TEENSY_E2);
@@ -95,6 +100,11 @@ inline void toggle_pins() {
watchdog_refresh();
}
}
+ #ifdef __STM32F1__
+ _SET_MODE(i, prior_mode);
+ #else
+ pinMode(pin, prior_mode);
+ #endif
}
SERIAL_EOL();
}
@@ -313,7 +323,7 @@ void GcodeSuite::M43() {
NOLESS(first_pin, 2); // Don't hijack the UART pins
#endif
uint8_t pin_state[last_pin - first_pin + 1];
- for (uint8_t i = first_pin; i <= last_pin; i++) {
+ LOOP_S_LE_N(i, first_pin, last_pin) {
pin_t pin = GET_PIN_MAP_PIN_M43(i);
if (!VALID_PIN(pin)) continue;
if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
@@ -339,7 +349,7 @@ void GcodeSuite::M43() {
#endif
for (;;) {
- for (uint8_t i = first_pin; i <= last_pin; i++) {
+ LOOP_S_LE_N(i, first_pin, last_pin) {
pin_t pin = GET_PIN_MAP_PIN_M43(i);
if (!VALID_PIN(pin)) continue;
if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
@@ -365,7 +375,7 @@ void GcodeSuite::M43() {
}
else {
// Report current state of selected pin(s)
- for (uint8_t i = first_pin; i <= last_pin; i++) {
+ LOOP_S_LE_N(i, first_pin, last_pin) {
pin_t pin = GET_PIN_MAP_PIN_M43(i);
if (VALID_PIN(pin)) report_pin_state_extended(pin, ignore_protection, true);
}
diff --git a/Marlin/src/gcode/config/M540.cpp b/Marlin/src/gcode/config/M540.cpp
index fa04fa059d..a8ec628d5a 100644
--- a/Marlin/src/gcode/config/M540.cpp
+++ b/Marlin/src/gcode/config/M540.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M575.cpp b/Marlin/src/gcode/config/M575.cpp
index 0abc8f9fea..947af14e30 100644
--- a/Marlin/src/gcode/config/M575.cpp
+++ b/Marlin/src/gcode/config/M575.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M672.cpp b/Marlin/src/gcode/config/M672.cpp
index ca4b028dc7..cc160bde66 100644
--- a/Marlin/src/gcode/config/M672.cpp
+++ b/Marlin/src/gcode/config/M672.cpp
@@ -62,7 +62,7 @@
// b3 b2 b1 b0 ~b0 ... lo bits, NOT last bit
//
void M672_send(uint8_t b) { // bit rate requirement: 1KHz +/- 30%
- for (uint8_t bits = 0; bits < 14; bits++) {
+ LOOP_L_N(bits, 14) {
switch (bits) {
default: { OUT_WRITE(SMART_EFFECTOR_MOD_PIN, !!(b & 0x80)); b <<= 1; break; } // send bit, shift next into place
case 7:
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 212b6f83b7..bc86ff4d32 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,7 +34,7 @@ void report_M92(const bool echo=true, const int8_t e=-1) {
SERIAL_EOL();
#if ENABLED(DISTINCT_E_FACTORS)
- for (uint8_t i = 0; i < E_STEPPERS; i++) {
+ LOOP_L_N(i, E_STEPPERS) {
if (e >= 0 && i != e) continue;
if (echo) SERIAL_ECHO_START(); else SERIAL_CHAR(' ');
SERIAL_ECHOLNPAIR_P(PSTR(" M92 T"), (int)i,
diff --git a/Marlin/src/gcode/control/M108_M112_M410.cpp b/Marlin/src/gcode/control/M108_M112_M410.cpp
index 606a39d51c..cb4220507d 100644
--- a/Marlin/src/gcode/control/M108_M112_M410.cpp
+++ b/Marlin/src/gcode/control/M108_M112_M410.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index 1c608408f3..20ed44fb2e 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,13 +28,13 @@
void GcodeSuite::M111() {
if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
- static const char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
- str_debug_2[] PROGMEM = MSG_DEBUG_INFO,
- str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS,
- str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN,
- str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION
+ static const char str_debug_1[] PROGMEM = STR_DEBUG_ECHO,
+ str_debug_2[] PROGMEM = STR_DEBUG_INFO,
+ str_debug_4[] PROGMEM = STR_DEBUG_ERRORS,
+ str_debug_8[] PROGMEM = STR_DEBUG_DRYRUN,
+ str_debug_16[] PROGMEM = STR_DEBUG_COMMUNICATION
#if ENABLED(DEBUG_LEVELING_FEATURE)
- , str_debug_lvl[] PROGMEM = MSG_DEBUG_LEVELING
+ , str_debug_lvl[] PROGMEM = STR_DEBUG_LEVELING
#endif
;
@@ -46,10 +46,10 @@ void GcodeSuite::M111() {
};
SERIAL_ECHO_START();
- SERIAL_ECHOPGM(MSG_DEBUG_PREFIX);
+ SERIAL_ECHOPGM(STR_DEBUG_PREFIX);
if (marlin_debug_flags) {
uint8_t comma = 0;
- for (uint8_t i = 0; i < COUNT(debug_strings); i++) {
+ LOOP_L_N(i, COUNT(debug_strings)) {
if (TEST(marlin_debug_flags, i)) {
if (comma++) SERIAL_CHAR(',');
serialprintPGM((char*)pgm_read_ptr(&debug_strings[i]));
@@ -57,7 +57,7 @@ void GcodeSuite::M111() {
}
}
else {
- SERIAL_ECHOPGM(MSG_DEBUG_OFF);
+ SERIAL_ECHOPGM(STR_DEBUG_OFF);
#if !defined(__AVR__) || !defined(USBCON)
#if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
SERIAL_ECHOPAIR("\nBuffer Overruns: ", MYSERIAL0.buffer_overruns());
diff --git a/Marlin/src/gcode/control/M120_M121.cpp b/Marlin/src/gcode/control/M120_M121.cpp
index 7ee6a83fbf..b25834cbda 100644
--- a/Marlin/src/gcode/control/M120_M121.cpp
+++ b/Marlin/src/gcode/control/M120_M121.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 081ca18d89..d69654a959 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,9 +34,9 @@
*/
void GcodeSuite::M17() {
if (parser.seen("XYZE")) {
- if (parser.seen('X')) enable_X();
- if (parser.seen('Y')) enable_Y();
- if (parser.seen('Z')) enable_Z();
+ if (parser.seen('X')) ENABLE_AXIS_X();
+ if (parser.seen('Y')) ENABLE_AXIS_Y();
+ if (parser.seen('Z')) ENABLE_AXIS_Z();
#if HAS_E_STEPPER_ENABLE
if (parser.seen('E')) enable_e_steppers();
#endif
@@ -57,9 +57,9 @@ void GcodeSuite::M18_M84() {
else {
if (parser.seen("XYZE")) {
planner.synchronize();
- if (parser.seen('X')) disable_X();
- if (parser.seen('Y')) disable_Y();
- if (parser.seen('Z')) disable_Z();
+ if (parser.seen('X')) DISABLE_AXIS_X();
+ if (parser.seen('Y')) DISABLE_AXIS_Y();
+ if (parser.seen('Z')) DISABLE_AXIS_Z();
#if HAS_E_STEPPER_ENABLE
if (parser.seen('E')) disable_e_steppers();
#endif
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index 432ab1379a..3b0a928b8f 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,11 +36,11 @@ void GcodeSuite::M211() {
const xyz_pos_t l_soft_min = soft_endstop.min.asLogical(),
l_soft_max = soft_endstop.max.asLogical();
SERIAL_ECHO_START();
- SERIAL_ECHOPGM(MSG_SOFT_ENDSTOPS);
+ SERIAL_ECHOPGM(STR_SOFT_ENDSTOPS);
if (parser.seen('S')) soft_endstops_enabled = parser.value_bool();
serialprint_onoff(soft_endstops_enabled);
- print_xyz(l_soft_min, PSTR(MSG_SOFT_MIN), PSTR(" "));
- print_xyz(l_soft_max, PSTR(MSG_SOFT_MAX));
+ print_xyz(l_soft_min, PSTR(STR_SOFT_MIN), PSTR(" "));
+ print_xyz(l_soft_max, PSTR(STR_SOFT_MAX));
}
#endif
diff --git a/Marlin/src/gcode/control/M226.cpp b/Marlin/src/gcode/control/M226.cpp
index 3dbc5984f9..0dfbfd6252 100644
--- a/Marlin/src/gcode/control/M226.cpp
+++ b/Marlin/src/gcode/control/M226.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M280.cpp b/Marlin/src/gcode/control/M280.cpp
index 6b65e9b753..21a6c9890d 100644
--- a/Marlin/src/gcode/control/M280.cpp
+++ b/Marlin/src/gcode/control/M280.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index 81e1645193..56e1e0e4ec 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index 44a2dd4943..54b29a21d3 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,7 +33,7 @@
* Warning: Steps-per-unit remains unchanged.
*/
void GcodeSuite::M350() {
- if (parser.seen('S')) for (uint8_t i = 0; i <= 4; i++) stepper.microstep_mode(i, parser.value_byte());
+ if (parser.seen('S')) LOOP_LE_N(i, 4) stepper.microstep_mode(i, parser.value_byte());
LOOP_XYZE(i) if (parser.seen(axis_codes[i])) stepper.microstep_mode(i, parser.value_byte());
if (parser.seen('B')) stepper.microstep_mode(4, parser.value_byte());
stepper.microstep_readings();
diff --git a/Marlin/src/gcode/control/M380_M381.cpp b/Marlin/src/gcode/control/M380_M381.cpp
index 58d0431698..756021a59b 100644
--- a/Marlin/src/gcode/control/M380_M381.cpp
+++ b/Marlin/src/gcode/control/M380_M381.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M400.cpp b/Marlin/src/gcode/control/M400.cpp
index 445aa9c979..3926299807 100644
--- a/Marlin/src/gcode/control/M400.cpp
+++ b/Marlin/src/gcode/control/M400.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 1ee03f8905..74625b0318 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,16 +37,33 @@
*
* S Pin status from 0 - 255
* I Flag to ignore Marlin's pin protection
+ *
+ * M Pin mode: 0=INPUT 1=OUTPUT 2=INPUT_PULLUP 3=INPUT_PULLDOWN
*/
void GcodeSuite::M42() {
- if (!parser.seenval('S')) return;
- const byte pin_status = parser.value_byte();
-
const int pin_index = PARSED_PIN_INDEX('P', GET_PIN_MAP_INDEX(LED_PIN));
if (pin_index < 0) return;
const pin_t pin = GET_PIN_MAP_PIN(pin_index);
+ if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
+
+ if (parser.seenval('M')) {
+ switch (parser.value_byte()) {
+ case 0: pinMode(pin, INPUT); break;
+ case 1: pinMode(pin, OUTPUT); break;
+ case 2: pinMode(pin, INPUT_PULLUP); break;
+ #ifdef INPUT_PULLDOWN
+ case 3: pinMode(pin, INPUT_PULLDOWN); break;
+ #endif
+ default: SERIAL_ECHOLNPGM("Invalid Pin Mode");
+ }
+ return;
+ }
+
+ if (!parser.seenval('S')) return;
+ const byte pin_status = parser.value_byte();
+
#if FAN_COUNT > 0
switch (pin) {
#if HAS_FAN0
@@ -76,8 +93,6 @@ void GcodeSuite::M42() {
}
#endif
- if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
-
pinMode(pin, OUTPUT);
extDigitalWrite(pin, pin_status);
analogWrite(pin, pin_status);
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 007c6fc6b8..ab5efbbb48 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -137,8 +137,8 @@
DEBUG_EOL();
HOTEND_LOOP() {
- DEBUG_ECHOPAIR(" T", int(e));
- LOOP_XYZ(a) DEBUG_ECHOPAIR(" hotend_offset[", int(e), "].", axis_codes[a] | 0x20, "=", hotend_offset[e][a]);
+ DEBUG_ECHOPAIR_P(SP_T_STR, int(e));
+ LOOP_XYZ(a) DEBUG_ECHOPAIR(" hotend_offset[", int(e), "].", XYZ_CHAR(a) | 0x20, "=", hotend_offset[e][a]);
DEBUG_EOL();
}
DEBUG_EOL();
@@ -167,7 +167,7 @@
extruder_duplication_enabled = ena && (duplication_e_mask >= 3);
}
SERIAL_ECHO_START();
- SERIAL_ECHOPGM(MSG_DUPLICATION_MODE);
+ SERIAL_ECHOPGM(STR_DUPLICATION_MODE);
serialprint_onoff(extruder_duplication_enabled);
if (ena) {
SERIAL_ECHOPGM(" ( ");
diff --git a/Marlin/src/gcode/control/M7-M9.cpp b/Marlin/src/gcode/control/M7-M9.cpp
index 91898374fd..1fc8a93e2e 100644
--- a/Marlin/src/gcode/control/M7-M9.cpp
+++ b/Marlin/src/gcode/control/M7-M9.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index d2b395e8d8..e8d9aa2fdf 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -44,7 +44,7 @@
// Could be moved to a feature, but this is all the data
bool powersupply_on;
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
#include "../../feature/tmc_util.h"
#endif
@@ -110,6 +110,6 @@ void GcodeSuite::M81() {
#endif
#if HAS_LCD_MENU
- LCD_MESSAGEPGM_P(PSTR(MACHINE_NAME " " MSG_OFF "."));
+ LCD_MESSAGEPGM_P(PSTR(MACHINE_NAME " " STR_OFF "."));
#endif
}
diff --git a/Marlin/src/gcode/control/M85.cpp b/Marlin/src/gcode/control/M85.cpp
index 403c0c59ac..1cdf49f609 100644
--- a/Marlin/src/gcode/control/M85.cpp
+++ b/Marlin/src/gcode/control/M85.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index 369bba044f..1d9b12204d 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M999.cpp b/Marlin/src/gcode/control/M999.cpp
index ac46311067..79cd5e1854 100644
--- a/Marlin/src/gcode/control/M999.cpp
+++ b/Marlin/src/gcode/control/M999.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,7 +23,7 @@
#include "../gcode.h"
#include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
-#include "../../MarlinCore.h" // for Running
+#include "../../MarlinCore.h" // for marlin_state
#include "../queue.h" // for flush_and_request_resend
/**
@@ -37,7 +37,7 @@
*
*/
void GcodeSuite::M999() {
- Running = true;
+ marlin_state = MF_RUNNING;
ui.reset_alert_level();
if (parser.boolval('S')) return;
diff --git a/Marlin/src/gcode/control/T.cpp b/Marlin/src/gcode/control/T.cpp
index db6c173071..e6b3bb5d68 100644
--- a/Marlin/src/gcode/control/T.cpp
+++ b/Marlin/src/gcode/control/T.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,7 +28,7 @@
#endif
#if ENABLED(PRUSA_MMU2)
- #include "../../feature/prusa_MMU2/mmu2.h"
+ #include "../../feature/mmu2/mmu2.h"
#endif
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp
index 79bacf0662..17f9ff71fa 100644
--- a/Marlin/src/gcode/eeprom/M500-M504.cpp
+++ b/Marlin/src/gcode/eeprom/M500-M504.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin/src/gcode/feature/L6470/M122.cpp
index f3d8d0b60f..ec5f9aea28 100644
--- a/Marlin/src/gcode/feature/L6470/M122.cpp
+++ b/Marlin/src/gcode/feature/L6470/M122.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -136,6 +136,12 @@ void GcodeSuite::M122() {
#if AXIS_IS_L64XX(E5)
L6470_say_status(E5);
#endif
+ #if AXIS_IS_L64XX(E6)
+ L6470_say_status(E6);
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ L6470_say_status(E7);
+ #endif
L64xxManager.spi_active = false; // done with all SPI transfers - clear handshake flags
L64xxManager.spi_abort = false;
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 5d8d7e8d34..497fa75622 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -298,6 +298,12 @@ void GcodeSuite::M906() {
#if AXIS_IS_L64XX(E5)
case 5: L6470_SET_KVAL_HOLD(E5); break;
#endif
+ #if AXIS_IS_L64XX(E6)
+ case 6: L6470_SET_KVAL_HOLD(E6); break;
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ case 7: L6470_SET_KVAL_HOLD(E7); break;
+ #endif
}
} break;
}
@@ -350,6 +356,12 @@ void GcodeSuite::M906() {
#if AXIS_IS_L64XX(E5)
L64XX_REPORT_CURRENT(E5);
#endif
+ #if AXIS_IS_L64XX(E6)
+ L64XX_REPORT_CURRENT(E6);
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ L64XX_REPORT_CURRENT(E7);
+ #endif
L64xxManager.spi_active = false; // done with all SPI transfers - clear handshake flags
L64xxManager.spi_abort = false;
diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-918.cpp
index 9eb097ad49..a3eaf7b26a 100644
--- a/Marlin/src/gcode/feature/L6470/M916-918.cpp
+++ b/Marlin/src/gcode/feature/L6470/M916-918.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index f030511422..b3985401cf 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,11 +29,10 @@
#include "../../../module/stepper.h"
#if ENABLED(EXTRA_LIN_ADVANCE_K)
- float saved_extruder_advance_K[EXTRUDERS];
+ float other_extruder_advance_K[EXTRUDERS];
uint8_t lin_adv_slot = 0;
#endif
-
/**
* M900: Get or Set Linear Advance K-factor
* T Which tool to address
@@ -43,100 +42,106 @@
*/
void GcodeSuite::M900() {
+ auto echo_value_oor = [](const char ltr, const bool ten=true) {
+ SERIAL_CHAR('?'); SERIAL_CHAR(ltr);
+ SERIAL_ECHOPGM(" value out of range");
+ if (ten) SERIAL_ECHOPGM(" (0-10)");
+ SERIAL_ECHOLNPGM(".");
+ };
+
#if EXTRUDERS < 2
constexpr uint8_t tool_index = 0;
#else
const uint8_t tool_index = parser.intval('T', active_extruder);
if (tool_index >= EXTRUDERS) {
- SERIAL_ECHOLNPGM("?T value out of range.");
+ echo_value_oor('T', false);
return;
}
#endif
+ float &kref = planner.extruder_advance_K[tool_index], newK = kref;
+ const float oldK = newK;
+
#if ENABLED(EXTRA_LIN_ADVANCE_K)
- bool ext_slot = TEST(lin_adv_slot, tool_index);
+ float &lref = other_extruder_advance_K[tool_index];
- if (parser.seenval('S')) {
- const bool slot = parser.value_bool();
- if (ext_slot != slot) {
- ext_slot = slot;
- SET_BIT_TO(lin_adv_slot, tool_index, slot);
- planner.synchronize();
- const float temp = planner.extruder_advance_K[tool_index];
- planner.extruder_advance_K[tool_index] = saved_extruder_advance_K[tool_index];
- saved_extruder_advance_K[tool_index] = temp;
- }
+ const bool old_slot = TEST(lin_adv_slot, tool_index), // The tool's current slot (0 or 1)
+ new_slot = parser.boolval('S', old_slot); // The passed slot (default = current)
+
+ // If a new slot is being selected swap the current and
+ // saved K values. Do here so K/L will apply correctly.
+ if (new_slot != old_slot) { // Not the same slot?
+ SET_BIT_TO(lin_adv_slot, tool_index, new_slot); // Update the slot for the tool
+ newK = lref; // Get new K value from backup
+ lref = oldK; // Save K to backup
}
+ // Set the main K value. Apply if the main slot is active.
if (parser.seenval('K')) {
- const float newK = parser.value_float();
- if (WITHIN(newK, 0, 10)) {
- if (ext_slot)
- saved_extruder_advance_K[tool_index] = newK;
- else {
- planner.synchronize();
- planner.extruder_advance_K[tool_index] = newK;
- }
- }
- else
- SERIAL_ECHOLNPGM("?K value out of range (0-10).");
+ const float K = parser.value_float();
+ if (!WITHIN(K, 0, 10)) echo_value_oor('K');
+ else if (new_slot) lref = K; // S1 Knn
+ else newK = K; // S0 Knn
}
+ // Set the extra K value. Apply if the extra slot is active.
if (parser.seenval('L')) {
- const float newL = parser.value_float();
- if (WITHIN(newL, 0, 10)) {
- if (!ext_slot)
- saved_extruder_advance_K[tool_index] = newL;
- else {
- planner.synchronize();
- planner.extruder_advance_K[tool_index] = newL;
- }
- }
- else
- SERIAL_ECHOLNPGM("?L value out of range (0-10).");
- }
-
- if (!parser.seen_any()) {
- #if EXTRUDERS < 2
- SERIAL_ECHOLNPAIR("Advance S", ext_slot, " K", planner.extruder_advance_K[0],
- "(Slot ", 1 - ext_slot, " K", saved_extruder_advance_K[0], ")");
- #else
- LOOP_L_N(i, EXTRUDERS) {
- const int slot = (int)TEST(lin_adv_slot, i);
- SERIAL_ECHOLNPAIR("Advance T", int(i), " S", slot, " K", planner.extruder_advance_K[i],
- "(Slot ", 1 - slot, " K", saved_extruder_advance_K[i], ")");
- SERIAL_EOL();
- }
- #endif
+ const float L = parser.value_float();
+ if (!WITHIN(L, 0, 10)) echo_value_oor('L');
+ else if (!new_slot) lref = L; // S0 Lnn
+ else newK = L; // S1 Lnn
}
#else
if (parser.seenval('K')) {
- const float newK = parser.value_float();
- if (WITHIN(newK, 0, 10)) {
- planner.synchronize();
- planner.extruder_advance_K[tool_index] = newK;
- }
+ const float K = parser.value_float();
+ if (WITHIN(K, 0, 10))
+ newK = K;
else
- SERIAL_ECHOLNPGM("?K value out of range (0-10).");
+ echo_value_oor('K');
}
- else {
+
+ #endif
+
+ if (newK != oldK) {
+ planner.synchronize();
+ kref = newK;
+ }
+
+ if (!parser.seen_any()) {
+
+ #if ENABLED(EXTRA_LIN_ADVANCE_K)
+
+ #if EXTRUDERS < 2
+ SERIAL_ECHOLNPAIR("Advance S", int(new_slot), " K", kref, "(S", int(!new_slot), " K", lref, ")");
+ #else
+ LOOP_L_N(i, EXTRUDERS) {
+ const bool slot = TEST(lin_adv_slot, i);
+ SERIAL_ECHOLNPAIR("Advance T", int(i), " S", int(slot), " K", planner.extruder_advance_K[i],
+ "(S", int(!slot), " K", other_extruder_advance_K[i], ")");
+ SERIAL_EOL();
+ }
+ #endif
+
+ #else
+
SERIAL_ECHO_START();
#if EXTRUDERS < 2
SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
#else
SERIAL_ECHOPGM("Advance K");
LOOP_L_N(i, EXTRUDERS) {
- SERIAL_CHAR(' '); SERIAL_ECHO(int(i));
- SERIAL_CHAR('='); SERIAL_ECHO(planner.extruder_advance_K[i]);
+ SERIAL_CHAR(' ', '0' + i, ':');
+ SERIAL_ECHO(planner.extruder_advance_K[i]);
}
SERIAL_EOL();
#endif
- }
- #endif
+ #endif
+ }
+
}
#endif // LIN_ADVANCE
diff --git a/Marlin/src/gcode/feature/baricuda/M126-M129.cpp b/Marlin/src/gcode/feature/baricuda/M126-M129.cpp
index 3c1588d806..d96ee03af1 100644
--- a/Marlin/src/gcode/feature/baricuda/M126-M129.cpp
+++ b/Marlin/src/gcode/feature/baricuda/M126-M129.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index 147dfccf05..33ef9bf1a1 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -48,14 +48,8 @@
#ifdef PHOTO_RETRACT_MM
inline void e_move_m240(const float length, const feedRate_t &fr_mm_s) {
- if (length && thermalManager.hotEnoughToExtrude(active_extruder)) {
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- do_pause_e_move(length, fr_mm_s);
- #else
- current_position.e += length / planner.e_factor[active_extruder];
- line_to_current_position(fr_mm_s);
- #endif
- }
+ if (length && thermalManager.hotEnoughToExtrude(active_extruder))
+ unscaled_e_move(length, fr_mm_s);
}
#endif
@@ -90,7 +84,7 @@
inline void spin_photo_pin() {
static constexpr uint32_t sequence[] = PHOTO_PULSES_US;
- for (uint8_t i = 0; i < COUNT(sequence); i++)
+ LOOP_L_N(i, COUNT(sequence))
pulse_photo_pin(sequence[i], !(i & 1));
}
diff --git a/Marlin/src/gcode/feature/cancel/M486.cpp b/Marlin/src/gcode/feature/cancel/M486.cpp
index 2fcb4840f6..19216b2cb9 100644
--- a/Marlin/src/gcode/feature/cancel/M486.cpp
+++ b/Marlin/src/gcode/feature/cancel/M486.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/caselight/M355.cpp b/Marlin/src/gcode/feature/caselight/M355.cpp
index e9ee0a4977..ff793451bd 100644
--- a/Marlin/src/gcode/feature/caselight/M355.cpp
+++ b/Marlin/src/gcode/feature/caselight/M355.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/clean/G12.cpp b/Marlin/src/gcode/feature/clean/G12.cpp
index 30c71264eb..6d13a010be 100644
--- a/Marlin/src/gcode/feature/clean/G12.cpp
+++ b/Marlin/src/gcode/feature/clean/G12.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
new file mode 100644
index 0000000000..c19919b2d4
--- /dev/null
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -0,0 +1,81 @@
+/**
+ * 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 .
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+
+#include "../../gcode.h"
+#include "../../../feature/controllerfan.h"
+
+void M710_report(const bool forReplay) {
+ if (!forReplay) { SERIAL_ECHOLNPGM("; Controller Fan"); SERIAL_ECHO_START(); }
+ SERIAL_ECHOLNPAIR(" M710"
+ " S", int(controllerFan.settings.active_speed),
+ " I", int(controllerFan.settings.idle_speed),
+ " A", int(controllerFan.settings.auto_mode),
+ " D", controllerFan.settings.duration,
+ " ; (", (int(controllerFan.settings.active_speed) * 100) / 255, "%"
+ " ", (int(controllerFan.settings.idle_speed) * 100) / 255, "%)"
+ );
+}
+
+/**
+ * M710: Set controller fan settings
+ *
+ * R : Reset to defaults
+ * S[0-255] : Fan speed when motors are active
+ * I[0-255] : Fan speed when motors are idle
+ * A[0|1] : Turn auto mode on or off
+ * D : Set auto mode idle duration
+ *
+ * Examples:
+ * M710 ; Report current Settings
+ * M710 R ; Reset SIAD to defaults
+ * M710 I64 ; Set controller fan Idle Speed to 25%
+ * M710 S255 ; Set controller fan Active Speed to 100%
+ * M710 S0 ; Set controller fan Active Speed to OFF
+ * M710 I255 A0 ; Set controller fan Idle Speed to 100% with Auto Mode OFF
+ * M710 I127 A1 S255 D160 ; Set controller fan idle speed 50%, AutoMode On, Fan speed 100%, duration to 160 Secs
+ */
+void GcodeSuite::M710() {
+
+ const bool seenR = parser.seen('R');
+ if (seenR) controllerFan.reset();
+
+ const bool seenS = parser.seenval('S');
+ if (seenS) controllerFan.settings.active_speed = parser.value_byte();
+
+ const bool seenI = parser.seenval('I');
+ if (seenI) controllerFan.settings.idle_speed = parser.value_byte();
+
+ const bool seenA = parser.seenval('A');
+ if (seenA) controllerFan.settings.auto_mode = parser.value_bool();
+
+ const bool seenD = parser.seenval('D');
+ if (seenD) controllerFan.settings.duration = parser.value_ushort();
+
+ if (!(seenR || seenS || seenI || seenA || seenD))
+ M710_report(false);
+}
+
+#endif // CONTROLLER_FAN_EDITABLE
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index a7546b2833..fe8e37ebdd 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,7 +46,7 @@ void GcodeSuite::M907() {
LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper.digipot_current(i, parser.value_int());
if (parser.seenval('B')) stepper.digipot_current(4, parser.value_int());
- if (parser.seenval('S')) for (uint8_t i = 0; i <= 4; i++) stepper.digipot_current(i, parser.value_int());
+ if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.digipot_current(i, parser.value_int());
#elif HAS_MOTOR_CURRENT_PWM
@@ -74,7 +74,7 @@ void GcodeSuite::M907() {
#if ENABLED(DAC_STEPPER_CURRENT)
if (parser.seenval('S')) {
const float dac_percent = parser.value_float();
- for (uint8_t i = 0; i <= 4; i++) dac_current_percent(i, dac_percent);
+ LOOP_LE_N(i, 4) dac_current_percent(i, dac_percent);
}
LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) dac_current_percent(i, parser.value_float());
#endif
diff --git a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
index 36cac7857c..41e6e90aa1 100644
--- a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
+++ b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
index 2b2f2f1c65..75e5b6a588 100644
--- a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
+++ b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
index 316433fa46..6c48774c30 100644
--- a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
+++ b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/i2c/M260_M261.cpp b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
index 05fa2d3466..ea04d2a293 100644
--- a/Marlin/src/gcode/feature/i2c/M260_M261.cpp
+++ b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 405be898ae..656b7e5f90 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/leds/M7219.cpp b/Marlin/src/gcode/feature/leds/M7219.cpp
index c3d2643535..acbd55957f 100644
--- a/Marlin/src/gcode/feature/leds/M7219.cpp
+++ b/Marlin/src/gcode/feature/leds/M7219.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,7 +25,7 @@
#if ENABLED(MAX7219_GCODE)
#include "../../gcode.h"
-#include "../../../feature/Max7219_Debug_LEDs.h"
+#include "../../../feature/max7219.h"
/**
* M7219: Control the Max7219 LED matrix
@@ -79,7 +79,7 @@ void GcodeSuite::M7219() {
}
if (parser.seen('P')) {
- for (uint8_t r = 0; r < MAX7219_LINES; r++) {
+ LOOP_L_N(r, MAX7219_LINES) {
SERIAL_ECHOPGM("led_line[");
if (r < 10) SERIAL_CHAR(' ');
SERIAL_ECHO(int(r));
diff --git a/Marlin/src/gcode/feature/macro/M810-M819.cpp b/Marlin/src/gcode/feature/macro/M810-M819.cpp
index ea90229c38..c106de298a 100644
--- a/Marlin/src/gcode/feature/macro/M810-M819.cpp
+++ b/Marlin/src/gcode/feature/macro/M810-M819.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/mixing/M163-M165.cpp b/Marlin/src/gcode/feature/mixing/M163-M165.cpp
index cc0a468366..61be64edec 100644
--- a/Marlin/src/gcode/feature/mixing/M163-M165.cpp
+++ b/Marlin/src/gcode/feature/mixing/M163-M165.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/mixing/M166.cpp b/Marlin/src/gcode/feature/mixing/M166.cpp
index cb3541eb8f..b4618c8111 100644
--- a/Marlin/src/gcode/feature/mixing/M166.cpp
+++ b/Marlin/src/gcode/feature/mixing/M166.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,7 +35,7 @@ inline void echo_mix() {
inline void echo_zt(const int t, const float &z) {
mixer.update_mix_from_vtool(t);
- SERIAL_ECHOPAIR_P(SP_Z_STR, z, PSTR(" T"), t);
+ SERIAL_ECHOPAIR_P(SP_Z_STR, z, SP_T_STR, t);
echo_mix();
}
diff --git a/Marlin/src/gcode/feature/pause/G27.cpp b/Marlin/src/gcode/feature/pause/G27.cpp
index 4f4c9e4698..7f2f0d48b7 100644
--- a/Marlin/src/gcode/feature/pause/G27.cpp
+++ b/Marlin/src/gcode/feature/pause/G27.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
new file mode 100644
index 0000000000..45a8734ca3
--- /dev/null
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -0,0 +1,59 @@
+/**
+ * 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 .
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if SAVED_POSITIONS
+
+#include "../../../core/language.h"
+#include "../../gcode.h"
+#include "../../../module/motion.h"
+
+#define DEBUG_OUT ENABLED(SAVED_POSITIONS_DEBUG)
+#include "../../../core/debug_out.h"
+
+/**
+ * G60: Save current position
+ *
+ * S - Memory slot # (0-based) to save into (default 0)
+ */
+void GcodeSuite::G60() {
+ const uint8_t slot = parser.byteval('S');
+
+ if (slot >= SAVED_POSITIONS) {
+ SERIAL_ERROR_MSG(STR_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
+ return;
+ }
+
+ stored_position[slot] = current_position;
+ SBI(saved_slots[slot >> 3], slot & 0x07);
+
+ #if ENABLED(SAVED_POSITIONS_DEBUG)
+ const xyze_pos_t &pos = stored_position[slot];
+ DEBUG_ECHOPAIR_F(STR_SAVED_POS " S", slot);
+ DEBUG_ECHOPAIR_F(" : X", pos.x);
+ DEBUG_ECHOPAIR_F_P(SP_Y_STR, pos.y);
+ DEBUG_ECHOLNPAIR_F_P(SP_Z_STR, pos.z);
+ #endif
+}
+
+#endif // SAVED_POSITIONS
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
new file mode 100644
index 0000000000..60e6bcf040
--- /dev/null
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -0,0 +1,71 @@
+/**
+ * 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 .
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if SAVED_POSITIONS
+
+#include "../../../core/language.h"
+#include "../../../module/planner.h"
+#include "../../gcode.h"
+#include "../../../module/motion.h"
+
+/**
+ * G61: Return to saved position
+ *
+ * F - Feedrate (optional) for the move back.
+ * S - Slot # (0-based) to restore from (default 0).
+ * X Y Z - Axes to restore. At least one is required.
+ */
+void GcodeSuite::G61(void) {
+
+ const uint8_t slot = parser.byteval('S');
+
+ #if SAVED_POSITIONS < 256
+ if (slot >= SAVED_POSITIONS) {
+ SERIAL_ERROR_MSG(STR_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
+ return;
+ }
+ #endif
+
+ // No saved position? No axes being restored?
+ if (!TEST(saved_slots[slot >> 3], slot & 0x07) || !parser.seen("XYZ")) return;
+
+ // Apply any given feedrate over 0.0
+ const float fr = parser.linearval('F');
+ if (fr > 0.0) feedrate_mm_s = MMM_TO_MMS(fr);
+
+ SERIAL_ECHOPAIR(STR_RESTORING_POS " S", int(slot));
+ LOOP_XYZ(i) {
+ destination[i] = parser.seen(XYZ_CHAR(i))
+ ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
+ : current_position[i];
+ SERIAL_CHAR(' ', XYZ_CHAR(i));
+ SERIAL_ECHO_F(destination[i]);
+ }
+ SERIAL_EOL();
+
+ // Move to the saved position
+ prepare_line_to_destination();
+}
+
+#endif // SAVED_POSITIONS
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 22aaf2c446..206815a200 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,6 +35,10 @@
#include "../../../lcd/ultralcd.h"
#endif
+#if ENABLED(POWER_LOSS_RECOVERY)
+ #include "../../../feature/powerloss.h"
+#endif
+
/**
* M125: Store current position and move to parking position.
* Called on pause (by M25) to prevent material leaking onto the
@@ -85,6 +89,9 @@ void GcodeSuite::M125() {
#endif
if (pause_print(retract, park_point, 0, show_lcd)) {
+ #if ENABLED(POWER_LOSS_RECOVERY)
+ if (recovery.enabled) recovery.save(true);
+ #endif
if (!sd_printing || show_lcd) {
wait_for_confirmation(false, 0);
resume_print(0, 0, PAUSE_PARK_RETRACT_LENGTH, 0);
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 4056a398e4..fc7702796b 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index 60070821d8..620b8f4f27 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index 325b748aa9..aa3c3c4c30 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,7 +39,7 @@
#endif
#if ENABLED(PRUSA_MMU2)
- #include "../../../feature/prusa_MMU2/mmu2.h"
+ #include "../../../feature/mmu2/mmu2.h"
#endif
#if ENABLED(MIXING_EXTRUDER)
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index b85dc84c43..8d8cdc7557 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,11 +25,11 @@
#if ENABLED(POWER_LOSS_RECOVERY)
#include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
#include "../../../module/motion.h"
#include "../../../lcd/ultralcd.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../../lcd/extensible_ui/ui_api.h"
+ #include "../../../lcd/extui/ui_api.h"
#endif
#define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
@@ -63,7 +63,7 @@ void GcodeSuite::M1000() {
#if HAS_LCD_MENU
ui.goto_screen(menu_job_recovery);
#elif ENABLED(EXTENSIBLE_UI)
- ExtUI::OnPowerLossResume();
+ ExtUI::onPowerLossResume();
#else
SERIAL_ECHO_MSG("Resume requires LCD.");
#endif
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index cd1dd801b9..67e756d5d2 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,7 +25,7 @@
#if ENABLED(POWER_LOSS_RECOVERY)
#include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
#include "../../../module/motion.h"
#include "../../../lcd/ultralcd.h"
diff --git a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
index 9ebdcd2070..0a9c519451 100644
--- a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
+++ b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,7 +25,7 @@
#if ENABLED(PRUSA_MMU2)
#include "../../gcode.h"
-#include "../../../feature/prusa_MMU2/mmu2.h"
+#include "../../../feature/mmu2/mmu2.h"
/**
* M403: Set filament type for MMU2
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index 7a5dd65e0e..f746dddfa1 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index a7e6d65172..0eb93a8006 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
#include "../../../inc/MarlinConfig.h"
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "../../gcode.h"
#include "../../../feature/tmc_util.h"
@@ -53,4 +53,4 @@ void GcodeSuite::M122() {
test_tmc_connection(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
}
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 7fddac0d79..f88e116839 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -104,6 +104,12 @@ static void set_stealth_status(const bool enable, const int8_t target_extruder)
#if AXIS_HAS_STEALTHCHOP(E5)
case 5: TMC_SET_STEALTH(E5); break;
#endif
+ #if AXIS_HAS_STEALTHCHOP(E6)
+ case 6: TMC_SET_STEALTH(E6); break;
+ #endif
+ #if AXIS_HAS_STEALTHCHOP(E7)
+ case 7: TMC_SET_STEALTH(E7); break;
+ #endif
}
} break;
}
@@ -155,6 +161,12 @@ static void say_stealth_status() {
#if AXIS_HAS_STEALTHCHOP(E5)
TMC_SAY_STEALTH_STATUS(E5);
#endif
+ #if AXIS_HAS_STEALTHCHOP(E6)
+ TMC_SAY_STEALTH_STATUS(E6);
+ #endif
+ #if AXIS_HAS_STEALTHCHOP(E7)
+ TMC_SAY_STEALTH_STATUS(E7);
+ #endif
}
/**
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 365988594c..95ad310ed0 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
#include "../../../inc/MarlinConfig.h"
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "../../gcode.h"
#include "../../../feature/tmc_util.h"
@@ -107,6 +107,12 @@ void GcodeSuite::M906() {
#if AXIS_IS_TMC(E5)
case 5: TMC_SET_CURRENT(E5); break;
#endif
+ #if AXIS_IS_TMC(E6)
+ case 6: TMC_SET_CURRENT(E6); break;
+ #endif
+ #if AXIS_IS_TMC(E7)
+ case 7: TMC_SET_CURRENT(E7); break;
+ #endif
}
} break;
}
@@ -155,7 +161,13 @@ void GcodeSuite::M906() {
#if AXIS_IS_TMC(E5)
TMC_SAY_CURRENT(E5);
#endif
+ #if AXIS_IS_TMC(E6)
+ TMC_SAY_CURRENT(E6);
+ #endif
+ #if AXIS_IS_TMC(E7)
+ TMC_SAY_CURRENT(E7);
+ #endif
}
}
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 578deac844..582e779cc2 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
#include "../../../inc/MarlinConfig.h"
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "../../gcode.h"
#include "../../../feature/tmc_util.h"
@@ -348,7 +348,7 @@
bool report = true;
const uint8_t index = parser.byteval('I');
- LOOP_XYZ(i) if (parser.seen(axis_codes[i])) {
+ LOOP_XYZ(i) if (parser.seen(XYZ_CHAR(i))) {
const int16_t value = parser.value_int();
report = false;
switch (i) {
@@ -426,4 +426,4 @@
}
#endif // USE_SENSORLESS
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 7ff86f3149..1f9d710bb4 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,14 +46,14 @@ GcodeSuite gcode;
#if ENABLED(POWER_LOSS_RECOVERY)
#include "../sd/cardreader.h"
- #include "../feature/power_loss_recovery.h"
+ #include "../feature/powerloss.h"
#endif
#if ENABLED(CANCEL_OBJECTS)
#include "../feature/cancel_object.h"
#endif
-#include "../MarlinCore.h" // for idle() and suspend_auto_report
+#include "../MarlinCore.h" // for idle()
millis_t GcodeSuite::previous_move_ms;
@@ -66,6 +66,10 @@ uint8_t GcodeSuite::axis_relative = (
| (ar_init.e ? _BV(REL_E) : 0)
);
+#if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
+ bool GcodeSuite::autoreport_paused; // = false
+#endif
+
#if ENABLED(HOST_KEEPALIVE_FEATURE)
GcodeSuite::MarlinBusyState GcodeSuite::busy_state = NOT_BUSY;
uint8_t GcodeSuite::host_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL;
@@ -90,7 +94,7 @@ int8_t GcodeSuite::get_target_extruder_from_command() {
if (e < EXTRUDERS) return e;
SERIAL_ECHO_START();
SERIAL_CHAR('M'); SERIAL_ECHO(parser.codenum);
- SERIAL_ECHOLNPAIR(" " MSG_INVALID_EXTRUDER " ", int(e));
+ SERIAL_ECHOLNPAIR(" " STR_INVALID_EXTRUDER " ", int(e));
return -1;
}
return active_extruder;
@@ -107,9 +111,9 @@ int8_t GcodeSuite::get_target_e_stepper_from_command() {
SERIAL_ECHO_START();
SERIAL_CHAR('M'); SERIAL_ECHO(parser.codenum);
if (e == -1)
- SERIAL_ECHOLNPGM(" " MSG_E_STEPPER_NOT_SPECIFIED);
+ SERIAL_ECHOLNPGM(" " STR_E_STEPPER_NOT_SPECIFIED);
else
- SERIAL_ECHOLNPAIR(" " MSG_INVALID_E_STEPPER " ", int(e));
+ SERIAL_ECHOLNPAIR(" " STR_INVALID_E_STEPPER " ", int(e));
return -1;
}
@@ -131,7 +135,7 @@ void GcodeSuite::get_destination_from_command() {
// Get new XYZ position, whether absolute or relative
LOOP_XYZ(i) {
- if ( (seen[i] = parser.seenval(axis_codes[i])) ) {
+ if ( (seen[i] = parser.seenval(XYZ_CHAR(i))) ) {
const float v = parser.value_axis_units((AxisEnum)i);
if (skip_move)
destination[i] = current_position[i];
@@ -273,7 +277,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 27: G27(); break; // G27: Nozzle Park
#endif
- case 28: G28(false); break; // G28: Home all axes, one at a time
+ case 28: G28(); break; // G28: Home one or more axes
#if HAS_LEVELING
case 29: // G29: Bed leveling calibration
@@ -314,13 +318,18 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#endif
#if ENABLED(CNC_COORDINATE_SYSTEMS)
- case 53: G53(); break;
- case 54: G54(); break;
- case 55: G55(); break;
- case 56: G56(); break;
- case 57: G57(); break;
- case 58: G58(); break;
- case 59: G59(); break;
+ case 53: G53(); break; // G53: (prefix) Apply native workspace
+ case 54: G54(); break; // G54: Switch to Workspace 1
+ case 55: G55(); break; // G55: Switch to Workspace 2
+ case 56: G56(); break; // G56: Switch to Workspace 3
+ case 57: G57(); break; // G57: Switch to Workspace 4
+ case 58: G58(); break; // G58: Switch to Workspace 5
+ case 59: G59(); break; // G59.0 - G59.3: Switch to Workspace 6-9
+ #endif
+
+ #if SAVED_POSITIONS
+ case 60: G60(); break; // G60: save current position
+ case 61: G61(); break; // G61: Apply/restore saved coordinates.
#endif
#if ENABLED(PROBE_TEMP_COMPENSATION)
@@ -348,7 +357,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 800: parser.debug(); break; // G800: GCode Parser Test for G
#endif
- default: parser.unknown_command_error(); break;
+ default: parser.unknown_command_warning(); break;
}
break;
@@ -743,6 +752,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 702: M702(); break; // M702: Unload Filament
#endif
+ #if ENABLED(CONTROLLER_FAN_EDITABLE)
+ case 710: M710(); break; // M710: Set Controller Fan settings
+ #endif
+
#if ENABLED(GCODE_MACROS)
case 810: case 811: case 812: case 813: case 814:
case 815: case 816: case 817: case 818: case 819:
@@ -776,7 +789,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#endif
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
case 122: M122(); break; // M122: Report driver configuration and status
case 906: M906(); break; // M906: Set motor current in milliamps using axis codes X, Y, Z, E
#if HAS_STEALTHCHOP
@@ -844,14 +857,18 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#if ENABLED(POWER_LOSS_RECOVERY)
case 413: M413(); break; // M413: Enable/disable/query Power-Loss Recovery
- case 1000: M1000(); break; // M1000: Resume from power-loss
+ case 1000: M1000(); break; // M1000: [INTERNAL] Resume from power-loss
+ #endif
+
+ #if ENABLED(SDSUPPORT)
+ case 1001: M1001(); break; // M1001: [INTERNAL] Handle SD completion
#endif
#if ENABLED(MAX7219_GCODE)
case 7219: M7219(); break; // M7219: Set LEDs, columns, and rows
#endif
- default: parser.unknown_command_error(); break;
+ default: parser.unknown_command_warning(); break;
}
break;
@@ -861,7 +878,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#if ENABLED(WIFI_CUSTOM_COMMAND)
if (wifi_custom_command(parser.command_ptr)) break;
#endif
- parser.unknown_command_error();
+ parser.unknown_command_warning();
}
if (!no_ok) queue.ok_to_send();
@@ -921,6 +938,7 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
char * const delim = strchr(gcode, '\n'); // Get address of next newline
if (delim) *delim = '\0'; // Replace with nul
parser.parse(gcode); // Parse the current command
+ if (delim) *delim = '\n'; // Put back the newline
process_parsed_command(true); // Process it
if (!delim) break; // Last command?
gcode = delim + 1; // Get the next command
@@ -937,18 +955,18 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
void GcodeSuite::host_keepalive() {
const millis_t ms = millis();
static millis_t next_busy_signal_ms = 0;
- if (!suspend_auto_report && host_keepalive_interval && busy_state != NOT_BUSY) {
+ if (!autoreport_paused && host_keepalive_interval && busy_state != NOT_BUSY) {
if (PENDING(ms, next_busy_signal_ms)) return;
switch (busy_state) {
case IN_HANDLER:
case IN_PROCESS:
- SERIAL_ECHO_MSG(MSG_BUSY_PROCESSING);
+ SERIAL_ECHO_MSG(STR_BUSY_PROCESSING);
break;
case PAUSED_FOR_USER:
- SERIAL_ECHO_MSG(MSG_BUSY_PAUSED_FOR_USER);
+ SERIAL_ECHO_MSG(STR_BUSY_PAUSED_FOR_USER);
break;
case PAUSED_FOR_INPUT:
- SERIAL_ECHO_MSG(MSG_BUSY_PAUSED_FOR_INPUT);
+ SERIAL_ECHO_MSG(STR_BUSY_PAUSED_FOR_INPUT);
break;
default:
break;
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index f7111c6eec..8e5d054d99 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -67,6 +67,8 @@
* G34 - Z Stepper automatic alignment using probe: I T A (Requires Z_STEPPER_AUTO_ALIGN)
* G38 - Probe in any direction using the Z_MIN_PROBE (Requires G38_PROBE_TARGET)
* G42 - Coordinated move to a mesh point (Requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BLINEAR, or AUTO_BED_LEVELING_UBL)
+ * G60 - Save current position. (Requires SAVED_POSITIONS)
+ * G61 - Apply/restore saved coordinates. (Requires SAVED_POSITIONS)
* G76 - Calibrate first layer temperature offsets. (Requires PROBE_TEMP_COMPENSATION)
* G80 - Cancel current motion mode (Requires GCODE_MOTION_MODES)
* G90 - Use Absolute Coordinates
@@ -285,7 +287,7 @@
#include "parser.h"
#if ENABLED(I2C_POSITION_ENCODERS)
- #include "../feature/I2CPositionEncoder.h"
+ #include "../feature/encoder_i2c.h"
#endif
enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };
@@ -349,6 +351,18 @@ public:
process_subcommands_now_P(G28_STR);
}
+ #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
+ static bool autoreport_paused;
+ static inline bool set_autoreport_paused(const bool p) {
+ const bool was = autoreport_paused;
+ autoreport_paused = p;
+ return was;
+ }
+ #else
+ static constexpr bool autoreport_paused = false;
+ static inline bool set_autoreport_paused(const bool) { return false; }
+ #endif
+
#if ENABLED(HOST_KEEPALIVE_FEATURE)
/**
* States for managing Marlin and host communication
@@ -420,7 +434,7 @@ private:
static void G27();
#endif
- static void G28(const bool always_home_all);
+ static void G28();
#if HAS_LEVELING
#if ENABLED(G29_RETRY_AND_RECOVER)
@@ -471,6 +485,11 @@ private:
static void G76();
#endif
+ #if SAVED_POSITIONS
+ static void G60();
+ static void G61();
+ #endif
+
#if ENABLED(GCODE_MOTION_MODES)
static void G80();
#endif
@@ -893,7 +912,7 @@ private:
static void M900();
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
static void M122();
static void M906();
#if HAS_STEALTHCHOP
@@ -949,10 +968,18 @@ private:
static void M1000();
#endif
+ #if ENABLED(SDSUPPORT)
+ static void M1001();
+ #endif
+
#if ENABLED(MAX7219_GCODE)
static void M7219();
#endif
+ #if ENABLED(CONTROLLER_FAN_EDITABLE)
+ static void M710();
+ #endif
+
static void T(const uint8_t tool_index);
};
diff --git a/Marlin/src/gcode/geometry/G17-G19.cpp b/Marlin/src/gcode/geometry/G17-G19.cpp
index bd0192fabf..14f3e80bbc 100644
--- a/Marlin/src/gcode/geometry/G17-G19.cpp
+++ b/Marlin/src/gcode/geometry/G17-G19.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/geometry/G53-G59.cpp b/Marlin/src/gcode/geometry/G53-G59.cpp
index 38f72ae62e..e24247b2c5 100644
--- a/Marlin/src/gcode/geometry/G53-G59.cpp
+++ b/Marlin/src/gcode/geometry/G53-G59.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 2f69654b0e..91a746dd76 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,7 +25,7 @@
#include "../../module/stepper.h"
#if ENABLED(I2C_POSITION_ENCODERS)
- #include "../../feature/I2CPositionEncoder.h"
+ #include "../../feature/encoder_i2c.h"
#endif
/**
@@ -35,7 +35,7 @@ void GcodeSuite::G92() {
bool sync_E = false, sync_XYZ = false;
- #if USE_GCODE_SUBCODES
+ #if ENABLED(USE_GCODE_SUBCODES)
const uint8_t subcode_G92 = parser.subcode;
#else
constexpr uint8_t subcode_G92 = 0;
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 6e2b46081c..13e82a0c73 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,7 +38,7 @@
*/
void GcodeSuite::M206() {
LOOP_XYZ(i)
- if (parser.seen(axis_codes[i]))
+ if (parser.seen(XYZ_CHAR(i)))
set_home_offset((AxisEnum)i, parser.value_linear_units());
#if ENABLED(MORGAN_SCARA)
@@ -69,7 +69,7 @@ void GcodeSuite::M428() {
if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0)
diff[i] = -current_position[i];
if (!WITHIN(diff[i], -20, 20)) {
- SERIAL_ERROR_MSG(MSG_ERR_M428_TOO_FAR);
+ SERIAL_ERROR_MSG(STR_ERR_M428_TOO_FAR);
LCD_ALERTMESSAGEPGM_P(PSTR("Err: Too far!"));
BUZZ(200, 40);
return;
diff --git a/Marlin/src/gcode/host/M110.cpp b/Marlin/src/gcode/host/M110.cpp
index 4bdafb403a..f7b6dfd4f4 100644
--- a/Marlin/src/gcode/host/M110.cpp
+++ b/Marlin/src/gcode/host/M110.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M113.cpp b/Marlin/src/gcode/host/M113.cpp
index 6881837a5b..872986561d 100644
--- a/Marlin/src/gcode/host/M113.cpp
+++ b/Marlin/src/gcode/host/M113.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index dabb14afcf..ec5b950b64 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,18 +34,9 @@
#include "../../core/debug_out.h"
#endif
- void report_xyze(const xyze_pos_t &pos, const uint8_t n=4, const uint8_t precision=3) {
+ void report_xyze(const xyze_pos_t &pos, const uint8_t n=XYZE, const uint8_t precision=3) {
char str[12];
- for (uint8_t a = 0; a < n; a++) {
- SERIAL_CHAR(' ', axis_codes[a], ':');
- SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
- }
- SERIAL_EOL();
- }
-
- void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) {
- char str[12];
- for (uint8_t a = X_AXIS; a <= Z_AXIS; a++) {
+ LOOP_L_N(a, n) {
SERIAL_CHAR(' ', axis_codes[a], ':');
SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
}
@@ -53,21 +44,34 @@
}
inline void report_xyz(const xyze_pos_t &pos) { report_xyze(pos, 3); }
+ void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) {
+ char str[12];
+ LOOP_XYZ(a) {
+ SERIAL_CHAR(' ', XYZ_CHAR(a), ':');
+ SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
+ }
+ SERIAL_EOL();
+ }
+
void report_current_position_detail() {
+ // Position as sent by G-code
SERIAL_ECHOPGM("\nLogical:");
report_xyz(current_position.asLogical());
+ // Cartesian position in native machine space
SERIAL_ECHOPGM("Raw: ");
report_xyz(current_position);
xyze_pos_t leveled = current_position;
#if HAS_LEVELING
+ // Current position with leveling applied
SERIAL_ECHOPGM("Leveled:");
planner.apply_leveling(leveled);
report_xyz(leveled);
+ // Test planner un-leveling. This should match the Raw result.
SERIAL_ECHOPGM("UnLevel:");
xyze_pos_t unleveled = leveled;
planner.unapply_leveling(unleveled);
@@ -75,6 +79,7 @@
#endif
#if IS_KINEMATIC
+ // Kinematics applied to the leveled position
#if IS_SCARA
SERIAL_ECHOPGM("ScaraK: ");
#else
@@ -142,6 +147,12 @@
#if AXIS_IS_L64XX(E5)
REPORT_ABSOLUTE_POS(E5);
#endif
+ #if AXIS_IS_L64XX(E6)
+ REPORT_ABSOLUTE_POS(E6);
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ REPORT_ABSOLUTE_POS(E7);
+ #endif
SERIAL_EOL();
#endif // HAS_L64XX
@@ -174,12 +185,21 @@
#endif // M114_DETAIL
/**
- * M114: Report current position to host
+ * M114: Report the current position to host.
+ * Since steppers are moving, the count positions are
+ * projected by using planner calculations.
+ * D - Report more detail. This syncs the planner. (Requires M114_DETAIL)
+ * E - Report E stepper position (Requires M114_DETAIL)
+ * R - Report the realtime position instead of projected.
*/
void GcodeSuite::M114() {
#if ENABLED(M114_DETAIL)
if (parser.seen('D')) {
+ #if DISABLED(M114_LEGACY)
+ planner.synchronize();
+ #endif
+ report_current_position();
report_current_position_detail();
return;
}
@@ -189,6 +209,12 @@ void GcodeSuite::M114() {
}
#endif
- planner.synchronize();
- report_current_position();
+ #if ENABLED(M114_REALTIME)
+ if (parser.seen('R')) { report_real_position(); return; }
+ #endif
+
+ #if ENABLED(M114_LEGACY)
+ planner.synchronize();
+ #endif
+ report_current_position_projected();
}
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 6d3cf36d52..d74f909c47 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,48 +33,40 @@
#endif
/**
- * M115: Capabilities string
+ * M115: Capabilities string and extended capabilities report
+ * If a capability is not reported, hosts should assume
+ * the capability is not present.
*/
void GcodeSuite::M115() {
- SERIAL_ECHOLNPGM(MSG_M115_REPORT);
+ SERIAL_ECHOLNPGM(STR_M115_REPORT);
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
+ // PAREN_COMMENTS
+ #if ENABLED(PAREN_COMMENTS)
+ cap_line(PSTR("PAREN_COMMENTS"), true);
+ #endif
+
+ // QUOTED_STRINGS
+ #if ENABLED(GCODE_QUOTED_STRINGS)
+ cap_line(PSTR("QUOTED_STRINGS"), true);
+ #endif
+
// SERIAL_XON_XOFF
- cap_line(PSTR("SERIAL_XON_XOFF")
- #if ENABLED(SERIAL_XON_XOFF)
- , true
- #endif
- );
+ cap_line(PSTR("SERIAL_XON_XOFF"), ENABLED(SERIAL_XON_XOFF));
// BINARY_FILE_TRANSFER (M28 B1)
- cap_line(PSTR("BINARY_FILE_TRANSFER")
- #if ENABLED(BINARY_FILE_TRANSFER)
- , true
- #endif
- );
+ cap_line(PSTR("BINARY_FILE_TRANSFER"), ENABLED(BINARY_FILE_TRANSFER));
// EEPROM (M500, M501)
- cap_line(PSTR("EEPROM")
- #if ENABLED(EEPROM_SETTINGS)
- , true
- #endif
- );
+ cap_line(PSTR("EEPROM"), ENABLED(EEPROM_SETTINGS));
// Volumetric Extrusion (M200)
- cap_line(PSTR("VOLUMETRIC")
- #if DISABLED(NO_VOLUMETRICS)
- , true
- #endif
- );
+ cap_line(PSTR("VOLUMETRIC"), DISABLED(NO_VOLUMETRICS));
// AUTOREPORT_TEMP (M155)
- cap_line(PSTR("AUTOREPORT_TEMP")
- #if ENABLED(AUTO_REPORT_TEMPERATURES)
- , true
- #endif
- );
+ cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES));
// PROGRESS (M530 S L, M531 , M532 X L)
cap_line(PSTR("PROGRESS"));
@@ -83,94 +75,42 @@ void GcodeSuite::M115() {
cap_line(PSTR("PRINT_JOB"), true);
// AUTOLEVEL (G29)
- cap_line(PSTR("AUTOLEVEL")
- #if HAS_AUTOLEVEL
- , true
- #endif
- );
+ cap_line(PSTR("AUTOLEVEL"), ENABLED(HAS_AUTOLEVEL));
// Z_PROBE (G30)
- cap_line(PSTR("Z_PROBE")
- #if HAS_BED_PROBE
- , true
- #endif
- );
+ cap_line(PSTR("Z_PROBE"), ENABLED(HAS_BED_PROBE));
// MESH_REPORT (M420 V)
- cap_line(PSTR("LEVELING_DATA")
- #if HAS_LEVELING
- , true
- #endif
- );
+ cap_line(PSTR("LEVELING_DATA"), ENABLED(HAS_LEVELING));
// BUILD_PERCENT (M73)
- cap_line(PSTR("BUILD_PERCENT")
- #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
- , true
- #endif
- );
+ cap_line(PSTR("BUILD_PERCENT"), ENABLED(LCD_SET_PROGRESS_MANUALLY));
// SOFTWARE_POWER (M80, M81)
- cap_line(PSTR("SOFTWARE_POWER")
- #if ENABLED(PSU_CONTROL)
- , true
- #endif
- );
+ cap_line(PSTR("SOFTWARE_POWER"), ENABLED(PSU_CONTROL));
// CASE LIGHTS (M355)
- cap_line(PSTR("TOGGLE_LIGHTS")
- #if HAS_CASE_LIGHT
- , true
- #endif
- );
- cap_line(PSTR("CASE_LIGHT_BRIGHTNESS")
- #if HAS_CASE_LIGHT
- , PWM_PIN(CASE_LIGHT_PIN)
- #endif
- );
+ cap_line(PSTR("TOGGLE_LIGHTS"), ENABLED(HAS_CASE_LIGHT));
+
+ cap_line(PSTR("CASE_LIGHT_BRIGHTNESS"), TERN(HAS_CASE_LIGHT, PWM_PIN(CASE_LIGHT_PIN), 0));
// EMERGENCY_PARSER (M108, M112, M410, M876)
- cap_line(PSTR("EMERGENCY_PARSER")
- #if ENABLED(EMERGENCY_PARSER)
- , true
- #endif
- );
+ cap_line(PSTR("EMERGENCY_PARSER"), ENABLED(EMERGENCY_PARSER));
// PROMPT SUPPORT (M876)
- cap_line(PSTR("PROMPT_SUPPORT")
- #if ENABLED(HOST_PROMPT_SUPPORT)
- , true
- #endif
- );
+ cap_line(PSTR("PROMPT_SUPPORT"), ENABLED(HOST_PROMPT_SUPPORT));
// AUTOREPORT_SD_STATUS (M27 extension)
- cap_line(PSTR("AUTOREPORT_SD_STATUS")
- #if ENABLED(AUTO_REPORT_SD_STATUS)
- , true
- #endif
- );
+ cap_line(PSTR("AUTOREPORT_SD_STATUS"), ENABLED(AUTO_REPORT_SD_STATUS));
// THERMAL_PROTECTION
- cap_line(PSTR("THERMAL_PROTECTION")
- #if (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) && (ENABLED(THERMAL_PROTECTION_BED) || !HAS_HEATED_BED) && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER)
- , true
- #endif
- );
+ cap_line(PSTR("THERMAL_PROTECTION"), ENABLED(THERMALLY_SAFE));
// MOTION_MODES (M80-M89)
- cap_line(PSTR("MOTION_MODES")
- #if ENABLED(GCODE_MOTION_MODES)
- , true
- #endif
- );
+ cap_line(PSTR("MOTION_MODES"), ENABLED(GCODE_MOTION_MODES));
// CHAMBER_TEMPERATURE (M141, M191)
- cap_line(PSTR("CHAMBER_TEMPERATURE")
- #if HAS_HEATED_CHAMBER
- , true
- #endif
- );
-
+ cap_line(PSTR("CHAMBER_TEMPERATURE"), ENABLED(HAS_HEATED_CHAMBER));
#endif // EXTENDED_CAPABILITIES_REPORT
}
diff --git a/Marlin/src/gcode/host/M118.cpp b/Marlin/src/gcode/host/M118.cpp
index 3d8a84fb5f..ba52a4f816 100644
--- a/Marlin/src/gcode/host/M118.cpp
+++ b/Marlin/src/gcode/host/M118.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M119.cpp b/Marlin/src/gcode/host/M119.cpp
index a13fa67b79..b3cb7290b3 100644
--- a/Marlin/src/gcode/host/M119.cpp
+++ b/Marlin/src/gcode/host/M119.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M16.cpp b/Marlin/src/gcode/host/M16.cpp
index 0a076a7a47..fd3320db93 100644
--- a/Marlin/src/gcode/host/M16.cpp
+++ b/Marlin/src/gcode/host/M16.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M876.cpp b/Marlin/src/gcode/host/M876.cpp
index 057b010e72..fe0ca1541a 100644
--- a/Marlin/src/gcode/host/M876.cpp
+++ b/Marlin/src/gcode/host/M876.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,7 +31,9 @@
* M876: Handle Prompt Response
*/
void GcodeSuite::M876() {
+
if (parser.seenval('S')) host_response_handler((uint8_t)parser.value_int());
+
}
#endif // HOST_PROMPT_SUPPORT && !EMERGENCY_PARSER
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 5bf9e94325..190023b090 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,25 +20,21 @@
*
*/
-#include "../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfigPre.h"
#if HAS_RESUME_CONTINUE
+#include "../../inc/MarlinConfig.h"
+
#include "../gcode.h"
-#include "../../module/stepper.h"
+
+#include "../../module/planner.h" // for synchronize()
+#include "../../MarlinCore.h" // for wait_for_user_response()
#if HAS_LCD_MENU
#include "../../lcd/ultralcd.h"
-#endif
-
-#if ENABLED(EXTENSIBLE_UI)
- #include "../../lcd/extensible_ui/ui_api.h"
-#endif
-
-#include "../../sd/cardreader.h"
-
-#if HAS_LEDS_OFF_FLAG
- #include "../../feature/leds/printer_event_leds.h"
+#elif ENABLED(EXTENSIBLE_UI)
+ #include "../../lcd/extui/ui_api.h"
#endif
#if ENABLED(HOST_PROMPT_SUPPORT)
@@ -50,27 +46,16 @@
* M1: Conditional stop - Wait for user button press on LCD
*/
void GcodeSuite::M0_M1() {
- const char * const args = parser.string_arg;
-
millis_t ms = 0;
- bool hasP = false, hasS = false;
- if (parser.seenval('P')) {
- ms = parser.value_millis(); // milliseconds to wait
- hasP = ms > 0;
- }
- if (parser.seenval('S')) {
- ms = parser.value_millis_from_seconds(); // seconds to wait
- hasS = ms > 0;
- }
-
- const bool has_message = !hasP && !hasS && args && *args;
+ if (parser.seenval('P')) ms = parser.value_millis(); // Milliseconds to wait
+ if (parser.seenval('S')) ms = parser.value_millis_from_seconds(); // Seconds to wait
planner.synchronize();
#if HAS_LCD_MENU
- if (has_message)
- ui.set_status(args, true);
+ if (parser.string_arg)
+ ui.set_status(parser.string_arg, true);
else {
LCD_MESSAGEPGM(MSG_USERWAIT);
#if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
@@ -79,44 +64,28 @@ void GcodeSuite::M0_M1() {
}
#elif ENABLED(EXTENSIBLE_UI)
-
- if (has_message)
- ExtUI::onUserConfirmRequired(args); // Can this take an SRAM string??
+ if (parser.string_arg)
+ ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
else
ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
-
#else
- if (has_message) {
+ if (parser.string_arg) {
SERIAL_ECHO_START();
- SERIAL_ECHOLN(args);
+ SERIAL_ECHOLN(parser.string_arg);
}
#endif
- KEEPALIVE_STATE(PAUSED_FOR_USER);
- wait_for_user = true;
-
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), CONTINUE_STR);
+ host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
#endif
- if (ms > 0) {
- ms += millis(); // wait until this time for a click
- while (PENDING(millis(), ms) && wait_for_user) idle();
- }
- else
- while (wait_for_user) idle();
-
- #if HAS_LEDS_OFF_FLAG
- printerEventLEDs.onResumeAfterWait();
- #endif
+ wait_for_user_response(ms);
#if HAS_LCD_MENU
ui.reset_status();
#endif
-
- wait_for_user = false;
}
#endif // HAS_RESUME_CONTINUE
diff --git a/Marlin/src/gcode/lcd/M117.cpp b/Marlin/src/gcode/lcd/M117.cpp
index 118b55fe37..7e314731f8 100644
--- a/Marlin/src/gcode/lcd/M117.cpp
+++ b/Marlin/src/gcode/lcd/M117.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index 297ece268e..3116727533 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,7 +38,7 @@
void GcodeSuite::M145() {
const uint8_t material = (uint8_t)parser.intval('S');
if (material >= COUNT(ui.preheat_hotend_temp))
- SERIAL_ERROR_MSG(MSG_ERR_MATERIAL_INDEX);
+ SERIAL_ERROR_MSG(STR_ERR_MATERIAL_INDEX);
else {
int v;
if (parser.seenval('H')) {
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 68c46fcfdd..839fd25969 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M300.cpp b/Marlin/src/gcode/lcd/M300.cpp
index ec2024ae2f..5d7e766b2d 100644
--- a/Marlin/src/gcode/lcd/M300.cpp
+++ b/Marlin/src/gcode/lcd/M300.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index 14d4d63813..347c42c442 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 4dd13ca017..069d76fdad 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -100,9 +100,9 @@ void GcodeSuite::G0_G1(
#endif // FWRETRACT
#if IS_SCARA
- fast_move ? prepare_fast_move_to_destination() : prepare_move_to_destination();
+ fast_move ? prepare_fast_move_to_destination() : prepare_line_to_destination();
#else
- prepare_move_to_destination();
+ prepare_line_to_destination();
#endif
#ifdef G0_FEEDRATE
@@ -118,7 +118,7 @@ void GcodeSuite::G0_G1(
#endif
if (_MOVE_SYNC) {
planner.synchronize();
- SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
+ SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
}
#endif
}
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index c915cc334e..b0fb299ab2 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -236,7 +236,7 @@ void plan_arc(
planner.apply_leveling(raw);
#endif
- planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, seg_length
+ planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
#if ENABLED(SCARA_FEEDRATE_SCALING)
, inv_duration
#endif
@@ -327,7 +327,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
// P indicates number of circles to do
int8_t circles_to_do = parser.byteval('P');
if (!WITHIN(circles_to_do, 0, 100))
- SERIAL_ERROR_MSG(MSG_ERR_ARC_ARGS);
+ SERIAL_ERROR_MSG(STR_ERR_ARC_ARGS);
while (circles_to_do--)
plan_arc(current_position, arc_offset, clockwise);
@@ -338,7 +338,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
reset_stepper_timeout();
}
else
- SERIAL_ERROR_MSG(MSG_ERR_ARC_ARGS);
+ SERIAL_ERROR_MSG(STR_ERR_ARC_ARGS);
}
}
diff --git a/Marlin/src/gcode/motion/G4.cpp b/Marlin/src/gcode/motion/G4.cpp
index 50606689a1..d157face90 100644
--- a/Marlin/src/gcode/motion/G4.cpp
+++ b/Marlin/src/gcode/motion/G4.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,7 +35,7 @@ void GcodeSuite::G4() {
planner.synchronize();
#if ENABLED(NANODLP_Z_SYNC)
- SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
+ SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
#endif
if (!ui.has_status()) LCD_MESSAGEPGM(MSG_DWELL);
diff --git a/Marlin/src/gcode/motion/G5.cpp b/Marlin/src/gcode/motion/G5.cpp
index 03dd496c58..5d289e11d8 100644
--- a/Marlin/src/gcode/motion/G5.cpp
+++ b/Marlin/src/gcode/motion/G5.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -45,7 +45,7 @@ void GcodeSuite::G5() {
#if ENABLED(CNC_WORKSPACE_PLANES)
if (workspace_plane != PLANE_XY) {
- SERIAL_ERROR_MSG(MSG_ERR_BAD_PLANE_MODE);
+ SERIAL_ERROR_MSG(STR_ERR_BAD_PLANE_MODE);
return;
}
#endif
diff --git a/Marlin/src/gcode/motion/G80.cpp b/Marlin/src/gcode/motion/G80.cpp
index e6bc537eca..700038df0f 100644
--- a/Marlin/src/gcode/motion/G80.cpp
+++ b/Marlin/src/gcode/motion/G80.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index e5b5b7e76d..5fef948fa4 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,15 +46,15 @@
&& active_extruder == 0
#endif
) {
- probe_offset.z += offs;
+ probe.offset.z += offs;
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET MSG_Z ": ", probe_offset.z);
+ SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET STR_Z ": ", probe.offset.z);
}
else {
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
hotend_offset[active_extruder].z -= offs;
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET MSG_Z ": ", hotend_offset[active_extruder].z);
+ SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET STR_Z ": ", hotend_offset[active_extruder].z);
#endif
}
}
@@ -76,8 +76,8 @@
*/
void GcodeSuite::M290() {
#if ENABLED(BABYSTEP_XY)
- for (uint8_t a = X_AXIS; a <= Z_AXIS; a++)
- if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) {
+ LOOP_XYZ(a)
+ if (parser.seenval(XYZ_CHAR(a)) || (a == Z_AXIS && parser.seenval('S'))) {
const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
babystep.add_mm((AxisEnum)a, offs);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
@@ -98,7 +98,7 @@ void GcodeSuite::M290() {
SERIAL_ECHO_START();
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
- SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET " " MSG_Z, probe_offset.z);
+ SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
#endif
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
@@ -131,7 +131,7 @@ void GcodeSuite::M290() {
#else
PSTR("Babystep Z")
#endif
- , babystep.axis_total[BS_TODO_AXIS(Z_AXIS)]
+ , babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
);
}
#endif
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index e5ce7beb1b..4ece6ede46 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -51,13 +51,13 @@ char *GCodeParser::command_ptr,
char GCodeParser::command_letter;
int GCodeParser::codenum;
-#if USE_GCODE_SUBCODES
+#if ENABLED(USE_GCODE_SUBCODES)
uint8_t GCodeParser::subcode;
#endif
#if ENABLED(GCODE_MOTION_MODES)
int16_t GCodeParser::motion_mode_codenum = -1;
- #if USE_GCODE_SUBCODES
+ #if ENABLED(USE_GCODE_SUBCODES)
uint8_t GCodeParser::motion_mode_subcode;
#endif
#endif
@@ -83,7 +83,7 @@ void GCodeParser::reset() {
string_arg = nullptr; // No whole line argument
command_letter = '?'; // No command letter
codenum = 0; // No command code
- #if USE_GCODE_SUBCODES
+ #if ENABLED(USE_GCODE_SUBCODES)
subcode = 0; // No command sub-code
#endif
#if ENABLED(FASTER_GCODE_PARSER)
@@ -92,17 +92,44 @@ void GCodeParser::reset() {
#endif
}
+#if ENABLED(GCODE_QUOTED_STRINGS)
+
+ // Pass the address after the first quote (if any)
+ char* GCodeParser::unescape_string(char* &src) {
+ if (*src == '"') ++src; // Skip the leading quote
+ char * const out = src; // Start of the string
+ char *dst = src; // Prepare to unescape and terminate
+ for (;;) {
+ char c = *src++; // Get the next char
+ switch (c) {
+ case '\\': c = *src++; break; // Get the escaped char
+ case '"' : c = '\0'; break; // Convert bare quote to nul
+ }
+ if (!(*dst++ = c)) break; // Copy and break on nul
+ }
+ return out;
+ }
+
+#endif
+
// Populate all fields by parsing a single line of GCode
// 58 bytes of SRAM are used to speed up seen/value
void GCodeParser::parse(char *p) {
reset(); // No codes to report
+ auto uppercase = [](char c) {
+ #if ENABLED(GCODE_CASE_INSENSITIVE)
+ if (WITHIN(c, 'a', 'z')) c += 'A' - 'a';
+ #endif
+ return c;
+ };
+
// Skip spaces
while (*p == ' ') ++p;
// Skip N[-0-9] if included in the command line
- if (*p == 'N' && NUMERIC_SIGNED(p[1])) {
+ if (uppercase(*p) == 'N' && NUMERIC_SIGNED(p[1])) {
#if ENABLED(FASTER_GCODE_PARSER)
//set('N', p + 1); // (optional) Set the 'N' parameter value
#endif
@@ -115,7 +142,7 @@ void GCodeParser::parse(char *p) {
command_ptr = p;
// Get the command letter, which must be G, M, or T
- const char letter = *p++;
+ const char letter = uppercase(*p++);
// Nullify asterisk and trailing whitespace
char *starpos = strchr(p, '*');
@@ -167,12 +194,12 @@ void GCodeParser::parse(char *p) {
do { codenum *= 10, codenum += *p++ - '0'; } while (NUMERIC(*p));
// Allow for decimal point in command
- #if USE_GCODE_SUBCODES
- if (*p == '.') {
- p++;
- while (NUMERIC(*p))
- subcode *= 10, subcode += *p++ - '0';
- }
+ #if ENABLED(USE_GCODE_SUBCODES)
+ if (*p == '.') {
+ p++;
+ while (NUMERIC(*p))
+ subcode *= 10, subcode += *p++ - '0';
+ }
#endif
// Skip all spaces to get to the first argument, or nul
@@ -186,7 +213,7 @@ void GCodeParser::parse(char *p) {
)
) {
motion_mode_codenum = codenum;
- #if USE_GCODE_SUBCODES
+ #if ENABLED(USE_GCODE_SUBCODES)
motion_mode_subcode = subcode;
#endif
}
@@ -205,7 +232,7 @@ void GCodeParser::parse(char *p) {
if (motion_mode_codenum < 0) return;
command_letter = 'G';
codenum = motion_mode_codenum;
- #if USE_GCODE_SUBCODES
+ #if ENABLED(USE_GCODE_SUBCODES)
subcode = motion_mode_subcode;
#endif
p--; // Back up one character to use the current parameter
@@ -229,17 +256,12 @@ void GCodeParser::parse(char *p) {
#if ENABLED(EXPECTED_PRINTER_CHECK)
case 16:
#endif
- case 23: case 28: case 30: case 117: case 118: case 928: string_arg = p; return;
+ case 23: case 28: case 30: case 117: case 118: case 928:
+ string_arg = unescape_string(p);
+ return;
default: break;
}
-/*
- #if ENABLED(CANCEL_OBJECTS)
- if (letter == 'O') switch (codenum) {
- case 1: string_arg = p; return;
- default: break;
- }
- #endif
-*/
+
#if ENABLED(DEBUG_GCODE_PARSER)
const bool debug = codenum == 800;
#endif
@@ -252,39 +274,57 @@ void GCodeParser::parse(char *p) {
* This allows M0/M1 with expire time to work: "M0 S5 You Win!"
* For 'M118' you must use 'E1' and 'A1' rather than just 'E' or 'A'
*/
+ #if ENABLED(GCODE_QUOTED_STRINGS)
+ bool quoted_string_arg = false;
+ #endif
string_arg = nullptr;
- while (const char code = *p++) { // Get the next parameter. A NUL ends the loop
+ while (const char param = uppercase(*p++)) { // Get the next parameter. A NUL ends the loop
// Special handling for M32 [P] !/path/to/file.g#
// The path must be the last parameter
- if (code == '!' && letter == 'M' && codenum == 32) {
+ if (param == '!' && letter == 'M' && codenum == 32) {
string_arg = p; // Name starts after '!'
char * const lb = strchr(p, '#'); // Already seen '#' as SD char (to pause buffering)
if (lb) *lb = '\0'; // Safe to mark the end of the filename
return;
}
- // Arguments MUST be uppercase for fast GCode parsing
- #if ENABLED(FASTER_GCODE_PARSER)
- #define PARAM_TEST WITHIN(code, 'A', 'Z')
- #else
- #define PARAM_TEST true
+ #if ENABLED(GCODE_QUOTED_STRINGS)
+ if (!quoted_string_arg && param == '"') {
+ quoted_string_arg = true;
+ string_arg = unescape_string(p);
+ }
#endif
- if (PARAM_TEST) {
+ #if ENABLED(FASTER_GCODE_PARSER)
+ // Arguments MUST be uppercase for fast GCode parsing
+ #define PARAM_OK(P) WITHIN((P), 'A', 'Z')
+ #else
+ #define PARAM_OK(P) true
+ #endif
+
+ if (PARAM_OK(param)) {
while (*p == ' ') p++; // Skip spaces between parameters & values
- const bool has_num = valid_float(p);
+ #if ENABLED(GCODE_QUOTED_STRINGS)
+ const bool is_str = (*p == '"'), has_val = is_str || valid_float(p);
+ char * const valptr = has_val ? is_str ? unescape_string(p) : p : nullptr;
+ #else
+ const bool has_val = valid_float(p);
+ #if ENABLED(FASTER_GCODE_PARSER)
+ char * const valptr = has_val ? p : nullptr;
+ #endif
+ #endif
#if ENABLED(DEBUG_GCODE_PARSER)
if (debug) {
- SERIAL_ECHOPAIR("Got letter ", code, " at index ", (int)(p - command_ptr - 1));
- if (has_num) SERIAL_ECHOPGM(" (has_num)");
+ SERIAL_ECHOPAIR("Got param ", param, " at index ", (int)(p - command_ptr - 1));
+ if (has_val) SERIAL_ECHOPGM(" (has_val)");
}
#endif
- if (!has_num && !string_arg) { // No value? First time, keep as string_arg
+ if (!has_val && !string_arg) { // No value? First time, keep as string_arg
string_arg = p - 1;
#if ENABLED(DEBUG_GCODE_PARSER)
if (debug) SERIAL_ECHOPAIR(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
@@ -296,7 +336,7 @@ void GCodeParser::parse(char *p) {
#endif
#if ENABLED(FASTER_GCODE_PARSER)
- set(code, has_num ? p : nullptr); // Set parameter exists and pointer (nullptr for no number)
+ set(param, valptr); // Set parameter exists and pointer (nullptr for no value)
#endif
}
else if (!string_arg) { // Not A-Z? First time, keep as the string_arg
@@ -333,9 +373,8 @@ void GCodeParser::parse(char *p) {
#endif // CNC_COORDINATE_SYSTEMS
-void GCodeParser::unknown_command_error() {
- SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_UNKNOWN_COMMAND, command_ptr, "\"");
+void GCodeParser::unknown_command_warning() {
+ SERIAL_ECHO_MSG(STR_UNKNOWN_COMMAND, command_ptr, "\"");
}
#if ENABLED(DEBUG_GCODE_PARSER)
@@ -351,13 +390,16 @@ void GCodeParser::unknown_command_error() {
#else
SERIAL_ECHOPAIR(" args: { ", command_args, " }");
#endif
- if (string_arg) SERIAL_ECHOPAIR(" string: \"", string_arg, "\"");
+ if (string_arg) {
+ SERIAL_ECHOPAIR(" string: \"", string_arg);
+ SERIAL_CHAR('"');
+ }
SERIAL_ECHOLNPGM("\n");
for (char c = 'A'; c <= 'Z'; ++c) {
if (seen(c)) {
SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':");
if (has_value()) {
- SERIAL_ECHOPAIR(
+ SERIAL_ECHOLNPAIR(
"\n float: ", value_float(),
"\n long: ", value_long(),
"\n ulong: ", value_ulong(),
@@ -372,8 +414,7 @@ void GCodeParser::unknown_command_error() {
);
}
else
- SERIAL_ECHOPGM(" (no value)");
- SERIAL_ECHOLNPGM("\n");
+ SERIAL_ECHOLNPGM(" (no value)");
}
}
}
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 2e91216a64..06e41ccf13 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -85,13 +85,13 @@ public:
*string_arg, // string of command line
command_letter; // G, M, or T
static int codenum; // 123
- #if USE_GCODE_SUBCODES
+ #if ENABLED(USE_GCODE_SUBCODES)
static uint8_t subcode; // .1
#endif
#if ENABLED(GCODE_MOTION_MODES)
static int16_t motion_mode_codenum;
- #if USE_GCODE_SUBCODES
+ #if ENABLED(USE_GCODE_SUBCODES)
static uint8_t motion_mode_subcode;
#endif
FORCE_INLINE static void cancel_motion_mode() { motion_mode_codenum = -1; }
@@ -166,7 +166,6 @@ public:
#ifdef CPU_32_BIT
FORCE_INLINE static bool seen(const char * const str) { return !!(codebits & letter_bits(str)); }
#else
- // At least one of a list of code letters was seen
FORCE_INLINE static bool seen(const char * const str) {
const uint32_t letrbits = letter_bits(str);
const uint8_t * const cb = (uint8_t*)&codebits;
@@ -177,14 +176,27 @@ public:
static inline bool seen_any() { return !!codebits; }
- #define SEEN_TEST(L) TEST32(codebits, LETTER_BIT(L))
+ FORCE_INLINE static bool seen_test(const char c) { return TEST32(codebits, LETTER_BIT(c)); }
#else // !FASTER_GCODE_PARSER
+ #if ENABLED(GCODE_CASE_INSENSITIVE)
+ FORCE_INLINE static char* strgchr(char *p, char g) {
+ auto uppercase = [](char c) {
+ return c + (WITHIN(c, 'a', 'z') ? 'A' - 'a' : 0);
+ };
+ const char d = uppercase(g);
+ for (char cc; (cc = uppercase(*p)); p++) if (cc == d) return p;
+ return nullptr;
+ }
+ #else
+ #define strgchr strchr
+ #endif
+
// Code is found in the string. If not found, value_ptr is unchanged.
// This allows "if (seen('A')||seen('B'))" to use the last-found value.
static inline bool seen(const char c) {
- char *p = strchr(command_args, c);
+ char *p = strgchr(command_args, c);
const bool b = !!p;
if (b) value_ptr = valid_float(&p[1]) ? &p[1] : nullptr;
return b;
@@ -192,12 +204,12 @@ public:
static inline bool seen_any() { return *command_args == '\0'; }
- #define SEEN_TEST(L) !!strchr(command_args, L)
+ FORCE_INLINE static bool seen_test(const char c) { return (bool)strgchr(command_args, c); }
// At least one of a list of code letters was seen
static inline bool seen(const char * const str) {
for (uint8_t i = 0; const char c = str[i]; i++)
- if (SEEN_TEST(c)) return true;
+ if (seen_test(c)) return true;
return false;
}
@@ -205,9 +217,15 @@ public:
// Seen any axis parameter
static inline bool seen_axis() {
- return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E');
+ return seen_test('X') || seen_test('Y') || seen_test('Z') || seen_test('E');
}
+ #if ENABLED(GCODE_QUOTED_STRINGS)
+ static char* unescape_string(char* &src);
+ #else
+ FORCE_INLINE static char* unescape_string(char* &src) { return src; }
+ #endif
+
// Populate all fields by parsing a single line of GCode
// This uses 54 bytes of SRAM to speed up seen/value
static void parse(char * p);
@@ -223,6 +241,9 @@ public:
// Seen a parameter with a value
static inline bool seenval(const char c) { return seen(c) && has_value(); }
+ // The value as a string
+ static inline char* value_string() { return value_ptr; }
+
// Float removes 'E' to prevent scientific notation interpretation
static inline float value_float() {
if (value_ptr) {
@@ -366,9 +387,10 @@ public:
static inline feedRate_t value_feedrate() { return MMM_TO_MMS(value_linear_units()); }
- void unknown_command_error();
+ void unknown_command_warning();
// Provide simple value accessors with default option
+ static inline char* stringval(const char c, char * const dval=nullptr) { return seenval(c) ? value_string() : dval; }
static inline float floatval(const char c, const float dval=0.0) { return seenval(c) ? value_float() : dval; }
static inline bool boolval(const char c, const bool dval=false) { return seenval(c) ? value_bool() : (seen(c) ? true : dval); }
static inline uint8_t byteval(const char c, const uint8_t dval=0) { return seenval(c) ? value_byte() : dval; }
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index a236ce3edf..21d56b3fd4 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,10 +40,10 @@
*/
void GcodeSuite::G30() {
- const xy_pos_t pos = { parser.linearval('X', current_position.x + probe_offset_xy.x),
- parser.linearval('Y', current_position.y + probe_offset_xy.y) };
+ const xy_pos_t pos = { parser.linearval('X', current_position.x + probe.offset_xy.x),
+ parser.linearval('Y', current_position.y + probe.offset_xy.y) };
- if (!position_is_reachable_by_probe(pos)) return;
+ if (!probe.can_reach(pos)) return;
// Disable leveling so the planner won't mess with us
#if HAS_LEVELING
@@ -53,14 +53,14 @@ void GcodeSuite::G30() {
remember_feedrate_scaling_off();
const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
- const float measured_z = probe_at_point(pos, raise_after, 1);
+ const float measured_z = probe.probe_at_point(pos, raise_after, 1);
if (!isnan(measured_z))
SERIAL_ECHOLNPAIR("Bed X: ", FIXFLOAT(pos.x), " Y: ", FIXFLOAT(pos.y), " Z: ", FIXFLOAT(measured_z));
restore_feedrate_and_scaling();
#ifdef Z_AFTER_PROBING
- if (raise_after == PROBE_PT_STOW) move_z_after_probing();
+ if (raise_after == PROBE_PT_STOW) probe.move_z_after_probing();
#endif
report_current_position();
diff --git a/Marlin/src/gcode/probe/G31_G32.cpp b/Marlin/src/gcode/probe/G31_G32.cpp
index 06c3c3adf1..e2e43e35ed 100644
--- a/Marlin/src/gcode/probe/G31_G32.cpp
+++ b/Marlin/src/gcode/probe/G31_G32.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,11 +30,11 @@
/**
* G31: Deploy the Z probe
*/
-void GcodeSuite::G31() { DEPLOY_PROBE(); }
+void GcodeSuite::G31() { probe.deploy(); }
/**
* G32: Stow the Z probe
*/
-void GcodeSuite::G32() { STOW_PROBE(); }
+void GcodeSuite::G32() { probe.stow(); }
#endif // Z_PROBE_SLED
diff --git a/Marlin/src/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index cb298bcccb..512e1ff89f 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,7 +34,7 @@
inline void G38_single_probe(const uint8_t move_value) {
endstops.enable(true);
G38_move = move_value;
- prepare_move_to_destination();
+ prepare_line_to_destination();
planner.synchronize();
G38_move = 0;
endstops.hit_on_purpose();
@@ -77,7 +77,7 @@ inline bool G38_run_probe() {
// Move away by the retract distance
destination = current_position + retract_mm;
endstops.enable(false);
- prepare_move_to_destination();
+ prepare_line_to_destination();
planner.synchronize();
REMEMBER(fr, feedrate_mm_s, feedrate_mm_s * 0.25);
diff --git a/Marlin/src/gcode/probe/M401_M402.cpp b/Marlin/src/gcode/probe/M401_M402.cpp
index aa63a7ea71..a0a6c1cec5 100644
--- a/Marlin/src/gcode/probe/M401_M402.cpp
+++ b/Marlin/src/gcode/probe/M401_M402.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,7 +32,7 @@
* M401: Deploy and activate the Z probe
*/
void GcodeSuite::M401() {
- DEPLOY_PROBE();
+ probe.deploy();
report_current_position();
}
@@ -40,9 +40,9 @@ void GcodeSuite::M401() {
* M402: Deactivate and stow the Z probe
*/
void GcodeSuite::M402() {
- STOW_PROBE();
+ probe.stow();
#ifdef Z_AFTER_PROBING
- move_z_after_probing();
+ probe.move_z_after_probing();
#endif
report_current_position();
}
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index b0a63041fe..c2e746cf0b 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,17 +39,17 @@ void GcodeSuite::M851() {
if (!parser.seen("XYZ")) {
SERIAL_ECHOLNPAIR_P(
#if HAS_PROBE_XY_OFFSET
- PSTR(MSG_PROBE_OFFSET " X"), probe_offset.x, SP_Y_STR, probe_offset.y, SP_Z_STR
+ PSTR(STR_PROBE_OFFSET " X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR
#else
- PSTR(MSG_PROBE_OFFSET " X0 Y0 Z")
+ PSTR(STR_PROBE_OFFSET " X0 Y0 Z")
#endif
- , probe_offset.z
+ , probe.offset.z
);
return;
}
// Start with current offsets and modify
- xyz_pos_t offs = probe_offset;
+ xyz_pos_t offs = probe.offset;
// Assume no errors
bool ok = true;
@@ -93,7 +93,7 @@ void GcodeSuite::M851() {
}
// Save the new offsets
- if (ok) probe_offset = offs;
+ if (ok) probe.offset = offs;
}
#endif // HAS_BED_PROBE
diff --git a/Marlin/src/gcode/probe/M951.cpp b/Marlin/src/gcode/probe/M951.cpp
index d8d2e8f8e0..c7e4ea8a70 100644
--- a/Marlin/src/gcode/probe/M951.cpp
+++ b/Marlin/src/gcode/probe/M951.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index ff35b553a8..abb50b960d 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -44,7 +44,7 @@ GCodeQueue queue;
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../feature/power_loss_recovery.h"
+ #include "../feature/powerloss.h"
#endif
/**
@@ -52,7 +52,7 @@ GCodeQueue queue;
* sending commands to Marlin, and lines will be checked for sequentiality.
* M110 N sets the current line number.
*/
-long gcode_N, GCodeQueue::last_N, GCodeQueue::stopped_N = 0;
+long gcode_N, GCodeQueue::last_N;
/**
* GCode Command Queue
@@ -94,7 +94,7 @@ static PGM_P injected_commands_P = nullptr;
GCodeQueue::GCodeQueue() {
// Send "ok" after commands by default
- for (uint8_t i = 0; i < COUNT(send_ok); i++) send_ok[i] = true;
+ LOOP_L_N(i, COUNT(send_ok)) send_ok[i] = true;
}
/**
@@ -150,6 +150,8 @@ 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
@@ -160,11 +162,10 @@ bool GCodeQueue::enqueue_one(const char* cmd) {
//SERIAL_ECHO(cmd);
//SERIAL_ECHOPGM("\") \n");
- if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true;
+ if (*cmd == 0 || ISEOL(*cmd)) return true;
if (_enqueue(cmd)) {
- SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_ENQUEUEING, cmd, "\"");
+ SERIAL_ECHO_MSG(STR_ENQUEUEING, cmd, "\"");
return true;
}
return false;
@@ -191,7 +192,6 @@ bool GCodeQueue::process_injected_command() {
// Execute command if non-blank
if (i) {
parser.parse(cmd);
- PORT_REDIRECT(SERIAL_PORT);
gcode.process_parsed_command();
}
return true;
@@ -211,6 +211,21 @@ void GCodeQueue::inject_P(PGM_P const pgcode) { injected_commands_P = pgcode; }
*/
void GCodeQueue::enqueue_one_now(const char* cmd) { while (!enqueue_one(cmd)) idle(); }
+/**
+ * Attempt to enqueue a single G-code command
+ * and return 'true' if successful.
+ */
+bool GCodeQueue::enqueue_one_P(PGM_P const pgcode) {
+ size_t i = 0;
+ PGM_P p = pgcode;
+ char c;
+ while ((c = pgm_read_byte(&p[i])) && c != '\n') i++;
+ char cmd[i + 1];
+ memcpy_P(cmd, p, i);
+ cmd[i] = '\0';
+ return _enqueue(cmd);
+}
+
/**
* Enqueue from program memory and return only when commands are actually enqueued
* Never call this from a G-code handler!
@@ -243,10 +258,10 @@ void GCodeQueue::ok_to_send() {
#if NUM_SERIAL > 1
const int16_t pn = port[index_r];
if (pn < 0) return;
- PORT_REDIRECT(pn);
+ PORT_REDIRECT(pn); // Reply to the serial port that sent the command
#endif
if (!send_ok[index_r]) return;
- SERIAL_ECHOPGM(MSG_OK);
+ SERIAL_ECHOPGM(STR_OK);
#if ENABLED(ADVANCED_OK)
char* p = command_buffer[index_r];
if (*p == 'N') {
@@ -255,8 +270,8 @@ void GCodeQueue::ok_to_send() {
while (NUMERIC_SIGNED(*p))
SERIAL_ECHO(*p++);
}
- SERIAL_ECHOPGM(" P"); SERIAL_ECHO(int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1));
- SERIAL_ECHOPGM(" B"); SERIAL_ECHO(BUFSIZE - length);
+ SERIAL_ECHOPAIR_P(SP_P_STR, int(planner.moves_free()));
+ SERIAL_ECHOPAIR(" B", int(BUFSIZE - length));
#endif
SERIAL_EOL();
}
@@ -267,12 +282,12 @@ void GCodeQueue::ok_to_send() {
*/
void GCodeQueue::flush_and_request_resend() {
#if NUM_SERIAL > 1
- const int16_t p = port[index_r];
- if (p < 0) return;
- PORT_REDIRECT(p);
+ const int16_t pn = port[index_r];
+ if (pn < 0) return;
+ PORT_REDIRECT(pn); // Reply to the serial port that sent the command
#endif
SERIAL_FLUSH();
- SERIAL_ECHOPGM(MSG_RESEND);
+ SERIAL_ECHOPGM(STR_RESEND);
SERIAL_ECHOLN(last_N + 1);
ok_to_send();
}
@@ -296,14 +311,14 @@ inline int read_serial(const uint8_t index) {
}
}
-void GCodeQueue::gcode_line_error(PGM_P const err, const int8_t port) {
- PORT_REDIRECT(port);
+void GCodeQueue::gcode_line_error(PGM_P const err, const int8_t pn) {
+ PORT_REDIRECT(pn); // Reply to the serial port that sent the command
SERIAL_ERROR_START();
serialprintPGM(err);
SERIAL_ECHOLN(last_N);
- while (read_serial(port) != -1); // clear out the RX buffer
+ while (read_serial(pn) != -1); // Clear out the RX buffer
flush_and_request_resend();
- serial_count[port] = 0;
+ serial_count[pn] = 0;
}
FORCE_INLINE bool is_M29(const char * const cmd) { // matches "M29" & "M29 ", but not "M290", etc
@@ -311,6 +326,70 @@ FORCE_INLINE bool is_M29(const char * const cmd) { // matches "M29" & "M29 ", b
return m29 && !NUMERIC(m29[3]);
}
+#define PS_NORMAL 0
+#define PS_EOL 1
+#define PS_QUOTED 2
+#define PS_PAREN 3
+#define PS_ESC 4
+
+inline void process_stream_char(const char c, uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
+
+ if (sis == PS_EOL) return; // EOL comment or overflow
+
+ #if ENABLED(PAREN_COMMENTS)
+ else if (sis == PS_PAREN) { // Inline comment
+ if (c == ')') sis = PS_NORMAL;
+ return;
+ }
+ #endif
+
+ else if (sis >= PS_ESC) // End escaped char
+ sis -= PS_ESC;
+
+ else if (c == '\\') { // Start escaped char
+ sis += PS_ESC;
+ if (sis == PS_ESC) return; // Keep if quoting
+ }
+
+ #if ENABLED(GCODE_QUOTED_STRINGS)
+
+ else if (sis == PS_QUOTED) {
+ if (c == '"') sis = PS_NORMAL; // End quoted string
+ }
+ else if (c == '"') // Start quoted string
+ sis = PS_QUOTED;
+
+ #endif
+
+ else if (c == ';') { // Start end-of-line comment
+ sis = PS_EOL;
+ return;
+ }
+
+ #if ENABLED(PAREN_COMMENTS)
+ else if (c == '(') { // Start inline comment
+ sis = PS_PAREN;
+ return;
+ }
+ #endif
+
+ buff[ind++] = c;
+ if (ind >= MAX_CMD_SIZE - 1)
+ sis = PS_EOL; // Skip the rest on overflow
+}
+
+/**
+ * Handle a line being completed. For an empty line
+ * keep sensor readings going and watchdog alive.
+ */
+inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
+ sis = PS_NORMAL;
+ buff[ind] = 0;
+ if (ind) { ind = 0; return false; }
+ thermalManager.manage_heater();
+ return true;
+}
+
/**
* Get all commands waiting on the serial port and queue them.
* Exit when the buffer is full or when no more characters are
@@ -318,11 +397,8 @@ FORCE_INLINE bool is_M29(const char * const cmd) { // matches "M29" & "M29 ", b
*/
void GCodeQueue::get_serial_commands() {
static char serial_line_buffer[NUM_SERIAL][MAX_CMD_SIZE];
- static bool serial_comment_mode[NUM_SERIAL] = { false }
- #if ENABLED(PAREN_COMMENTS)
- , serial_comment_paren_mode[NUM_SERIAL] = { false }
- #endif
- ;
+
+ static uint8_t serial_input_state[NUM_SERIAL] = { PS_NORMAL };
#if ENABLED(BINARY_FILE_TRANSFER)
if (card.flag.binary_mode) {
@@ -342,7 +418,7 @@ void GCodeQueue::get_serial_commands() {
static millis_t last_command_time = 0;
const millis_t ms = millis();
if (length == 0 && !serial_data_available() && ELAPSED(ms, last_command_time + NO_TIMEOUTS)) {
- SERIAL_ECHOLNPGM(MSG_WAIT);
+ SERIAL_ECHOLNPGM(STR_WAIT);
last_command_time = ms;
}
#endif
@@ -351,32 +427,22 @@ void GCodeQueue::get_serial_commands() {
* Loop while serial characters are incoming and the queue is not full
*/
while (length < BUFSIZE && serial_data_available()) {
- for (uint8_t i = 0; i < NUM_SERIAL; ++i) {
- int c;
- if ((c = read_serial(i)) < 0) continue;
+ LOOP_L_N(i, NUM_SERIAL) {
- char serial_char = c;
+ const int c = read_serial(i);
+ if (c < 0) continue;
- /**
- * If the character ends the line
- */
- if (serial_char == '\n' || serial_char == '\r') {
+ const char serial_char = c;
- // Start with comment mode off
- serial_comment_mode[i] = false;
- #if ENABLED(PAREN_COMMENTS)
- serial_comment_paren_mode[i] = false;
- #endif
+ if (ISEOL(serial_char)) {
- // Skip empty lines and comments
- if (!serial_count[i]) { thermalManager.manage_heater(); continue; }
-
- serial_line_buffer[i][serial_count[i]] = 0; // Terminate string
- serial_count[i] = 0; // Reset buffer
+ // Reset our state, continue if the line was empty
+ if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]))
+ continue;
char* command = serial_line_buffer[i];
- while (*command == ' ') command++; // Skip leading spaces
+ while (*command == ' ') command++; // Skip leading spaces
char *npos = (*command == 'N') ? command : nullptr; // Require the N parameter to start the line
if (npos) {
@@ -391,41 +457,43 @@ void GCodeQueue::get_serial_commands() {
gcode_N = strtol(npos + 1, nullptr, 10);
if (gcode_N != last_N + 1 && !M110)
- return gcode_line_error(PSTR(MSG_ERR_LINE_NO), i);
+ return gcode_line_error(PSTR(STR_ERR_LINE_NO), i);
char *apos = strrchr(command, '*');
if (apos) {
uint8_t checksum = 0, count = uint8_t(apos - command);
while (count) checksum ^= command[--count];
if (strtol(apos + 1, nullptr, 10) != checksum)
- return gcode_line_error(PSTR(MSG_ERR_CHECKSUM_MISMATCH), i);
+ return gcode_line_error(PSTR(STR_ERR_CHECKSUM_MISMATCH), i);
}
else
- return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
+ return gcode_line_error(PSTR(STR_ERR_NO_CHECKSUM), i);
last_N = gcode_N;
}
#if ENABLED(SDSUPPORT)
// Pronterface "M29" and "M29 " has no line number
else if (card.flag.saving && !is_M29(command))
- return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
+ return gcode_line_error(PSTR(STR_ERR_NO_CHECKSUM), i);
#endif
- // Movement commands alert when stopped
+ //
+ // Movement commands give an alert when the machine is stopped
+ //
+
if (IsStopped()) {
char* gpos = strchr(command, 'G');
if (gpos) {
switch (strtol(gpos + 1, nullptr, 10)) {
- case 0:
- case 1:
+ case 0: case 1:
#if ENABLED(ARC_SUPPORT)
- case 2:
- case 3:
+ case 2: case 3:
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
case 5:
#endif
- SERIAL_ECHOLNPGM(MSG_ERR_STOPPED);
+ PORT_REDIRECT(i); // Reply to the serial port that sent the command
+ SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED);
break;
}
@@ -455,31 +523,9 @@ void GCodeQueue::get_serial_commands() {
#endif
);
}
- else if (serial_count[i] >= MAX_CMD_SIZE - 1) {
- // Keep fetching, but ignore normal characters beyond the max length
- // The command will be injected when EOL is reached
- }
- else if (serial_char == '\\') { // Handle escapes
- // if we have one more character, copy it over
- if ((c = read_serial(i)) >= 0 && !serial_comment_mode[i]
- #if ENABLED(PAREN_COMMENTS)
- && !serial_comment_paren_mode[i]
- #endif
- )
- serial_line_buffer[i][serial_count[i]++] = (char)c;
- }
- else { // it's not a newline, carriage return or escape char
- if (serial_char == ';') serial_comment_mode[i] = true;
- #if ENABLED(PAREN_COMMENTS)
- else if (serial_char == '(') serial_comment_paren_mode[i] = true;
- else if (serial_char == ')') serial_comment_paren_mode[i] = false;
- #endif
- else if (!serial_comment_mode[i]
- #if ENABLED(PAREN_COMMENTS)
- && ! serial_comment_paren_mode[i]
- #endif
- ) serial_line_buffer[i][serial_count[i]++] = serial_char;
- }
+ else
+ process_stream_char(serial_char, serial_input_state[i], serial_line_buffer[i], serial_count[i]);
+
} // for NUM_SERIAL
} // queue has space, serial has data
}
@@ -487,105 +533,41 @@ void GCodeQueue::get_serial_commands() {
#if ENABLED(SDSUPPORT)
/**
- * Get commands from the SD Card until the command buffer is full
- * or until the end of the file is reached. The special character '#'
- * can also interrupt buffering.
+ * Get lines from the SD Card until the command buffer is full
+ * or until the end of the file is reached. Because this method
+ * always receives complete command-lines, they can go directly
+ * into the main command queue.
*/
inline void GCodeQueue::get_sdcard_commands() {
- static bool stop_buffering = false,
- sd_comment_mode = false
- #if ENABLED(PAREN_COMMENTS)
- , sd_comment_paren_mode = false
- #endif
- ;
+ static uint8_t sd_input_state = PS_NORMAL;
if (!IS_SD_PRINTING()) return;
- /**
- * '#' stops reading from SD to the buffer prematurely, so procedural
- * macro calls are possible. If it occurs, stop_buffering is triggered
- * and the buffer is run dry; this character _can_ occur in serial com
- * due to checksums, however, no checksums are used in SD printing.
- */
-
- if (length == 0) stop_buffering = false;
-
- uint16_t sd_count = 0;
+ int sd_count = 0;
bool card_eof = card.eof();
- while (length < BUFSIZE && !card_eof && !stop_buffering) {
+ while (length < BUFSIZE && !card_eof) {
const int16_t n = card.get();
- char sd_char = (char)n;
card_eof = card.eof();
- if (card_eof || n == -1
- || sd_char == '\n' || sd_char == '\r'
- || ((sd_char == '#' || sd_char == ':') && !sd_comment_mode
- #if ENABLED(PAREN_COMMENTS)
- && !sd_comment_paren_mode
- #endif
- )
- ) {
- if (card_eof) {
+ if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(STR_SD_ERR_READ); continue; }
- card.printingHasFinished();
+ const char sd_char = (char)n;
+ const bool is_eol = ISEOL(sd_char);
+ if (is_eol || card_eof) {
- if (IS_SD_PRINTING())
- sd_count = 0; // If a sub-file was printing, continue from call point
- else {
- SERIAL_ECHOLNPGM(MSG_FILE_PRINTED);
- #if ENABLED(PRINTER_EVENT_LEDS)
- printerEventLEDs.onPrintCompleted();
- #if HAS_RESUME_CONTINUE
- inject_P(PSTR("M0 S"
- #if HAS_LCD_MENU
- "1800"
- #else
- "60"
- #endif
- ));
- #endif
- #endif // PRINTER_EVENT_LEDS
- }
- }
- else if (n == -1)
- SERIAL_ERROR_MSG(MSG_SD_ERR_READ);
-
- if (sd_char == '#') stop_buffering = true;
-
- sd_comment_mode = false; // for new command
- #if ENABLED(PAREN_COMMENTS)
- sd_comment_paren_mode = false;
- #endif
-
- // Skip empty lines and comments
- if (!sd_count) { thermalManager.manage_heater(); continue; }
-
- command_buffer[index_w][sd_count] = '\0'; // terminate string
- sd_count = 0; // clear sd line buffer
-
- _commit_command(false);
-
- #if ENABLED(POWER_LOSS_RECOVERY)
- recovery.cmd_sdpos = card.getIndex(); // Prime for the next _commit_command
- #endif
- }
- else if (sd_count >= MAX_CMD_SIZE - 1) {
- /**
- * Keep fetching, but ignore normal characters beyond the max length
- * The command will be injected when EOL is reached
- */
- }
- else {
- if (sd_char == ';') sd_comment_mode = true;
- #if ENABLED(PAREN_COMMENTS)
- else if (sd_char == '(') sd_comment_paren_mode = true;
- else if (sd_char == ')') sd_comment_paren_mode = false;
- #endif
- else if (!sd_comment_mode
- #if ENABLED(PAREN_COMMENTS)
- && ! sd_comment_paren_mode
+ // Reset stream state, terminate the buffer, and commit a non-empty command
+ if (!is_eol && sd_count) ++sd_count; // End of file with no newline
+ if (!process_line_done(sd_input_state, command_buffer[index_w], sd_count)) {
+ _commit_command(false);
+ #if ENABLED(POWER_LOSS_RECOVERY)
+ recovery.cmd_sdpos = card.getIndex(); // Prime for the NEXT _commit_command
#endif
- ) command_buffer[index_w][sd_count++] = sd_char;
+ }
+
+ if (card_eof) card.fileHasFinished(); // Handle end of file reached
}
+ else
+ process_stream_char(sd_char, sd_input_state, command_buffer[index_w], sd_count);
+
}
}
@@ -624,7 +606,7 @@ void GCodeQueue::advance() {
if (is_M29(command)) {
// M29 closes the file
card.closefile();
- SERIAL_ECHOLNPGM(MSG_FILE_SAVED);
+ SERIAL_ECHOLNPGM(STR_FILE_SAVED);
#if !defined(__AVR__) || !defined(USBCON)
#if ENABLED(SERIAL_STATS_DROPPED_RX)
@@ -657,9 +639,7 @@ void GCodeQueue::advance() {
#endif // SDSUPPORT
// The queue may be reset by a command handler or by code invoked by idle() within a handler
- if (length) {
- --length;
- if (++index_r >= BUFSIZE) index_r = 0;
- }
+ --length;
+ if (++index_r >= BUFSIZE) index_r = 0;
}
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 173cadc68e..6a87d47ac8 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,9 +35,7 @@ public:
* commands to Marlin, and lines will be checked for sequentiality.
* M110 N sets the current line number.
*/
- static long last_N, stopped_N;
-
- static inline void stop() { stopped_N = last_N; }
+ static long last_N;
/**
* GCode Command Queue
@@ -79,6 +77,12 @@ public:
*/
static void enqueue_one_now(const char* cmd);
+ /**
+ * Attempt to enqueue a single G-code command
+ * and return 'true' if successful.
+ */
+ static bool enqueue_one_P(PGM_P const pgcode);
+
/**
* Enqueue from program memory and return only when commands are actually enqueued
*/
@@ -150,7 +154,7 @@ private:
*/
static bool enqueue_one(const char* cmd);
- static void gcode_line_error(PGM_P const err, const int8_t port);
+ static void gcode_line_error(PGM_P const err, const int8_t pn);
};
diff --git a/Marlin/src/gcode/scara/M360-M364.cpp b/Marlin/src/gcode/scara/M360-M364.cpp
index 6fd8306e07..cd901d5dd4 100644
--- a/Marlin/src/gcode/scara/M360-M364.cpp
+++ b/Marlin/src/gcode/scara/M360-M364.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
new file mode 100644
index 0000000000..4261b57f97
--- /dev/null
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -0,0 +1,109 @@
+/**
+ * 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 .
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(SDSUPPORT)
+
+#include "../gcode.h"
+#include "../../module/printcounter.h"
+
+#if EITHER(LCD_SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE)
+ #include "../../lcd/ultralcd.h"
+#endif
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+ #include "../../feature/powerloss.h"
+#endif
+
+#if HAS_LEDS_OFF_FLAG
+ #include "../../feature/leds/printer_event_leds.h"
+#endif
+
+#if ENABLED(EXTENSIBLE_UI)
+ #include "../../lcd/extui/ui_api.h"
+#endif
+
+#if ENABLED(HOST_ACTION_COMMANDS)
+ #include "../../feature/host_actions.h"
+#endif
+
+#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
+ #include "../../module/planner.h"
+#endif
+
+#ifndef PE_LEDS_COMPLETED_TIME
+ #define PE_LEDS_COMPLETED_TIME (30*60)
+#endif
+
+/**
+ * M1001: Execute actions for SD print completion
+ */
+void GcodeSuite::M1001() {
+
+ // Report total print time
+ const bool long_print = print_job_timer.duration() > 60;
+ if (long_print) gcode.process_subcommands_now_P(PSTR("M31"));
+
+ // Stop the print job timer
+ gcode.process_subcommands_now_P(PSTR("M77"));
+
+ // Set the progress bar "done" state
+ #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+ ui.set_progress_done();
+ #endif
+
+ // Purge the recovery file
+ #if ENABLED(POWER_LOSS_RECOVERY)
+ recovery.purge();
+ #endif
+
+ // Announce SD file completion
+ SERIAL_ECHOLNPGM(STR_FILE_PRINTED);
+
+ // Update the status LED color
+ #if HAS_LEDS_OFF_FLAG
+ if (long_print) {
+ printerEventLEDs.onPrintCompleted();
+ #if ENABLED(EXTENSIBLE_UI)
+ ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE));
+ #endif
+ #if ENABLED(HOST_PROMPT_SUPPORT)
+ host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR);
+ #endif
+ wait_for_user_response(1000UL * TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30));
+ printerEventLEDs.onResumeAfterWait();
+ }
+ #endif
+
+ // Wait for the queue to empty (and "clean"), inject SD_FINISHED_RELEASECOMMAND
+ #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
+ planner.finish_and_disable();
+ #endif
+
+ // Re-select the last printed file in the UI
+ #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
+ ui.reselect_last_file();
+ #endif
+}
+
+#endif // SDSUPPORT
diff --git a/Marlin/src/gcode/sdcard/M20.cpp b/Marlin/src/gcode/sd/M20.cpp
similarity index 87%
rename from Marlin/src/gcode/sdcard/M20.cpp
rename to Marlin/src/gcode/sd/M20.cpp
index 79f2fd8008..c45fcb038a 100644
--- a/Marlin/src/gcode/sdcard/M20.cpp
+++ b/Marlin/src/gcode/sd/M20.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,9 +31,9 @@
* M20: List SD card to serial output
*/
void GcodeSuite::M20() {
- SERIAL_ECHOLNPGM(MSG_BEGIN_FILE_LIST);
+ SERIAL_ECHOLNPGM(STR_BEGIN_FILE_LIST);
card.ls();
- SERIAL_ECHOLNPGM(MSG_END_FILE_LIST);
+ SERIAL_ECHOLNPGM(STR_END_FILE_LIST);
}
#endif // SDSUPPORT
diff --git a/Marlin/src/gcode/sdcard/M21_M22.cpp b/Marlin/src/gcode/sd/M21_M22.cpp
similarity index 94%
rename from Marlin/src/gcode/sdcard/M21_M22.cpp
rename to Marlin/src/gcode/sd/M21_M22.cpp
index 9362db0808..2d5bccaf84 100644
--- a/Marlin/src/gcode/sdcard/M21_M22.cpp
+++ b/Marlin/src/gcode/sd/M21_M22.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M23.cpp b/Marlin/src/gcode/sd/M23.cpp
similarity index 95%
rename from Marlin/src/gcode/sdcard/M23.cpp
rename to Marlin/src/gcode/sd/M23.cpp
index 7dd4ad9203..4bf8105f60 100644
--- a/Marlin/src/gcode/sdcard/M23.cpp
+++ b/Marlin/src/gcode/sd/M23.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
similarity index 90%
rename from Marlin/src/gcode/sdcard/M24_M25.cpp
rename to Marlin/src/gcode/sd/M24_M25.cpp
index d68031c0c9..c1e6dde8de 100644
--- a/Marlin/src/gcode/sdcard/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,7 +39,7 @@
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../../feature/power_loss_recovery.h"
+ #include "../../feature/powerloss.h"
#endif
#include "../../MarlinCore.h" // for startOrResumeJob
@@ -74,7 +74,7 @@ void GcodeSuite::M24() {
host_action_resume();
#endif
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), PSTR("Dismiss"));
+ host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), DISMISS_STR);
#endif
#endif
@@ -86,10 +86,6 @@ void GcodeSuite::M24() {
*/
void GcodeSuite::M25() {
- #if ENABLED(POWER_LOSS_RECOVERY)
- if (recovery.enabled) recovery.save(true, false);
- #endif
-
// Set initial pause flag to prevent more commands from landing in the queue while we try to pause
#if ENABLED(SDSUPPORT)
if (IS_SD_PRINTING()) card.pauseSDPrint();
@@ -101,6 +97,10 @@ void GcodeSuite::M25() {
#else
+ #if ENABLED(POWER_LOSS_RECOVERY)
+ if (recovery.enabled) recovery.save(true);
+ #endif
+
print_job_timer.pause();
ui.reset_status();
diff --git a/Marlin/src/gcode/sdcard/M26.cpp b/Marlin/src/gcode/sd/M26.cpp
similarity index 94%
rename from Marlin/src/gcode/sdcard/M26.cpp
rename to Marlin/src/gcode/sd/M26.cpp
index 0003758804..d2e9e8e72a 100644
--- a/Marlin/src/gcode/sdcard/M26.cpp
+++ b/Marlin/src/gcode/sd/M26.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M27.cpp b/Marlin/src/gcode/sd/M27.cpp
similarity index 95%
rename from Marlin/src/gcode/sdcard/M27.cpp
rename to Marlin/src/gcode/sd/M27.cpp
index 64eb91876b..9c71e510a6 100644
--- a/Marlin/src/gcode/sdcard/M27.cpp
+++ b/Marlin/src/gcode/sd/M27.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M28_M29.cpp b/Marlin/src/gcode/sd/M28_M29.cpp
similarity index 96%
rename from Marlin/src/gcode/sdcard/M28_M29.cpp
rename to Marlin/src/gcode/sd/M28_M29.cpp
index c64ce7bb86..9dc192c09b 100644
--- a/Marlin/src/gcode/sdcard/M28_M29.cpp
+++ b/Marlin/src/gcode/sd/M28_M29.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M30.cpp b/Marlin/src/gcode/sd/M30.cpp
similarity index 94%
rename from Marlin/src/gcode/sdcard/M30.cpp
rename to Marlin/src/gcode/sd/M30.cpp
index 2f318687ad..2fd407341b 100644
--- a/Marlin/src/gcode/sdcard/M30.cpp
+++ b/Marlin/src/gcode/sd/M30.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M32.cpp b/Marlin/src/gcode/sd/M32.cpp
similarity index 96%
rename from Marlin/src/gcode/sdcard/M32.cpp
rename to Marlin/src/gcode/sd/M32.cpp
index 2eb0717a4a..35a6fb1d64 100644
--- a/Marlin/src/gcode/sdcard/M32.cpp
+++ b/Marlin/src/gcode/sd/M32.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M33.cpp b/Marlin/src/gcode/sd/M33.cpp
similarity index 95%
rename from Marlin/src/gcode/sdcard/M33.cpp
rename to Marlin/src/gcode/sd/M33.cpp
index 409467cd25..7c6654a02e 100644
--- a/Marlin/src/gcode/sdcard/M33.cpp
+++ b/Marlin/src/gcode/sd/M33.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M34.cpp b/Marlin/src/gcode/sd/M34.cpp
similarity index 95%
rename from Marlin/src/gcode/sdcard/M34.cpp
rename to Marlin/src/gcode/sd/M34.cpp
index 832b827f3b..ff1a8939a0 100644
--- a/Marlin/src/gcode/sdcard/M34.cpp
+++ b/Marlin/src/gcode/sd/M34.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M524.cpp b/Marlin/src/gcode/sd/M524.cpp
similarity index 94%
rename from Marlin/src/gcode/sdcard/M524.cpp
rename to Marlin/src/gcode/sd/M524.cpp
index 4d4394b4cb..4013303614 100644
--- a/Marlin/src/gcode/sdcard/M524.cpp
+++ b/Marlin/src/gcode/sd/M524.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M928.cpp b/Marlin/src/gcode/sd/M928.cpp
similarity index 94%
rename from Marlin/src/gcode/sdcard/M928.cpp
rename to Marlin/src/gcode/sd/M928.cpp
index 87f5af692b..b8b9175f02 100644
--- a/Marlin/src/gcode/sdcard/M928.cpp
+++ b/Marlin/src/gcode/sd/M928.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/stats/M31.cpp b/Marlin/src/gcode/stats/M31.cpp
index fdad76e99a..019598cb83 100644
--- a/Marlin/src/gcode/stats/M31.cpp
+++ b/Marlin/src/gcode/stats/M31.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 6891a44df5..41d550cb59 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
similarity index 84%
rename from Marlin/src/gcode/temperature/M104_M109.cpp
rename to Marlin/src/gcode/temp/M104_M109.cpp
index 8c5827e83b..434c6c9663 100644
--- a/Marlin/src/gcode/temperature/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,6 +20,12 @@
*
*/
+/**
+ * gcode/temp/M104_M109.cpp
+ *
+ * Hotend target temperature control
+ */
+
#include "../../inc/MarlinConfigPre.h"
#if EXTRUDERS
@@ -73,14 +79,11 @@ void GcodeSuite::M104() {
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
/**
* Stop the timer at the end of print. Start is managed by 'heat and wait' M109.
- * We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
- * standby mode, for instance in a dual extruder setup, without affecting
- * the running print timer.
+ * Hotends use EXTRUDE_MINTEMP / 2 to allow nozzles to be put into hot standby
+ * mode, for instance in a dual extruder setup, without affecting the running
+ * print timer.
*/
- if (temp <= (EXTRUDE_MINTEMP) / 2) {
- print_job_timer.stop();
- ui.reset_status();
- }
+ thermalManager.check_timer_autostart(false, true);
#endif
}
@@ -90,8 +93,10 @@ void GcodeSuite::M104() {
}
/**
- * M109: Sxxx Wait for extruder(s) to reach temperature. Waits only when heating.
- * Rxxx Wait for extruder(s) to reach temperature. Waits when heating and cooling.
+ * M109: Sxxx Wait for hotend(s) to reach temperature. Waits only when heating.
+ * Rxxx Wait for hotend(s) to reach temperature. Waits when heating and cooling.
+ *
+ * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating and stop it if turned off.
*/
void GcodeSuite::M109() {
@@ -125,12 +130,7 @@ void GcodeSuite::M109() {
* standby mode, (e.g., in a dual extruder setup) without affecting
* the running print timer.
*/
- if (parser.value_celsius() <= (EXTRUDE_MINTEMP) / 2) {
- print_job_timer.stop();
- ui.reset_status();
- }
- else
- startOrResumeJob();
+ thermalManager.check_timer_autostart(true, true);
#endif
#if HAS_DISPLAY
diff --git a/Marlin/src/gcode/temperature/M105.cpp b/Marlin/src/gcode/temp/M105.cpp
similarity index 93%
rename from Marlin/src/gcode/temperature/M105.cpp
rename to Marlin/src/gcode/temp/M105.cpp
index 3dbbb5eb7b..7d68ccadc0 100644
--- a/Marlin/src/gcode/temperature/M105.cpp
+++ b/Marlin/src/gcode/temp/M105.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,7 +31,7 @@ void GcodeSuite::M105() {
const int8_t target_extruder = get_target_extruder_from_command();
if (target_extruder < 0) return;
- SERIAL_ECHOPGM(MSG_OK);
+ SERIAL_ECHOPGM(STR_OK);
#if HAS_TEMP_SENSOR
diff --git a/Marlin/src/gcode/temperature/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
similarity index 97%
rename from Marlin/src/gcode/temperature/M106_M107.cpp
rename to Marlin/src/gcode/temp/M106_M107.cpp
index ede826a3f1..2415484d51 100644
--- a/Marlin/src/gcode/temperature/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
similarity index 78%
rename from Marlin/src/gcode/temperature/M140_M190.cpp
rename to Marlin/src/gcode/temp/M140_M190.cpp
index d6386cef50..2da438707b 100644
--- a/Marlin/src/gcode/temperature/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,6 +20,12 @@
*
*/
+/**
+ * gcode/temp/M140_M190.cpp
+ *
+ * Bed target temperature control
+ */
+
#include "../../inc/MarlinConfig.h"
#if HAS_HEATED_BED
@@ -45,11 +51,22 @@
void GcodeSuite::M140() {
if (DEBUGGING(DRYRUN)) return;
if (parser.seenval('S')) thermalManager.setTargetBed(parser.value_celsius());
+
+ #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
+ /**
+ * Stop the timer at the end of print. Both hotend and bed target
+ * temperatures need to be set below mintemp. Order of M140 and M104
+ * at the end of the print does not matter.
+ */
+ thermalManager.check_timer_autostart(false, true);
+ #endif
}
/**
* M190: Sxxx Wait for bed current temp to reach target temp. Waits only when heating
* Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
+ *
+ * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating.
*/
void GcodeSuite::M190() {
if (DEBUGGING(DRYRUN)) return;
@@ -58,8 +75,7 @@ void GcodeSuite::M190() {
if (no_wait_for_cooling || parser.seenval('R')) {
thermalManager.setTargetBed(parser.value_celsius());
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
- if (parser.value_celsius() > BED_MINTEMP)
- startOrResumeJob();
+ thermalManager.check_timer_autostart(true, false);
#endif
}
else return;
diff --git a/Marlin/src/gcode/temperature/M141_M191.cpp b/Marlin/src/gcode/temp/M141_M191.cpp
similarity index 91%
rename from Marlin/src/gcode/temperature/M141_M191.cpp
rename to Marlin/src/gcode/temp/M141_M191.cpp
index 12eaa24bf9..3f02836476 100644
--- a/Marlin/src/gcode/temperature/M141_M191.cpp
+++ b/Marlin/src/gcode/temp/M141_M191.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,6 +20,12 @@
*
*/
+/**
+ * gcode/temp/M141_M191.cpp
+ *
+ * Chamber target temperature control
+ */
+
#include "../../inc/MarlinConfig.h"
#if HAS_HEATED_CHAMBER
@@ -59,8 +65,7 @@ void GcodeSuite::M191() {
if (no_wait_for_cooling || parser.seenval('R')) {
thermalManager.setTargetChamber(parser.value_celsius());
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
- if (parser.value_celsius() > CHAMBER_MINTEMP)
- startOrResumeJob();
+ thermalManager.check_timer_autostart(true, false);
#endif
}
else return;
diff --git a/Marlin/src/gcode/temperature/M155.cpp b/Marlin/src/gcode/temp/M155.cpp
similarity index 94%
rename from Marlin/src/gcode/temperature/M155.cpp
rename to Marlin/src/gcode/temp/M155.cpp
index 12403114e9..52f9ef2be5 100644
--- a/Marlin/src/gcode/temperature/M155.cpp
+++ b/Marlin/src/gcode/temp/M155.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
similarity index 64%
rename from Marlin/src/gcode/temperature/M303.cpp
rename to Marlin/src/gcode/temp/M303.cpp
index e8f5f604f7..358a1436b1 100644
--- a/Marlin/src/gcode/temperature/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,18 +28,37 @@
#include "../../module/temperature.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../../lcd/extensible_ui/ui_api.h"
+ #include "../../lcd/extui/ui_api.h"
#endif
/**
* M303: PID relay autotune
*
- * S sets the target temperature. (default 150C / 70C)
- * E (-1 for the bed) (default 0)
- * C Minimum 3. Default 5.
- * U with a non-zero value will apply the result to current settings
+ * S Set the target temperature. (Default: 150C / 70C)
+ * E Extruder number to tune, or -1 for the bed. (Default: E0)
+ * C Number of times to repeat the procedure. (Minimum: 3, Default: 5)
+ * U Flag to apply the result to the current PID values
+ *
+ * With PID_DEBUG:
+ * D Toggle PID debugging and EXIT without further action.
*/
+
+#if ENABLED(PID_DEBUG)
+ bool pid_debug_flag = 0;
+#endif
+
void GcodeSuite::M303() {
+
+ #if ENABLED(PID_DEBUG)
+ if (parser.seen('D')) {
+ pid_debug_flag = !pid_debug_flag;
+ SERIAL_ECHO_START();
+ SERIAL_ECHOPGM("PID Debug ");
+ serialprintln_onoff(pid_debug_flag);
+ return;
+ }
+ #endif
+
#if ENABLED(PIDTEMPBED)
#define SI H_BED
#else
@@ -52,9 +71,9 @@ void GcodeSuite::M303() {
#endif
const heater_ind_t e = (heater_ind_t)parser.intval('E');
if (!WITHIN(e, SI, EI)) {
- SERIAL_ECHOLNPGM(MSG_PID_BAD_EXTRUDER_NUM);
+ SERIAL_ECHOLNPGM(STR_PID_BAD_EXTRUDER_NUM);
#if ENABLED(EXTENSIBLE_UI)
- ExtUI::OnPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM);
+ ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM);
#endif
return;
}
diff --git a/Marlin/src/gcode/units/G20_G21.cpp b/Marlin/src/gcode/units/G20_G21.cpp
index 53eac4e9be..4961ae1601 100644
--- a/Marlin/src/gcode/units/G20_G21.cpp
+++ b/Marlin/src/gcode/units/G20_G21.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index b21e376f71..d8d962c5be 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/units/M82_M83.cpp b/Marlin/src/gcode/units/M82_M83.cpp
index 11868b6ddc..bf5aff0b85 100644
--- a/Marlin/src/gcode/units/M82_M83.cpp
+++ b/Marlin/src/gcode/units/M82_M83.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c372960b2f..dd1f13fae0 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,6 +26,15 @@
* Conditionals that need to be set before Configuration_adv.h or pins.h
*/
+#if ENABLED(MORGAN_SCARA)
+ #define IS_SCARA 1
+ #define IS_KINEMATIC 1
+#elif ENABLED(DELTA)
+ #define IS_KINEMATIC 1
+#else
+ #define IS_CARTESIAN 1
+#endif
+
#if ENABLED(CARTESIO_UI)
#define DOGLCD
@@ -65,7 +74,6 @@
#define U8GLIB_ST7565_64128N
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define U8GLIB_LM6059_AF
- #define SD_DETECT_INVERTED
#elif ENABLED(AZSMZ_12864)
#define U8GLIB_ST7565_64128N
#endif
@@ -193,7 +201,9 @@
#endif
// 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
-#define HAS_SSD1306_OLED_I2C ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
+#if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
+ #define HAS_SSD1306_OLED_I2C 1
+#endif
#if HAS_SSD1306_OLED_I2C
#define IS_ULTRA_LCD
#define DOGLCD
@@ -346,20 +356,45 @@
#endif
#endif
+// Aliases for LCD features
+#if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
+ #define HAS_DGUS_LCD 1
+#endif
+
// Extensible UI serial touch screens. (See src/lcd/extensible_ui)
-#if ANY(MALYAN_LCD, DGUS_LCD, TOUCH_UI_FTDI_EVE)
+#if ANY(HAS_DGUS_LCD, MALYAN_LCD, TOUCH_UI_FTDI_EVE)
#define IS_EXTUI
#define EXTENSIBLE_UI
#endif
// Aliases for LCD features
-#define HAS_SPI_LCD ENABLED(ULTRA_LCD)
-#define HAS_DISPLAY (HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI))
-#define HAS_GRAPHICAL_LCD ENABLED(DOGLCD)
-#define HAS_CHARACTER_LCD (HAS_SPI_LCD && !HAS_GRAPHICAL_LCD)
-#define HAS_LCD_MENU (ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS))
-#define HAS_ADC_BUTTONS ENABLED(ADC_KEYPAD)
-#define HAS_DGUS_LCD ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
+#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
+ #define HAS_DISPLAY 1
+ #if ENABLED(ULTRA_LCD)
+ #define HAS_SPI_LCD 1
+ #if ENABLED(DOGLCD)
+ #define HAS_GRAPHICAL_LCD 1
+ #else
+ #define HAS_CHARACTER_LCD 1
+ #endif
+ #endif
+#endif
+
+#if ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS)
+ #define HAS_LCD_MENU 1
+#endif
+#if ENABLED(ADC_KEYPAD)
+ #define HAS_ADC_BUTTONS 1
+#endif
+
+#if HAS_GRAPHICAL_LCD
+ #ifndef LCD_PIXEL_WIDTH
+ #define LCD_PIXEL_WIDTH 128
+ #endif
+ #ifndef LCD_PIXEL_HEIGHT
+ #define LCD_PIXEL_HEIGHT 64
+ #endif
+#endif
/**
* Extruders have some combination of stepper motors and hotends
@@ -424,22 +459,46 @@
#ifndef HOTENDS
#define HOTENDS EXTRUDERS
#endif
-
#ifndef E_STEPPERS
#define E_STEPPERS EXTRUDERS
#endif
-
#ifndef E_MANUAL
#define E_MANUAL EXTRUDERS
#endif
+// Helper macros for extruder and hotend arrays
#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
+#define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
+#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1, v1, v1)
+#define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
+#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1, v1, v1)
-#define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
-#define SWITCHING_NOZZLE_TWO_SERVOS defined(SWITCHING_NOZZLE_E1_SERVO_NR)
+#if ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)
+ #define DO_SWITCH_EXTRUDER 1
+#endif
-#define HAS_HOTEND_OFFSET (HOTENDS > 1)
-#define HAS_DUPLICATION_MODE EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
+#ifdef SWITCHING_NOZZLE_E1_SERVO_NR
+ #define SWITCHING_NOZZLE_TWO_SERVOS 1
+#endif
+
+#if HOTENDS > 1
+ #define HAS_HOTEND_OFFSET 1
+#endif
+
+/**
+ * Default hotend offsets, if not defined
+ */
+#if HAS_HOTEND_OFFSET
+ #ifndef HOTEND_OFFSET_X
+ #define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
+ #endif
+ #ifndef HOTEND_OFFSET_Y
+ #define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
+ #endif
+ #ifndef HOTEND_OFFSET_Z
+ #define HOTEND_OFFSET_Z { 0 } // Z offsets for each extruder
+ #endif
+#endif
/**
* DISTINCT_E_FACTORS affects how some E factors are accessed
@@ -481,6 +540,10 @@
#endif
#endif
+#ifndef NUM_SERVOS
+ #define NUM_SERVOS 0
+#endif
+
#ifndef PREHEAT_1_LABEL
#define PREHEAT_1_LABEL "PLA"
#endif
@@ -490,27 +553,46 @@
#endif
/**
- * Set a flag for a servo probe
+ * Set a flag for a servo probe (or BLTouch)
*/
-#define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
+#if defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0
+ #define HAS_Z_SERVO_PROBE 1
+#endif
+#if HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
+ #define HAS_SERVO_ANGLES 1
+#endif
+#if !HAS_SERVO_ANGLES
+ #undef EDITABLE_SERVO_ANGLES
+#endif
/**
* Set flags for enabled probes
*/
-#define HAS_BED_PROBE (HAS_Z_SERVO_PROBE || ANY(FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, SOLENOID_PROBE, SENSORLESS_PROBING, RACK_AND_PINION_PROBE))
-#define PROBE_SELECTED (HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING))
+#if ANY(HAS_Z_SERVO_PROBE, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, SOLENOID_PROBE, SENSORLESS_PROBING, RACK_AND_PINION_PROBE)
+ #define HAS_BED_PROBE 1
+#endif
+
+#if HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING)
+ #define PROBE_SELECTED 1
+#endif
#if HAS_BED_PROBE
- #define HAS_PROBE_XY_OFFSET DISABLED(NOZZLE_AS_PROBE)
- #define HAS_CUSTOM_PROBE_PIN DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
- #define HOMING_Z_WITH_PROBE (Z_HOME_DIR < 0 && !HAS_CUSTOM_PROBE_PIN)
+ #if DISABLED(NOZZLE_AS_PROBE)
+ #define HAS_PROBE_XY_OFFSET 1
+ #endif
+ #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+ #define HAS_CUSTOM_PROBE_PIN 1
+ #endif
+ #if Z_HOME_DIR < 0 && !HAS_CUSTOM_PROBE_PIN
+ #define HOMING_Z_WITH_PROBE 1
+ #endif
#ifndef Z_PROBE_LOW_POINT
#define Z_PROBE_LOW_POINT -5
#endif
#if ENABLED(Z_PROBE_ALLEN_KEY)
- #define PROBE_TRIGGERED_WHEN_STOWED_TEST // Extra test for Allen Key Probe
+ #define PROBE_TRIGGERED_WHEN_STOWED_TEST 1 // Extra test for Allen Key Probe
#endif
- #ifdef MULTIPLE_PROBING
+ #if MULTIPLE_PROBING > 1
#if EXTRA_PROBING
#define TOTAL_PROBING (MULTIPLE_PROBING + EXTRA_PROBING)
#else
@@ -522,26 +604,53 @@
#undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
#endif
-#ifdef GRID_MAX_POINTS_X
- #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
+/**
+ * Set granular options based on the specific type of leveling
+ */
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+ #undef LCD_BED_LEVELING
+ #if ENABLED(DELTA)
+ #define UBL_SEGMENTED 1
+ #endif
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
+ #define ABL_PLANAR 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
+ #define ABL_GRID 1
+#endif
+#if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
+ #define HAS_ABL_NOT_UBL 1
+#endif
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
+ #define HAS_MESH 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
+ #define NEEDS_THREE_PROBE_POINTS 1
+#endif
+#if EITHER(HAS_ABL_NOT_UBL, AUTO_BED_LEVELING_UBL)
+ #define HAS_ABL_OR_UBL 1
+ #if DISABLED(PROBE_MANUALLY)
+ #define HAS_AUTOLEVEL 1
+ #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, MESH_BED_LEVELING)
+ #define HAS_LEVELING 1
+ #if DISABLED(AUTO_BED_LEVELING_UBL)
+ #define PLANNER_LEVELING 1
+ #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, Z_MIN_PROBE_REPEATABILITY_TEST)
+ #define HAS_PROBING_PROCEDURE 1
+#endif
+#if !HAS_LEVELING
+ #undef RESTORE_LEVELING_AFTER_G28
#endif
-#define HAS_EXTRA_ENDSTOPS ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
-#define HAS_SOFTWARE_ENDSTOPS EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
-#define HAS_RESUME_CONTINUE ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER)
-#define HAS_COLOR_LEDS ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
-#define HAS_LEDS_OFF_FLAG (BOTH(PRINTER_EVENT_LEDS, SDSUPPORT) && HAS_RESUME_CONTINUE)
-#define HAS_PRINT_PROGRESS EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
-#define HAS_PRINT_PROGRESS_PERMYRIAD (HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME))
-#define HAS_SERVICE_INTERVALS (ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0))
-#define HAS_FILAMENT_SENSOR ENABLED(FILAMENT_RUNOUT_SENSOR)
-
-#define HAS_GAMES ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
-#define HAS_GAME_MENU (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
-
-#define IS_SCARA ENABLED(MORGAN_SCARA)
-#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
-#define IS_CARTESIAN !IS_KINEMATIC
+#ifdef GRID_MAX_POINTS_X
+ #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
+ #define GRID_LOOP(A,B) LOOP_L_N(A, GRID_MAX_POINTS_X) LOOP_L_N(B, GRID_MAX_POINTS_Y)
+#endif
#ifndef INVERT_X_DIR
#define INVERT_X_DIR false
@@ -560,12 +669,28 @@
#define BOOT_MARLIN_LOGO_SMALL
#endif
-#define IS_RE_ARM_BOARD MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
+// This flag indicates some kind of jerk storage is needed
+#if ENABLED(CLASSIC_JERK) || IS_KINEMATIC
+ #define HAS_CLASSIC_JERK 1
+#endif
-#define HAS_SDCARD_CONNECTION EITHER(TARGET_LPC1768, ADAFRUIT_GRAND_CENTRAL_M4)
-
-#define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
+// E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA
+#if ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE))
+ #define HAS_CLASSIC_E_JERK 1
+#endif
#ifndef SPI_SPEED
#define SPI_SPEED SPI_FULL_SPEED
#endif
+
+#if SERIAL_PORT == -1 || SERIAL_PORT_2 == -1
+ #define HAS_USB_SERIAL 1
+#endif
+
+/**
+ * This setting is also used by M109 when trying to calculate
+ * a ballpark safe margin to prevent wait-forever situation.
+ */
+#ifndef EXTRUDE_MINTEMP
+ #define EXTRUDE_MINTEMP 170
+#endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 00be08433d..a52ae1af29 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -56,11 +56,66 @@
#undef SHOW_TEMP_ADC_VALUES
#endif
+#if EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
+ #define HAS_DUPLICATION_MODE 1
+#endif
+
+#if ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0)
+ #define HAS_SERVICE_INTERVALS 1
+#endif
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+ #define HAS_FILAMENT_SENSOR 1
+#endif
+
+#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
+ #define HAS_PRINT_PROGRESS 1
+#endif
+
+#if HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME)
+ #define HAS_PRINT_PROGRESS_PERMYRIAD 1
+#endif
+
+#if ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
+ #define HAS_GAMES 1
+ #if (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
+ #define HAS_GAME_MENU 1
+ #endif
+#endif
+
+#if ANY(FWRETRACT, HAS_LEVELING, SKEW_CORRECTION)
+ #define HAS_POSITION_MODIFIERS 1
+#endif
+
+#if ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
+ #define HAS_EXTRA_ENDSTOPS 1
+#endif
+#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
+ #define HAS_SOFTWARE_ENDSTOPS 1
+#endif
+#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS)
+ #define HAS_RESUME_CONTINUE 1
+#endif
+
+#if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
+ #define HAS_COLOR_LEDS 1
+#endif
+#if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
+ #define HAS_LEDS_OFF_FLAG 1
+#endif
+
// Multiple Z steppers
#ifndef NUM_Z_STEPPER_DRIVERS
#define NUM_Z_STEPPER_DRIVERS 1
#endif
+#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ #undef Z_STEPPER_ALIGN_AMP
+#endif
+#ifndef Z_STEPPER_ALIGN_AMP
+ #define Z_STEPPER_ALIGN_AMP 1.0
+#endif
+
#define HAS_CUTTER EITHER(SPINDLE_FEATURE, LASER_FEATURE)
#if !defined(__AVR__) || !defined(USBCON)
@@ -121,9 +176,6 @@
#define LED_CONTROL_MENU
#define LED_USER_PRESET_STARTUP
#define LED_COLOR_PRESETS
- #ifndef LED_USER_PRESET_RED
- #define LED_USER_PRESET_RED 255
- #endif
#ifndef LED_USER_PRESET_GREEN
#define LED_USER_PRESET_GREEN 128
#endif
@@ -135,10 +187,106 @@
#endif
#endif
+// Set defaults for unspecified LED user colors
+#if ENABLED(LED_CONTROL_MENU)
+ #ifndef LED_USER_PRESET_RED
+ #define LED_USER_PRESET_RED 255
+ #endif
+ #ifndef LED_USER_PRESET_GREEN
+ #define LED_USER_PRESET_GREEN 255
+ #endif
+ #ifndef LED_USER_PRESET_BLUE
+ #define LED_USER_PRESET_BLUE 255
+ #endif
+ #ifndef LED_USER_PRESET_WHITE
+ #define LED_USER_PRESET_WHITE 0
+ #endif
+ #ifndef LED_USER_PRESET_BRIGHTNESS
+ #ifdef NEOPIXEL_BRIGHTNESS
+ #define LED_USER_PRESET_BRIGHTNESS NEOPIXEL_BRIGHTNESS
+ #else
+ #define LED_USER_PRESET_BRIGHTNESS 255
+ #endif
+ #endif
+#endif
+
+// If platform requires early initialization of watchdog to properly boot
+#if ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM)
+ #define EARLY_WATCHDOG 1
+#endif
+
// Extensible UI pin mapping for RepRapDiscount
-#define TOUCH_UI_ULTIPANEL ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
+#if ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
+ #define TOUCH_UI_ULTIPANEL 1
+#endif
// Poll-based jogging for joystick and other devices
#if ENABLED(JOYSTICK)
#define POLL_JOG
#endif
+
+/**
+ * Driver Timings
+ * NOTE: Driver timing order is longest-to-shortest duration.
+ * Preserve this ordering when adding new drivers.
+ */
+
+#ifndef MINIMUM_STEPPER_POST_DIR_DELAY
+ #if HAS_DRIVER(TB6560)
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 15000
+ #elif HAS_DRIVER(TB6600)
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 1500
+ #elif HAS_DRIVER(DRV8825)
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 650
+ #elif HAS_DRIVER(LV8729)
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 500
+ #elif HAS_DRIVER(A5984)
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 400
+ #elif HAS_DRIVER(A4988)
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 200
+ #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 20
+ #else
+ #define MINIMUM_STEPPER_POST_DIR_DELAY 0 // Expect at least 10µS since one Stepper ISR must transpire
+ #endif
+#endif
+
+#ifndef MINIMUM_STEPPER_PRE_DIR_DELAY
+ #define MINIMUM_STEPPER_PRE_DIR_DELAY MINIMUM_STEPPER_POST_DIR_DELAY
+#endif
+
+#ifndef MINIMUM_STEPPER_PULSE
+ #if HAS_DRIVER(TB6560)
+ #define MINIMUM_STEPPER_PULSE 30
+ #elif HAS_DRIVER(TB6600)
+ #define MINIMUM_STEPPER_PULSE 3
+ #elif HAS_DRIVER(DRV8825)
+ #define MINIMUM_STEPPER_PULSE 2
+ #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
+ #define MINIMUM_STEPPER_PULSE 1
+ #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
+ #define MINIMUM_STEPPER_PULSE 0
+ #elif HAS_DRIVER(LV8729)
+ #define MINIMUM_STEPPER_PULSE 0
+ #else
+ #define MINIMUM_STEPPER_PULSE 2
+ #endif
+#endif
+
+#ifndef MAXIMUM_STEPPER_RATE
+ #if HAS_DRIVER(TB6560)
+ #define MAXIMUM_STEPPER_RATE 15000
+ #elif HAS_DRIVER(TB6600)
+ #define MAXIMUM_STEPPER_RATE 150000
+ #elif HAS_DRIVER(DRV8825)
+ #define MAXIMUM_STEPPER_RATE 250000
+ #elif HAS_DRIVER(A4988)
+ #define MAXIMUM_STEPPER_RATE 500000
+ #elif HAS_DRIVER(LV8729)
+ #define MAXIMUM_STEPPER_RATE 1000000
+ #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
+ #define MAXIMUM_STEPPER_RATE 5000000
+ #else
+ #define MAXIMUM_STEPPER_RATE 250000
+ #endif
+#endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1a2c39ec25..20867b4fea 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,6 +30,29 @@
// Extras for CI testing
#endif
+// Linear advance uses Jerk since E is an isolated axis
+#if DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE)
+ #define HAS_LINEAR_E_JERK 1
+#endif
+
+// Determine which type of 'EEPROM' is in use
+#if ENABLED(EEPROM_SETTINGS)
+ // EEPROM type may be defined by compile flags, configs, HALs, or pins
+ // Set additional flags to let HALs choose in their Conditionals_post.h
+ #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && ANY(I2C_EEPROM, SPI_EEPROM, QSPI_EEPROM)
+ #define USE_WIRED_EEPROM 1
+ #else
+ #define USE_FALLBACK_EEPROM 1
+ #endif
+#else
+ #undef I2C_EEPROM
+ #undef SPI_EEPROM
+ #undef QSPI_EEPROM
+ #undef SDCARD_EEPROM_EMULATION
+ #undef SRAM_EEPROM_EMULATION
+ #undef FLASH_EEPROM_EMULATION
+#endif
+
#ifdef TEENSYDUINO
#undef max
#define max(a,b) ((a)>(b)?(a):(b))
@@ -40,9 +63,6 @@
#define NOT_A_PIN 0 // For PINS_DEBUGGING
#endif
-#define HAS_CLASSIC_JERK (ENABLED(CLASSIC_JERK) || IS_KINEMATIC)
-#define HAS_CLASSIC_E_JERK (ENABLED(CLASSIC_JERK) || DISABLED(LIN_ADVANCE))
-
/**
* Axis lengths and center
*/
@@ -66,13 +86,8 @@
// Define center values for future use
#define _X_HALF_BED ((X_BED_SIZE) / 2)
#define _Y_HALF_BED ((Y_BED_SIZE) / 2)
-#if ENABLED(BED_CENTER_AT_0_0)
- #define X_CENTER 0
- #define Y_CENTER 0
-#else
- #define X_CENTER _X_HALF_BED
- #define Y_CENTER _Y_HALF_BED
-#endif
+#define X_CENTER TERN(BED_CENTER_AT_0_0, 0, _X_HALF_BED)
+#define Y_CENTER TERN(BED_CENTER_AT_0_0, 0, _Y_HALF_BED)
// Get the linear boundaries of the bed
#define X_MIN_BED (X_CENTER - _X_HALF_BED)
@@ -95,10 +110,18 @@
/**
* CoreXY, CoreXZ, and CoreYZ - and their reverse
*/
-#define CORE_IS_XY EITHER(COREXY, COREYX)
-#define CORE_IS_XZ EITHER(COREXZ, COREZX)
-#define CORE_IS_YZ EITHER(COREYZ, COREZY)
-#define IS_CORE (CORE_IS_XY || CORE_IS_XZ || CORE_IS_YZ)
+#if EITHER(COREXY, COREYX)
+ #define CORE_IS_XY 1
+#endif
+#if EITHER(COREXZ, COREZX)
+ #define CORE_IS_XZ 1
+#endif
+#if EITHER(COREYZ, COREZY)
+ #define CORE_IS_YZ 1
+#endif
+#if CORE_IS_XY || CORE_IS_XZ || CORE_IS_YZ
+ #define IS_CORE 1
+#endif
#if IS_CORE
#if CORE_IS_XY
#define CORE_AXIS_1 A_AXIS
@@ -113,12 +136,21 @@
#define CORE_AXIS_1 B_AXIS
#define CORE_AXIS_2 C_AXIS
#endif
- #if ANY(COREYX, COREZX, COREZY)
- #define CORESIGN(n) (-(n))
+ #define CORESIGN(n) (ANY(COREYX, COREZX, COREZY) ? (-(n)) : (n))
+#endif
+
+// Calibration codes only for non-core axes
+#if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE)
+ #if IS_CORE
+ #define X_AXIS_INDEX 0
+ #define Y_AXIS_INDEX 1
+ #define Z_AXIS_INDEX 2
+ #define CAN_CALIBRATE(A,B) (A##_AXIS_INDEX == B##_INDEX)
#else
- #define CORESIGN(n) (n)
+ #define CAN_CALIBRATE(...) 1
#endif
#endif
+#define AXIS_CAN_CALIBRATE(A) CAN_CALIBRATE(A,NORMAL_AXIS)
/**
* No adjustable bed on non-cartesians
@@ -142,33 +174,23 @@
*/
#ifdef MANUAL_X_HOME_POS
#define X_HOME_POS MANUAL_X_HOME_POS
-#elif ENABLED(BED_CENTER_AT_0_0)
- #if ENABLED(DELTA)
- #define X_HOME_POS 0
- #else
- #define X_HOME_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
- #endif
#else
- #if ENABLED(DELTA)
- #define X_HOME_POS (X_MIN_POS + (X_BED_SIZE) * 0.5)
+ #define X_END_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
+ #if ENABLED(BED_CENTER_AT_0_0)
+ #define X_HOME_POS TERN(DELTA, 0, X_END_POS)
#else
- #define X_HOME_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
+ #define X_HOME_POS TERN(DELTA, X_MIN_POS + (X_BED_SIZE) * 0.5, X_END_POS)
#endif
#endif
#ifdef MANUAL_Y_HOME_POS
#define Y_HOME_POS MANUAL_Y_HOME_POS
-#elif ENABLED(BED_CENTER_AT_0_0)
- #if ENABLED(DELTA)
- #define Y_HOME_POS 0
- #else
- #define Y_HOME_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
- #endif
#else
- #if ENABLED(DELTA)
- #define Y_HOME_POS (Y_MIN_POS + (Y_BED_SIZE) * 0.5)
+ #define Y_END_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
+ #if ENABLED(BED_CENTER_AT_0_0)
+ #define Y_HOME_POS TERN(DELTA, 0, Y_END_POS)
#else
- #define Y_HOME_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
+ #define Y_HOME_POS TERN(DELTA, Y_MIN_POS + (Y_BED_SIZE) * 0.5, Y_END_POS)
#endif
#endif
@@ -271,7 +293,10 @@
#define _LCD_CONTRAST_INIT 17
#endif
-#define HAS_LCD_CONTRAST defined(_LCD_CONTRAST_INIT)
+#ifdef _LCD_CONTRAST_INIT
+ #define HAS_LCD_CONTRAST 1
+#endif
+
#if HAS_LCD_CONTRAST
#ifndef LCD_CONTRAST_MIN
#ifdef _LCD_CONTRAST_MIN
@@ -298,10 +323,18 @@
#endif
/**
- * Override here because this is set in Configuration_adv.h
+ * Override the SD_DETECT_STATE set in Configuration_adv.h
*/
-#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #undef SD_DETECT_INVERTED
+#if ENABLED(SDSUPPORT)
+ #if HAS_LCD_MENU && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+ #undef SD_DETECT_STATE
+ #if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+ #define SD_DETECT_STATE HIGH
+ #endif
+ #endif
+ #ifndef SD_DETECT_STATE
+ #define SD_DETECT_STATE LOW
+ #endif
#endif
/**
@@ -579,99 +612,6 @@
HEATER_0_USES_THERMISTOR, HEATER_1_USES_THERMISTOR, HEATER_2_USES_THERMISTOR, HEATER_3_USES_THERMISTOR, \
HEATER_4_USES_THERMISTOR, HEATER_5_USES_THERMISTOR, HEATER_6_USES_THERMISTOR, HEATER_7_USES_THERMISTOR )
-/**
- * Default hotend offsets, if not defined
- */
-#if HAS_HOTEND_OFFSET
- #ifndef HOTEND_OFFSET_X
- #define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
- #endif
- #ifndef HOTEND_OFFSET_Y
- #define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
- #endif
- #ifndef HOTEND_OFFSET_Z
- #define HOTEND_OFFSET_Z { 0 } // Z offsets for each extruder
- #endif
-#endif
-
-/**
- * ARRAY_BY_EXTRUDERS based on EXTRUDERS
- */
-#define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
-#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1)
-
-/**
- * ARRAY_BY_HOTENDS based on HOTENDS
- */
-#define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
-#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1)
-
-/**
- * Driver Timings
- * NOTE: Driver timing order is longest-to-shortest duration.
- * Preserve this ordering when adding new drivers.
- */
-
-#ifndef MINIMUM_STEPPER_POST_DIR_DELAY
- #if HAS_DRIVER(TB6560)
- #define MINIMUM_STEPPER_POST_DIR_DELAY 15000
- #elif HAS_DRIVER(TB6600)
- #define MINIMUM_STEPPER_POST_DIR_DELAY 1500
- #elif HAS_DRIVER(DRV8825)
- #define MINIMUM_STEPPER_POST_DIR_DELAY 650
- #elif HAS_DRIVER(LV8729)
- #define MINIMUM_STEPPER_POST_DIR_DELAY 500
- #elif HAS_DRIVER(A5984)
- #define MINIMUM_STEPPER_POST_DIR_DELAY 400
- #elif HAS_DRIVER(A4988)
- #define MINIMUM_STEPPER_POST_DIR_DELAY 200
- #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
- #define MINIMUM_STEPPER_POST_DIR_DELAY 20
- #else
- #define MINIMUM_STEPPER_POST_DIR_DELAY 0 // Expect at least 10µS since one Stepper ISR must transpire
- #endif
-#endif
-
-#ifndef MINIMUM_STEPPER_PRE_DIR_DELAY
- #define MINIMUM_STEPPER_PRE_DIR_DELAY MINIMUM_STEPPER_POST_DIR_DELAY
-#endif
-
-#ifndef MINIMUM_STEPPER_PULSE
- #if HAS_DRIVER(TB6560)
- #define MINIMUM_STEPPER_PULSE 30
- #elif HAS_DRIVER(TB6600)
- #define MINIMUM_STEPPER_PULSE 3
- #elif HAS_DRIVER(DRV8825)
- #define MINIMUM_STEPPER_PULSE 2
- #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
- #define MINIMUM_STEPPER_PULSE 1
- #elif TRINAMICS
- #define MINIMUM_STEPPER_PULSE 0
- #elif HAS_DRIVER(LV8729)
- #define MINIMUM_STEPPER_PULSE 0
- #else
- #define MINIMUM_STEPPER_PULSE 2
- #endif
-#endif
-
-#ifndef MAXIMUM_STEPPER_RATE
- #if HAS_DRIVER(TB6560)
- #define MAXIMUM_STEPPER_RATE 15000
- #elif HAS_DRIVER(TB6600)
- #define MAXIMUM_STEPPER_RATE 150000
- #elif HAS_DRIVER(DRV8825)
- #define MAXIMUM_STEPPER_RATE 250000
- #elif HAS_DRIVER(A4988)
- #define MAXIMUM_STEPPER_RATE 500000
- #elif HAS_DRIVER(LV8729)
- #define MAXIMUM_STEPPER_RATE 1000000
- #elif TRINAMICS
- #define MAXIMUM_STEPPER_RATE 5000000
- #else
- #define MAXIMUM_STEPPER_RATE 250000
- #endif
-#endif
-
/**
* X_DUAL_ENDSTOPS endstop reassignment
*/
@@ -679,48 +619,110 @@
#if X_HOME_DIR > 0
#if X2_USE_ENDSTOP == _XMIN_
#define X2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define X2_MAX_PIN X_MIN_PIN
#elif X2_USE_ENDSTOP == _XMAX_
#define X2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define X2_MAX_PIN X_MAX_PIN
#elif X2_USE_ENDSTOP == _YMIN_
#define X2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define X2_MAX_PIN Y_MIN_PIN
#elif X2_USE_ENDSTOP == _YMAX_
#define X2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define X2_MAX_PIN Y_MAX_PIN
#elif X2_USE_ENDSTOP == _ZMIN_
#define X2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define X2_MAX_PIN Z_MIN_PIN
#elif X2_USE_ENDSTOP == _ZMAX_
#define X2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define X2_MAX_PIN Z_MAX_PIN
#else
#define X2_MAX_ENDSTOP_INVERTING false
#endif
+ #ifndef X2_MAX_PIN
+ #if X2_USE_ENDSTOP == _XMIN_
+ #define X2_MAX_PIN X_MIN_PIN
+ #elif X2_USE_ENDSTOP == _XMAX_
+ #define X2_MAX_PIN X_MAX_PIN
+ #elif X2_USE_ENDSTOP == _YMIN_
+ #define X2_MAX_PIN Y_MIN_PIN
+ #elif X2_USE_ENDSTOP == _YMAX_
+ #define X2_MAX_PIN Y_MAX_PIN
+ #elif X2_USE_ENDSTOP == _ZMIN_
+ #define X2_MAX_PIN Z_MIN_PIN
+ #elif X2_USE_ENDSTOP == _ZMAX_
+ #define X2_MAX_PIN Z_MAX_PIN
+ #elif X2_USE_ENDSTOP == _XDIAG_
+ #define X2_MAX_PIN X_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _YDIAG_
+ #define X2_MAX_PIN Y_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _ZDIAG_
+ #define X2_MAX_PIN Z_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E0DIAG_
+ #define X2_MAX_PIN E0_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E1DIAG_
+ #define X2_MAX_PIN E1_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E2DIAG_
+ #define X2_MAX_PIN E2_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E3DIAG_
+ #define X2_MAX_PIN E3_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E4DIAG_
+ #define X2_MAX_PIN E4_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E5DIAG_
+ #define X2_MAX_PIN E5_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E6DIAG_
+ #define X2_MAX_PIN E6_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E7DIAG_
+ #define X2_MAX_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define X2_MIN_ENDSTOP_INVERTING false
#else
#if X2_USE_ENDSTOP == _XMIN_
#define X2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define X2_MIN_PIN X_MIN_PIN
#elif X2_USE_ENDSTOP == _XMAX_
#define X2_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define X2_MIN_PIN X_MAX_PIN
#elif X2_USE_ENDSTOP == _YMIN_
#define X2_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define X2_MIN_PIN Y_MIN_PIN
#elif X2_USE_ENDSTOP == _YMAX_
#define X2_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define X2_MIN_PIN Y_MAX_PIN
#elif X2_USE_ENDSTOP == _ZMIN_
#define X2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define X2_MIN_PIN Z_MIN_PIN
#elif X2_USE_ENDSTOP == _ZMAX_
#define X2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define X2_MIN_PIN Z_MAX_PIN
#else
#define X2_MIN_ENDSTOP_INVERTING false
#endif
+ #ifndef X2_MIN_PIN
+ #if X2_USE_ENDSTOP == _XMIN_
+ #define X2_MIN_PIN X_MIN_PIN
+ #elif X2_USE_ENDSTOP == _XMAX_
+ #define X2_MIN_PIN X_MAX_PIN
+ #elif X2_USE_ENDSTOP == _YMIN_
+ #define X2_MIN_PIN Y_MIN_PIN
+ #elif X2_USE_ENDSTOP == _YMAX_
+ #define X2_MIN_PIN Y_MAX_PIN
+ #elif X2_USE_ENDSTOP == _ZMIN_
+ #define X2_MIN_PIN Z_MIN_PIN
+ #elif X2_USE_ENDSTOP == _ZMAX_
+ #define X2_MIN_PIN Z_MAX_PIN
+ #elif X2_USE_ENDSTOP == _XDIAG_
+ #define X2_MIN_PIN X_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _YDIAG_
+ #define X2_MIN_PIN Y_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _ZDIAG_
+ #define X2_MIN_PIN Z_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E0DIAG_
+ #define X2_MIN_PIN E0_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E1DIAG_
+ #define X2_MIN_PIN E1_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E2DIAG_
+ #define X2_MIN_PIN E2_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E3DIAG_
+ #define X2_MIN_PIN E3_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E4DIAG_
+ #define X2_MIN_PIN E4_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E5DIAG_
+ #define X2_MIN_PIN E5_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E6DIAG_
+ #define X2_MIN_PIN E6_DIAG_PIN
+ #elif X2_USE_ENDSTOP == _E7DIAG_
+ #define X2_MIN_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define X2_MAX_ENDSTOP_INVERTING false
#endif
#endif
@@ -732,48 +734,110 @@
#if Y_HOME_DIR > 0
#if Y2_USE_ENDSTOP == _XMIN_
#define Y2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Y2_MAX_PIN X_MIN_PIN
#elif Y2_USE_ENDSTOP == _XMAX_
#define Y2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Y2_MAX_PIN X_MAX_PIN
#elif Y2_USE_ENDSTOP == _YMIN_
#define Y2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Y2_MAX_PIN Y_MIN_PIN
#elif Y2_USE_ENDSTOP == _YMAX_
#define Y2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Y2_MAX_PIN Y_MAX_PIN
#elif Y2_USE_ENDSTOP == _ZMIN_
#define Y2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Y2_MAX_PIN Z_MIN_PIN
#elif Y2_USE_ENDSTOP == _ZMAX_
#define Y2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Y2_MAX_PIN Z_MAX_PIN
#else
#define Y2_MAX_ENDSTOP_INVERTING false
#endif
+ #ifndef Y2_MAX_PIN
+ #if Y2_USE_ENDSTOP == _XMIN_
+ #define Y2_MAX_PIN X_MIN_PIN
+ #elif Y2_USE_ENDSTOP == _XMAX_
+ #define Y2_MAX_PIN X_MAX_PIN
+ #elif Y2_USE_ENDSTOP == _YMIN_
+ #define Y2_MAX_PIN Y_MIN_PIN
+ #elif Y2_USE_ENDSTOP == _YMAX_
+ #define Y2_MAX_PIN Y_MAX_PIN
+ #elif Y2_USE_ENDSTOP == _ZMIN_
+ #define Y2_MAX_PIN Z_MIN_PIN
+ #elif Y2_USE_ENDSTOP == _ZMAX_
+ #define Y2_MAX_PIN Z_MAX_PIN
+ #elif Y2_USE_ENDSTOP == _XDIAG_
+ #define Y2_MAX_PIN X_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _YDIAG_
+ #define Y2_MAX_PIN Y_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _ZDIAG_
+ #define Y2_MAX_PIN Z_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E0DIAG_
+ #define Y2_MAX_PIN E0_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E1DIAG_
+ #define Y2_MAX_PIN E1_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E2DIAG_
+ #define Y2_MAX_PIN E2_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E3DIAG_
+ #define Y2_MAX_PIN E3_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E4DIAG_
+ #define Y2_MAX_PIN E4_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E5DIAG_
+ #define Y2_MAX_PIN E5_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E6DIAG_
+ #define Y2_MAX_PIN E6_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E7DIAG_
+ #define Y2_MAX_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Y2_MIN_ENDSTOP_INVERTING false
#else
#if Y2_USE_ENDSTOP == _XMIN_
#define Y2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Y2_MIN_PIN X_MIN_PIN
#elif Y2_USE_ENDSTOP == _XMAX_
#define Y2_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Y2_MIN_PIN X_MAX_PIN
#elif Y2_USE_ENDSTOP == _YMIN_
#define Y2_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Y2_MIN_PIN Y_MIN_PIN
#elif Y2_USE_ENDSTOP == _YMAX_
#define Y2_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Y2_MIN_PIN Y_MAX_PIN
#elif Y2_USE_ENDSTOP == _ZMIN_
#define Y2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Y2_MIN_PIN Z_MIN_PIN
#elif Y2_USE_ENDSTOP == _ZMAX_
#define Y2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Y2_MIN_PIN Z_MAX_PIN
#else
#define Y2_MIN_ENDSTOP_INVERTING false
#endif
+ #ifndef Y2_MIN_PIN
+ #if Y2_USE_ENDSTOP == _XMIN_
+ #define Y2_MIN_PIN X_MIN_PIN
+ #elif Y2_USE_ENDSTOP == _XMAX_
+ #define Y2_MIN_PIN X_MAX_PIN
+ #elif Y2_USE_ENDSTOP == _YMIN_
+ #define Y2_MIN_PIN Y_MIN_PIN
+ #elif Y2_USE_ENDSTOP == _YMAX_
+ #define Y2_MIN_PIN Y_MAX_PIN
+ #elif Y2_USE_ENDSTOP == _ZMIN_
+ #define Y2_MIN_PIN Z_MIN_PIN
+ #elif Y2_USE_ENDSTOP == _ZMAX_
+ #define Y2_MIN_PIN Z_MAX_PIN
+ #elif Y2_USE_ENDSTOP == _XDIAG_
+ #define Y2_MIN_PIN X_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _YDIAG_
+ #define Y2_MIN_PIN Y_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _ZDIAG_
+ #define Y2_MIN_PIN Z_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E0DIAG_
+ #define Y2_MIN_PIN E0_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E1DIAG_
+ #define Y2_MIN_PIN E1_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E2DIAG_
+ #define Y2_MIN_PIN E2_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E3DIAG_
+ #define Y2_MIN_PIN E3_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E4DIAG_
+ #define Y2_MIN_PIN E4_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E5DIAG_
+ #define Y2_MIN_PIN E5_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E6DIAG_
+ #define Y2_MIN_PIN E6_DIAG_PIN
+ #elif Y2_USE_ENDSTOP == _E7DIAG_
+ #define Y2_MIN_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Y2_MAX_ENDSTOP_INVERTING false
#endif
#endif
@@ -786,48 +850,110 @@
#if Z_HOME_DIR > 0
#if Z2_USE_ENDSTOP == _XMIN_
#define Z2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Z2_MAX_PIN X_MIN_PIN
#elif Z2_USE_ENDSTOP == _XMAX_
#define Z2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Z2_MAX_PIN X_MAX_PIN
#elif Z2_USE_ENDSTOP == _YMIN_
#define Z2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Z2_MAX_PIN Y_MIN_PIN
#elif Z2_USE_ENDSTOP == _YMAX_
#define Z2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Z2_MAX_PIN Y_MAX_PIN
#elif Z2_USE_ENDSTOP == _ZMIN_
#define Z2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Z2_MAX_PIN Z_MIN_PIN
#elif Z2_USE_ENDSTOP == _ZMAX_
#define Z2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Z2_MAX_PIN Z_MAX_PIN
#else
#define Z2_MAX_ENDSTOP_INVERTING false
#endif
+ #ifndef Z2_MAX_PIN
+ #if Z2_USE_ENDSTOP == _XMIN_
+ #define Z2_MAX_PIN X_MIN_PIN
+ #elif Z2_USE_ENDSTOP == _XMAX_
+ #define Z2_MAX_PIN X_MAX_PIN
+ #elif Z2_USE_ENDSTOP == _YMIN_
+ #define Z2_MAX_PIN Y_MIN_PIN
+ #elif Z2_USE_ENDSTOP == _YMAX_
+ #define Z2_MAX_PIN Y_MAX_PIN
+ #elif Z2_USE_ENDSTOP == _ZMIN_
+ #define Z2_MAX_PIN Z_MIN_PIN
+ #elif Z2_USE_ENDSTOP == _ZMAX_
+ #define Z2_MAX_PIN Z_MAX_PIN
+ #elif Z2_USE_ENDSTOP == _XDIAG_
+ #define Z2_MAX_PIN X_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _YDIAG_
+ #define Z2_MAX_PIN Y_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _ZDIAG_
+ #define Z2_MAX_PIN Z_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E0DIAG_
+ #define Z2_MAX_PIN E0_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E1DIAG_
+ #define Z2_MAX_PIN E1_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E2DIAG_
+ #define Z2_MAX_PIN E2_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E3DIAG_
+ #define Z2_MAX_PIN E3_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E4DIAG_
+ #define Z2_MAX_PIN E4_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E5DIAG_
+ #define Z2_MAX_PIN E5_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E6DIAG_
+ #define Z2_MAX_PIN E6_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E7DIAG_
+ #define Z2_MAX_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Z2_MIN_ENDSTOP_INVERTING false
#else
#if Z2_USE_ENDSTOP == _XMIN_
#define Z2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Z2_MIN_PIN X_MIN_PIN
#elif Z2_USE_ENDSTOP == _XMAX_
#define Z2_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Z2_MIN_PIN X_MAX_PIN
#elif Z2_USE_ENDSTOP == _YMIN_
#define Z2_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Z2_MIN_PIN Y_MIN_PIN
#elif Z2_USE_ENDSTOP == _YMAX_
#define Z2_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Z2_MIN_PIN Y_MAX_PIN
#elif Z2_USE_ENDSTOP == _ZMIN_
#define Z2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Z2_MIN_PIN Z_MIN_PIN
#elif Z2_USE_ENDSTOP == _ZMAX_
#define Z2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Z2_MIN_PIN Z_MAX_PIN
#else
#define Z2_MIN_ENDSTOP_INVERTING false
#endif
+ #ifndef Z2_MIN_PIN
+ #if Z2_USE_ENDSTOP == _XMIN_
+ #define Z2_MIN_PIN X_MIN_PIN
+ #elif Z2_USE_ENDSTOP == _XMAX_
+ #define Z2_MIN_PIN X_MAX_PIN
+ #elif Z2_USE_ENDSTOP == _YMIN_
+ #define Z2_MIN_PIN Y_MIN_PIN
+ #elif Z2_USE_ENDSTOP == _YMAX_
+ #define Z2_MIN_PIN Y_MAX_PIN
+ #elif Z2_USE_ENDSTOP == _ZMIN_
+ #define Z2_MIN_PIN Z_MIN_PIN
+ #elif Z2_USE_ENDSTOP == _ZMAX_
+ #define Z2_MIN_PIN Z_MAX_PIN
+ #elif Z2_USE_ENDSTOP == _XDIAG_
+ #define Z2_MIN_PIN X_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _YDIAG_
+ #define Z2_MIN_PIN Y_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _ZDIAG_
+ #define Z2_MIN_PIN Z_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E0DIAG_
+ #define Z2_MIN_PIN E0_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E1DIAG_
+ #define Z2_MIN_PIN E1_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E2DIAG_
+ #define Z2_MIN_PIN E2_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E3DIAG_
+ #define Z2_MIN_PIN E3_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E4DIAG_
+ #define Z2_MIN_PIN E4_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E5DIAG_
+ #define Z2_MIN_PIN E5_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E6DIAG_
+ #define Z2_MIN_PIN E6_DIAG_PIN
+ #elif Z2_USE_ENDSTOP == _E7DIAG_
+ #define Z2_MIN_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Z2_MAX_ENDSTOP_INVERTING false
#endif
@@ -835,48 +961,110 @@
#if Z_HOME_DIR > 0
#if Z3_USE_ENDSTOP == _XMIN_
#define Z3_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Z3_MAX_PIN X_MIN_PIN
#elif Z3_USE_ENDSTOP == _XMAX_
#define Z3_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Z3_MAX_PIN X_MAX_PIN
#elif Z3_USE_ENDSTOP == _YMIN_
#define Z3_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Z3_MAX_PIN Y_MIN_PIN
#elif Z3_USE_ENDSTOP == _YMAX_
#define Z3_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Z3_MAX_PIN Y_MAX_PIN
#elif Z3_USE_ENDSTOP == _ZMIN_
#define Z3_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Z3_MAX_PIN Z_MIN_PIN
#elif Z3_USE_ENDSTOP == _ZMAX_
#define Z3_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Z3_MAX_PIN Z_MAX_PIN
#else
#define Z3_MAX_ENDSTOP_INVERTING false
#endif
+ #ifndef Z3_MAX_PIN
+ #if Z3_USE_ENDSTOP == _XMIN_
+ #define Z3_MAX_PIN X_MIN_PIN
+ #elif Z3_USE_ENDSTOP == _XMAX_
+ #define Z3_MAX_PIN X_MAX_PIN
+ #elif Z3_USE_ENDSTOP == _YMIN_
+ #define Z3_MAX_PIN Y_MIN_PIN
+ #elif Z3_USE_ENDSTOP == _YMAX_
+ #define Z3_MAX_PIN Y_MAX_PIN
+ #elif Z3_USE_ENDSTOP == _ZMIN_
+ #define Z3_MAX_PIN Z_MIN_PIN
+ #elif Z3_USE_ENDSTOP == _ZMAX_
+ #define Z3_MAX_PIN Z_MAX_PIN
+ #elif Z3_USE_ENDSTOP == _XDIAG_
+ #define Z3_MAX_PIN X_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _YDIAG_
+ #define Z3_MAX_PIN Y_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _ZDIAG_
+ #define Z3_MAX_PIN Z_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E0DIAG_
+ #define Z3_MAX_PIN E0_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E1DIAG_
+ #define Z3_MAX_PIN E1_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E2DIAG_
+ #define Z3_MAX_PIN E2_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E3DIAG_
+ #define Z3_MAX_PIN E3_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E4DIAG_
+ #define Z3_MAX_PIN E4_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E5DIAG_
+ #define Z3_MAX_PIN E5_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E6DIAG_
+ #define Z3_MAX_PIN E6_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E7DIAG_
+ #define Z3_MAX_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Z3_MIN_ENDSTOP_INVERTING false
#else
#if Z3_USE_ENDSTOP == _XMIN_
#define Z3_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Z3_MIN_PIN X_MIN_PIN
#elif Z3_USE_ENDSTOP == _XMAX_
#define Z3_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Z3_MIN_PIN X_MAX_PIN
#elif Z3_USE_ENDSTOP == _YMIN_
#define Z3_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Z3_MIN_PIN Y_MIN_PIN
#elif Z3_USE_ENDSTOP == _YMAX_
#define Z3_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Z3_MIN_PIN Y_MAX_PIN
#elif Z3_USE_ENDSTOP == _ZMIN_
#define Z3_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Z3_MIN_PIN Z_MIN_PIN
#elif Z3_USE_ENDSTOP == _ZMAX_
#define Z3_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Z3_MIN_PIN Z_MAX_PIN
#else
#define Z3_MIN_ENDSTOP_INVERTING false
#endif
+ #ifndef Z3_MIN_PIN
+ #if Z3_USE_ENDSTOP == _XMIN_
+ #define Z3_MIN_PIN X_MIN_PIN
+ #elif Z3_USE_ENDSTOP == _XMAX_
+ #define Z3_MIN_PIN X_MAX_PIN
+ #elif Z3_USE_ENDSTOP == _YMIN_
+ #define Z3_MIN_PIN Y_MIN_PIN
+ #elif Z3_USE_ENDSTOP == _YMAX_
+ #define Z3_MIN_PIN Y_MAX_PIN
+ #elif Z3_USE_ENDSTOP == _ZMIN_
+ #define Z3_MIN_PIN Z_MIN_PIN
+ #elif Z3_USE_ENDSTOP == _ZMAX_
+ #define Z3_MIN_PIN Z_MAX_PIN
+ #elif Z3_USE_ENDSTOP == _XDIAG_
+ #define Z3_MIN_PIN X_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _YDIAG_
+ #define Z3_MIN_PIN Y_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _ZDIAG_
+ #define Z3_MIN_PIN Z_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E0DIAG_
+ #define Z3_MIN_PIN E0_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E1DIAG_
+ #define Z3_MIN_PIN E1_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E2DIAG_
+ #define Z3_MIN_PIN E2_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E3DIAG_
+ #define Z3_MIN_PIN E3_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E4DIAG_
+ #define Z3_MIN_PIN E4_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E5DIAG_
+ #define Z3_MIN_PIN E5_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E6DIAG_
+ #define Z3_MIN_PIN E6_DIAG_PIN
+ #elif Z3_USE_ENDSTOP == _E7DIAG_
+ #define Z3_MIN_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Z3_MAX_ENDSTOP_INVERTING false
#endif
#endif
@@ -885,48 +1073,110 @@
#if Z_HOME_DIR > 0
#if Z4_USE_ENDSTOP == _XMIN_
#define Z4_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Z4_MAX_PIN X_MIN_PIN
#elif Z4_USE_ENDSTOP == _XMAX_
#define Z4_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Z4_MAX_PIN X_MAX_PIN
#elif Z4_USE_ENDSTOP == _YMIN_
#define Z4_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Z4_MAX_PIN Y_MIN_PIN
#elif Z4_USE_ENDSTOP == _YMAX_
#define Z4_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Z4_MAX_PIN Y_MAX_PIN
#elif Z4_USE_ENDSTOP == _ZMIN_
#define Z4_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Z4_MAX_PIN Z_MIN_PIN
#elif Z4_USE_ENDSTOP == _ZMAX_
#define Z4_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Z4_MAX_PIN Z_MAX_PIN
#else
#define Z4_MAX_ENDSTOP_INVERTING false
#endif
+ #ifndef Z4_MAX_PIN
+ #if Z4_USE_ENDSTOP == _XMIN_
+ #define Z4_MAX_PIN X_MIN_PIN
+ #elif Z4_USE_ENDSTOP == _XMAX_
+ #define Z4_MAX_PIN X_MAX_PIN
+ #elif Z4_USE_ENDSTOP == _YMIN_
+ #define Z4_MAX_PIN Y_MIN_PIN
+ #elif Z4_USE_ENDSTOP == _YMAX_
+ #define Z4_MAX_PIN Y_MAX_PIN
+ #elif Z4_USE_ENDSTOP == _ZMIN_
+ #define Z4_MAX_PIN Z_MIN_PIN
+ #elif Z4_USE_ENDSTOP == _ZMAX_
+ #define Z4_MAX_PIN Z_MAX_PIN
+ #elif Z4_USE_ENDSTOP == _XDIAG_
+ #define Z4_MAX_PIN X_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _YDIAG_
+ #define Z4_MAX_PIN Y_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _ZDIAG_
+ #define Z4_MAX_PIN Z_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E0DIAG_
+ #define Z4_MAX_PIN E0_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E1DIAG_
+ #define Z4_MAX_PIN E1_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E2DIAG_
+ #define Z4_MAX_PIN E2_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E3DIAG_
+ #define Z4_MAX_PIN E3_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E4DIAG_
+ #define Z4_MAX_PIN E4_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E5DIAG_
+ #define Z4_MAX_PIN E5_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E6DIAG_
+ #define Z4_MAX_PIN E6_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E7DIAG_
+ #define Z4_MAX_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Z4_MIN_ENDSTOP_INVERTING false
#else
#if Z4_USE_ENDSTOP == _XMIN_
#define Z4_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
- #define Z4_MIN_PIN X_MIN_PIN
#elif Z4_USE_ENDSTOP == _XMAX_
#define Z4_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
- #define Z4_MIN_PIN X_MAX_PIN
#elif Z4_USE_ENDSTOP == _YMIN_
#define Z4_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
- #define Z4_MIN_PIN Y_MIN_PIN
#elif Z4_USE_ENDSTOP == _YMAX_
#define Z4_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
- #define Z4_MIN_PIN Y_MAX_PIN
#elif Z4_USE_ENDSTOP == _ZMIN_
#define Z4_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
- #define Z4_MIN_PIN Z_MIN_PIN
#elif Z4_USE_ENDSTOP == _ZMAX_
#define Z4_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
- #define Z4_MIN_PIN Z_MAX_PIN
#else
#define Z4_MIN_ENDSTOP_INVERTING false
#endif
+ #ifndef Z4_MIN_PIN
+ #if Z4_USE_ENDSTOP == _XMIN_
+ #define Z4_MIN_PIN X_MIN_PIN
+ #elif Z4_USE_ENDSTOP == _XMAX_
+ #define Z4_MIN_PIN X_MAX_PIN
+ #elif Z4_USE_ENDSTOP == _YMIN_
+ #define Z4_MIN_PIN Y_MIN_PIN
+ #elif Z4_USE_ENDSTOP == _YMAX_
+ #define Z4_MIN_PIN Y_MAX_PIN
+ #elif Z4_USE_ENDSTOP == _ZMIN_
+ #define Z4_MIN_PIN Z_MIN_PIN
+ #elif Z4_USE_ENDSTOP == _ZMAX_
+ #define Z4_MIN_PIN Z_MAX_PIN
+ #elif Z4_USE_ENDSTOP == _XDIAG_
+ #define Z4_MIN_PIN X_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _YDIAG_
+ #define Z4_MIN_PIN Y_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _ZDIAG_
+ #define Z4_MIN_PIN Z_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E0DIAG_
+ #define Z4_MIN_PIN E0_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E1DIAG_
+ #define Z4_MIN_PIN E1_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E2DIAG_
+ #define Z4_MIN_PIN E2_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E3DIAG_
+ #define Z4_MIN_PIN E3_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E4DIAG_
+ #define Z4_MIN_PIN E4_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E5DIAG_
+ #define Z4_MIN_PIN E5_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E6DIAG_
+ #define Z4_MIN_PIN E6_DIAG_PIN
+ #elif Z4_USE_ENDSTOP == _E7DIAG_
+ #define Z4_MIN_PIN E7_DIAG_PIN
+ #endif
+ #endif
#define Z4_MAX_ENDSTOP_INVERTING false
#endif
#endif
@@ -1076,21 +1326,41 @@
#define HAS_SOLENOID_7 (PIN_EXISTS(SOL7))
// Trinamic Stepper Drivers
-#if HAS_TRINAMIC
- #define STEALTHCHOP_ENABLED ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
- #define USE_SENSORLESS EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+#if HAS_TRINAMIC_CONFIG
+ #if ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
+ #define STEALTHCHOP_ENABLED 1
+ #endif
+ #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+ #define USE_SENSORLESS 1
+ #endif
// Disable Z axis sensorless homing if a probe is used to home the Z axis
#if HOMING_Z_WITH_PROBE
#undef Z_STALL_SENSITIVITY
#endif
- #define X_SENSORLESS (AXIS_HAS_STALLGUARD(X) && defined(X_STALL_SENSITIVITY))
- #define X2_SENSORLESS (AXIS_HAS_STALLGUARD(X2) && defined(X2_STALL_SENSITIVITY))
- #define Y_SENSORLESS (AXIS_HAS_STALLGUARD(Y) && defined(Y_STALL_SENSITIVITY))
- #define Y2_SENSORLESS (AXIS_HAS_STALLGUARD(Y2) && defined(Y2_STALL_SENSITIVITY))
- #define Z_SENSORLESS (AXIS_HAS_STALLGUARD(Z) && defined(Z_STALL_SENSITIVITY))
- #define Z2_SENSORLESS (AXIS_HAS_STALLGUARD(Z2) && defined(Z2_STALL_SENSITIVITY))
- #define Z3_SENSORLESS (AXIS_HAS_STALLGUARD(Z3) && defined(Z3_STALL_SENSITIVITY))
- #define Z4_SENSORLESS (AXIS_HAS_STALLGUARD(Z4) && defined(Z4_STALL_SENSITIVITY))
+ #if defined(X_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(X)
+ #define X_SENSORLESS 1
+ #endif
+ #if defined(X2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(X2)
+ #define X2_SENSORLESS 1
+ #endif
+ #if defined(Y_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y)
+ #define Y_SENSORLESS 1
+ #endif
+ #if defined(Y2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y2)
+ #define Y2_SENSORLESS 1
+ #endif
+ #if defined(Z_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z)
+ #define Z_SENSORLESS 1
+ #endif
+ #if defined(Z2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z2)
+ #define Z2_SENSORLESS 1
+ #endif
+ #if defined(Z3_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z3)
+ #define Z3_SENSORLESS 1
+ #endif
+ #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
+ #define Z4_SENSORLESS 1
+ #endif
#if ENABLED(SPI_ENDSTOPS)
#define X_SPI_SENSORLESS X_SENSORLESS
#define Y_SPI_SENSORLESS Y_SENSORLESS
@@ -1133,7 +1403,6 @@
#define HAS_Z4_MIN (PIN_EXISTS(Z4_MIN))
#define HAS_Z4_MAX (PIN_EXISTS(Z4_MAX))
#define HAS_Z_MIN_PROBE_PIN (HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE))
-#define HAS_CALIBRATION_PIN (PIN_EXISTS(CALIBRATION))
//
// ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
@@ -1175,23 +1444,48 @@
#define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
// Shorthand for common combinations
-#define HAS_HEATED_BED (HAS_TEMP_BED && HAS_HEATER_BED)
-#define BED_OR_CHAMBER (HAS_HEATED_BED || HAS_TEMP_CHAMBER)
-#define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE)
-#define HAS_HEATED_CHAMBER (HAS_TEMP_CHAMBER && PIN_EXISTS(HEATER_CHAMBER))
+#if HAS_TEMP_BED && HAS_HEATER_BED
+ #define HAS_HEATED_BED 1
+#endif
+#if HAS_HEATED_BED || HAS_TEMP_CHAMBER
+ #define BED_OR_CHAMBER 1
+#endif
+#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE
+ #define HAS_TEMP_SENSOR 1
+#endif
+#if HAS_TEMP_CHAMBER && PIN_EXISTS(HEATER_CHAMBER)
+ #define HAS_HEATED_CHAMBER 1
+#endif
// PID heating
#if !HAS_HEATED_BED
#undef PIDTEMPBED
#endif
-#define HAS_PID_HEATING EITHER(PIDTEMP, PIDTEMPBED)
-#define HAS_PID_FOR_BOTH BOTH(PIDTEMP, PIDTEMPBED)
+#if EITHER(PIDTEMP, PIDTEMPBED)
+ #define HAS_PID_HEATING 1
+#endif
+#if BOTH(PIDTEMP, PIDTEMPBED)
+ #define HAS_PID_FOR_BOTH 1
+#endif
// Thermal protection
-#define HAS_THERMALLY_PROTECTED_BED (HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED))
-#define WATCH_HOTENDS (ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0)
-#define WATCH_BED (HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0)
-#define WATCH_CHAMBER (HAS_HEATED_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER) && WATCH_CHAMBER_TEMP_PERIOD > 0)
+#if HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED)
+ #define HAS_THERMALLY_PROTECTED_BED 1
+#endif
+#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
+ #define WATCH_HOTENDS 1
+#endif
+#if HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0
+ #define WATCH_BED 1
+#endif
+#if HAS_HEATED_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER) && WATCH_CHAMBER_TEMP_PERIOD > 0
+ #define WATCH_CHAMBER 1
+#endif
+#if (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) \
+ && (ENABLED(THERMAL_PROTECTION_BED) || !HAS_HEATED_BED) \
+ && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER)
+ #define THERMALLY_SAFE 1
+#endif
// Auto fans
#define HAS_AUTO_FAN_0 (HOTENDS > 0 && PIN_EXISTS(E0_AUTO_FAN))
@@ -1213,6 +1507,7 @@
#if !HAS_TEMP_SENSOR
#undef AUTO_REPORT_TEMPERATURES
#endif
+#define HAS_AUTO_REPORTING EITHER(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS)
#if !HAS_AUTO_CHAMBER_FAN || AUTO_CHAMBER_IS_E
#undef AUTO_POWER_CHAMBER_FAN
@@ -1220,7 +1515,7 @@
// Other fans
#define HAS_FAN0 (PIN_EXISTS(FAN))
-#define _HAS_FAN(P) (PIN_EXISTS(FAN_##P) && CONTROLLER_FAN_PIN != FAN_##P##_PIN && E0_AUTO_FAN_PIN != FAN_##P##_PIN && E1_AUTO_FAN_PIN != FAN_##P##_PIN && E2_AUTO_FAN_PIN != FAN_##P##_PIN && E3_AUTO_FAN_PIN != FAN_##P##_PIN && E4_AUTO_FAN_PIN != FAN_##P##_PIN && E5_AUTO_FAN_PIN != FAN_##P##_PIN && E6_AUTO_FAN_PIN != FAN_##P##_PIN && E7_AUTO_FAN_PIN != FAN_##P##_PIN)
+#define _HAS_FAN(P) (PIN_EXISTS(FAN##P) && CONTROLLER_FAN_PIN != FAN##P##_PIN && E0_AUTO_FAN_PIN != FAN##P##_PIN && E1_AUTO_FAN_PIN != FAN##P##_PIN && E2_AUTO_FAN_PIN != FAN##P##_PIN && E3_AUTO_FAN_PIN != FAN##P##_PIN && E4_AUTO_FAN_PIN != FAN##P##_PIN && E5_AUTO_FAN_PIN != FAN##P##_PIN && E6_AUTO_FAN_PIN != FAN##P##_PIN && E7_AUTO_FAN_PIN != FAN##P##_PIN)
#define HAS_FAN1 _HAS_FAN(1)
#define HAS_FAN2 _HAS_FAN(2)
#define HAS_FAN3 _HAS_FAN(3)
@@ -1237,36 +1532,52 @@
#define HAS_SERVO_3 (PIN_EXISTS(SERVO3) && NUM_SERVOS > 3)
#define HAS_SERVOS (NUM_SERVOS > 0)
-#if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)
- #define Z_PROBE_SERVO_NR -1
-#endif
-
-#define HAS_SERVO_ANGLES (EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE) || (HAS_Z_SERVO_PROBE && defined(Z_PROBE_SERVO_NR)))
-
-#if !HAS_SERVO_ANGLES || ENABLED(BLTOUCH)
- #undef EDITABLE_SERVO_ANGLES
-#endif
-
// Sensors
#define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
// User Interface
-#define HAS_HOME (PIN_EXISTS(HOME))
-#define HAS_KILL (PIN_EXISTS(KILL))
-#define HAS_SUICIDE (PIN_EXISTS(SUICIDE))
-#define HAS_PHOTOGRAPH (PIN_EXISTS(PHOTOGRAPH))
-#define HAS_BUZZER (PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER))
-#define USE_BEEPER (HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER))
-#define HAS_CASE_LIGHT (PIN_EXISTS(CASE_LIGHT) && ENABLED(CASE_LIGHT_ENABLE))
+#if PIN_EXISTS(HOME)
+ #define HAS_HOME 1
+#endif
+#if PIN_EXISTS(KILL)
+ #define HAS_KILL 1
+#endif
+#if PIN_EXISTS(SUICIDE)
+ #define HAS_SUICIDE 1
+#endif
+#if PIN_EXISTS(PHOTOGRAPH)
+ #define HAS_PHOTOGRAPH 1
+#endif
+#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+ #define HAS_BUZZER 1
+#endif
+#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+ #define USE_BEEPER 1
+#endif
+#if PIN_EXISTS(CASE_LIGHT) && ENABLED(CASE_LIGHT_ENABLE)
+ #define HAS_CASE_LIGHT 1
+#endif
// Digital control
-#define HAS_STEPPER_RESET (PIN_EXISTS(STEPPER_RESET))
-#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
-#define HAS_MOTOR_CURRENT_PWM ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
+#if PIN_EXISTS(STEPPER_RESET)
+ #define HAS_STEPPER_RESET 1
+#endif
+#if PIN_EXISTS(DIGIPOTSS)
+ #define HAS_DIGIPOTSS 1
+#endif
+#if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
+ #define HAS_MOTOR_CURRENT_PWM 1
+#endif
-#define HAS_SOME_Z_MICROSTEPS (HAS_Z_MICROSTEPS || HAS_Z2_MICROSTEPS || HAS_Z3_MICROSTEPS || HAS_Z4_MICROSTEPS)
-#define HAS_SOME_E_MICROSTEPS (HAS_E0_MICROSTEPS || HAS_E1_MICROSTEPS || HAS_E2_MICROSTEPS || HAS_E3_MICROSTEPS || HAS_E4_MICROSTEPS || HAS_E5_MICROSTEPS || HAS_E6_MICROSTEPS || HAS_E7_MICROSTEPS)
-#define HAS_MICROSTEPS (HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS || HAS_Y_MICROSTEPS || HAS_Y2_MICROSTEPS || HAS_SOME_Z_MICROSTEPS || HAS_SOME_E_MICROSTEPS)
+#if HAS_Z_MICROSTEPS || HAS_Z2_MICROSTEPS || HAS_Z3_MICROSTEPS || HAS_Z4_MICROSTEPS
+ #define HAS_SOME_Z_MICROSTEPS 1
+#endif
+#if HAS_E0_MICROSTEPS || HAS_E1_MICROSTEPS || HAS_E2_MICROSTEPS || HAS_E3_MICROSTEPS || HAS_E4_MICROSTEPS || HAS_E5_MICROSTEPS || HAS_E6_MICROSTEPS || HAS_E7_MICROSTEPS
+ #define HAS_SOME_E_MICROSTEPS 1
+#endif
+#if HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS || HAS_Y_MICROSTEPS || HAS_Y2_MICROSTEPS || HAS_SOME_Z_MICROSTEPS || HAS_SOME_E_MICROSTEPS
+ #define HAS_MICROSTEPS 1
+#endif
#if HAS_MICROSTEPS
@@ -1319,20 +1630,6 @@
#endif // HAS_MICROSTEPS
-#if !HAS_TEMP_SENSOR
- #undef AUTO_REPORT_TEMPERATURES
-#endif
-
-#define HAS_AUTO_REPORTING EITHER(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS)
-
-/**
- * This setting is also used by M109 when trying to calculate
- * a ballpark safe margin to prevent wait-forever situation.
- */
-#ifndef EXTRUDE_MINTEMP
- #define EXTRUDE_MINTEMP 170
-#endif
-
/**
* Heater signal inversion defaults
*/
@@ -1571,26 +1868,6 @@
#endif
#endif // SKEW_CORRECTION
-/**
- * Set granular options based on the specific type of leveling
- */
-#define UBL_SEGMENTED BOTH(AUTO_BED_LEVELING_UBL, DELTA)
-#define ABL_PLANAR EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
-#define ABL_GRID EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
-#define HAS_ABL_NOT_UBL (ABL_PLANAR || ABL_GRID)
-#define HAS_ABL_OR_UBL (HAS_ABL_NOT_UBL || ENABLED(AUTO_BED_LEVELING_UBL))
-#define HAS_LEVELING (HAS_ABL_OR_UBL || ENABLED(MESH_BED_LEVELING))
-#define HAS_AUTOLEVEL (HAS_ABL_OR_UBL && DISABLED(PROBE_MANUALLY))
-#define HAS_MESH ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
-#define PLANNER_LEVELING (HAS_LEVELING && DISABLED(AUTO_BED_LEVELING_UBL))
-#define HAS_PROBING_PROCEDURE (HAS_ABL_OR_UBL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
-#define HAS_POSITION_MODIFIERS (ENABLED(FWRETRACT) || HAS_LEVELING || ENABLED(SKEW_CORRECTION))
-#define NEEDS_THREE_PROBE_POINTS EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
-
-#if ENABLED(AUTO_BED_LEVELING_UBL)
- #undef LCD_BED_LEVELING
-#endif
-
/**
* Heater, Fan, and Probe interactions
*/
@@ -1715,8 +1992,8 @@
#undef MESH_MAX_Y
#endif
-#if (defined(PROBE_PT_1_X) && defined(PROBE_PT_2_X) && defined(PROBE_PT_3_X) && defined(PROBE_PT_1_Y) && defined(PROBE_PT_2_Y) && defined(PROBE_PT_3_Y))
- #define HAS_FIXED_3POINT
+#if defined(PROBE_PT_1_X) && defined(PROBE_PT_2_X) && defined(PROBE_PT_3_X) && defined(PROBE_PT_1_Y) && defined(PROBE_PT_2_Y) && defined(PROBE_PT_3_Y)
+ #define HAS_FIXED_3POINT 1
#endif
/**
@@ -1754,10 +2031,10 @@
* Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
*/
#ifndef Z_HOMING_HEIGHT
- #ifndef Z_CLEARANCE_BETWEEN_PROBES
- #define Z_HOMING_HEIGHT 0
- #else
+ #ifdef Z_CLEARANCE_BETWEEN_PROBES
#define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
+ #else
+ #define Z_HOMING_HEIGHT 0
#endif
#endif
@@ -1785,15 +2062,16 @@
#endif
// Updated G92 behavior shifts the workspace
-#define HAS_POSITION_SHIFT DISABLED(NO_WORKSPACE_OFFSETS)
-// The home offset also shifts the coordinate space
-#define HAS_HOME_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && IS_CARTESIAN)
-// The SCARA home offset applies only on G28
-#define HAS_SCARA_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && IS_SCARA)
-// Cumulative offset to workspace to save some calculation
-#define HAS_WORKSPACE_OFFSET (HAS_POSITION_SHIFT && HAS_HOME_OFFSET)
-// M206 sets the home offset for Cartesian machines
-#define HAS_M206_COMMAND (HAS_HOME_OFFSET && !IS_SCARA)
+#if DISABLED(NO_WORKSPACE_OFFSETS)
+ #define HAS_POSITION_SHIFT 1
+ #if IS_CARTESIAN
+ #define HAS_HOME_OFFSET 1 // The home offset also shifts the coordinate space
+ #define HAS_WORKSPACE_OFFSET 1 // Cumulative offset to workspace to save some calculation
+ #define HAS_M206_COMMAND 1 // M206 sets the home offset for Cartesian machines
+ #elif IS_SCARA
+ #define HAS_SCARA_OFFSET 1 // The SCARA home offset applies only on G28
+ #endif
+#endif
// LCD timeout to status screen default is 15s
#ifndef LCD_TIMEOUT_TO_STATUS
@@ -1801,7 +2079,9 @@
#endif
// Add commands that need sub-codes to this list
-#define USE_GCODE_SUBCODES ANY(G38_PROBE_TARGET, CNC_COORDINATE_SYSTEMS, POWER_LOSS_RECOVERY)
+#if ANY(G38_PROBE_TARGET, CNC_COORDINATE_SYSTEMS, POWER_LOSS_RECOVERY)
+ #define USE_GCODE_SUBCODES
+#endif
// Parking Extruder
#if ENABLED(PARKING_EXTRUDER)
@@ -1814,34 +2094,7 @@
#endif
// Number of VFAT entries used. Each entry has 13 UTF-16 characters
-#if ENABLED(SCROLL_LONG_FILENAMES)
- #define MAX_VFAT_ENTRIES (5)
-#else
- #define MAX_VFAT_ENTRIES (2)
-#endif
-
-// Set defaults for unspecified LED user colors
-#if ENABLED(LED_CONTROL_MENU)
- #ifndef LED_USER_PRESET_RED
- #define LED_USER_PRESET_RED 255
- #endif
- #ifndef LED_USER_PRESET_GREEN
- #define LED_USER_PRESET_GREEN 255
- #endif
- #ifndef LED_USER_PRESET_BLUE
- #define LED_USER_PRESET_BLUE 255
- #endif
- #ifndef LED_USER_PRESET_WHITE
- #define LED_USER_PRESET_WHITE 0
- #endif
- #ifndef LED_USER_PRESET_BRIGHTNESS
- #ifdef NEOPIXEL_BRIGHTNESS
- #define LED_USER_PRESET_BRIGHTNESS NEOPIXEL_BRIGHTNESS
- #else
- #define LED_USER_PRESET_BRIGHTNESS 255
- #endif
- #endif
-#endif
+#define MAX_VFAT_ENTRIES TERN(SCROLL_LONG_FILENAMES, 5, 2)
// Nozzle park for Delta
#if BOTH(NOZZLE_PARK_FEATURE, DELTA)
@@ -1853,9 +2106,8 @@
// on boards where SD card and LCD display share the same SPI bus
// because of a bug in the shared SPI implementation. (See #8122)
#if defined(TARGET_LPC1768) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && (SCK_PIN == LCD_PINS_D4)
- #define SDCARD_SORT_ALPHA // Keeps one directory level in RAM. Changing
- // directory levels still glitches the screen,
- // but the following LCD update cleans it up.
+ #define SDCARD_SORT_ALPHA // Keep one directory level in RAM. Changing directory levels
+ // may still glitch the screen, but LCD updates clean it up.
#undef SDSORT_LIMIT
#undef SDSORT_USES_RAM
#undef SDSORT_USES_STACK
@@ -1879,37 +2131,30 @@
#endif
// Defined here to catch the above defines
-#if ENABLED(SDCARD_SORT_ALPHA)
- #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
+#if ENABLED(SDCARD_SORT_ALPHA) && (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
+ #define HAS_FOLDER_SORTING 1
#endif
-// If platform requires early initialization of watchdog to properly boot
-#define EARLY_WATCHDOG (ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM))
-
#if HAS_SPI_LCD
// Get LCD character width/height, which may be overridden by pins, configs, etc.
#ifndef LCD_WIDTH
#if HAS_GRAPHICAL_LCD
#define LCD_WIDTH 21
- #elif ENABLED(ULTIPANEL)
- #define LCD_WIDTH 20
#else
- #define LCD_WIDTH 16
+ #define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
#endif
#endif
#ifndef LCD_HEIGHT
#if HAS_GRAPHICAL_LCD
#define LCD_HEIGHT 5
- #elif ENABLED(ULTIPANEL)
- #define LCD_HEIGHT 4
#else
- #define LCD_HEIGHT 2
+ #define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)
#endif
#endif
#endif
#if ENABLED(SDSUPPORT)
- #if SD_CONNECTION_IS(ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
+ #if SD_CONNECTION_IS(ONBOARD) && DISABLED(NO_SD_HOST_DRIVE) && !defined(ARDUINO_GRAND_CENTRAL_M4)
//
// The external SD card is not used. Hardware SPI is used to access the card.
// When sharing the SD card with a PC we want the menu options to
@@ -1919,17 +2164,10 @@
#define SHARED_SD_CARD
#endif
#if DISABLED(SHARED_SD_CARD)
- #define INIT_SDCARD_ON_BOOT
+ #define INIT_SDCARD_ON_BOOT 1
#endif
#endif
#if !NUM_SERIAL
#undef BAUD_RATE_GCODE
#endif
-
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
- #undef Z_STEPPER_ALIGN_AMP
-#endif
-#ifndef Z_STEPPER_ALIGN_AMP
- #define Z_STEPPER_ALIGN_AMP 1.0
-#endif
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index fc26862853..c1655015e0 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,11 +35,12 @@
#include "Conditionals_post.h"
#include HAL_PATH(../HAL, inc/Conditionals_post.h)
+#include "../core/types.h" // Ahead of sanity-checks
+
#include "SanityCheck.h"
#include HAL_PATH(../HAL, inc/SanityCheck.h)
// Include all core headers
-#include "../core/types.h"
#include "../core/language.h"
#include "../core/utility.h"
#include "../core/serial.h"
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
index e11f171c6e..d84f751200 100644
--- a/Marlin/src/inc/MarlinConfigPre.h
+++ b/Marlin/src/inc/MarlinConfigPre.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,12 +37,8 @@
#include "../../Configuration.h"
#ifdef CUSTOM_VERSION_FILE
- #if defined(__has_include)
- #if __has_include(XSTR(../../CUSTOM_VERSION_FILE))
- #include XSTR(../../CUSTOM_VERSION_FILE)
- #endif
- #else
- #include XSTR(../../CUSTOM_VERSION_FILE)
+ #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
+ #include STRINGIFY(../../CUSTOM_VERSION_FILE)
#endif
#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a91131e083..2fd61d4be1 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,6 +34,37 @@
#error "Marlin requires C++11 support (gcc >= 4.7, Arduino IDE >= 1.6.8). Please upgrade your toolchain."
#endif
+// Make sure macros aren't borked
+#define TEST1
+#define TEST2 1
+#define TEST3 0
+#define TEST4 true
+#if ENABLED(TEST0)
+ #error "ENABLED is borked!"
+#endif
+#if DISABLED(TEST1)
+ #error "DISABLED is borked!"
+#endif
+#if !ENABLED(TEST2)
+ #error "ENABLED is borked!"
+#endif
+#if ENABLED(TEST3)
+ #error "ENABLED is borked!"
+#endif
+#if DISABLED(TEST4)
+ #error "DISABLED is borked!"
+#endif
+#if !ANY(TEST1, TEST2, TEST3, TEST4) || ANY(TEST0, TEST3)
+ #error "ANY is borked!"
+#endif
+#if DISABLED(TEST0, TEST1, TEST2, TEST4)
+ #error "DISABLED is borked!"
+#endif
+#undef TEST1
+#undef TEST2
+#undef TEST3
+#undef TEST4
+
/**
* We try our best to include sanity checks for all changed configuration
* directives because users have a tendency to use outdated config files with
@@ -68,7 +99,9 @@
#elif defined(X_HOME_RETRACT_MM)
#error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM."
#elif defined(SDCARDDETECTINVERTED)
- #error "SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration."
+ #error "SDCARDDETECTINVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
+#elif defined(SD_DETECT_INVERTED)
+ #error "SD_DETECT_INVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
#elif defined(BTENABLED)
#error "BTENABLED is now BLUETOOTH. Please update your configuration."
#elif defined(CUSTOM_MENDEL_NAME)
@@ -237,6 +270,10 @@
#error "Replace SLED_PIN with SOL1_PIN (applies to both Z_PROBE_SLED and SOLENOID_PROBE)."
#elif defined(CONTROLLERFAN_PIN)
#error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SPEED)
+ #error "CONTROLLERFAN_SPEED is now CONTROLLERFAN_SPEED_ACTIVE. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SECS)
+ #error "CONTROLLERFAN_SECS is now CONTROLLERFAN_IDLE_TIME. Please update your Configuration_adv.h."
#elif defined(MIN_RETRACT)
#error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h."
#elif defined(ADVANCE)
@@ -312,8 +349,10 @@
#error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS. Please update your configuration."
#elif defined(FILAMENT_CHANGE_LOAD_LENGTH)
#error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration."
-#elif ENABLED(LEVEL_BED_CORNERS) && !defined(LEVEL_CORNERS_INSET)
- #error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h."
+#elif defined(LEVEL_CORNERS_INSET)
+ #error "LEVEL_CORNERS_INSET is now LEVEL_CORNERS_INSET_LFRB . Please update your Configuration.h."
+#elif ENABLED(LEVEL_BED_CORNERS) && !defined(LEVEL_CORNERS_INSET_LFRB)
+ #error "LEVEL_BED_CORNERS requires LEVEL_CORNERS_INSET_LFRB values. Please update your Configuration.h."
#elif defined(BEZIER_JERK_CONTROL)
#error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration."
#elif DISABLED(CLASSIC_JERK) && defined(JUNCTION_DEVIATION_FACTOR)
@@ -448,6 +487,8 @@
#error "Z_TRIPLE_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
#elif defined(Z_QUAD_ENDSTOPS)
#error "Z_QUAD_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
+#elif defined(DUGS_UI_MOVE_DIS_OPTION)
+ #error "DUGS_UI_MOVE_DIS_OPTION is spelled DGUS_UI_MOVE_DIS_OPTION. Please update Configuration_adv.h."
#endif
/**
@@ -718,14 +759,16 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#if ENABLED(ADVANCED_PAUSE_FEATURE)
#if !HAS_RESUME_CONTINUE
#error "ADVANCED_PAUSE_FEATURE currently requires an LCD controller or EMERGENCY_PARSER."
+ #elif DISABLED(NOZZLE_PARK_FEATURE)
+ #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE."
+ #elif !defined(FILAMENT_UNLOAD_PURGE_FEEDRATE)
+ #error "ADVANCED_PAUSE_FEATURE requires FILAMENT_UNLOAD_PURGE_FEEDRATE. Please add it to Configuration_adv.h."
#elif ENABLED(EXTRUDER_RUNOUT_PREVENT)
#error "EXTRUDER_RUNOUT_PREVENT is incompatible with ADVANCED_PAUSE_FEATURE."
#elif ENABLED(PARK_HEAD_ON_PAUSE) && NONE(SDSUPPORT, NEWPANEL, EMERGENCY_PARSER)
#error "PARK_HEAD_ON_PAUSE requires SDSUPPORT, EMERGENCY_PARSER, or an LCD controller."
#elif ENABLED(HOME_BEFORE_FILAMENT_CHANGE) && DISABLED(PAUSE_PARK_NO_STEPPER_TIMEOUT)
#error "HOME_BEFORE_FILAMENT_CHANGE requires PAUSE_PARK_NO_STEPPER_TIMEOUT."
- #elif DISABLED(NOZZLE_PARK_FEATURE)
- #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE."
#elif ENABLED(PREVENT_LENGTHY_EXTRUDE) && FILAMENT_CHANGE_UNLOAD_LENGTH > EXTRUDE_MAXLENGTH
#error "FILAMENT_CHANGE_UNLOAD_LENGTH must be less than or equal to EXTRUDE_MAXLENGTH."
#elif ENABLED(PREVENT_LENGTHY_EXTRUDE) && FILAMENT_CHANGE_SLOW_LOAD_LENGTH > EXTRUDE_MAXLENGTH
@@ -923,7 +966,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#elif TOOLCHANGE_ZRAISE < 0
#error "TOOLCHANGE_ZRAISE must be 0 or higher."
#elif ENABLED(PARKING_EXTRUDER)
- #if !PIN_EXISTS(SOL0, SOL1)
+ #if !PINS_EXIST(SOL0, SOL1)
#error "PARKING_EXTRUDER requires SOL0_PIN and SOL1_PIN."
#elif !defined(PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE) || !WITHIN(PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE, LOW, HIGH)
#error "PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE must be defined as HIGH or LOW."
@@ -1223,13 +1266,17 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "Z_PROBE_LOW_POINT must be less than or equal to 0."
#endif
+ #if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
+ #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable it or comment out this line to continue."
+ #endif
+
#else
/**
* Require some kind of probe for bed leveling and probe testing
*/
#if HAS_ABL_NOT_UBL && !PROBE_SELECTED
- #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
+ #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
#endif
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
@@ -1353,14 +1400,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
* Make sure Z_SAFE_HOMING point is reachable
*/
#if ENABLED(Z_SAFE_HOMING)
- #if HAS_BED_PROBE && (ENABLED(DELTA) || IS_SCARA)
- static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, PROBE_X_MIN, PROBE_X_MAX), "Z_SAFE_HOMING_X_POINT is outside the probe region.");
- static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, PROBE_Y_MIN, PROBE_Y_MAX), "Z_SAFE_HOMING_Y_POINT is outside the probe region.");
- #else
- static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
- static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
- #endif
-#endif // Z_SAFE_HOMING
+ static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
+ static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
+#endif
/**
* Make sure DISABLE_[XYZ] compatible with selected homing options
@@ -1511,9 +1553,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "HEATER_0_PIN not defined for this board."
#elif !ANY_PIN(TEMP_0, MAX6675_SS)
#error "TEMP_0_PIN not defined for this board."
-#elif ((defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && !PIN_EXISTS(E0_STEP, E0_DIR))
+#elif ((defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && !PINS_EXIST(E0_STEP, E0_DIR))
#error "E0_STEP_PIN or E0_DIR_PIN not defined for this board."
-#elif ( !(defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && (!PIN_EXISTS(E0_STEP, E0_DIR) || !HAS_E0_ENABLE))
+#elif ( !(defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && (!PINS_EXIST(E0_STEP, E0_DIR) || !HAS_E0_ENABLE))
#error "E0_STEP_PIN, E0_DIR_PIN, or E0_ENABLE_PIN not defined for this board."
#elif EXTRUDERS && TEMP_SENSOR_0 == 0
#error "TEMP_SENSOR_0 is required with any extruders."
@@ -1705,35 +1747,35 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
*/
#if DISABLED(MK2_MULTIPLEXER) // MK2_MULTIPLEXER uses E0 stepper only
#if E_STEPPERS
- #if !(PIN_EXISTS(E0_STEP, E0_DIR) && HAS_E0_ENABLE)
+ #if !(PINS_EXIST(E0_STEP, E0_DIR) && HAS_E0_ENABLE)
#error "E0_STEP_PIN, E0_DIR_PIN, or E0_ENABLE_PIN not defined for this board."
#endif
#if E_STEPPERS > 1
- #if !(PIN_EXISTS(E1_STEP, E1_DIR) && HAS_E1_ENABLE)
+ #if !(PINS_EXIST(E1_STEP, E1_DIR) && HAS_E1_ENABLE)
#error "E1_STEP_PIN, E1_DIR_PIN, or E1_ENABLE_PIN not defined for this board."
#endif
#if E_STEPPERS > 2
- #if !(PIN_EXISTS(E2_STEP, E2_DIR) && HAS_E2_ENABLE)
+ #if !(PINS_EXIST(E2_STEP, E2_DIR) && HAS_E2_ENABLE)
#error "E2_STEP_PIN, E2_DIR_PIN, or E2_ENABLE_PIN not defined for this board."
#endif
#if E_STEPPERS > 3
- #if !(PIN_EXISTS(E3_STEP, E3_DIR) && HAS_E3_ENABLE)
+ #if !(PINS_EXIST(E3_STEP, E3_DIR) && HAS_E3_ENABLE)
#error "E3_STEP_PIN, E3_DIR_PIN, or E3_ENABLE_PIN not defined for this board."
#endif
#if E_STEPPERS > 4
- #if !(PIN_EXISTS(E4_STEP, E4_DIR) && HAS_E4_ENABLE)
+ #if !(PINS_EXIST(E4_STEP, E4_DIR) && HAS_E4_ENABLE)
#error "E4_STEP_PIN, E4_DIR_PIN, or E4_ENABLE_PIN not defined for this board."
#endif
#if E_STEPPERS > 5
- #if !(PIN_EXISTS(E5_STEP, E5_DIR) && HAS_E5_ENABLE)
+ #if !(PINS_EXIST(E5_STEP, E5_DIR) && HAS_E5_ENABLE)
#error "E5_STEP_PIN, E5_DIR_PIN, or E5_ENABLE_PIN not defined for this board."
#endif
#if E_STEPPERS > 6
- #if !(PIN_EXISTS(E6_STEP, E6_DIR) && HAS_E6_ENABLE)
+ #if !(PINS_EXIST(E6_STEP, E6_DIR) && HAS_E6_ENABLE)
#error "E6_STEP_PIN, E6_DIR_PIN, or E6_ENABLE_PIN not defined for this board."
#endif
#if E_STEPPERS > 7
- #if !(PIN_EXISTS(E7_STEP, E7_DIR) && HAS_E7_ENABLE)
+ #if !(PINS_EXIST(E7_STEP, E7_DIR) && HAS_E7_ENABLE)
#error "E7_STEP_PIN, E7_DIR_PIN, or E7_ENABLE_PIN not defined for this board."
#endif
#endif // E_STEPPERS > 7
@@ -1922,7 +1964,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
/**
* RGB_LED Requirements
*/
-#define _RGB_TEST (PIN_EXISTS(RGB_LED_R, RGB_LED_G, RGB_LED_B))
+#define _RGB_TEST (PINS_EXIST(RGB_LED_R, RGB_LED_G, RGB_LED_B))
#if ENABLED(PRINTER_EVENT_LEDS) && !HAS_COLOR_LEDS
#error "PRINTER_EVENT_LEDS requires BLINKM, PCA9533, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED."
#elif ENABLED(RGB_LED)
@@ -1945,7 +1987,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
/**
* Auto Fan check for PWM pins
*/
-#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255
+#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(NO_COMPILE_TIME_PWM)
#define AF_ERR_SUFF "_AUTO_FAN_PIN is not a PWM pin. Set EXTRUDER_AUTO_FAN_SPEED to 255."
#if HAS_AUTO_FAN_0
static_assert(PWM_PIN(E0_AUTO_FAN_PIN), "E0" AF_ERR_SUFF);
@@ -1955,9 +1997,24 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
static_assert(PWM_PIN(E2_AUTO_FAN_PIN), "E2" AF_ERR_SUFF);
#elif HAS_AUTO_FAN_3
static_assert(PWM_PIN(E3_AUTO_FAN_PIN), "E3" AF_ERR_SUFF);
+ #elif HAS_AUTO_FAN_4
+ static_assert(PWM_PIN(E4_AUTO_FAN_PIN), "E4" AF_ERR_SUFF);
+ #elif HAS_AUTO_FAN_5
+ static_assert(PWM_PIN(E5_AUTO_FAN_PIN), "E5" AF_ERR_SUFF);
+ #elif HAS_AUTO_FAN_6
+ static_assert(PWM_PIN(E6_AUTO_FAN_PIN), "E6" AF_ERR_SUFF);
+ #elif HAS_AUTO_FAN_7
+ static_assert(PWM_PIN(E7_AUTO_FAN_PIN), "E7" AF_ERR_SUFF);
#endif
#endif
+/**
+ * Make sure only one EEPROM type is enabled
+ */
+#if ENABLED(EEPROM_SETTINGS) && 1 < ENABLED(SDCARD_EEPROM_EMULATION) + ENABLED(FLASH_EEPROM_EMULATION) + ENABLED(SRAM_EEPROM_EMULATION)
+ #error "Please select only one of SDCARD, FLASH, or SRAM_EEPROM_EMULATION."
+#endif
+
/**
* Make sure only one display is enabled
*/
@@ -2054,6 +2111,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "An SPI driven TMC driver on Z2 requires Z2_CS_PIN."
#elif INVALID_TMC_SPI(Z3)
#error "An SPI driven TMC driver on Z3 requires Z3_CS_PIN."
+#elif INVALID_TMC_SPI(Z4)
+ #error "An SPI driven TMC driver on Z4 requires Z4_CS_PIN."
#elif INVALID_TMC_SPI(E0)
#error "An SPI driven TMC driver on E0 requires E0_CS_PIN."
#elif INVALID_TMC_SPI(E1)
@@ -2076,7 +2135,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
/**
* Check existing RX/TX pins against enable TMC UART drivers.
*/
-#define INVALID_TMC_UART(ST) (AXIS_HAS_UART(ST) && !(defined(ST##_HARDWARE_SERIAL) || (PIN_EXISTS(ST##_SERIAL_RX, ST##_SERIAL_TX))))
+#define INVALID_TMC_UART(ST) (AXIS_HAS_UART(ST) && !(defined(ST##_HARDWARE_SERIAL) || (PINS_EXIST(ST##_SERIAL_RX, ST##_SERIAL_TX))))
#if INVALID_TMC_UART(X)
#error "TMC2208 or TMC2209 on X requires X_HARDWARE_SERIAL or X_SERIAL_(RX|TX)_PIN."
#elif INVALID_TMC_UART(X2)
@@ -2091,6 +2150,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "TMC2208 or TMC2209 on Z2 requires Z2_HARDWARE_SERIAL or Z2_SERIAL_(RX|TX)_PIN."
#elif INVALID_TMC_UART(Z3)
#error "TMC2208 or TMC2209 on Z3 requires Z3_HARDWARE_SERIAL or Z3_SERIAL_(RX|TX)_PIN."
+#elif INVALID_TMC_UART(Z4)
+ #error "TMC2208 or TMC2209 on Z4 requires Z4_HARDWARE_SERIAL or Z4_SERIAL_(RX|TX)_PIN."
#elif INVALID_TMC_UART(E0)
#error "TMC2208 or TMC2209 on E0 requires E0_HARDWARE_SERIAL or E0_SERIAL_(RX|TX)_PIN."
#elif INVALID_TMC_UART(E1)
@@ -2128,6 +2189,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
INVALID_TMC_ADDRESS(Z2);
#elif AXIS_DRIVER_TYPE_Z3(TMC2209)
INVALID_TMC_ADDRESS(Z3);
+#elif AXIS_DRIVER_TYPE_Z4(TMC2209)
+ INVALID_TMC_ADDRESS(Z4);
#elif AXIS_DRIVER_TYPE_E0(TMC2209)
INVALID_TMC_ADDRESS(E0);
#elif AXIS_DRIVER_TYPE_E1(TMC2209)
@@ -2147,6 +2210,47 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif
#undef INVALID_TMC_ADDRESS
+#define _TMC_MICROSTEP_IS_VALID(MS) (MS == 0 || MS == 2 || MS == 4 || MS == 8 || MS == 16 || MS == 32 || MS == 64 || MS == 128 || MS == 256)
+#define TMC_MICROSTEP_IS_VALID(M) (!AXIS_IS_TMC(M) || _TMC_MICROSTEP_IS_VALID(M##_MICROSTEPS))
+#define INVALID_TMC_MS(ST) static_assert(0, "Invalid " STRINGIFY(ST) "_MICROSTEPS. Valid values are 0, 2, 4, 8, 16, 32, 64, 128, and 256.")
+
+#if !TMC_MICROSTEP_IS_VALID(X)
+ INVALID_TMC_MS(X);
+#elif !TMC_MICROSTEP_IS_VALID(Y)
+ INVALID_TMC_MS(Y)
+#elif !TMC_MICROSTEP_IS_VALID(Z)
+ INVALID_TMC_MS(Z)
+#elif !TMC_MICROSTEP_IS_VALID(X2)
+ INVALID_TMC_MS(X2);
+#elif !TMC_MICROSTEP_IS_VALID(Y2)
+ INVALID_TMC_MS(Y2)
+#elif !TMC_MICROSTEP_IS_VALID(Z2)
+ INVALID_TMC_MS(Z2)
+#elif !TMC_MICROSTEP_IS_VALID(Z3)
+ INVALID_TMC_MS(Z3)
+#elif !TMC_MICROSTEP_IS_VALID(Z4)
+ INVALID_TMC_MS(Z4)
+#elif !TMC_MICROSTEP_IS_VALID(E0)
+ INVALID_TMC_MS(E0)
+#elif !TMC_MICROSTEP_IS_VALID(E1)
+ INVALID_TMC_MS(E1)
+#elif !TMC_MICROSTEP_IS_VALID(E2)
+ INVALID_TMC_MS(E2)
+#elif !TMC_MICROSTEP_IS_VALID(E3)
+ INVALID_TMC_MS(E3)
+#elif !TMC_MICROSTEP_IS_VALID(E4)
+ INVALID_TMC_MS(E4)
+#elif !TMC_MICROSTEP_IS_VALID(E5)
+ INVALID_TMC_MS(E5)
+#elif !TMC_MICROSTEP_IS_VALID(E6)
+ INVALID_TMC_MS(E6)
+#elif !TMC_MICROSTEP_IS_VALID(E7)
+ INVALID_TMC_MS(E7)
+#endif
+#undef INVALID_TMC_MS
+#undef TMC_MICROSTEP_IS_VALID
+#undef _TMC_MICROSTEP_IS_VALID
+
#if ENABLED(DELTA) && (ENABLED(STEALTHCHOP_XY) != ENABLED(STEALTHCHOP_Z))
#error "STEALTHCHOP_XY and STEALTHCHOP_Z must be the same on DELTA."
#endif
@@ -2235,11 +2339,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
// Sensorless homing is required for both combined steppers in an H-bot
#if CORE_IS_XY && X_SENSORLESS != Y_SENSORLESS
- #error "CoreXY requires both X and Y to use sensorless homing if either does."
-#elif CORE_IS_XZ && X_SENSORLESS != Z_SENSORLESS
- #error "CoreXZ requires both X and Z to use sensorless homing if either does."
-#elif CORE_IS_YZ && Y_SENSORLESS != Z_SENSORLESS
- #error "CoreYZ requires both Y and Z to use sensorless homing if either does."
+ #error "CoreXY requires both X and Y to use sensorless homing if either one does."
+#elif CORE_IS_XZ && X_SENSORLESS != Z_SENSORLESS && !HOMING_Z_WITH_PROBE
+ #error "CoreXZ requires both X and Z to use sensorless homing if either one does."
+#elif CORE_IS_YZ && Y_SENSORLESS != Z_SENSORLESS && !HOMING_Z_WITH_PROBE
+ #error "CoreYZ requires both Y and Z to use sensorless homing if either one does."
#endif
// Other TMC feature requirements
@@ -2253,17 +2357,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "STEALTHCHOP requires TMC2130, TMC2160, TMC2208, TMC2209, or TMC5160 stepper drivers."
#endif
+/**
+ * TMC SPI Chaining
+ */
#define IN_CHAIN(A) ((A##_CHAIN_POS > 0) && !HAS_L64XX)
-// TMC SPI Chaining
-#if IN_CHAIN(X) || IN_CHAIN(Y) || IN_CHAIN(Z) || IN_CHAIN(X2) || IN_CHAIN(Y2) || IN_CHAIN(Z2) || IN_CHAIN(Z3) || IN_CHAIN(E0) || IN_CHAIN(E1) || IN_CHAIN(E2) || IN_CHAIN(E3) || IN_CHAIN(E4) || IN_CHAIN(E5)
- #if (IN_CHAIN(X) && !PIN_EXISTS(X_CS) ) || (IN_CHAIN(Y) && !PIN_EXISTS(Y_CS) ) \
- || (IN_CHAIN(Z) && !PIN_EXISTS(Z_CS) ) || (IN_CHAIN(X2) && !PIN_EXISTS(X2_CS)) \
- || (IN_CHAIN(Y2) && !PIN_EXISTS(Y2_CS)) || (IN_CHAIN(Z2) && !PIN_EXISTS(Z2_CS)) \
- || (IN_CHAIN(Z3) && !PIN_EXISTS(Z3_CS)) || (IN_CHAIN(E0) && !PIN_EXISTS(E0_CS)) \
- || (IN_CHAIN(E1) && !PIN_EXISTS(E1_CS)) || (IN_CHAIN(E2) && !PIN_EXISTS(E2_CS)) \
- || (IN_CHAIN(E3) && !PIN_EXISTS(E3_CS)) || (IN_CHAIN(E4) && !PIN_EXISTS(E4_CS)) \
- || (IN_CHAIN(E5) && !PIN_EXISTS(E5_CS)) || (IN_CHAIN(E6) && !PIN_EXISTS(E6_CS)) \
- || (IN_CHAIN(E7) && !PIN_EXISTS(E7_CS))
+#if IN_CHAIN(X ) || IN_CHAIN(Y ) || IN_CHAIN(Z ) || IN_CHAIN(X2) || IN_CHAIN(Y2) || IN_CHAIN(Z2) || IN_CHAIN(Z3) || IN_CHAIN(Z4) \
+ || IN_CHAIN(E0) || IN_CHAIN(E1) || IN_CHAIN(E2) || IN_CHAIN(E3) || IN_CHAIN(E4) || IN_CHAIN(E5) || IN_CHAIN(E6) || IN_CHAIN(E7)
+ #define BAD_CHAIN(A) (IN_CHAIN(A) && !PIN_EXISTS(A##_CS))
+ #if BAD_CHAIN(X ) || BAD_CHAIN(Y ) || BAD_CHAIN(Z ) || BAD_CHAIN(X2) || BAD_CHAIN(Y2) || BAD_CHAIN(Z2) || BAD_CHAIN(Z3) || BAD_CHAIN(Z4) \
+ || BAD_CHAIN(E0) || BAD_CHAIN(E1) || BAD_CHAIN(E2) || BAD_CHAIN(E3) || BAD_CHAIN(E4) || BAD_CHAIN(E5) || BAD_CHAIN(E6) || BAD_CHAIN(E7)
#error "All chained TMC drivers need a CS pin."
#else
#if IN_CHAIN(X)
@@ -2297,18 +2399,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#elif IN_CHAIN(E7)
#define CS_COMPARE E7_CS_PIN
#endif
- #if (IN_CHAIN(X) && X_CS_PIN != CS_COMPARE) || (IN_CHAIN(Y) && Y_CS_PIN != CS_COMPARE) \
- || (IN_CHAIN(Z) && Z_CS_PIN != CS_COMPARE) || (IN_CHAIN(X2) && X2_CS_PIN != CS_COMPARE) \
- || (IN_CHAIN(Y2) && Y2_CS_PIN != CS_COMPARE) || (IN_CHAIN(Z2) && Z2_CS_PIN != CS_COMPARE) \
- || (IN_CHAIN(Z3) && Z3_CS_PIN != CS_COMPARE) || (IN_CHAIN(E0) && E0_CS_PIN != CS_COMPARE) \
- || (IN_CHAIN(E1) && E1_CS_PIN != CS_COMPARE) || (IN_CHAIN(E2) && E2_CS_PIN != CS_COMPARE) \
- || (IN_CHAIN(E3) && E3_CS_PIN != CS_COMPARE) || (IN_CHAIN(E4) && E4_CS_PIN != CS_COMPARE) \
- || (IN_CHAIN(E5) && E5_CS_PIN != CS_COMPARE) || (IN_CHAIN(E6) && E6_CS_PIN != CS_COMPARE) \
- || (IN_CHAIN(E7) && E7_CS_PIN != CS_COMPARE)
+ #define BAD_CS_PIN(A) (IN_CHAIN(A) && A##_CS_PIN != CS_COMPARE)
+ #if BAD_CS_PIN(X ) || BAD_CS_PIN(Y ) || BAD_CS_PIN(Z ) || BAD_CS_PIN(X2) || BAD_CS_PIN(Y2) || BAD_CS_PIN(Z2) || BAD_CS_PIN(Z3) || BAD_CS_PIN(Z4) \
+ || BAD_CS_PIN(E0) || BAD_CS_PIN(E1) || BAD_CS_PIN(E2) || BAD_CS_PIN(E3) || BAD_CS_PIN(E4) || BAD_CS_PIN(E5) || BAD_CS_PIN(E6) || BAD_CS_PIN(E7)
#error "All chained TMC drivers must use the same CS pin."
#endif
+ #undef BAD_CS_PIN
+ #undef CS_COMPARE
#endif
- #undef CS_COMPARE
+ #undef BAD_CHAIN
#endif
#undef IN_CHAIN
@@ -2429,8 +2528,8 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#error "Z_STEPPER_AUTO_ALIGN requires NUM_Z_STEPPER_DRIVERS greater than 1."
#elif !HAS_BED_PROBE
#error "Z_STEPPER_AUTO_ALIGN requires a Z-bed probe."
- #elif ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) && NUM_Z_STEPPER_DRIVERS != 3
- #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS requires NUM_Z_STEPPER_DRIVERS to be 3."
+ #elif ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) && NUM_Z_STEPPER_DRIVERS < 3
+ #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS requires NUM_Z_STEPPER_DRIVERS to be 3 or 4."
#endif
#endif
@@ -2438,7 +2537,7 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#error "PRINTCOUNTER requires EEPROM_SETTINGS. Please update your Configuration."
#endif
-#if ENABLED(USB_FLASH_DRIVE_SUPPORT) && !PIN_EXISTS(USB_CS, USB_INTR)
+#if ENABLED(USB_FLASH_DRIVE_SUPPORT) && !PINS_EXIST(USB_CS, USB_INTR)
#error "USB_CS_PIN and USB_INTR_PIN are required for USB_FLASH_DRIVE_SUPPORT."
#endif
@@ -2471,17 +2570,97 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
constexpr char _chr5 = USER_GCODE_5[strlen(USER_GCODE_5) - 1];
static_assert(_chr5 != '\n' && _chr5 != '\r', "USER_GCODE_5 cannot have a newline at the end. Please remove it.");
#endif
+ #ifdef USER_GCODE_6
+ constexpr char _chr6 = USER_GCODE_6[strlen(USER_GCODE_6) - 1];
+ static_assert(_chr6 != '\n' && _chr6 != '\r', "USER_GCODE_6 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_7
+ constexpr char _chr7 = USER_GCODE_7[strlen(USER_GCODE_7) - 1];
+ static_assert(_chr7 != '\n' && _chr7 != '\r', "USER_GCODE_7 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_8
+ constexpr char _chr8 = USER_GCODE_8[strlen(USER_GCODE_8) - 1];
+ static_assert(_chr8 != '\n' && _chr8 != '\r', "USER_GCODE_8 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_9
+ constexpr char _chr9 = USER_GCODE_9[strlen(USER_GCODE_9) - 1];
+ static_assert(_chr9 != '\n' && _chr9 != '\r', "USER_GCODE_9 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_10
+ constexpr char _chr10 = USER_GCODE_10[strlen(USER_GCODE_10) - 1];
+ static_assert(_chr10 != '\n' && _chr10 != '\r', "USER_GCODE_10 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_11
+ constexpr char _chr11 = USER_GCODE_11[strlen(USER_GCODE_11) - 1];
+ static_assert(_chr11 != '\n' && _chr11 != '\r', "USER_GCODE_11 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_12
+ constexpr char _chr12 = USER_GCODE_12[strlen(USER_GCODE_12) - 1];
+ static_assert(_chr12 != '\n' && _chr12 != '\r', "USER_GCODE_12 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_13
+ constexpr char _chr13 = USER_GCODE_13[strlen(USER_GCODE_13) - 1];
+ static_assert(_chr13 != '\n' && _chr13 != '\r', "USER_GCODE_13 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_14
+ constexpr char _chr14 = USER_GCODE_14[strlen(USER_GCODE_14) - 1];
+ static_assert(_chr14 != '\n' && _chr14 != '\r', "USER_GCODE_14 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_15
+ constexpr char _chr15 = USER_GCODE_15[strlen(USER_GCODE_15) - 1];
+ static_assert(_chr15 != '\n' && _chr15 != '\r', "USER_GCODE_15 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_16
+ constexpr char _chr16 = USER_GCODE_16[strlen(USER_GCODE_16) - 1];
+ static_assert(_chr16 != '\n' && _chr16 != '\r', "USER_GCODE_16 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_17
+ constexpr char _chr17 = USER_GCODE_17[strlen(USER_GCODE_17) - 1];
+ static_assert(_chr17 != '\n' && _chr17 != '\r', "USER_GCODE_17 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_18
+ constexpr char _chr18 = USER_GCODE_18[strlen(USER_GCODE_18) - 1];
+ static_assert(_chr18 != '\n' && _chr18 != '\r', "USER_GCODE_18 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_19
+ constexpr char _chr19 = USER_GCODE_19[strlen(USER_GCODE_19) - 1];
+ static_assert(_chr19 != '\n' && _chr19 != '\r', "USER_GCODE_19 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_20
+ constexpr char _chr20 = USER_GCODE_20[strlen(USER_GCODE_20) - 1];
+ static_assert(_chr20 != '\n' && _chr20 != '\r', "USER_GCODE_20 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_21
+ constexpr char _chr21 = USER_GCODE_21[strlen(USER_GCODE_21) - 1];
+ static_assert(_chr21 != '\n' && _chr21 != '\r', "USER_GCODE_21 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_22
+ constexpr char _chr22 = USER_GCODE_22[strlen(USER_GCODE_22) - 1];
+ static_assert(_chr22 != '\n' && _chr22 != '\r', "USER_GCODE_22 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_23
+ constexpr char _chr23 = USER_GCODE_23[strlen(USER_GCODE_23) - 1];
+ static_assert(_chr23 != '\n' && _chr23 != '\r', "USER_GCODE_23 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_24
+ constexpr char _chr24 = USER_GCODE_24[strlen(USER_GCODE_24) - 1];
+ static_assert(_chr24 != '\n' && _chr24 != '\r', "USER_GCODE_24 cannot have a newline at the end. Please remove it.");
+ #endif
+ #ifdef USER_GCODE_25
+ constexpr char _chr25 = USER_GCODE_25[strlen(USER_GCODE_25) - 1];
+ static_assert(_chr25 != '\n' && _chr25 != '\r', "USER_GCODE_25 cannot have a newline at the end. Please remove it.");
+ #endif
#endif
#if ENABLED(BACKLASH_COMPENSATION)
- #if IS_CORE
- #error "BACKLASH_COMPENSATION is incompatible with CORE kinematics."
- #endif
#ifndef BACKLASH_DISTANCE_MM
#error "BACKLASH_COMPENSATION requires BACKLASH_DISTANCE_MM"
- #endif
- #ifndef BACKLASH_CORRECTION
+ #elif !defined(BACKLASH_CORRECTION)
#error "BACKLASH_COMPENSATION requires BACKLASH_CORRECTION"
+ #elif IS_CORE
+ constexpr float backlash_arr[] = BACKLASH_DISTANCE_MM;
+ static_assert(!backlash_arr[CORE_AXIS_1] && !backlash_arr[CORE_AXIS_2],
+ "BACKLASH_COMPENSATION can only apply to " STRINGIFY(NORMAL_AXIS) " with your CORE system.");
#endif
#endif
@@ -2646,6 +2825,11 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
* Check to make sure MONITOR_DRIVER_STATUS isn't enabled
* on boards where TMC drivers share the SPI bus with SD.
*/
-#if TMC_HAS_SPI && ALL(MONITOR_DRIVER_STATUS, SDSUPPORT, USES_SHARED_SPI)
+#if HAS_TMC_SPI && ALL(MONITOR_DRIVER_STATUS, SDSUPPORT, USES_SHARED_SPI)
#error "MONITOR_DRIVER_STATUS and SDSUPPORT cannot be used together on boards with shared SPI."
#endif
+
+// G60/G61 Position Save
+#if SAVED_POSITIONS > 256
+ #error "SAVED_POSITIONS must be an integer from 0 to 256."
+#endif
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8d4b2fdc38..0316c69672 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2020-01-26"
+ #define STRING_DISTRIBUTION_DATE "2020-04-02"
#endif
/**
@@ -52,7 +52,7 @@
* to alert users to major changes.
*/
-#define MARLIN_HEX_VERSION 020000
+#define MARLIN_HEX_VERSION 020005
#ifndef REQUIRED_CONFIGURATION_H_VERSION
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
#endif
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index bf57f1dfc2..3c89d1803c 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -102,7 +102,7 @@
static void createChar_P(const char c, const byte * const ptr) {
byte temp[8];
- for (uint8_t i = 0; i < 8; i++)
+ LOOP_L_N(i, 8)
temp[i] = pgm_read_byte(&ptr[i]);
lcd.createChar(c, temp);
}
@@ -367,11 +367,11 @@ void MarlinUI::init_lcd() {
}
bool MarlinUI::detected() {
- return true
+ return (true
#if EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008) && defined(DETECT_DEVICE)
&& lcd.LcdDetected() == 1
#endif
- ;
+ );
}
#if HAS_SLOW_BUTTONS
@@ -414,7 +414,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
else {
PGM_P p = text;
int dly = time / _MAX(slen, 1);
- for (uint8_t i = 0; i <= slen; i++) {
+ LOOP_LE_N(i, slen) {
// Print the text at the correct place
lcd_put_u8str_max_P(col, line, p, len);
@@ -530,7 +530,7 @@ FORCE_INLINE void _draw_heater_status(const heater_ind_t heater, const char pref
if (prefix >= 0) lcd_put_wchar(prefix);
- lcd_put_u8str(i16tostr3(t1 + 0.5));
+ lcd_put_u8str(i16tostr3rj(t1 + 0.5));
lcd_put_wchar('/');
#if !HEATER_IDLE_HANDLER
@@ -582,7 +582,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
#endif
));
if (progress)
- lcd_put_u8str(ui8tostr3(progress));
+ lcd_put_u8str(ui8tostr3rj(progress));
else
lcd_put_u8str_P(PSTR("---"));
lcd_put_wchar('%');
@@ -631,7 +631,7 @@ void MarlinUI::draw_status_message(const bool blink) {
lcd_put_u8str_P(PSTR("Dia "));
lcd_put_u8str(ftostr12ns(filwidth.measured_mm));
lcd_put_u8str_P(PSTR(" V"));
- lcd_put_u8str(i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
+ lcd_put_u8str(i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
lcd_put_wchar('%');
return;
}
@@ -829,7 +829,7 @@ void MarlinUI::draw_status_screen() {
&& !printingIsActive()
#endif
) {
- xy_pos_t lpos = current_position; toLogical(lpos);
+ const xy_pos_t lpos = current_position.asLogical();
_draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink);
lcd_put_wchar(' ');
_draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink);
@@ -863,7 +863,7 @@ void MarlinUI::draw_status_screen() {
#if LCD_HEIGHT > 3
lcd_put_wchar(0, 2, LCD_STR_FEEDRATE[0]);
- lcd_put_u8str(i16tostr3(feedrate_percentage));
+ lcd_put_u8str(i16tostr3rj(feedrate_percentage));
lcd_put_wchar('%');
char buffer[14];
@@ -902,7 +902,7 @@ void MarlinUI::draw_status_screen() {
#endif
}
lcd_put_wchar(c);
- lcd_put_u8str(i16tostr3(per));
+ lcd_put_u8str(i16tostr3rj(per));
lcd_put_wchar('%');
#endif
#endif
@@ -941,7 +941,7 @@ void MarlinUI::draw_status_screen() {
#endif
lcd_put_wchar(LCD_WIDTH - 9, 1, LCD_STR_FEEDRATE[0]);
- lcd_put_u8str(i16tostr3(feedrate_percentage));
+ lcd_put_u8str(i16tostr3rj(feedrate_percentage));
lcd_put_wchar('%');
// ========== Line 3 ==========
@@ -1212,10 +1212,10 @@ void MarlinUI::draw_status_screen() {
#define _LCD_W_POS 12
#define _PLOT_X 1
#define _MAP_X 3
- #define _LABEL(C,X,Y) lcd_put_u8str(X, Y, C)
- #define _XLABEL(X,Y) _LABEL("X:",X,Y)
- #define _YLABEL(X,Y) _LABEL("Y:",X,Y)
- #define _ZLABEL(X,Y) _LABEL("Z:",X,Y)
+ #define _LABEL(C,X,Y) lcd_put_u8str_P(X, Y, C)
+ #define _XLABEL(X,Y) _LABEL(X_LBL,X,Y)
+ #define _YLABEL(X,Y) _LABEL(Y_LBL,X,Y)
+ #define _ZLABEL(X,Y) _LABEL(Z_LBL,X,Y)
#else
#define _LCD_W_POS 8
#define _PLOT_X 0
@@ -1415,9 +1415,9 @@ void MarlinUI::draw_status_screen() {
* Print plot position
*/
lcd_put_wchar(_LCD_W_POS, 0, '(');
- lcd_put_u8str(ui8tostr3(x_plot));
+ lcd_put_u8str(ui8tostr3rj(x_plot));
lcd_put_wchar(',');
- lcd_put_u8str(ui8tostr3(y_plot));
+ lcd_put_u8str(ui8tostr3rj(y_plot));
lcd_put_wchar(')');
#if LCD_HEIGHT <= 3 // 16x2 or 20x2 display
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.h b/Marlin/src/lcd/HD44780/ultralcd_HD44780.h
index d600dd3c2d..12bf86a161 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.h
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
index b7b1717e1b..4ab165c7a0 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index 427685cadb..25224934c5 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,7 +25,7 @@
#include
-#ifndef U8G_HAL_LINKS
+#ifndef U8G_HAL_LINKS // Defined by LPC1768/9 environments in platform.ini
#ifdef __SAM3X8E__
@@ -75,6 +75,7 @@
#define U8G_COM_ST7920_HAL_HW_SPI u8g_com_arduino_st7920_hw_spi_fn
#endif
+ // This can't be invoked from the current platformio.ini
#ifdef TARGET_LPC1768
uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
#endif
diff --git a/Marlin/src/lcd/dogm/dogm_Bootscreen.h b/Marlin/src/lcd/dogm/dogm_Bootscreen.h
index ea8ce5e38a..f4bf5f5f69 100644
--- a/Marlin/src/lcd/dogm/dogm_Bootscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Bootscreen.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index fbc7a8128a..3384f5798a 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -785,7 +785,9 @@
#endif
#endif
-#else
+#endif
+
+#ifndef STATUS_BED_WIDTH
#define STATUS_BED_WIDTH 0
#endif
@@ -852,7 +854,9 @@
};
#endif
-#else // HAS_HEATED_CHAMBER
+#endif
+
+#ifndef STATUS_CHAMBER_WIDTH
#define STATUS_CHAMBER_WIDTH 0
#endif
@@ -1729,8 +1733,8 @@
#define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
#define DO_DRAW_HOTENDS (HOTENDS > 0)
-#define DO_DRAW_CUTTER (HAS_CUTTER)
-#define DO_DRAW_BED (HAS_HEATED_BED && STATUS_BED_WIDTH && HOTENDS <= 4)
+#define DO_DRAW_BED (HAS_HEATED_BED && HOTENDS <= 4)
+#define DO_DRAW_CUTTER (HAS_CUTTER && !DO_DRAW_BED)
#define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
#define DO_DRAW_FAN (HAS_FAN0 && STATUS_FAN_WIDTH && HOTENDS <= 4 && defined(STATUS_FAN_FRAMES))
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
index 42f1606763..fd07e4af1e 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
index be304b1a14..e3087a55df 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 8774b72e4f..be414ab303 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -107,7 +107,7 @@
#define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, const uint8_t ty) {
- const char *str = i16tostr3(temp);
+ const char *str = i16tostr3rj(temp);
const uint8_t len = str[0] != ' ' ? 3 : str[1] != ' ' ? 2 : 1;
lcd_put_u8str(tx - len * (INFO_FONT_WIDTH) / 2 + 1, ty, &str[3-len]);
lcd_put_wchar(LCD_STR_DEGREE[0]);
@@ -188,21 +188,6 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(heater, isHeat));
#endif
- // Draw a heating progress bar, if specified
- #if DO_DRAW_BED && ENABLED(STATUS_HEAT_PERCENT)
-
- if (STATIC_HOTEND && isHeat) {
- const uint8_t bx = STATUS_HOTEND_X(heater) + STATUS_HOTEND_WIDTH(heater) + 1;
- u8g.drawFrame(bx, STATUS_HEATERS_Y, 3, STATUS_HEATERS_HEIGHT);
- if (tall) {
- const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
- if (PAGE_OVER(STATUS_HEATERS_Y + ph))
- u8g.drawVLine(bx + 1, STATUS_HEATERS_Y + ph, tall);
- }
- }
-
- #endif
-
} // PAGE_CONTAINS
if (PAGE_UNDER(7)) {
@@ -240,11 +225,11 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
const float temp = thermalManager.degBed(),
target = thermalManager.degTargetBed();
- #if ENABLED(STATUS_HEAT_PERCENT) || (DO_DRAW_BED && DISABLED(STATUS_BED_ANIM))
+ #if ENABLED(STATUS_HEAT_PERCENT) || DISABLED(STATUS_BED_ANIM)
const bool isHeat = BED_ALT();
#endif
- #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
+ #if DISABLED(STATUS_BED_ANIM)
#define STATIC_BED true
#define BED_DOT isHeat
#else
@@ -421,7 +406,7 @@ void MarlinUI::draw_status_screen() {
#if ENABLED(FILAMENT_LCD_DISPLAY)
strcpy(wstring, ftostr12ns(filwidth.measured_mm));
- strcpy(mstring, i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
+ strcpy(mstring, i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
#endif
// Progress / elapsed / estimation updates and string formatting to avoid float math on each LCD draw
@@ -453,7 +438,7 @@ void MarlinUI::draw_status_screen() {
#if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
permyriadtostr4(progress)
#else
- ui8tostr3(progress / (PROGRESS_SCALE))
+ ui8tostr3rj(progress / (PROGRESS_SCALE))
#endif
));
}
@@ -463,10 +448,10 @@ void MarlinUI::draw_status_screen() {
#endif
}
+ constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
if (ev != lastElapsed) {
lastElapsed = ev;
- const bool has_days = (elapsed.value >= 60*60*24L);
- const uint8_t len = elapsed.toDigital(elapsed_string, has_days);
+ const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L);
elapsed_x_pos = _SD_INFO_X(len);
#if ENABLED(SHOW_REMAINING_TIME)
@@ -483,8 +468,7 @@ void MarlinUI::draw_status_screen() {
}
else {
duration_t estimation = timeval;
- const bool has_days = (estimation.value >= 60*60*24L);
- const uint8_t len = estimation.toDigital(estimation_string, has_days);
+ const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L);
estimation_x_pos = _SD_INFO_X(len
#if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
+ 1
@@ -513,7 +497,7 @@ void MarlinUI::draw_status_screen() {
u8g.drawBitmapP(STATUS_HEATERS_X, STATUS_HEATERS_Y, STATUS_HEATERS_BYTEWIDTH, STATUS_HEATERS_HEIGHT, status_heaters_bmp);
#endif
- #if DO_DRAW_CUTTER
+ #if DO_DRAW_CUTTER && DISABLED(STATUS_COMBINE_HEATERS)
#if ANIM_CUTTER
#define CUTTER_BITMAP(S) ((S) ? status_cutter_on_bmp : status_cutter_bmp)
#else
@@ -537,7 +521,7 @@ void MarlinUI::draw_status_screen() {
u8g.drawBitmapP(STATUS_BED_X, bedy, STATUS_BED_BYTEWIDTH, bedh, BED_BITMAP(BED_ALT()));
#endif
- #if DO_DRAW_CHAMBER
+ #if DO_DRAW_CHAMBER && DISABLED(STATUS_COMBINE_HEATERS)
#if ANIM_CHAMBER
#define CHAMBER_BITMAP(S) ((S) ? status_chamber_on_bmp : status_chamber_bmp)
#else
@@ -579,14 +563,14 @@ void MarlinUI::draw_status_screen() {
if (PAGE_UNDER(6 + 1 + 12 + 1 + 6 + 1)) {
// Extruders
#if DO_DRAW_HOTENDS
- for (uint8_t e = 0; e < MAX_HOTEND_DRAW; ++e)
+ LOOP_L_N(e, MAX_HOTEND_DRAW)
_draw_hotend_status((heater_ind_t)e, blink);
#endif
// Laser / Spindle
#if DO_DRAW_CUTTER
if (cutter.power && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) {
- lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3(cutter.powerPercent(cutter.power)));
+ lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3rj(cutter.powerPercent(cutter.power)));
lcd_put_wchar('%');
}
#endif
@@ -613,7 +597,7 @@ void MarlinUI::draw_status_screen() {
c = '*';
}
#endif
- lcd_put_u8str(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y, i16tostr3(thermalManager.fanPercent(spd)));
+ lcd_put_u8str(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y, i16tostr3rj(thermalManager.fanPercent(spd)));
lcd_put_wchar(c);
}
}
@@ -667,11 +651,11 @@ void MarlinUI::draw_status_screen() {
}
}
else if (progress_state == 2 && estimation_string[0]) {
- lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "R:");
+ lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, PSTR("R:"));
lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string);
}
else if (elapsed_string[0]) {
- lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "E:");
+ lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, E_LBL);
lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
}
@@ -783,7 +767,7 @@ void MarlinUI::draw_status_screen() {
lcd_put_wchar(3, EXTRAS_2_BASELINE, LCD_STR_FEEDRATE[0]);
set_font(FONT_STATUSMENU);
- lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3(feedrate_percentage));
+ lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(feedrate_percentage));
lcd_put_wchar('%');
//
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index f5931917ae..e623776b31 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -209,7 +209,7 @@ void ST7920_Lite_Status_Screen::clear_ddram() {
/* This fills the entire graphics buffer with zeros */
void ST7920_Lite_Status_Screen::clear_gdram() {
- for (uint8_t y = 0; y < BUFFER_HEIGHT; y++) {
+ LOOP_L_N(y, BUFFER_HEIGHT) {
set_gdram_address(0, y);
begin_data();
for (uint8_t i = (BUFFER_WIDTH) / 16; i--;) write_word(0);
@@ -407,7 +407,7 @@ void ST7920_Lite_Status_Screen::draw_degree_symbol(uint8_t x, uint8_t y, const b
const uint8_t x_word = x >> 1,
y_top = degree_symbol_y_top,
y_bot = y_top + COUNT(degree_symbol);
- for (uint8_t i = y_top; i < y_bot; i++) {
+ LOOP_S_L_N(i, y_top, y_bot) {
uint8_t byte = pgm_read_byte(p_bytes++);
set_gdram_address(x_word, i + y * 16);
begin_data();
@@ -467,10 +467,10 @@ void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
const uint8_t char_pcnt = 100 / width; // How many percent does each 16-bit word represent?
// Draw the progress bar as a bitmap in CGRAM
- for (uint8_t y = top; y <= bottom; y++) {
+ LOOP_S_LE_N(y, top, bottom) {
set_gdram_address(left, y);
begin_data();
- for (uint8_t x = 0; x < width; x++) {
+ LOOP_L_N(x, width) {
uint16_t gfx_word = 0x0000;
if ((x + 1) * char_pcnt <= value)
gfx_word = 0xFFFF; // Draw completely filled bytes
diff --git a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
index d1d740e235..1854ac1c67 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
index 8db341293a..1542d9db0d 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
index 87094eb804..599ee2a9ef 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -59,8 +59,6 @@
#include "HAL_LCD_com_defines.h"
-#define LCD_PIXEL_WIDTH 128
-#define LCD_PIXEL_HEIGHT 64
#define PAGE_HEIGHT 8
/* init sequence from https://github.com/adafruit/ST7565-LCD/blob/master/ST7565/ST7565.cpp */
@@ -89,11 +87,11 @@ void clear_graphics_DRAM(u8g_t *u8g, u8g_dev_t *dev) {
u8g_SetAddress(u8g, dev, 0); // cmd mode
u8g_WriteByte(u8g, dev, 0x08); //display off, cursor+blink off
u8g_WriteByte(u8g, dev, 0x3E); //extended mode + GDRAM active
- for (uint8_t y = 0; y < (LCD_PIXEL_HEIGHT) / 2; y++) { //clear GDRAM
+ LOOP_L_N(y, (LCD_PIXEL_HEIGHT) / 2) { //clear GDRAM
u8g_WriteByte(u8g, dev, 0x80 | y); //set y
u8g_WriteByte(u8g, dev, 0x80); //set x = 0
u8g_SetAddress(u8g, dev, 1); /* data mode */
- for (uint8_t i = 0; i < 2 * (LCD_PIXEL_WIDTH) / 8; i++) //2x width clears both segments
+ LOOP_L_N(i, 2 * (LCD_PIXEL_WIDTH) / 8) //2x width clears both segments
u8g_WriteByte(u8g, dev, 0);
u8g_SetAddress(u8g, dev, 0); /* cmd mode */
}
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
index 39e0c43cdd..206f61c675 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -670,7 +670,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
case U8G_DEV_MSG_PAGE_NEXT:
if (++page > (HEIGHT / PAGE_HEIGHT)) return 1;
- for (uint8_t y = 0; y < PAGE_HEIGHT; y++) {
+ LOOP_L_N(y, PAGE_HEIGHT) {
uint32_t k = 0;
#ifdef LCD_USE_DMA_FSMC
buffer = (y & 1) ? bufferB : bufferA;
diff --git a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
index cd41373ab4..94956e7410 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -118,7 +118,7 @@ static const uint8_t u8g_dev_uc1701_mini12864_HAL_init_seq[] PROGMEM = {
static const uint8_t u8g_dev_uc1701_mini12864_HAL_data_start[] PROGMEM = {
U8G_ESC_ADR(0), // instruction mode
U8G_ESC_CS(1), // enable chip
- #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+ #if ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY, FYSETC_MINI_12864)
UC1701_START_LINE(0), // set display start line to 0
UC1701_ADC_REVERSE(0), // ADC set to reverse
UC1701_OUT_MODE(1), // common output mode
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index ae9614d677..4e07999bf6 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -219,9 +219,6 @@ bool MarlinUI::detected() { return true; }
// Show the Marlin bootscreen, with the u8g loop and delays
void MarlinUI::show_marlin_bootscreen() {
- #ifndef BOOTSCREEN_TIMEOUT
- #define BOOTSCREEN_TIMEOUT 2500
- #endif
constexpr uint8_t pages = two_part ? 2 : 1;
for (uint8_t q = pages; q--;) {
draw_marlin_bootscreen(q == 0);
@@ -247,13 +244,7 @@ void MarlinUI::init_lcd() {
#if DISABLED(MKS_LCD12864B)
#if PIN_EXISTS(LCD_BACKLIGHT)
- OUT_WRITE(LCD_BACKLIGHT_PIN, (
- #if ENABLED(DELAYED_BACKLIGHT_INIT)
- LOW // Illuminate after reset
- #else
- HIGH // Illuminate right away
- #endif
- ));
+ OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away
#endif
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
@@ -327,11 +318,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), row_y2, 'E');
lcd_put_wchar((char)('1' + extruder));
lcd_put_wchar(' ');
- lcd_put_u8str(i16tostr3(thermalManager.degHotend(extruder)));
+ lcd_put_u8str(i16tostr3rj(thermalManager.degHotend(extruder)));
lcd_put_wchar('/');
if (get_blink() || !thermalManager.hotend_idle[extruder].timed_out)
- lcd_put_u8str(i16tostr3(thermalManager.degTargetHotend(extruder)));
+ lcd_put_u8str(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
}
#endif // ADVANCED_PAUSE_FEATURE
@@ -548,9 +539,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
if (PAGE_UNDER(7)) {
const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
lpos = pos.asLogical();
- lcd_put_u8str(5, 7, "X:");
+ lcd_put_u8str_P(5, 7, X_LBL);
lcd_put_u8str(ftostr52(lpos.x));
- lcd_put_u8str(74, 7, "Y:");
+ lcd_put_u8str_P(74, 7, Y_LBL);
lcd_put_u8str(ftostr52(lpos.y));
}
@@ -563,7 +554,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
lcd_put_wchar(')');
// Show the location value
- lcd_put_u8str(74, LCD_PIXEL_HEIGHT, "Z:");
+ lcd_put_u8str_P(74, LCD_PIXEL_HEIGHT, Z_LBL);
if (!isnan(ubl.z_values[x_plot][y_plot]))
lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
else
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
index 576de49485..536b8f0bf9 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -196,13 +196,6 @@
#endif
#endif
-#ifndef LCD_PIXEL_WIDTH
- #define LCD_PIXEL_WIDTH 128
-#endif
-#ifndef LCD_PIXEL_HEIGHT
- #define LCD_PIXEL_HEIGHT 64
-#endif
-
// LCD_FULL_PIXEL_WIDTH =
// LCD_PIXEL_OFFSET_X + (LCD_PIXEL_WIDTH * 2) + LCD_PIXEL_OFFSET_X
#if ENABLED(FSMC_GRAPHICAL_TFT)
diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
index 8c4d1cf297..4e38e554a2 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -154,4 +154,4 @@ u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_rrd_st7920_128x64_fn, &u8
#endif
#endif // U8GLIB_ST7920
-#endif // __AVR__ && !U8G_HAL_LINKS
+#endif // !U8G_HAL_LINKS && (__AVR__ || ARDUINO_ARCH_STM32 || ARDUINO_ARCH_ESP32)
diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
index 858cbe8824..c6e0b9944b 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,12 +31,9 @@
#define ST7920_DAT_PIN LCD_PINS_ENABLE
#define ST7920_CS_PIN LCD_PINS_RS
-//#define PAGE_HEIGHT 8 //128 byte framebuffer
-#define PAGE_HEIGHT 16 //256 byte framebuffer
-//#define PAGE_HEIGHT 32 //512 byte framebuffer
-
-#define LCD_PIXEL_WIDTH 128
-#define LCD_PIXEL_HEIGHT 64
+//#define PAGE_HEIGHT 8 // 128 byte framebuffer
+#define PAGE_HEIGHT 16 // 256 byte framebuffer
+//#define PAGE_HEIGHT 32 // 512 byte framebuffer
#include
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
deleted file mode 100644
index 016996e265..0000000000
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*****************
- * main_menu.cpp *
- *****************/
-
-/****************************************************************************
- * Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
- * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. *
- * Written By Marcio Teixeira 2019 - Cocoa Press *
- * *
- * 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. *
- * *
- * To view a copy of the GNU General Public License, go to the following *
- * location: . *
- ****************************************************************************/
-
-#include "../config.h"
-
-#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
-
-#include "screens.h"
-
-using namespace FTDI;
-using namespace Theme;
-
-void MainMenu::onRedraw(draw_mode_t what) {
- if (what & BACKGROUND) {
- CommandProcessor cmd;
- cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
- .cmd(CLEAR(true,true,true));
- }
-
- if (what & FOREGROUND) {
- CommandProcessor cmd;
- cmd.colors(normal_btn)
- .font(Theme::font_medium)
- #ifdef TOUCH_UI_PORTRAIT
- #define GRID_ROWS 8
- #define GRID_COLS 2
- .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME))
- .enabled(
- #if ENABLED(NOZZLE_CLEAN_FEATURE)
- 1
- #endif
- )
- .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE))
- .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS))
- .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS))
- .tag(6).button( BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_TEMPERATURE))
- .enabled(
- #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS)
- 1
- #endif
- )
- .tag(7).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_FILAMENTCHANGE))
- .tag(8).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
- .enabled(
- #ifdef PRINTCOUNTER
- 1
- #endif
- )
- .tag(9).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_STATS_MENU))
- .tag(10).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
- .colors(action_btn)
- .tag(1).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
- #undef GRID_COLS
- #undef GRID_ROWS
- #else
- #define GRID_ROWS 5
- #define GRID_COLS 2
- .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME))
- #if ENABLED(TOUCH_UI_COCOA_PRESS)
- .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_PREHEAT_1))
- #else
- .enabled(
- #if ENABLED(NOZZLE_CLEAN_FEATURE)
- 1
- #endif
- )
- .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE))
- #endif
- .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS))
- .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS))
- .tag(6).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TEMPERATURE))
- #if ENABLED(TOUCH_UI_COCOA_PRESS)
- .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
- #else
- .enabled(
- #if DISABLED(TOUCH_UI_LULZBOT_BIO)
- 1
- #endif
- )
- .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENTCHANGE))
- #endif
- .tag(8).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
- .enabled(
- #ifdef PRINTCOUNTER
- 1
- #endif
- )
- .tag(9).button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_STATS_MENU))
- .tag(10).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_MENU))
- .colors(action_btn)
- .tag(1).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
- #undef GRID_COLS
- #undef GRID_ROWS
- #endif
- }
-}
-
-bool MainMenu::onTouchEnd(uint8_t tag) {
- using namespace ExtUI;
-
- switch (tag) {
- case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
- case 2: SpinnerDialogBox::enqueueAndWait_P(F("G28")); break;
- #if ENABLED(TOUCH_UI_COCOA_PRESS)
- case 3: GOTO_SCREEN(PreheatTimerScreen); break;
- #elif ENABLED(NOZZLE_CLEAN_FEATURE)
- case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
- #endif
- case 4: GOTO_SCREEN(MoveAxisScreen); break;
- case 5: injectCommands_P(PSTR("M84")); break;
- case 6: GOTO_SCREEN(TemperatureScreen); break;
- #if ENABLED(TOUCH_UI_COCOA_PRESS)
- case 7: GOTO_SCREEN(CaseLightScreen); break;
- #else
- case 7: GOTO_SCREEN(ChangeFilamentScreen); break;
- #endif
- case 8: GOTO_SCREEN(AdvancedSettingsMenu); break;
-#if ENABLED(PRINTCOUNTER)
- case 9: GOTO_SCREEN(StatisticsScreen); break;
-#endif
- case 10: GOTO_SCREEN(AboutScreen); break;
- default:
- return false;
- }
- return true;
-}
-
-#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h
deleted file mode 100644
index 933e91db80..0000000000
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/************
- * colors.h *
- ************/
-
-/****************************************************************************
- * Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
- * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. *
- * Written By Marcio Teixeira 2019 - Cocoa Press *
- * *
- * 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. *
- * *
- * To view a copy of the GNU General Public License, go to the following *
- * location: . *
- ****************************************************************************/
-
-#pragma once
-
-namespace Theme {
- #ifdef TOUCH_UI_LULZBOT_BIO
- // The Lulzbot Bio uses the color PANTONE 2175C on the case silkscreen.
- // This translates to HSL(208°, 100%, 39%) as an accent color on the GUI.
-
- constexpr int accent_hue = 208;
- constexpr float accent_sat = 0.5;
-
- constexpr uint32_t logo_bg_rgb = 0xffffff;
- constexpr uint32_t logo_fill_rgb = 0xffffff;
- constexpr uint32_t logo_stroke_rgb = hsl_to_rgb(accent_hue, 1.0, 0.39);
- #else
- // The Lulzbot logo uses the color PANTONE 382c.
- // This translates to HSL(68°, 68%, 52%) as an accent color on the GUI.
-
- constexpr int accent_hue = 68;
- constexpr float accent_sat = 0.68;
-
- constexpr uint32_t logo_bg_rgb = hsl_to_rgb(accent_hue, 0.77, 0.64);
- constexpr uint32_t logo_fill_rgb = hsl_to_rgb(accent_hue, 0.68, 0.52); // Lulzbot Green
- constexpr uint32_t logo_stroke_rgb = 0x000000;
- #endif
-
- // Shades of accent color
-
- #ifdef TOUCH_UI_COCOA_PRESS
- constexpr uint32_t accent_color_1 = hsl_to_rgb(12.8,0.597,0.263); // Darkest
- constexpr uint32_t accent_color_2 = hsl_to_rgb(12.8,0.597,0.263);
- constexpr uint32_t accent_color_3 = hsl_to_rgb( 9.6,0.664,0.443);
- constexpr uint32_t accent_color_4 = hsl_to_rgb(16.3,0.873,0.537);
- constexpr uint32_t accent_color_5 = hsl_to_rgb(23.0,0.889,0.539);
- constexpr uint32_t accent_color_6 = hsl_to_rgb(23.0,0.889,0.539); // Lightest
- #else
- constexpr uint32_t accent_color_1 = hsl_to_rgb(accent_hue, accent_sat, 0.26); // Darkest
- constexpr uint32_t accent_color_2 = hsl_to_rgb(accent_hue, accent_sat, 0.39);
- constexpr uint32_t accent_color_3 = hsl_to_rgb(accent_hue, accent_sat, 0.52);
- constexpr uint32_t accent_color_4 = hsl_to_rgb(accent_hue, accent_sat, 0.65);
- constexpr uint32_t accent_color_5 = hsl_to_rgb(accent_hue, accent_sat, 0.78);
- constexpr uint32_t accent_color_6 = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
- #endif
-
- // Shades of gray
-
- constexpr float gray_sat = 0.14;
-
- constexpr uint32_t gray_color_1 = hsl_to_rgb(accent_hue, gray_sat, 0.26); // Darkest
- constexpr uint32_t gray_color_2 = hsl_to_rgb(accent_hue, gray_sat, 0.39);
- constexpr uint32_t gray_color_3 = hsl_to_rgb(accent_hue, gray_sat, 0.52);
- constexpr uint32_t gray_color_4 = hsl_to_rgb(accent_hue, gray_sat, 0.65);
- constexpr uint32_t gray_color_5 = hsl_to_rgb(accent_hue, gray_sat, 0.78);
- constexpr uint32_t gray_color_6 = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest
-
- #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS)
- // Lulzbot TAZ Pro
- constexpr uint32_t theme_darkest = gray_color_1;
- constexpr uint32_t theme_dark = gray_color_2;
-
- constexpr uint32_t bg_color = theme_darkest;
- constexpr uint32_t bg_text_disabled = theme_dark;
- constexpr uint32_t bg_text_enabled = 0xFFFFFF;
- constexpr uint32_t bg_normal = theme_darkest;
-
- constexpr uint32_t fg_normal = theme_dark;
- constexpr uint32_t fg_action = accent_color_2;
- constexpr uint32_t fg_disabled = theme_darkest;
- #else
- // Lulzbot Bio
- constexpr uint32_t theme_darkest = accent_color_1;
- constexpr uint32_t theme_dark = accent_color_4;
-
- constexpr uint32_t bg_color = 0xFFFFFF;
- constexpr uint32_t bg_text_disabled = gray_color_1;
- constexpr uint32_t bg_text_enabled = accent_color_1;
- constexpr uint32_t bg_normal = accent_color_4;
-
- constexpr uint32_t fg_normal = accent_color_1;
- constexpr uint32_t fg_action = accent_color_4;
- constexpr uint32_t fg_disabled = gray_color_6;
-
- constexpr uint32_t shadow_rgb = gray_color_6;
- constexpr uint32_t stroke_rgb = accent_color_1;
- constexpr uint32_t fill_rgb = accent_color_3;
- constexpr uint32_t syringe_rgb = accent_color_5;
- #endif
-
- constexpr uint32_t x_axis = 0xFF0000;
- constexpr uint32_t y_axis = 0x00BB00;
- constexpr uint32_t z_axis = 0x0000BF;
- constexpr uint32_t e_axis = gray_color_2;
- constexpr uint32_t feedrate = gray_color_2;
- constexpr uint32_t other = gray_color_2;
-
- // Status screen
- constexpr uint32_t progress = gray_color_2;
- constexpr uint32_t status_msg = gray_color_2;
- constexpr uint32_t fan_speed = 0x377198;
- constexpr uint32_t temp = 0x892c78;
- constexpr uint32_t axis_label = gray_color_2;
-
- constexpr uint32_t disabled_icon = gray_color_1;
-
- // Calibration Registers Screen
- constexpr uint32_t transformA = 0x3010D0;
- constexpr uint32_t transformB = 0x4010D0;
- constexpr uint32_t transformC = 0x5010D0;
- constexpr uint32_t transformD = 0x6010D0;
- constexpr uint32_t transformE = 0x7010D0;
- constexpr uint32_t transformF = 0x8010D0;
- constexpr uint32_t transformVal = 0x104010;
-
- constexpr btn_colors disabled_btn = {.bg = bg_color, .grad = fg_disabled, .fg = fg_disabled, .rgb = fg_disabled };
- constexpr btn_colors normal_btn = {.bg = fg_action, .grad = 0xFFFFFF, .fg = fg_normal, .rgb = 0xFFFFFF };
- constexpr btn_colors action_btn = {.bg = bg_color, .grad = 0xFFFFFF, .fg = fg_action, .rgb = 0xFFFFFF };
- constexpr btn_colors red_btn = {.bg = 0xFF5555, .grad = 0xFFFFFF, .fg = 0xFF0000, .rgb = 0xFFFFFF };
- constexpr btn_colors ui_slider = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = accent_color_3 };
- constexpr btn_colors ui_toggle = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = 0xFFFFFF };
-
- // Temperature color scale
-
- const rgb_t cool_rgb ( 0, 0, 0);
- const rgb_t low_rgb (128, 0, 0);
- const rgb_t med_rgb (255, 128, 0);
- const rgb_t high_rgb (255, 255, 128);
-};
diff --git a/Marlin/src/lcd/extui/lib/Creality_DWIN.h b/Marlin/src/lcd/extui/lib/Creality_DWIN.h
new file mode 100644
index 0000000000..e8126b16f4
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/Creality_DWIN.h
@@ -0,0 +1,194 @@
+#pragma once
+
+#include "string.h"
+#include
+#include "../ui_api.h"
+#if ENABLED(EXTENSIBLE_UI)
+namespace ExtUI {
+/*********************************/
+#define FHONE (0x5A)
+#define FHTWO (0xA5)
+#define TEXTBYTELEN 18
+#define MaxFileNumber 20// 16
+
+#define CEIconGrap 12
+#define FileNum MaxFileNumber
+#define FileNameLen TEXTBYTELEN
+
+#define SizeofDatabuf 26
+
+/*************Register and Variable addr*****************/
+#define RegAddr_W 0x80
+#define RegAddr_R 0x81
+#define VarAddr_W 0x82
+#define VarAddr_R 0x83
+#define ExchangePageBase (unsigned long)0x5A010000 //the first page ID. other page = first page ID + relevant num;
+#define StartSoundSet ((unsigned long)0x060480A0) // 06,start-music; 04, 4 musics; 80, the volume value; 04, return value about music number.
+#define FONT_EEPROM 90
+#define AutoLeve_EEPROM 100
+#define FanOn 255
+#define FanOff 0
+
+/*variable addr*/
+#define ExchangepageAddr 0x0084
+#define SoundAddr 0x00A0
+#define StartIcon 0x1000
+#define FeedrateDisplay 0x1006 // Speed
+#define Stopprint 0x1008
+#define Pauseprint 0x100A
+#define Resumeprint 0x100C
+#define PrintscheduleIcon 0x100E
+#define Timehour 0x1010
+#define Timemin 0x1012
+#define IconPrintstatus 0x1014
+#define Percentage 0x1016
+#define FanKeyIcon 0x101E
+#define Flowrate 0x1300
+
+#define StepMM_X 0x1242
+#define StepMM_Y 0x1246
+#define StepMM_Z 0x124A
+#define StepMM_E 0x124E
+
+#define ProbeOffset_X 0x1236
+#define ProbeOffset_Y 0x123A
+#define ProbeOffset_Z 0x123E
+
+#define HotendPID_AutoTmp 0x1252
+#define BedPID_AutoTmp 0x1254
+
+#define HotendPID_P 0x1256
+#define HotendPID_I 0x125A
+#define HotendPID_D 0x125E
+
+#define BedPID_P 0x1262
+#define BedPID_I 0x1266
+#define BedPID_D 0x126A
+
+#define HeatPercentIcon 0x1024
+
+#define NzBdSet 0x1032
+#define NozzlePreheat 0x1034
+#define NozzleTemp 0x1036
+#define BedPreheat 0x103A
+#define Bedtemp 0x103C
+
+#define AutoZeroIcon 0x1042
+#define AutoLevelIcon 0x1045
+#define AutoZero 0x1046
+#define DisplayXaxis 0x1048
+#define DisplayYaxis 0x104A
+#define DisplayZaxis 0x104C
+
+#define FilementUnit1 0x1054
+#define Exchfilement 0x1056
+#define FilementUnit2 0x1058
+
+#define MacVersion 0x1060
+#define SoftVersion 0x106A
+#define PrinterSize 0x1074
+#define CorpWebsite 0x107E
+#define VolumeIcon 0x108A
+#define SoundIcon 0x108C
+#define AutolevelIcon 0x108D
+#define ExchFlmntIcon 0x108E
+#define AutolevelVal 0x1100
+
+#define FilenameIcon 0x1200
+#define FilenameIcon1 0x1220
+#define Printfilename 0x2000
+#define SDFILE_ADDR 0x200A
+#define FilenamePlay 0x20D2
+#define FilenameChs 0x20D3
+#define Choosefilename 0x20D4
+#define FilenameCount 0x20DE
+#define FilenameNature 0x6003
+
+#if ANY(MachineCR10SPro, MachineEnder5Plus, MachineCR10Max) || ENABLED(Force10SProDisplay)
+ #define StatusMessageString 0x3000
+#else
+ #define StatusMessageString 0x20E8
+#endif
+
+#if defined(MCU_LPC1769) || defined(MCU_LPC1768)
+ #define DWIN_SERIAL DGUS_SERIAL
+#elif defined(TARGET_STM32F4)
+ #define DWIN_SERIAL Serial1
+#else
+ #define DWIN_SERIAL Serial2
+#endif
+
+/************struct**************/
+
+typedef struct DataBuf
+{
+ unsigned char len;
+ unsigned char head[2];
+ unsigned char command;
+ unsigned long addr;
+ unsigned long bytelen;
+ unsigned short data[32];
+ unsigned char reserv[4];
+} DB;
+
+typedef struct CardRecord
+{
+ char recordcount;
+ int Filesum;
+ unsigned long addr[FileNum];
+ char Cardshowfilename[FileNum][FileNameLen];
+ char Cardfilename[FileNum][FileNameLen];
+}CRec;
+
+class RTSSHOW {
+ public:
+ RTSSHOW();
+ int RTS_RecData();
+ void RTS_SDCardInit(void);
+ void RTS_SDCardUpate(bool, bool);
+ int RTS_CheckFilement(int);
+ void RTS_SndData(void);
+ void RTS_SndData(const String &, unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(const char[], unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(char, unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(unsigned char*, unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(int, unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(float, unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(unsigned int,unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(long,unsigned long, unsigned char = VarAddr_W);
+ void RTS_SndData(unsigned long,unsigned long, unsigned char = VarAddr_W);
+ void RTS_SDcard_Stop();
+ void RTS_HandleData();
+ void RTS_Init();
+
+ DB recdat;
+ DB snddat;
+ unsigned char databuf[SizeofDatabuf];
+ };
+
+static RTSSHOW rtscheck;
+
+ #define Addvalue 3
+ #define PrintChoice_Value (0+Addvalue)
+ #define Zoffset_Value (3+Addvalue)
+ #define Setting_Value (8+Addvalue)
+ #define XYZEaxis_Value (12+Addvalue)
+ #define Filement_Value (15+Addvalue)
+ #define Language_Value (18+Addvalue)
+ #define Filename_Value (22+Addvalue)
+
+ enum PROC_COM {Printfile=0,Ajust,Feedrate,PrintChoice=PrintChoice_Value,Zoffset=Zoffset_Value,TempControl,ManualSetTemp,Setting=Setting_Value,
+ ReturnBack,Bedlevel,Autohome,XYZEaxis=XYZEaxis_Value,Filement=Filement_Value,LanguageChoice=Language_Value,No_Filement,PwrOffNoF,Volume,Filename=Filename_Value};
+
+ const unsigned long Addrbuf[] = {0x1002, 0x1004, 0x1006, 0x1008, 0x100A, 0x100C, 0x1026, 0x1030, 0x1032, 0x1034, 0x103A,
+ 0x103E, 0x1040, 0x1044, 0x1046, 0x1048, 0x104A, 0x104C, 0x1054, 0x1056, 0x1058,
+ 0x105C, 0x105E, 0x105F, 0x1088, 0};
+
+void RTSUpdate();
+void RTSInit();
+
+}
+#ifndef USER_GCODE_1
+ #define USER_GCODE_1 "G28"
+#endif
+#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
index 0807ca9a99..bd73e811d1 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,10 +30,6 @@
#error "More than 2 hotends not implemented on the Display UI design."
#endif
-#include "DGUSDisplay.h"
-#include "DGUSVPVariable.h"
-#include "DGUSDisplayDefinition.h"
-
#include "../../ui_api.h"
#include "../../../../MarlinCore.h"
@@ -45,9 +41,13 @@
#include "../../../../libs/duration_t.h"
#include "../../../../module/printcounter.h"
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../../../../feature/power_loss_recovery.h"
+ #include "../../../../feature/powerloss.h"
#endif
+#include "DGUSDisplay.h"
+#include "DGUSVPVariable.h"
+#include "DGUSDisplayDef.h"
+
// Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable
constexpr uint8_t DGUS_HEADER1 = 0x5A;
constexpr uint8_t DGUS_HEADER2 = 0xA5;
@@ -179,6 +179,15 @@ void DGUSScreenVariableHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable
}
}
+// Send the current print progress to the display.
+void DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var) {
+ //DEBUG_ECHOPAIR(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
+ uint16_t tmp = ExtUI::getProgress_percent();
+ //DEBUG_ECHOLNPAIR(" data ", tmp);
+ uint16_t data_to_send = swap16(tmp);
+ dgusdisplay.WriteVariable(var.VP, data_to_send);
+}
+
// Send the current print time to the display.
// It is using a hex display for that: It expects BSD coded data in the format xxyyzz
void DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) {
@@ -432,7 +441,6 @@ void DGUSScreenVariableHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variab
DGUSLCD_SendStringToDisplay(var);
}
-
void DGUSScreenVariableHandler::SDCardInserted() {
top_file = 0;
auto cs = ScreenHandler.getCurrentScreen();
@@ -465,7 +473,7 @@ void DGUSScreenVariableHandler::ScreenConfirmedOK(DGUS_VP_Variable &var, void *v
const uint16_t* DGUSLCD_FindScreenVPMapList(uint8_t screen) {
const uint16_t *ret;
const struct VPMapping *map = VPMap;
- while (ret = (uint16_t*) pgm_read_word(&(map->VPList))) {
+ while (ret = (uint16_t*) pgm_read_ptr(&(map->VPList))) {
if (pgm_read_byte(&(map->screen)) == screen) return ret;
map++;
}
@@ -594,7 +602,7 @@ void DGUSScreenVariableHandler::HandleManualExtrude(DGUS_VP_Variable &var, void
skipVP = var.VP;
}
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
void DGUSScreenVariableHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) {
DEBUG_ECHOLNPGM("HandleManualMoveOption");
*(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr);
@@ -605,7 +613,7 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va
DEBUG_ECHOLNPGM("HandleManualMove");
int16_t movevalue = swap16(*(uint16_t*)val_ptr);
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
const uint16_t choice = *(uint16_t*)var.memadr;
movevalue = movevalue > 0 ? choice : -choice;
#endif
@@ -846,8 +854,8 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable
void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
- uint16_t value = swap16(*(uint16_t*)val_ptr)/100;
- ExtUI::setZOffset_mm(value);
+ const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f;
+ ExtUI::setZOffset_mm(offset);
ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
return;
}
@@ -858,7 +866,7 @@ void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var,
int16_t flag = swap16(*(uint16_t*)val_ptr);
int16_t steps = flag ? -20 : 20;
- ExtUI::smartAdjustAxis_steps(steps,ExtUI::axis_t::Z,true);
+ ExtUI::smartAdjustAxis_steps(steps, ExtUI::axis_t::Z, true);
ScreenHandler.ForceCompleteUpdate();
return;
}
@@ -1307,11 +1315,8 @@ void DGUSDisplay::ProcessRx() {
//DEBUG_ECHOPAIR(" vp=", vp, " dlen=", dlen);
DGUS_VP_Variable ramcopy;
if (populate_VPVar(vp, &ramcopy)) {
- if (!(dlen == ramcopy.size || (dlen == 2 && ramcopy.size == 1)))
- DEBUG_ECHOLNPGM("SIZE MISMATCH");
- else if (ramcopy.set_by_display_handler) {
+ if (ramcopy.set_by_display_handler)
ramcopy.set_by_display_handler(ramcopy, &tmp[3]);
- }
else
DEBUG_ECHOLNPGM(" VPVar found, no handler.");
}
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
index 698f825c5d..00e626adc9 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,6 +26,9 @@
#include "../../../../inc/MarlinConfigPre.h"
#include "../../../../MarlinCore.h"
+#if HAS_BED_PROBE
+ #include "../../../../module/probe.h"
+#endif
#include "DGUSVPVariable.h"
enum DGUSLCD_Screens : uint8_t;
@@ -116,7 +119,7 @@ public:
static void HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr);
// Hook for "Change Flowrate"
static void HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr);
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
// Hook for manual move option
static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
#endif
@@ -140,8 +143,10 @@ public:
// Hook for PID autotune
static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
#endif
- // Hook for "Change probe offset z"
- static void HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr);
+ #if HAS_BED_PROBE
+ // Hook for "Change probe offset z"
+ static void HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr);
+ #endif
#if ENABLED(BABYSTEPPING)
// Hook for live z adjust action
static void HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr);
@@ -210,6 +215,7 @@ public:
static void DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var);
static void DGUSLCD_SendTemperaturePID(DGUS_VP_Variable &var);
static void DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var);
+ static void DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var);
static void DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var);
#if ENABLED(PRINTCOUNTER)
static void DGUSLCD_SendPrintAccTimeToDisplay(DGUS_VP_Variable &var);
@@ -231,7 +237,7 @@ public:
if (!var.memadr) return;
union { unsigned char tmp[sizeof(T)]; T t; } x;
unsigned char *ptr = (unsigned char*)val_ptr;
- for (uint8_t i = 0; i < sizeof(T); i++) x.tmp[i] = ptr[sizeof(T) - i - 1];
+ LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
*(T*)var.memadr = x.t;
}
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
similarity index 89%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
index b79ea2cff6..7af1ffefa7 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,9 +42,9 @@ extern const struct VPMapping VPMap[];
extern const struct DGUS_VP_Variable ListOfVP[];
#if ENABLED(DGUS_LCD_UI_ORIGIN)
- #include "DGUSDisplayDefinitionOrigin.h"
+ #include "origin/DGUSDisplayDef.h"
#elif ENABLED(DGUS_LCD_UI_FYSETC)
- #include "DGUSDisplayDefinitionFYSETC.h"
+ #include "fysetc/DGUSDisplayDef.h"
#elif ENABLED(DGUS_LCD_UI_HIPRECY)
- #include "DGUSDisplayDefinitionHIPRECY.h"
+ #include "hiprecy/DGUSDisplayDef.h"
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h b/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
similarity index 95%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
index 8a2172f554..30555bbb9f 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
similarity index 95%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
rename to Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
index 4d953b88c8..49d89948ba 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,21 +22,21 @@
/* DGUS VPs changed by George Fu in 2019 for Marlin */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_FYSETC)
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
-#include "../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../ui_api.h"
+#include "../../../../ultralcd.h"
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
uint16_t distanceToMove = 0.1;
#endif
@@ -213,6 +213,7 @@ const uint16_t VPList_SDPrintTune[] PROGMEM = {
VP_T_Bed_Is, VP_T_Bed_Set,
#endif
VP_Feedrate_Percentage,
+ VP_SD_Print_ProbeOffsetZ,
0x0000
};
@@ -279,6 +280,13 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = {
0x0000
};
+const uint16_t VPList_Z_Offset[] PROGMEM = {
+ #if HOTENDS >= 1
+ VP_SD_Print_ProbeOffsetZ,
+ #endif
+ 0x0000
+};
+
const struct VPMapping VPMap[] PROGMEM = {
{ DGUSLCD_SCREEN_BOOT, VPList_Boot },
{ DGUSLCD_SCREEN_MAIN, VPList_Main },
@@ -297,6 +305,7 @@ const struct VPMapping VPMap[] PROGMEM = {
{ DGUSLCD_SCREEN_WAITING, VPList_PIDTuningWaiting },
{ DGUSLCD_SCREEN_FLC_PREHEAT, VPList_FLCPreheat },
{ DGUSLCD_SCREEN_FLC_PRINTING, VPList_FLCPrinting },
+ { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
{ DGUSLCD_SCREEN_STEPPERMM, VPList_StepPerMM },
{ DGUSLCD_SCREEN_PID_E, VPList_PIDE0 },
{ DGUSLCD_SCREEN_PID_BED, VPList_PIDBED },
@@ -322,10 +331,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
#endif
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
@@ -418,9 +427,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_ZPos, ¤t_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
// Print Progress
- #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
- VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
- #endif
+ VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
// Print Time
VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay),
@@ -453,7 +460,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_ReallyAbort, nullptr),
VPHELPER(VP_SD_Print_Setting, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_PrintTune, nullptr),
#if HAS_BED_PROBE
- VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe_offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+ VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
#if ENABLED(BABYSTEPPING)
VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, DGUSScreenVariableHandler::HandleLiveAdjustZ, nullptr),
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
rename to Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
index ca465697f3..309a23b9b5 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
+++ b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,7 +43,8 @@ enum DGUSLCD_Screens : uint8_t {
DGUSLCD_SCREEN_STEPPERMM = 212,
DGUSLCD_SCREEN_PID_E = 214,
DGUSLCD_SCREEN_PID_BED = 218,
- DGUSLCD_SCREEN_INFOS = 30,
+ DGUSLCD_SCREEN_Z_OFFSET = 222,
+ DGUSLCD_SCREEN_INFOS = 36,
DGUSLCD_SCREEN_CONFIRM = 240,
DGUSLCD_SCREEN_KILL = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
DGUSLCD_SCREEN_WAITING = 251,
@@ -121,8 +122,8 @@ constexpr uint16_t VP_POWER_LOSS_RECOVERY = 0x2180;
// Fan Control Buttons , switch between "off" and "on"
constexpr uint16_t VP_FAN0_CONTROL = 0x2200;
constexpr uint16_t VP_FAN1_CONTROL = 0x2202;
-//constexpr uint16_t VP_FAN2_CONTROL = 0x2204;
-//constexpr uint16_t VP_FAN3_CONTROL = 0x2206;
+constexpr uint16_t VP_FAN2_CONTROL = 0x2204;
+constexpr uint16_t VP_FAN3_CONTROL = 0x2206;
// Heater Control Buttons , triged between "cool down" and "heat PLA" state
constexpr uint16_t VP_E0_CONTROL = 0x2210;
@@ -240,8 +241,8 @@ constexpr uint16_t VP_SD_Print_Filename = 0x32C0;
// Fan status
constexpr uint16_t VP_FAN0_STATUS = 0x3300;
constexpr uint16_t VP_FAN1_STATUS = 0x3302;
-//constexpr uint16_t VP_FAN2_STATUS = 0x3304;
-//constexpr uint16_t VP_FAN3_STATUS = 0x3306;
+constexpr uint16_t VP_FAN2_STATUS = 0x3304;
+constexpr uint16_t VP_FAN3_STATUS = 0x3306;
// Heater status
constexpr uint16_t VP_E0_STATUS = 0x3310;
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
similarity index 95%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
rename to Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
index 0c25f64b6a..5fbb307ee8 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,21 +22,21 @@
/* DGUS VPs changed by George Fu in 2019 for Marlin */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_HIPRECY)
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
-#include "../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../ui_api.h"
+#include "../../../../ultralcd.h"
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
uint16_t distanceToMove = 0.1;
#endif
@@ -283,6 +283,13 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = {
0x0000
};
+const uint16_t VPList_Z_Offset[] PROGMEM = {
+ #if HOTENDS >= 1
+ VP_SD_Print_ProbeOffsetZ,
+ #endif
+ 0x0000
+};
+
const struct VPMapping VPMap[] PROGMEM = {
{ DGUSLCD_SCREEN_BOOT, VPList_Boot },
{ DGUSLCD_SCREEN_MAIN, VPList_Main },
@@ -291,6 +298,7 @@ const struct VPMapping VPMap[] PROGMEM = {
{ DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
{ DGUSLCD_SCREEN_PREHEAT, VPList_Preheat },
{ DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
+ { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
{ DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
{ DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating },
{ DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload },
@@ -327,10 +335,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
#endif
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
@@ -361,7 +369,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
#if HOTENDS >= 1
VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<0>),
VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
- VPHELPER(VP_Flowrate_E0, nullptr, DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
+ VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
VPHELPER(VP_EPos, &destination.e, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
VPHELPER(VP_MOVE_E0, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr),
VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &DGUSScreenVariableHandler::HandleHeaterControl, nullptr),
@@ -418,9 +426,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_ZPos, ¤t_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
// Print Progress
- #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
- VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
- #endif
+ VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
// Print Time
VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),
@@ -453,7 +459,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_ReallyAbort, nullptr),
VPHELPER(VP_SD_Print_Setting, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_PrintTune, nullptr),
#if HAS_BED_PROBE
- VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe_offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+ VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
#if ENABLED(BABYSTEPPING)
VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, DGUSScreenVariableHandler::HandleLiveAdjustZ, nullptr),
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
rename to Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
index 776b78f11a..1bfdf54254 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,6 +35,7 @@ enum DGUSLCD_Screens : uint8_t {
DGUSLCD_SCREEN_FILAMENT_LOADING = 76,
DGUSLCD_SCREEN_FILAMENT_UNLOADING = 82,
DGUSLCD_SCREEN_MANUALEXTRUDE = 84,
+ DGUSLCD_SCREEN_Z_OFFSET = 88,
DGUSLCD_SCREEN_SDFILELIST = 3,
DGUSLCD_SCREEN_SDPRINTMANIPULATION = 7,
DGUSLCD_SCREEN_SDPRINTTUNE = 9,
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
similarity index 95%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
rename to Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
index ca56052829..37b7335e67 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,20 +22,20 @@
/* DGUS implementation written by coldtobi in 2019 for Marlin */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_ORIGIN)
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
-#include "../../../ultralcd.h"
+#include "../../../../ultralcd.h"
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
uint16_t distanceToMove = 0.1;
#endif
@@ -162,10 +162,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
#endif
- #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+ #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
@@ -250,9 +250,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_ZPos, ¤t_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
// Print Progress
- #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
- VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
- #endif
+ VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
// Print Time
VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),
@@ -285,7 +283,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_ReallyAbort, nullptr),
VPHELPER(VP_SD_Print_Setting, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_PrintTune, nullptr),
#if HAS_BED_PROBE
- VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe_offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+ VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
#if ENABLED(BABYSTEPPING)
VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, DGUSScreenVariableHandler::HandleLiveAdjustZ, nullptr),
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h
rename to Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
index 7c76363094..756b91ddbd 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h
+++ b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
similarity index 94%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
index 90fd615a5d..c3e8052a0e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
@@ -37,6 +37,10 @@
#ifdef __MARLIN_FIRMWARE__
// __MARLIN_FIRMWARE__ exists when compiled within Marlin.
#include "pin_mappings.h"
+ #undef max
+ #define max(a,b) ((a)>(b)?(a):(b))
+ #undef min
+ #define min(a,b) ((a)<(b)?(a):(b))
#else
namespace UI {
static inline uint32_t safe_millis() {return millis();};
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/config.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/config.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
similarity index 94%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
index 7f666be45b..6621ea3cbf 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
@@ -38,6 +38,11 @@ namespace FTDI {
SET_OUTPUT(CLCD_SPI_CS);
WRITE(CLCD_SPI_CS, 1);
+ #ifdef CLCD_SPI_EXTRA_CS
+ SET_OUTPUT(CLCD_SPI_EXTRA_CS);
+ WRITE(CLCD_SPI_EXTRA_CS, 1);
+ #endif
+
#ifdef SPI_FLASH_SS
SET_OUTPUT(SPI_FLASH_SS);
WRITE(SPI_FLASH_SS, 1);
@@ -111,12 +116,18 @@ namespace FTDI {
::SPI.beginTransaction(spi_settings);
#endif
WRITE(CLCD_SPI_CS, 0);
+ #ifdef CLCD_SPI_EXTRA_CS
+ WRITE(CLCD_SPI_EXTRA_CS, 0);
+ #endif
delayMicroseconds(1);
}
// CLCD SPI - Chip Deselect
void SPI::spi_ftdi_deselect() {
WRITE(CLCD_SPI_CS, 1);
+ #ifdef CLCD_SPI_EXTRA_CS
+ WRITE(CLCD_SPI_EXTRA_CS, 1);
+ #endif
#ifndef CLCD_USE_SOFT_SPI
::SPI.endTransaction();
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
similarity index 90%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index ef2b23a3a2..3023a1c6bc 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -176,11 +176,12 @@
#undef MAKE_ARDUINO_PINS
} // namespace fast_io
- #define SET_INPUT(pin) fast_io::pin::set_input()
- #define SET_INPUT_PULLUP(pin) fast_io::pin::set_input(); fast_io::pin::set_high()
- #define SET_OUTPUT(pin) fast_io::pin::set_output()
- #define READ(pin) fast_io::pin::read()
- #define WRITE(pin, value) fast_io::pin::write(value)
+ #define SET_INPUT(pin) fast_io::pin::set_input()
+ #define SET_INPUT_PULLUP(pin) do{ fast_io::pin::set_input(); fast_io::pin::set_high(); }while(0)
+ #define SET_INPUT_PULLDOWN SET_INPUT
+ #define SET_OUTPUT(pin) fast_io::pin::set_output()
+ #define READ(pin) fast_io::pin::read()
+ #define WRITE(pin, value) fast_io::pin::write(value)
#ifndef pgm_read_word_far
#define pgm_read_word_far pgm_read_word
@@ -195,11 +196,11 @@
#endif
#define SERIAL_ECHO_START()
- #define SERIAL_ECHOLNPGM(str) Serial.println(F(str))
- #define SERIAL_ECHOPGM(str) Serial.print(F(str))
- #define SERIAL_ECHO_MSG(str) Serial.println(str)
- #define SERIAL_ECHOLNPAIR(str, val) {Serial.print(F(str)); Serial.println(val);}
- #define SERIAL_ECHOPAIR(str, val) {Serial.print(F(str)); Serial.print(val);}
+ #define SERIAL_ECHOLNPGM(str) Serial.println(F(str))
+ #define SERIAL_ECHOPGM(str) Serial.print(F(str))
+ #define SERIAL_ECHO_MSG(str) Serial.println(str)
+ #define SERIAL_ECHOLNPAIR(str, val) do{ Serial.print(F(str)); Serial.println(val); }while(0)
+ #define SERIAL_ECHOPAIR(str, val) do{ Serial.print(F(str)); Serial.print(val); }while(0)
#define safe_delay delay
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
index f0f693bfd8..b338758ed1 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
@@ -191,7 +191,7 @@ namespace FTDI {
#if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR("Touch end: ", tag);
+ SERIAL_ECHOLNPAIR("Touch end: ", pressed_tag);
#endif
const uint8_t saved_pressed_tag = pressed_tag;
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
index 688b68ae0c..e2ce15dc8f 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
@@ -339,11 +339,11 @@
alt_fm.stride = 19;
alt_fm.width = 38;
alt_fm.height = 49;
- for (uint8_t i = 0; i < 127; i++)
+ LOOP_L_N(i, 127)
alt_fm.char_widths[i] = 0;
// For special characters, copy the character widths from the char tables
- for (uint8_t i = 0; i < NUM_ELEMENTS(char_recipe); i++) {
+ LOOP_L_N(i, NUM_ELEMENTS(char_recipe)) {
uint8_t std_char, alt_char, alt_data;
get_char_data(i, std_char, alt_char, alt_data);
if (std_char == 0)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
similarity index 91%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
index e59e1d9468..ebd60aed31 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
@@ -70,13 +70,15 @@ namespace Language_en {
PROGMEM Language_Str MSG_PRINT_FINISHED = u8"Print finished";
PROGMEM Language_Str MSG_PRINT_ERROR = u8"Print error";
PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_1 = u8"Color Touch Panel";
- PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2 = u8"Portions " COPYRIGHT_SIGN " 2019 Aleph Objects, Inc.\n"
- "Portions " COPYRIGHT_SIGN " 2019 Cocoa Press";
- PROGMEM Language_Str MSG_FIRMWARE_FOR_TOOLHEAD = u8"Firmware for toolhead:\n%s\n\n";
+ PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2 = WEBSITE_URL;
+ PROGMEM Language_Str MSG_LICENSE = u8"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.\n\nTo view a copy of the GNU General "
+ "Public License, go to the following location: http://www.gnu.org/licenses.";
PROGMEM Language_Str MSG_RUNOUT_1 = u8"Runout 1";
PROGMEM Language_Str MSG_RUNOUT_2 = u8"Runout 2";
PROGMEM Language_Str MSG_DISPLAY_MENU = u8"Display";
- PROGMEM Language_Str MSG_INTERFACE_SETTINGS = u8"Interface Settings";
+ PROGMEM Language_Str MSG_INTERFACE = u8"Interface";
PROGMEM Language_Str MSG_MEASURE_AUTOMATICALLY = u8"Measure automatically";
PROGMEM Language_Str MSG_H_OFFSET = u8"H Offset";
PROGMEM Language_Str MSG_V_OFFSET = u8"V Offset";
@@ -129,7 +131,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_SOUND_VOLUME = u8"Sound volume";
PROGMEM Language_Str MSG_SCREEN_LOCK = u8"Screen lock";
PROGMEM Language_Str MSG_BOOT_SCREEN = u8"Boot screen";
- PROGMEM Language_Str MSG_INTERFACE_SOUNDS = u8"Interface Sounds";
+ PROGMEM Language_Str MSG_SOUNDS = u8"Sounds";
PROGMEM Language_Str MSG_CLICK_SOUNDS = u8"Click sounds";
PROGMEM Language_Str MSG_EEPROM_RESTORED = u8"Settings restored from backup";
PROGMEM Language_Str MSG_EEPROM_RESET = u8"Settings restored to default";
@@ -144,12 +146,12 @@ namespace Language_en {
PROGMEM Language_Str MSG_TOUCH_CALIBRATION_START = u8"Release to begin screen calibration";
PROGMEM Language_Str MSG_TOUCH_CALIBRATION_PROMPT = u8"Touch the dots to calibrate";
+ PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS = u8"Level X Axis";
#ifdef TOUCH_UI_LULZBOT_BIO
PROGMEM Language_Str MSG_MOVE_TO_HOME = u8"Move to Home";
PROGMEM Language_Str MSG_RAISE_PLUNGER = u8"Raise Plunger";
PROGMEM Language_Str MSG_RELEASE_XY_AXIS = u8"Release X and Y Axis";
- PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS = u8"Auto-level X Axis";
PROGMEM Language_Str MSG_BED_TEMPERATURE = u8"Bed Temperature";
PROGMEM Language_Str MSG_HOME_XYZ_WARNING = u8"About to move to home position. Ensure the top and the bed of the printer are clear.\n\nContinue?";
PROGMEM Language_Str MSG_HOME_E_WARNING = u8"About to re-home plunger and auto-level. Remove syringe prior to proceeding.\n\nContinue?";
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
similarity index 91%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
index aabc5ef27a..bed32cc606 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
@@ -131,22 +131,28 @@ namespace ExtUI {
}
#endif
+ #if ENABLED(POWER_LOSS_RECOVERY)
+ void onPowerLossResume() {
+ // Called on resume from power-loss
+ }
+ #endif
+
#if HAS_PID_HEATING
- void OnPidTuning(const result_t rst) {
+ void onPidTuning(const result_t rst) {
// Called for temperature PID tuning result
SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
switch (rst) {
case PID_BAD_EXTRUDER_NUM:
- StatusScreen::setStatusMessage(MSG_PID_BAD_EXTRUDER_NUM);
+ StatusScreen::setStatusMessage(STR_PID_BAD_EXTRUDER_NUM);
break;
case PID_TEMP_TOO_HIGH:
- StatusScreen::setStatusMessage(MSG_PID_TEMP_TOO_HIGH);
+ StatusScreen::setStatusMessage(STR_PID_TEMP_TOO_HIGH);
break;
case PID_TUNING_TIMEOUT:
- StatusScreen::setStatusMessage(MSG_PID_TIMEOUT);
+ StatusScreen::setStatusMessage(STR_PID_TIMEOUT);
break;
case PID_DONE:
- StatusScreen::setStatusMessage(MSG_PID_AUTOTUNE_FINISHED);
+ StatusScreen::setStatusMessage(STR_PID_AUTOTUNE_FINISHED);
break;
}
GOTO_SCREEN(StatusScreen);
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
similarity index 90%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
index d474644b8c..b5b0f22e11 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
@@ -27,6 +27,15 @@
* without adding new pin definitions to the board.
*/
+#ifdef S6_TFT_PINMAP
+ #ifndef __MARLIN_FIRMWARE__
+ #error "This pin mapping requires Marlin."
+ #endif
+
+ #define CLCD_SPI_CS PC7
+ #define CLCD_MOD_RESET PC6
+#endif
+
#ifdef CR10_TFT_PINMAP
#ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin."
@@ -120,12 +129,13 @@
* 9 GND GND GND --> GND
* 10 5V 5V 5V --> KILL [3]
*
- * [1] This configuration is not compatible with the
- * EinsyRetro 1.1a because there is a level shifter
- * on MISO enabled by SD/USB chip select.
+ * [1] This configuration allows daisy-chaining of the
+ * display and SD/USB on EXP2, except for [2]
*
- * [2] This configuration allows daisy-chaining of the
- * display and SD/USB on EXP2.
+ * [2] The Ultimachine Einsy boards have a level shifter
+ * on MISO enabled by SD_CSEL chip select, hence it
+ * is not possible to run both the display and the
+ * SD/USB on EXP2.
*
* [3] Archim Rambo provides 5V on this pin. On any other
* board, divert this wire from the ribbon cable and
@@ -139,4 +149,8 @@
#define CLCD_SPI_CS BTN_EN1
#define CLCD_MOD_RESET BTN_EN2
+
+ #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT)
+ #define CLCD_SPI_EXTRA_CS SDSS
+ #endif
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
similarity index 56%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
index afd4402fc1..70acc09071 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
@@ -27,7 +27,7 @@
#include "screens.h"
#define GRID_COLS 4
-#define GRID_ROWS 9
+#define GRID_ROWS 7
using namespace FTDI;
using namespace Theme;
@@ -45,7 +45,32 @@ void AboutScreen::onRedraw(draw_mode_t) {
.cmd(COLOR_RGB(bg_text_enabled))
.tag(0);
- draw_text_box(cmd, BTN_POS(1,2), BTN_SIZE(4,1),
+ #define HEADING_POS BTN_POS(1,2), BTN_SIZE(4,1)
+ #define FW_VERS_POS BTN_POS(1,3), BTN_SIZE(4,1)
+ #define FW_INFO_POS BTN_POS(1,4), BTN_SIZE(4,1)
+ #define LICENSE_POS BTN_POS(1,5), BTN_SIZE(4,2)
+ #define STATS_POS BTN_POS(1,7), BTN_SIZE(2,1)
+ #define BACK_POS BTN_POS(3,7), BTN_SIZE(2,1)
+
+ #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
+ #define INSET_POS(pos) _INSET_POS(pos)
+
+ char about_str[
+ strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) +
+ strlen_P(TOOLHEAD_NAME) + 1
+ ];
+ #ifdef TOOLHEAD_NAME
+ // If MSG_ABOUT_TOUCH_PANEL_2 has %s, substitute in the toolhead name.
+ // But this is optional, so squelch the compiler warning here.
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wformat-extra-args"
+ sprintf_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2), TOOLHEAD_NAME);
+ #pragma GCC diagnostic pop
+ #else
+ strcpy_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2));
+ #endif
+
+ draw_text_box(cmd, HEADING_POS,
#ifdef CUSTOM_MACHINE_NAME
F(CUSTOM_MACHINE_NAME)
#else
@@ -53,42 +78,29 @@ void AboutScreen::onRedraw(draw_mode_t) {
#endif
, OPT_CENTER, font_xlarge
);
+ draw_text_box(cmd, FW_VERS_POS, progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium);
+ draw_text_box(cmd, FW_INFO_POS, about_str, OPT_CENTER, font_medium);
+ draw_text_box(cmd, INSET_POS(LICENSE_POS), GET_TEXT_F(MSG_LICENSE), OPT_CENTER, font_tiny);
- #ifdef TOOLHEAD_NAME
- char about_str[
- strlen_P(GET_TEXT(FIRMWARE_FOR_TOOLHEAD)) +
- strlen_P(TOOLHEAD_NAME) +
- strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) + 1
- ];
-
- sprintf_P(about_str, GET_TEXT(MSG_FIRMWARE_FOR_TOOLHEAD), TOOLHEAD_NAME);
- strcat_P (about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2));
- #endif
-
- cmd.tag(2);
- draw_text_box(cmd, BTN_POS(1,3), BTN_SIZE(4,3),
- #ifdef TOOLHEAD_NAME
- about_str
- #else
- GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_2)
- #endif
- , OPT_CENTER, font_medium
- );
-
- cmd.tag(0);
- draw_text_box(cmd, BTN_POS(1,6), BTN_SIZE(4,2), progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium);
-
- cmd.font(font_medium).colors(action_btn).tag(1).button(BTN_POS(2,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_OKAY));
+ cmd.font(font_medium)
+ .colors(normal_btn)
+ .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU))
+ .colors(action_btn)
+ .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
}
bool AboutScreen::onTouchEnd(uint8_t tag) {
switch (tag) {
- case 1: GOTO_PREVIOUS(); return true;
-#if ENABLED(TOUCH_UI_DEVELOPER_MENU)
- case 2: GOTO_SCREEN(DeveloperMenu); return true;
-#endif
- default: return false;
+ case 1: GOTO_PREVIOUS(); break;
+ #if ENABLED(PRINTCOUNTER)
+ case 2: GOTO_SCREEN(StatisticsScreen); break;
+ #endif
+ #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
+ case 3: GOTO_SCREEN(DeveloperMenu); break;
+ #endif
+ default: return false;
}
+ return true;
}
#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
similarity index 52%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
index b2fc2790a0..57137c5d4a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -37,127 +37,116 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.cmd(CLEAR(true,true,true));
}
+ #ifdef TOUCH_UI_PORTRAIT
+ #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+ #define GRID_ROWS 9
+ #else
+ #define GRID_ROWS 8
+ #endif
+ #define GRID_COLS 2
+ #define RESTORE_DEFAULTS_POS BTN_POS(1,1), BTN_SIZE(2,1)
+ #define DISPLAY_POS BTN_POS(1,2), BTN_SIZE(1,1)
+ #define INTERFACE_POS BTN_POS(2,2), BTN_SIZE(1,1)
+ #define ZPROBE_ZOFFSET_POS BTN_POS(1,3), BTN_SIZE(1,1)
+ #define STEPS_PER_MM_POS BTN_POS(2,3), BTN_SIZE(1,1)
+ #define FILAMENT_POS BTN_POS(1,4), BTN_SIZE(1,1)
+ #define VELOCITY_POS BTN_POS(2,4), BTN_SIZE(1,1)
+ #define TMC_CURRENT_POS BTN_POS(1,5), BTN_SIZE(1,1)
+ #define ACCELERATION_POS BTN_POS(2,5), BTN_SIZE(1,1)
+ #define ENDSTOPS_POS BTN_POS(1,6), BTN_SIZE(1,1)
+ #define JERK_POS BTN_POS(2,6), BTN_SIZE(1,1)
+ #define OFFSETS_POS BTN_POS(1,7), BTN_SIZE(1,1)
+ #define BACKLASH_POS BTN_POS(2,7), BTN_SIZE(1,1)
+ #define CASE_LIGHT_POS BTN_POS(1,8), BTN_SIZE(1,1)
+ #define TMC_HOMING_THRS_POS BTN_POS(2,8), BTN_SIZE(1,1)
+ #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+ #define BACK_POS BTN_POS(1,9), BTN_SIZE(2,1)
+ #else
+ #define BACK_POS BTN_POS(1,8), BTN_SIZE(2,1)
+ #endif
+ #else
+ #define GRID_ROWS 6
+ #define GRID_COLS 3
+ #define ZPROBE_ZOFFSET_POS BTN_POS(1,1), BTN_SIZE(1,1)
+ #define CASE_LIGHT_POS BTN_POS(1,4), BTN_SIZE(1,1)
+ #define STEPS_PER_MM_POS BTN_POS(2,1), BTN_SIZE(1,1)
+ #define TMC_CURRENT_POS BTN_POS(3,1), BTN_SIZE(1,1)
+ #define TMC_HOMING_THRS_POS BTN_POS(3,2), BTN_SIZE(1,1)
+ #define BACKLASH_POS BTN_POS(3,3), BTN_SIZE(1,1)
+ #define FILAMENT_POS BTN_POS(1,3), BTN_SIZE(1,1)
+ #define ENDSTOPS_POS BTN_POS(3,4), BTN_SIZE(1,1)
+ #define DISPLAY_POS BTN_POS(3,5), BTN_SIZE(1,1)
+ #define INTERFACE_POS BTN_POS(1,5), BTN_SIZE(2,1)
+ #define RESTORE_DEFAULTS_POS BTN_POS(1,6), BTN_SIZE(2,1)
+ #define VELOCITY_POS BTN_POS(2,2), BTN_SIZE(1,1)
+ #define ACCELERATION_POS BTN_POS(2,3), BTN_SIZE(1,1)
+ #define JERK_POS BTN_POS(2,4), BTN_SIZE(1,1)
+ #define OFFSETS_POS BTN_POS(1,2), BTN_SIZE(1,1)
+ #define BACK_POS BTN_POS(3,6), BTN_SIZE(1,1)
+ #endif
+
if (what & FOREGROUND) {
CommandProcessor cmd;
cmd.colors(normal_btn)
.font(Theme::font_medium)
- #ifdef TOUCH_UI_PORTRAIT
- #define GRID_ROWS 10
- #define GRID_COLS 2
.enabled(
#if HAS_BED_PROBE
1
#endif
)
- .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
+ .tag(2) .button( ZPROBE_ZOFFSET_POS, GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
.enabled(
#if HAS_CASE_LIGHT
1
#endif
)
- .tag(16).button( BTN_POS(1,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
- .tag(3) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
+ .tag(16).button( CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT))
+ .tag(3) .button( STEPS_PER_MM_POS, GET_TEXT_F(MSG_STEPS_PER_MM))
.enabled(
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
1
#endif
)
- .tag(13).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
+ .tag(13).button( TMC_CURRENT_POS, GET_TEXT_F(MSG_TMC_CURRENT))
.enabled(
- #if HAS_TRINAMIC
+ #if ENABLED(SENSORLESS_HOMING)
1
#endif
)
- .tag(14).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
+ .tag(14).button( TMC_HOMING_THRS_POS, GET_TEXT_F(MSG_TMC_HOMING_THRS))
.enabled(
#if HOTENDS > 1
1
#endif
)
- .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
+ .tag(4) .button( OFFSETS_POS, GET_TEXT_F(MSG_OFFSETS_MENU))
.enabled(
#if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
1
#endif
)
- .tag(11).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT))
- .tag(12).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
- .tag(15).button( BTN_POS(2,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
- .tag(9) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
- .tag(10).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_FAILSAFE))
- .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
- .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
- #if DISABLED(CLASSIC_JERK)
- .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
- #else
- .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
- #endif
+ .tag(11).button( FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
+ .tag(12).button( ENDSTOPS_POS, GET_TEXT_F(MSG_LCD_ENDSTOPS))
+ .tag(15).button( DISPLAY_POS, GET_TEXT_F(MSG_DISPLAY_MENU))
+ .tag(9) .button( INTERFACE_POS, GET_TEXT_F(MSG_INTERFACE))
+ .tag(10).button( RESTORE_DEFAULTS_POS, GET_TEXT_F(MSG_RESTORE_DEFAULTS))
+ .tag(5) .button( VELOCITY_POS, GET_TEXT_F(MSG_VELOCITY))
+ .tag(6) .button( ACCELERATION_POS, GET_TEXT_F(MSG_ACCELERATION))
+ .tag(7) .button( JERK_POS, GET_TEXT_F(
+ #if DISABLED(CLASSIC_JERK)
+ MSG_JUNCTION_DEVIATION
+ #else
+ JERK_POS
+ #endif
+ ))
.enabled(
#if ENABLED(BACKLASH_GCODE)
1
#endif
)
- .tag(8).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
+ .tag(8).button( BACKLASH_POS, GET_TEXT_F(MSG_BACKLASH))
.colors(action_btn)
- .tag(1) .button( BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
- #undef GRID_COLS
- #undef GRID_ROWS
- #else
- #define GRID_ROWS 6
- #define GRID_COLS 3
- .enabled(
- #if HAS_BED_PROBE
- 1
- #endif
- )
- .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
- .enabled(
- #if HAS_CASE_LIGHT
- 1
- #endif
- )
- .tag(16).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
- .enabled(1)
- .tag(3) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
- .enabled(
- #if HAS_TRINAMIC
- 1
- #endif
- )
- .tag(13).button( BTN_POS(3,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
- .enabled(
- #if HAS_TRINAMIC
- 1
- #endif
- )
- .tag(14).button( BTN_POS(3,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
- .enabled(
- #if ENABLED(BACKLASH_GCODE)
- 1
- #endif
- )
- .tag(8).button( BTN_POS(3,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
- .enabled(
- #if HOTENDS > 1
- 1
- #endif
- )
- .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
- .tag(12).button( BTN_POS(3,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
- .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
- .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
- #if DISABLED(CLASSIC_JERK)
- .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
- #else
- .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
- #endif
- .tag(11).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT))
- .tag(15).button( BTN_POS(3,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
- .tag(9) .button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
- .tag(10).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_FAILSAFE))
- .colors(action_btn)
- .tag(1) .button( BTN_POS(3,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
- #endif
+ .tag(1).button( BACK_POS, GET_TEXT_F(MSG_BACK));
}
}
@@ -189,8 +178,10 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
case 11: GOTO_SCREEN(FilamentMenu); break;
#endif
case 12: GOTO_SCREEN(EndstopStatesScreen); break;
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
case 13: GOTO_SCREEN(StepperCurrentScreen); break;
+ #endif
+ #if ENABLED(SENSORLESS_HOMING)
case 14: GOTO_SCREEN(StepperBumpSensitivityScreen); break;
#endif
case 15: GOTO_SCREEN(DisplayTuningScreen); break;
@@ -201,5 +192,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
}
return true;
}
-
#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
index 97e399a403..3e3f1d48a2 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
@@ -345,10 +345,14 @@ void BaseNumericAdjustmentScreen::widgets_t::home_buttons(uint8_t tag) {
}
cmd.font(LAYOUT_FONT);
- _button(cmd, tag+0, BTN_POS(5,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X));
- _button(cmd, tag+1, BTN_POS(7,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y));
- _button(cmd, tag+2, BTN_POS(9,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z));
- _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ _button(cmd, tag+0, BTN_POS(5,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X));
+ _button(cmd, tag+1, BTN_POS(7,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y));
+ #if DISABLED(Z_SAFE_HOMING)
+ _button(cmd, tag+2, BTN_POS(9,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z));
+ _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ #else
+ _button(cmd, tag+3, BTN_POS(9,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ #endif
_line++;
}
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
similarity index 95%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
index 77cadabcd7..7e88b7883a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
@@ -46,7 +46,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
return false;
}
- #ifdef LCD_TIMEOUT_TO_STATUS
+ #if LCD_TIMEOUT_TO_STATUS
if (EventLoop::get_pressed_tag() != 0) {
reset_menu_timeout();
}
@@ -66,7 +66,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
}
void BaseScreen::onIdle() {
- #ifdef LCD_TIMEOUT_TO_STATUS
+ #if LCD_TIMEOUT_TO_STATUS
if ((millis() - last_interaction) > LCD_TIMEOUT_TO_STATUS) {
reset_menu_timeout();
#if ENABLED(TOUCH_UI_DEBUG)
@@ -78,12 +78,12 @@ void BaseScreen::onIdle() {
}
void BaseScreen::reset_menu_timeout() {
- #ifdef LCD_TIMEOUT_TO_STATUS
+ #if LCD_TIMEOUT_TO_STATUS
last_interaction = millis();
#endif
}
-#ifdef LCD_TIMEOUT_TO_STATUS
+#if LCD_TIMEOUT_TO_STATUS
uint32_t BaseScreen::last_interaction;
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
index c2cbf70ae2..ed8bcee557 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
@@ -45,13 +45,13 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
.enabled(
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
1
#endif
)
.tag(3) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
.enabled(
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
1
#endif
)
@@ -85,8 +85,8 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
#endif
)
.tag(12) .button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
- .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
- .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_FAILSAFE))
+ .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
+ .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
.colors(action_btn)
.tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
#undef GRID_COLS
@@ -100,7 +100,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
switch (tag) {
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
case 2: GOTO_SCREEN(DisplayTuningScreen); break;
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
case 3: GOTO_SCREEN(StepperCurrentScreen); break;
case 4: GOTO_SCREEN(StepperBumpSensitivityScreen); break;
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
similarity index 88%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
index a3254bae9a..79a6112e4f 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
@@ -36,11 +36,13 @@ void BioConfirmHomeE::onRedraw(draw_mode_t) {
bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
switch (tag) {
case 1:
- SpinnerDialogBox::enqueueAndWait_P(F(
- "G28 E\n"
- AXIS_LEVELING_COMMANDS "\n"
- PARK_AND_RELEASE_COMMANDS
- ));
+ #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
+ SpinnerDialogBox::enqueueAndWait_P(F(
+ "G28 E\n"
+ AXIS_LEVELING_COMMANDS "\n"
+ PARK_AND_RELEASE_COMMANDS
+ ));
+ #endif
current_screen.forget();
break;
case 2:
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
similarity index 92%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
index 883a446b3e..3ae2d680ce 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
@@ -36,10 +36,12 @@ void BioConfirmHomeXYZ::onRedraw(draw_mode_t) {
bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
switch (tag) {
case 1:
- SpinnerDialogBox::enqueueAndWait_P(F(
- "G28\n"
- PARK_AND_RELEASE_COMMANDS
- ));
+ #ifdef PARK_AND_RELEASE_COMMANDS
+ SpinnerDialogBox::enqueueAndWait_P(F(
+ "G28\n"
+ PARK_AND_RELEASE_COMMANDS
+ ));
+ #endif
current_screen.forget();
break;
case 2:
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
index 40ed8479ee..1f6aa45c17 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
@@ -51,7 +51,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
.tag(4).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
.tag(5).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
.tag(6).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE))
- .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+ .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
.tag(8).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
.tag(9).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
.colors(action_btn)
@@ -72,7 +72,9 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
case 2: GOTO_SCREEN(BioConfirmHomeXYZ); break;
case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? F("G0 E0 F120") : F("G112")); break;
case 4: StatusScreen::unlockMotors(); break;
+ #ifdef AXIS_LEVELING_COMMANDS
case 5: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS)); break;
+ #endif
case 6: GOTO_SCREEN(TemperatureScreen); break;
case 7: GOTO_SCREEN(InterfaceSettingsScreen); break;
case 8: GOTO_SCREEN(AdvancedSettingsMenu); break;
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
similarity index 93%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
index 996c12cf23..5e022b58e7 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
@@ -80,12 +80,14 @@ void BootScreen::onIdle() {
SpinnerDialogBox::hide();
}
- if (UIData::animations_enabled()) {
- // If there is a startup video in the flash SPI, play
- // that, otherwise show a static splash screen.
- if (!MediaPlayerScreen::playBootMedia())
- showSplashScreen();
- }
+ #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
+ if (UIData::animations_enabled()) {
+ // If there is a startup video in the flash SPI, play
+ // that, otherwise show a static splash screen.
+ if (!MediaPlayerScreen::playBootMedia())
+ showSplashScreen();
+ }
+ #endif
StatusScreen::loadBitmaps();
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
index 2d1e0d6627..2b5963fdf6 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
@@ -111,6 +111,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
if (what & BACKGROUND) {
cmd.cmd(CLEAR_COLOR_RGB(bg_color))
.cmd(CLEAR(true,true,true))
+ .cmd(COLOR_RGB(bg_text_enabled))
.tag(0)
#ifdef TOUCH_UI_PORTRAIT
.font(font_large)
@@ -119,7 +120,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
#endif
.text(BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_EXTRUDER_SELECTION))
#ifdef TOUCH_UI_PORTRAIT
- .text(BTN_POS(1,7), BTN_SIZE(1,1), F(""))
+ .text(BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
#else
.text(BTN_POS(3,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
.font(font_small)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
similarity index 84%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
index 9901bbf45b..4510c93416 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
@@ -62,34 +62,34 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
.text(BTN_POS(1,1), BTN_SIZE(6,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
.font(font_tiny);
#if PIN_EXISTS(X_MAX)
- PIN_ENABLED (1, 2, PSTR(MSG_X_MAX), X_MAX, X_MAX_ENDSTOP_INVERTING)
+ PIN_ENABLED (1, 2, PSTR(STR_X_MAX), X_MAX, X_MAX_ENDSTOP_INVERTING)
#else
- PIN_DISABLED(1, 2, PSTR(MSG_X_MAX), X_MAX)
+ PIN_DISABLED(1, 2, PSTR(STR_X_MAX), X_MAX)
#endif
#if PIN_EXISTS(Y_MAX)
- PIN_ENABLED (3, 2, PSTR(MSG_Y_MAX), Y_MAX, Y_MAX_ENDSTOP_INVERTING)
+ PIN_ENABLED (3, 2, PSTR(STR_Y_MAX), Y_MAX, Y_MAX_ENDSTOP_INVERTING)
#else
- PIN_DISABLED(3, 2, PSTR(MSG_Y_MAX), Y_MAX)
+ PIN_DISABLED(3, 2, PSTR(STR_Y_MAX), Y_MAX)
#endif
#if PIN_EXISTS(Z_MAX)
- PIN_ENABLED (5, 2, PSTR(MSG_Z_MAX), Z_MAX, Z_MAX_ENDSTOP_INVERTING)
+ PIN_ENABLED (5, 2, PSTR(STR_Z_MAX), Z_MAX, Z_MAX_ENDSTOP_INVERTING)
#else
- PIN_DISABLED(5, 2, PSTR(MSG_Z_MAX), Z_MAX)
+ PIN_DISABLED(5, 2, PSTR(STR_Z_MAX), Z_MAX)
#endif
#if PIN_EXISTS(X_MIN)
- PIN_ENABLED (1, 3, PSTR(MSG_X_MIN), X_MIN, X_MIN_ENDSTOP_INVERTING)
+ PIN_ENABLED (1, 3, PSTR(STR_X_MIN), X_MIN, X_MIN_ENDSTOP_INVERTING)
#else
- PIN_DISABLED(1, 3, PSTR(MSG_X_MIN), X_MIN)
+ PIN_DISABLED(1, 3, PSTR(STR_X_MIN), X_MIN)
#endif
#if PIN_EXISTS(Y_MIN)
- PIN_ENABLED (3, 3, PSTR(MSG_Y_MIN), Y_MIN, Y_MIN_ENDSTOP_INVERTING)
+ PIN_ENABLED (3, 3, PSTR(STR_Y_MIN), Y_MIN, Y_MIN_ENDSTOP_INVERTING)
#else
- PIN_DISABLED(3, 3, PSTR(MSG_Y_MIN), Y_MIN)
+ PIN_DISABLED(3, 3, PSTR(STR_Y_MIN), Y_MIN)
#endif
#if PIN_EXISTS(Z_MIN)
- PIN_ENABLED (5, 3, PSTR(MSG_Z_MIN), Z_MIN, Z_MIN_ENDSTOP_INVERTING)
+ PIN_ENABLED (5, 3, PSTR(STR_Z_MIN), Z_MIN, Z_MIN_ENDSTOP_INVERTING)
#else
- PIN_DISABLED(5, 3, PSTR(MSG_Z_MIN), Z_MIN)
+ PIN_DISABLED(5, 3, PSTR(STR_Z_MIN), Z_MIN)
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && PIN_EXISTS(FIL_RUNOUT)
PIN_ENABLED (1, 4, GET_TEXT_F(MSG_RUNOUT_1), FIL_RUNOUT, FIL_RUNOUT_INVERTING)
@@ -102,9 +102,9 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
PIN_DISABLED(3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2)
#endif
#if PIN_EXISTS(Z_MIN_PROBE)
- PIN_ENABLED (5, 4, PSTR(MSG_Z_PROBE), Z_MIN_PROBE, Z_MIN_PROBE_ENDSTOP_INVERTING)
+ PIN_ENABLED (5, 4, PSTR(STR_Z_PROBE), Z_MIN_PROBE, Z_MIN_PROBE_ENDSTOP_INVERTING)
#else
- PIN_DISABLED(5, 4, PSTR(MSG_Z_PROBE), Z_MIN_PROBE)
+ PIN_DISABLED(5, 4, PSTR(STR_Z_PROBE), Z_MIN_PROBE)
#endif
#if HAS_SOFTWARE_ENDSTOPS
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
index 61875c52f1..4e165aa448 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
@@ -69,7 +69,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
.cmd(COLOR_RGB(bg_text_enabled))
.tag(0)
.font(font_medium)
- .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+ .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE))
#undef EDGE_R
#define EDGE_R 30
.font(font_small)
@@ -77,7 +77,9 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
.text(BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_LCD_BRIGHTNESS), OPT_RIGHTX | OPT_CENTERY)
.text(BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUND_VOLUME), OPT_RIGHTX | OPT_CENTERY)
.text(BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_SCREEN_LOCK), OPT_RIGHTX | OPT_CENTERY);
+ #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
cmd.text(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BOOT_SCREEN), OPT_RIGHTX | OPT_CENTERY);
+ #endif
#undef EDGE_R
}
@@ -95,16 +97,18 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
.tag(3).slider(BTN_POS(3,3), BTN_SIZE(2,1), screen_data.InterfaceSettingsScreen.volume, 0xFF)
.colors(ui_toggle)
.tag(4).toggle2(BTN_POS(3,4), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), LockScreen::is_enabled())
+ #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
.tag(5).toggle2(BTN_POS(3,5), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), UIData::animations_enabled())
+ #endif
#undef EDGE_R
#define EDGE_R 0
#ifdef TOUCH_UI_PORTRAIT
.colors(normal_btn)
- .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+ .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
.colors(action_btn)
.tag(1).button (BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
#else
- .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+ .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUNDS))
.colors(action_btn)
.tag(1).button (BTN_POS(3,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
#endif
@@ -252,7 +256,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
}
#ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
- #include "../../../../../HAL/shared/persistent_store_api.h"
+ #include "../../../../../HAL/shared/eeprom_api.h"
bool restoreEEPROM() {
uint8_t data[ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE];
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
index 57f520e8ab..48fae863a7 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
@@ -71,7 +71,7 @@ void InterfaceSoundsScreen::onRedraw(draw_mode_t what) {
#define GRID_ROWS 9
.font(font_medium)
- .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+ .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
#undef EDGE_R
#define EDGE_R 30
.font(font_small)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
new file mode 100644
index 0000000000..5d165edef0
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
@@ -0,0 +1,165 @@
+/*****************
+ * main_menu.cpp *
+ *****************/
+
+/****************************************************************************
+ * Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
+ * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. *
+ * Written By Marcio Teixeira 2019 - Cocoa Press *
+ * *
+ * 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. *
+ * *
+ * To view a copy of the GNU General Public License, go to the following *
+ * location: . *
+ ****************************************************************************/
+
+#include "../config.h"
+
+#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
+
+#include "screens.h"
+
+using namespace FTDI;
+using namespace Theme;
+
+void MainMenu::onRedraw(draw_mode_t what) {
+ if (what & BACKGROUND) {
+ CommandProcessor cmd;
+ cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
+ .cmd(CLEAR(true,true,true));
+ }
+
+ #ifdef TOUCH_UI_PORTRAIT
+ #define GRID_ROWS 8
+ #define GRID_COLS 2
+ #define ABOUT_PRINTER_POS BTN_POS(1,1), BTN_SIZE(2,1)
+ #define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
+ #define FILAMENTCHANGE_POS BTN_POS(1,3), BTN_SIZE(2,1)
+ #define TEMPERATURE_POS BTN_POS(1,4), BTN_SIZE(2,1)
+ #define MOVE_AXIS_POS BTN_POS(1,5), BTN_SIZE(1,1)
+ #define DISABLE_STEPPERS_POS BTN_POS(2,5), BTN_SIZE(1,1)
+ #define AUTO_HOME_POS BTN_POS(1,6), BTN_SIZE(1,1)
+ #define CLEAN_NOZZLE_POS BTN_POS(2,6), BTN_SIZE(1,1)
+ #define LEVEL_BED_POS BTN_POS(1,7), BTN_SIZE(1,1)
+ #define LEVEL_AXIS_POS BTN_POS(2,7), BTN_SIZE(1,1)
+ #define BACK_POS BTN_POS(1,8), BTN_SIZE(2,1)
+ #else
+ #define GRID_ROWS 6
+ #define GRID_COLS 2
+ #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(1,1)
+ #define ABOUT_PRINTER_POS BTN_POS(2,1), BTN_SIZE(1,1)
+ #define AUTO_HOME_POS BTN_POS(1,2), BTN_SIZE(1,1)
+ #define CLEAN_NOZZLE_POS BTN_POS(2,2), BTN_SIZE(1,1)
+ #define MOVE_AXIS_POS BTN_POS(1,3), BTN_SIZE(1,1)
+ #define DISABLE_STEPPERS_POS BTN_POS(2,3), BTN_SIZE(1,1)
+ #define TEMPERATURE_POS BTN_POS(1,4), BTN_SIZE(1,1)
+ #define FILAMENTCHANGE_POS BTN_POS(2,4), BTN_SIZE(1,1)
+ #define LEVEL_BED_POS BTN_POS(1,5), BTN_SIZE(1,1)
+ #define LEVEL_AXIS_POS BTN_POS(2,5), BTN_SIZE(1,1)
+ #define BACK_POS BTN_POS(1,6), BTN_SIZE(2,1)
+ #endif
+
+ if (what & FOREGROUND) {
+ CommandProcessor cmd;
+ cmd.colors(normal_btn)
+ .font(Theme::font_medium)
+ .tag(2).button( AUTO_HOME_POS, GET_TEXT_F(MSG_AUTO_HOME))
+ .enabled(
+ #if ANY(NOZZLE_CLEAN_FEATURE, TOUCH_UI_COCOA_PRESS)
+ 1
+ #endif
+ )
+ .tag(3).button( CLEAN_NOZZLE_POS, GET_TEXT_F(
+ #if ENABLED(TOUCH_UI_COCOA_PRESS)
+ MSG_PREHEAT_1
+ #else
+ MSG_CLEAN_NOZZLE
+ #endif
+ ))
+ .tag(4).button( MOVE_AXIS_POS, GET_TEXT_F(MSG_MOVE_AXIS))
+ .tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS))
+ .tag(6).button( TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE))
+ .enabled(
+ #if DISABLED(TOUCH_UI_LULZBOT_BIO)
+ 1
+ #endif
+ )
+ .tag(7).button( FILAMENTCHANGE_POS, GET_TEXT_F(
+ #if ENABLED(TOUCH_UI_COCOA_PRESS)
+ MSG_CASE_LIGHT
+ #else
+ MSG_FILAMENTCHANGE
+ #endif
+ ))
+ .tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
+ .enabled(
+ #ifdef PRINTCOUNTER
+ 1
+ #endif
+ )
+ .enabled(
+ #ifdef AXIS_LEVELING_COMMANDS
+ 1
+ #endif
+ )
+ .tag(9).button( LEVEL_AXIS_POS, GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
+ .enabled(
+ #ifdef HAS_LEVELING
+ 1
+ #endif
+ )
+ .tag(10).button( LEVEL_BED_POS, GET_TEXT_F(MSG_LEVEL_BED))
+ .tag(11).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
+ .colors(action_btn)
+ .tag(1).button( BACK_POS, GET_TEXT_F(MSG_BACK));
+ }
+}
+
+bool MainMenu::onTouchEnd(uint8_t tag) {
+ using namespace ExtUI;
+
+ switch (tag) {
+ case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
+ case 2: SpinnerDialogBox::enqueueAndWait_P(F("G28")); break;
+ #if ENABLED(TOUCH_UI_COCOA_PRESS)
+ case 3: GOTO_SCREEN(PreheatMenu); break;
+ #elif ENABLED(NOZZLE_CLEAN_FEATURE)
+ case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
+ #endif
+ case 4: GOTO_SCREEN(MoveAxisScreen); break;
+ case 5: injectCommands_P(PSTR("M84")); break;
+ case 6: GOTO_SCREEN(TemperatureScreen); break;
+ #if ENABLED(TOUCH_UI_COCOA_PRESS) && HAS_CASE_LIGHT
+ case 7: GOTO_SCREEN(CaseLightScreen); break;
+ #else
+ case 7: GOTO_SCREEN(ChangeFilamentScreen); break;
+ #endif
+ case 8: GOTO_SCREEN(AdvancedSettingsMenu); break;
+ #ifdef AXIS_LEVELING_COMMANDS
+ case 9: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS)); break;
+ #endif
+ #ifdef HAS_LEVELING
+ case 10: SpinnerDialogBox::enqueueAndWait_P(F(
+ #ifdef BED_LEVELING_COMMANDS
+ BED_LEVELING_COMMANDS
+ #else
+ "G29"
+ #endif
+ )); break;
+ #endif
+ case 11: GOTO_SCREEN(AboutScreen); break;
+ default:
+ return false;
+ }
+ return true;
+}
+
+#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
index 8513c79f84..4bf8ed190e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
@@ -36,7 +36,7 @@ void MoveAxisScreen::onEntry() {
// ourselves. The relative distances are reset to zero whenever this
// screen is entered.
- for (uint8_t i = 0; i < ExtUI::extruderCount; i++) {
+ LOOP_L_N(i, ExtUI::extruderCount) {
screen_data.MoveAxisScreen.e_rel[i] = 0;
}
BaseNumericAdjustmentScreen::onEntry();
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp
new file mode 100644
index 0000000000..f0b5dd887b
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp
@@ -0,0 +1,83 @@
+/********************
+ * preheat_menu.cpp *
+ ********************/
+
+/****************************************************************************
+ * Written By Marcio Teixeira 2020 - Cocoa Press *
+ * *
+ * 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. *
+ * *
+ * To view a copy of the GNU General Public License, go to the following *
+ * location: . *
+ ****************************************************************************/
+
+#include "../config.h"
+
+#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_COCOA_PRESS)
+
+#include "screens.h"
+
+using namespace FTDI;
+using namespace ExtUI;
+using namespace Theme;
+
+void PreheatMenu::onRedraw(draw_mode_t what) {
+ if (what & BACKGROUND) {
+ CommandProcessor cmd;
+ cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
+ .cmd(CLEAR(true,true,true))
+ .tag(0);
+ }
+
+ #define GRID_ROWS 3
+ #define GRID_COLS 2
+
+ if (what & FOREGROUND) {
+ CommandProcessor cmd;
+ cmd.cmd(COLOR_RGB(bg_text_enabled))
+ .font(Theme::font_medium)
+ .text ( BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_PREHEAT_1))
+ .colors(normal_btn)
+ .tag(2).button( BTN_POS(1,2), BTN_SIZE(1,1), F("Dark Chocolate"))
+ .tag(3).button( BTN_POS(2,2), BTN_SIZE(1,1), F("Milk Chocolate"))
+ .tag(4).button( BTN_POS(1,3), BTN_SIZE(1,1), F("White Chocolate"))
+ .colors(action_btn)
+ .tag(1) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
+ }
+}
+
+bool PreheatMenu::onTouchEnd(uint8_t tag) {
+ switch (tag) {
+ case 1: GOTO_PREVIOUS(); break;
+ case 2:
+ #ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT
+ injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT));
+ #endif
+ GOTO_SCREEN(PreheatTimerScreen);
+ break;
+ case 3:
+ #ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT
+ injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT));
+ #endif
+ GOTO_SCREEN(PreheatTimerScreen);
+ break;
+ case 4:
+ #ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT
+ injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT));
+ #endif
+ GOTO_SCREEN(PreheatTimerScreen);
+ break;
+ default: return false;
+ }
+ return true;
+}
+
+#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
index 0a24c30082..7d68ae2d67 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
@@ -77,9 +77,6 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) {
void PreheatTimerScreen::onEntry() {
screen_data.PreheatTimerScreen.start_ms = millis();
- #ifdef COCOA_PRESS_PREHEAT_SCRIPT
- injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_SCRIPT));
- #endif
}
void PreheatTimerScreen::onRedraw(draw_mode_t what) {
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screen_data.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
index bc92800054..ce75462040 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
@@ -58,7 +58,7 @@ SCREEN_TABLE {
#endif
DECL_SCREEN(MoveAxisScreen),
DECL_SCREEN(StepsScreen),
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
DECL_SCREEN(StepperCurrentScreen),
DECL_SCREEN(StepperBumpSensitivityScreen),
#endif
@@ -105,6 +105,7 @@ SCREEN_TABLE {
DECL_SCREEN(BioConfirmHomeE),
#endif
#if ENABLED(TOUCH_UI_COCOA_PRESS)
+ DECL_SCREEN(PreheatMenu),
DECL_SCREEN(PreheatTimerScreen),
#endif
#if ENABLED(TOUCH_UI_DEVELOPER_MENU)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
index 176c8145e3..346d122a0f 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
@@ -76,6 +76,7 @@ enum {
PRINTING_SCREEN_CACHE,
#endif
#if ENABLED(TOUCH_UI_COCOA_PRESS)
+ PREHEAT_MENU_CACHE,
PREHEAT_TIMER_SCREEN_CACHE,
#endif
CHANGE_FILAMENT_SCREEN_CACHE,
@@ -99,7 +100,7 @@ enum {
class BaseScreen : public UIScreen {
protected:
- #ifdef LCD_TIMEOUT_TO_STATUS
+ #if LCD_TIMEOUT_TO_STATUS
static uint32_t last_interaction;
#endif
@@ -314,6 +315,12 @@ class StatusScreen : public BaseScreen, public CachedScreen {
+ public:
+ static void onRedraw(draw_mode_t);
+ static bool onTouchEnd(uint8_t tag);
+ };
+
class PreheatTimerScreen : public BaseScreen, public CachedScreen {
private:
static uint16_t secondsRemaining();
@@ -455,7 +462,7 @@ class StepsScreen : public BaseNumericAdjustmentScreen, public CachedScreen {
public:
static void onRedraw(draw_mode_t);
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
similarity index 57%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
index e71f200a35..98d0bba759 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
@@ -33,9 +33,9 @@ using namespace FTDI;
using namespace Theme;
#ifdef TOUCH_UI_PORTRAIT
- #define GRID_ROWS 8
+ #define GRID_ROWS 8
#else
- #define GRID_ROWS 8
+ #define GRID_ROWS 8
#endif
void StatusScreen::draw_axis_position(draw_mode_t what) {
@@ -43,41 +43,41 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
#define GRID_COLS 3
+ #ifdef TOUCH_UI_PORTRAIT
+ #define X_LBL_POS BTN_POS(1,5), BTN_SIZE(1,1)
+ #define Y_LBL_POS BTN_POS(1,6), BTN_SIZE(1,1)
+ #define Z_LBL_POS BTN_POS(1,7), BTN_SIZE(1,1)
+ #define X_VAL_POS BTN_POS(2,5), BTN_SIZE(2,1)
+ #define Y_VAL_POS BTN_POS(2,6), BTN_SIZE(2,1)
+ #define Z_VAL_POS BTN_POS(2,7), BTN_SIZE(2,1)
+ #else
+ #define X_LBL_POS BTN_POS(1,5), BTN_SIZE(1,1)
+ #define Y_LBL_POS BTN_POS(2,5), BTN_SIZE(1,1)
+ #define Z_LBL_POS BTN_POS(3,5), BTN_SIZE(1,1)
+ #define X_VAL_POS BTN_POS(1,6), BTN_SIZE(1,1)
+ #define Y_VAL_POS BTN_POS(2,6), BTN_SIZE(1,1)
+ #define Z_VAL_POS BTN_POS(3,6), BTN_SIZE(1,1)
+ #endif
+
+ #define _UNION_POS(x1,y1,w1,h1,x2,y2,w2,h2) x1,y1,max(x1+w1,x2+w2)-x1,max(y1+h1,y2+h2)-y1
+ #define UNION_POS(p1, p2) _UNION_POS(p1, p2)
+
if (what & BACKGROUND) {
cmd.tag(6)
- #ifdef TOUCH_UI_PORTRAIT
- .fgcolor(Theme::axis_label)
- .font(Theme::font_large)
- .button( BTN_POS(1,5), BTN_SIZE(2,1), F(""), OPT_FLAT)
- .button( BTN_POS(1,6), BTN_SIZE(2,1), F(""), OPT_FLAT)
- .button( BTN_POS(1,7), BTN_SIZE(2,1), F(""), OPT_FLAT)
-
- .font(Theme::font_small)
- .text ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X))
- .text ( BTN_POS(1,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y))
- .text ( BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z))
-
- .font(Theme::font_medium)
- .fgcolor(Theme::x_axis) .button( BTN_POS(2,5), BTN_SIZE(2,1), F(""), OPT_FLAT)
- .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(2,1), F(""), OPT_FLAT)
- .fgcolor(Theme::z_axis) .button( BTN_POS(2,7), BTN_SIZE(2,1), F(""), OPT_FLAT);
- #else
- .fgcolor(Theme::axis_label)
- .font(Theme::font_large)
- .button( BTN_POS(1,5), BTN_SIZE(1,2), F(""), OPT_FLAT)
- .button( BTN_POS(2,5), BTN_SIZE(1,2), F(""), OPT_FLAT)
- .button( BTN_POS(3,5), BTN_SIZE(1,2), F(""), OPT_FLAT)
-
- .font(Theme::font_small)
- .text ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X))
- .text ( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y))
- .text ( BTN_POS(3,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z))
- .font(Theme::font_medium)
-
- .fgcolor(Theme::x_axis) .button( BTN_POS(1,6), BTN_SIZE(1,1), F(""), OPT_FLAT)
- .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(1,1), F(""), OPT_FLAT)
- .fgcolor(Theme::z_axis) .button( BTN_POS(3,6), BTN_SIZE(1,1), F(""), OPT_FLAT);
- #endif
+ .fgcolor(Theme::axis_label)
+ .font(Theme::font_large)
+ .button( UNION_POS(X_LBL_POS, X_VAL_POS), F(""), OPT_FLAT)
+ .button( UNION_POS(Y_LBL_POS, Y_VAL_POS), F(""), OPT_FLAT)
+ .button( UNION_POS(Z_LBL_POS, Z_VAL_POS), F(""), OPT_FLAT)
+ .font(Theme::font_medium)
+ .fgcolor(Theme::x_axis) .button( X_VAL_POS, F(""), OPT_FLAT)
+ .fgcolor(Theme::y_axis) .button( Y_VAL_POS, F(""), OPT_FLAT)
+ .fgcolor(Theme::z_axis) .button( Z_VAL_POS, F(""), OPT_FLAT)
+ .font(Theme::font_small)
+ .text ( X_LBL_POS, GET_TEXT_F(MSG_AXIS_X))
+ .text ( Y_LBL_POS, GET_TEXT_F(MSG_AXIS_Y))
+ .text ( Z_LBL_POS, GET_TEXT_F(MSG_AXIS_Z))
+ .colors(normal_btn);
}
if (what & FOREGROUND) {
@@ -101,16 +101,11 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
else
strcpy_P(z_str, PSTR("?"));
- cmd.tag(6).font(Theme::font_medium)
- #ifdef TOUCH_UI_PORTRAIT
- .text ( BTN_POS(2,5), BTN_SIZE(2,1), x_str)
- .text ( BTN_POS(2,6), BTN_SIZE(2,1), y_str)
- .text ( BTN_POS(2,7), BTN_SIZE(2,1), z_str);
- #else
- .text ( BTN_POS(1,6), BTN_SIZE(1,1), x_str)
- .text ( BTN_POS(2,6), BTN_SIZE(1,1), y_str)
- .text ( BTN_POS(3,6), BTN_SIZE(1,1), z_str);
- #endif
+ cmd.tag(6)
+ .font(Theme::font_medium)
+ .text ( X_VAL_POS, x_str)
+ .text ( Y_VAL_POS, y_str)
+ .text ( Z_VAL_POS, z_str);
}
#undef GRID_COLS
@@ -125,49 +120,49 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
void StatusScreen::draw_temperature(draw_mode_t what) {
using namespace Theme;
+ #define TEMP_RECT_1 BTN_POS(1,1), BTN_SIZE(4,2)
+ #define TEMP_RECT_2 BTN_POS(1,1), BTN_SIZE(8,1)
+ #define NOZ_1_POS BTN_POS(1,1), BTN_SIZE(4,1)
+ #define NOZ_2_POS BTN_POS(5,1), BTN_SIZE(4,1)
+ #define BED_POS BTN_POS(1,2), BTN_SIZE(4,1)
+ #define FAN_POS BTN_POS(5,2), BTN_SIZE(4,1)
+
+ #define _ICON_POS(x,y,w,h) x, y, w/4, h
+ #define _TEXT_POS(x,y,w,h) x + w/4, y, w - w/4, h
+ #define ICON_POS(pos) _ICON_POS(pos)
+ #define TEXT_POS(pos) _TEXT_POS(pos)
+
CommandProcessor cmd;
if (what & BACKGROUND) {
cmd.font(Theme::font_small)
- #ifdef TOUCH_UI_PORTRAIT
.tag(5)
- .fgcolor(temp) .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT)
- .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT)
- .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT)
- .tag(0)
- .fgcolor(progress) .button( BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT)
- .button( BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT);
- #else
- .tag(5)
- .fgcolor(temp) .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT)
- .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT)
- .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT)
- .tag(0)
- .fgcolor(progress) .button( BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT)
- .button( BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT);
- #endif
+ .fgcolor(temp) .button( TEMP_RECT_1, F(""), OPT_FLAT)
+ .button( TEMP_RECT_2, F(""), OPT_FLAT)
+ .fgcolor(fan_speed).button( FAN_POS, F(""), OPT_FLAT)
+ .tag(0);
// Draw Extruder Bitmap on Extruder Temperature Button
cmd.tag(5)
- .cmd(BITMAP_SOURCE(Extruder_Icon_Info))
- .cmd(BITMAP_LAYOUT(Extruder_Icon_Info))
- .cmd(BITMAP_SIZE (Extruder_Icon_Info))
- .icon (BTN_POS(1,1), BTN_SIZE(1,1), Extruder_Icon_Info, icon_scale)
- .icon (BTN_POS(5,1), BTN_SIZE(1,1), Extruder_Icon_Info, icon_scale);
+ .cmd (BITMAP_SOURCE(Extruder_Icon_Info))
+ .cmd (BITMAP_LAYOUT(Extruder_Icon_Info))
+ .cmd (BITMAP_SIZE (Extruder_Icon_Info))
+ .icon(ICON_POS(NOZ_1_POS), Extruder_Icon_Info, icon_scale)
+ .icon(ICON_POS(NOZ_2_POS), Extruder_Icon_Info, icon_scale);
// Draw Bed Heat Bitmap on Bed Heat Button
- cmd.cmd(BITMAP_SOURCE(Bed_Heat_Icon_Info))
- .cmd(BITMAP_LAYOUT(Bed_Heat_Icon_Info))
- .cmd(BITMAP_SIZE (Bed_Heat_Icon_Info))
- .icon (BTN_POS(1,2), BTN_SIZE(1,1), Bed_Heat_Icon_Info, icon_scale);
+ cmd.cmd (BITMAP_SOURCE(Bed_Heat_Icon_Info))
+ .cmd (BITMAP_LAYOUT(Bed_Heat_Icon_Info))
+ .cmd (BITMAP_SIZE (Bed_Heat_Icon_Info))
+ .icon(ICON_POS(BED_POS), Bed_Heat_Icon_Info, icon_scale);
// Draw Fan Percent Bitmap on Bed Heat Button
- cmd.cmd(BITMAP_SOURCE(Fan_Icon_Info))
- .cmd(BITMAP_LAYOUT(Fan_Icon_Info))
- .cmd(BITMAP_SIZE (Fan_Icon_Info))
- .icon (BTN_POS(5,2), BTN_SIZE(1,1), Fan_Icon_Info, icon_scale);
+ cmd.cmd (BITMAP_SOURCE(Fan_Icon_Info))
+ .cmd (BITMAP_LAYOUT(Fan_Icon_Info))
+ .cmd (BITMAP_SIZE (Fan_Icon_Info))
+ .icon(ICON_POS(FAN_POS), Fan_Icon_Info, icon_scale);
#ifdef TOUCH_UI_USE_UTF8
load_utf8_bitmaps(cmd); // Restore font bitmap handles
@@ -212,10 +207,10 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
cmd.tag(5)
.font(font_medium)
- .text(BTN_POS(2,1), BTN_SIZE(3,1), e0_str)
- .text(BTN_POS(6,1), BTN_SIZE(3,1), e1_str)
- .text(BTN_POS(2,2), BTN_SIZE(3,1), bed_str)
- .text(BTN_POS(6,2), BTN_SIZE(3,1), fan_str);
+ .text(TEXT_POS(NOZ_1_POS), e0_str)
+ .text(TEXT_POS(NOZ_2_POS), e1_str)
+ .text(TEXT_POS(BED_POS), bed_str)
+ .text(TEXT_POS(FAN_POS), fan_str);
}
}
@@ -225,15 +220,18 @@ void StatusScreen::draw_progress(draw_mode_t what) {
CommandProcessor cmd;
+ #if ENABLED(TOUCH_UI_PORTRAIT)
+ #define TIME_POS BTN_POS(1,3), BTN_SIZE(4,1)
+ #define PROGRESS_POS BTN_POS(5,3), BTN_SIZE(4,1)
+ #else
+ #define TIME_POS BTN_POS(9,1), BTN_SIZE(4,1)
+ #define PROGRESS_POS BTN_POS(9,2), BTN_SIZE(4,1)
+ #endif
+
if (what & BACKGROUND) {
cmd.tag(0).font(font_medium)
- #ifdef TOUCH_UI_PORTRAIT
- .fgcolor(progress) .button(BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT)
- .button(BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT);
- #else
- .fgcolor(progress) .button(BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT)
- .button(BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT);
- #endif
+ .fgcolor(progress).button(TIME_POS, F(""), OPT_FLAT)
+ .button(PROGRESS_POS, F(""), OPT_FLAT);
}
if (what & FOREGROUND) {
@@ -248,13 +246,8 @@ void StatusScreen::draw_progress(draw_mode_t what) {
sprintf_P(progress_str, PSTR("%-3d %%"), getProgress_percent() );
cmd.font(font_medium)
- #ifdef TOUCH_UI_PORTRAIT
- .tag(0).text(BTN_POS(1,3), BTN_SIZE(4,1), time_str)
- .text(BTN_POS(5,3), BTN_SIZE(4,1), progress_str);
- #else
- .tag(0).text(BTN_POS(9,1), BTN_SIZE(4,1), time_str)
- .text(BTN_POS(9,2), BTN_SIZE(4,1), progress_str);
- #endif
+ .tag(0).text(TIME_POS, time_str)
+ .text(PROGRESS_POS, progress_str);
}
}
@@ -266,6 +259,14 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
if (what & FOREGROUND) {
using namespace ExtUI;
+ #if ENABLED(TOUCH_UI_PORTRAIT)
+ #define MEDIA_BTN_POS BTN_POS(1,8), BTN_SIZE(2,1)
+ #define MENU_BTN_POS BTN_POS(3,8), BTN_SIZE(2,1)
+ #else
+ #define MEDIA_BTN_POS BTN_POS(1,7), BTN_SIZE(2,2)
+ #define MENU_BTN_POS BTN_POS(3,7), BTN_SIZE(2,2)
+ #endif
+
const bool has_media = isMediaInserted() && !isPrintingFromMedia();
CommandProcessor cmd;
@@ -273,42 +274,29 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
.font(Theme::font_medium)
.enabled(has_media)
.colors(has_media ? action_btn : normal_btn)
- .tag(3).button(
- #ifdef TOUCH_UI_PORTRAIT
- BTN_POS(1,8), BTN_SIZE(2,1),
- #else
- BTN_POS(1,7), BTN_SIZE(2,2),
- #endif
- isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA)
- ).colors(!has_media ? action_btn : normal_btn)
- #ifdef TOUCH_UI_PORTRAIT
- .tag(4).button( BTN_POS(3,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_MENU));
- #else
- .tag(4).button( BTN_POS(3,7), BTN_SIZE(2,2), GET_TEXT_F(MSG_BUTTON_MENU));
- #endif
+ .tag(3).button(MEDIA_BTN_POS, isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA))
+ .colors(!has_media ? action_btn : normal_btn)
+ .tag(4).button( MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU));
}
#undef GRID_COLS
}
void StatusScreen::draw_status_message(draw_mode_t what, const char* message) {
#define GRID_COLS 1
+
+ #if ENABLED(TOUCH_UI_PORTRAIT)
+ #define STATUS_POS BTN_POS(1,4), BTN_SIZE(1,1)
+ #else
+ #define STATUS_POS BTN_POS(1,3), BTN_SIZE(1,2)
+ #endif
+
if (what & BACKGROUND) {
CommandProcessor cmd;
cmd.fgcolor(Theme::status_msg)
.tag(0)
- #ifdef TOUCH_UI_PORTRAIT
- .button( BTN_POS(1,4), BTN_SIZE(1,1), F(""), OPT_FLAT);
- #else
- .button( BTN_POS(1,3), BTN_SIZE(1,2), F(""), OPT_FLAT);
- #endif
+ .button( STATUS_POS, F(""), OPT_FLAT);
- draw_text_box(cmd,
- #ifdef TOUCH_UI_PORTRAIT
- BTN_POS(1,4), BTN_SIZE(1,1),
- #else
- BTN_POS(1,3), BTN_SIZE(1,2),
- #endif
- message, OPT_CENTER, font_large);
+ draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large);
}
#undef GRID_COLS
}
@@ -326,10 +314,10 @@ void StatusScreen::setStatusMessage(const char* message) {
.cmd(CLEAR(true,true,true));
draw_temperature(BACKGROUND);
- draw_progress(BACKGROUND);
- draw_axis_position(BACKGROUND);
draw_status_message(BACKGROUND, message);
draw_interaction_buttons(BACKGROUND);
+ draw_progress(BACKGROUND);
+ draw_axis_position(BACKGROUND);
storeBackground();
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
index 9aa28aff39..2e05ad5c57 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
@@ -22,7 +22,7 @@
#include "../config.h"
-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
+#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
#include "screens.h"
@@ -74,4 +74,4 @@ bool StepperBumpSensitivityScreen::onTouchHeld(uint8_t tag) {
return true;
}
-#endif // TOUCH_UI_FTDI_EVE && HAS_TRINAMIC
+#endif // TOUCH_UI_FTDI_EVE && HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
index acc94684e0..5abcea7a67 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
@@ -22,7 +22,7 @@
#include "../config.h"
-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
+#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
#include "screens.h"
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
similarity index 86%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
index f969f47979..81cde5a341 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
@@ -75,24 +75,24 @@ bool TemperatureScreen::onTouchHeld(uint8_t tag) {
case 22: UI_DECREMENT(TargetTemp_celsius, CHAMBER); break;
case 23: UI_INCREMENT(TargetTemp_celsius, CHAMBER); break;
#ifndef NO_TOOLHEAD_HEATER_GCODE
- case 2: UI_DECREMENT(TargetTemp_celsius, E0); break;
- case 3: UI_INCREMENT(TargetTemp_celsius, E0); break;
+ case 2: UI_DECREMENT(TargetTemp_celsius, E0); break;
+ case 3: UI_INCREMENT(TargetTemp_celsius, E0); break;
#endif
#if HOTENDS > 1
- case 4: UI_DECREMENT(TargetTemp_celsius, E1); break;
- case 5: UI_INCREMENT(TargetTemp_celsius, E1); break;
+ case 4: UI_DECREMENT(TargetTemp_celsius, E1); break;
+ case 5: UI_INCREMENT(TargetTemp_celsius, E1); break;
#endif
#if HOTENDS > 2
- case 6: UI_DECREMENT(TargetTemp_celsius, E2); break;
- case 7: UI_INCREMENT(TargetTemp_celsius, E2); break;
+ case 6: UI_DECREMENT(TargetTemp_celsius, E2); break;
+ case 7: UI_INCREMENT(TargetTemp_celsius, E2); break;
#endif
#if HOTENDS > 3
- case 8: UI_DECREMENT(TargetTemp_celsius, E3); break;
- case 9: UI_INCREMENT(TargetTemp_celsius, E3); break;
+ case 8: UI_DECREMENT(TargetTemp_celsius, E3); break;
+ case 9: UI_INCREMENT(TargetTemp_celsius, E3); break;
#endif
#if FAN_COUNT > 0
- case 10: UI_DECREMENT(TargetFan_percent, FAN0); break;
- case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
+ case 10: UI_DECREMENT(TargetFan_percent, FAN0); break;
+ case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
#endif
case 30:
#define _HOTEND_OFF(N) setTargetTemp_celsius(0,E##N);
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
new file mode 100644
index 0000000000..e2770d8116
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
@@ -0,0 +1,177 @@
+/************
+ * colors.h *
+ ************/
+
+/****************************************************************************
+ * Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
+ * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. *
+ * Written By Marcio Teixeira 2019 - Cocoa Press *
+ * *
+ * 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. *
+ * *
+ * To view a copy of the GNU General Public License, go to the following *
+ * location: . *
+ ****************************************************************************/
+
+#pragma once
+
+namespace Theme {
+ #if ENABLED(TOUCH_UI_COCOA_THEME)
+ constexpr int accent_hue = 23;
+
+ // Browns and Oranges
+ constexpr uint32_t accent_color_1 = hsl_to_rgb(12.8,0.597,0.263); // Darkest
+ constexpr uint32_t accent_color_2 = hsl_to_rgb(12.8,0.597,0.263);
+ constexpr uint32_t accent_color_3 = hsl_to_rgb( 9.6,0.664,0.443);
+ constexpr uint32_t accent_color_4 = hsl_to_rgb(16.3,0.873,0.537);
+ constexpr uint32_t accent_color_5 = hsl_to_rgb(23.0,0.889,0.539);
+ constexpr uint32_t accent_color_6 = hsl_to_rgb(23.0,0.889,0.539); // Lightest
+ #else
+ // Use linear accent colors
+
+ #if ANY(TOUCH_UI_ROYAL_THEME, TOUCH_UI_FROZEN_THEME)
+ // Dark blue accent colors
+ constexpr int accent_hue = 216;
+ constexpr float accent_sat = 0.7;
+ #else
+ // Green accent colors
+ constexpr int accent_hue = 68;
+ constexpr float accent_sat = 0.68;
+ #endif
+
+ // Shades of accent color
+ constexpr uint32_t accent_color_0 = hsl_to_rgb(accent_hue, accent_sat, 0.15); // Darkest
+ constexpr uint32_t accent_color_1 = hsl_to_rgb(accent_hue, accent_sat, 0.26);
+ constexpr uint32_t accent_color_2 = hsl_to_rgb(accent_hue, accent_sat, 0.39);
+ constexpr uint32_t accent_color_3 = hsl_to_rgb(accent_hue, accent_sat, 0.52);
+ constexpr uint32_t accent_color_4 = hsl_to_rgb(accent_hue, accent_sat, 0.65);
+ constexpr uint32_t accent_color_5 = hsl_to_rgb(accent_hue, accent_sat, 0.78);
+ constexpr uint32_t accent_color_6 = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
+ #endif
+
+ // Shades of gray
+
+ constexpr float gray_sat = 0.14;
+ constexpr uint32_t gray_color_0 = hsl_to_rgb(accent_hue, gray_sat, 0.15); // Darkest
+ constexpr uint32_t gray_color_1 = hsl_to_rgb(accent_hue, gray_sat, 0.26);
+ constexpr uint32_t gray_color_2 = hsl_to_rgb(accent_hue, gray_sat, 0.39);
+ constexpr uint32_t gray_color_3 = hsl_to_rgb(accent_hue, gray_sat, 0.52);
+ constexpr uint32_t gray_color_4 = hsl_to_rgb(accent_hue, gray_sat, 0.65);
+ constexpr uint32_t gray_color_5 = hsl_to_rgb(accent_hue, gray_sat, 0.78);
+ constexpr uint32_t gray_color_6 = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest
+
+ #if ENABLED(TOUCH_UI_ROYAL_THEME)
+ constexpr uint32_t theme_darkest = accent_color_1;
+ constexpr uint32_t theme_dark = accent_color_4;
+
+ constexpr uint32_t bg_color = gray_color_0;
+ constexpr uint32_t axis_label = gray_color_1;
+
+ constexpr uint32_t bg_text_enabled = accent_color_6;
+ constexpr uint32_t bg_text_disabled = gray_color_0;
+ constexpr uint32_t bg_normal = accent_color_4;
+ constexpr uint32_t fg_disabled = gray_color_0;
+ constexpr uint32_t fg_normal = accent_color_0;
+ constexpr uint32_t fg_action = accent_color_1;
+
+ constexpr uint32_t logo_bg_rgb = accent_color_1;
+ constexpr uint32_t logo_fill_rgb = accent_color_0;
+ constexpr uint32_t logo_stroke_rgb = accent_color_4;
+ #elif ANY(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME)
+ constexpr uint32_t theme_darkest = accent_color_1;
+ constexpr uint32_t theme_dark = accent_color_4;
+
+ constexpr uint32_t bg_color = 0xFFFFFF;
+ constexpr uint32_t axis_label = gray_color_5;
+
+ constexpr uint32_t bg_text_enabled = accent_color_1;
+ constexpr uint32_t bg_text_disabled = gray_color_1;
+ constexpr uint32_t bg_normal = accent_color_4;
+ constexpr uint32_t fg_disabled = gray_color_6;
+ constexpr uint32_t fg_normal = accent_color_1;
+ constexpr uint32_t fg_action = accent_color_4;
+
+ constexpr uint32_t logo_bg_rgb = accent_color_5;
+ constexpr uint32_t logo_fill_rgb = accent_color_6;
+ constexpr uint32_t logo_stroke_rgb = accent_color_2;
+ #else
+ constexpr uint32_t theme_darkest = gray_color_1;
+ constexpr uint32_t theme_dark = gray_color_2;
+
+ constexpr uint32_t bg_color = gray_color_1;
+ constexpr uint32_t axis_label = gray_color_2;
+
+ constexpr uint32_t bg_text_enabled = 0xFFFFFF;
+ constexpr uint32_t bg_text_disabled = gray_color_2;
+ constexpr uint32_t bg_normal = gray_color_1;
+ constexpr uint32_t fg_disabled = gray_color_1;
+ constexpr uint32_t fg_normal = gray_color_2;
+ constexpr uint32_t fg_action = accent_color_2;
+
+ constexpr uint32_t logo_bg_rgb = accent_color_4;
+ constexpr uint32_t logo_fill_rgb = accent_color_3;
+ constexpr uint32_t logo_stroke_rgb = 0x000000;
+ #endif
+
+ constexpr uint32_t shadow_rgb = gray_color_6;
+ constexpr uint32_t stroke_rgb = accent_color_1;
+ constexpr uint32_t fill_rgb = accent_color_3;
+ constexpr uint32_t syringe_rgb = accent_color_5;
+
+ #if ENABLED(TOUCH_UI_ROYAL_THEME)
+ constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.26);
+ constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.13);
+ constexpr uint32_t z_axis = hsl_to_rgb(240, 1.00, 0.10);
+ #else
+ constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.5);
+ constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.37);
+ constexpr uint32_t z_axis = hsl_to_rgb(240, 1.00, 0.37);
+ #endif
+ constexpr uint32_t e_axis = axis_label;
+ constexpr uint32_t feedrate = axis_label;
+ constexpr uint32_t other = axis_label;
+
+ // Status screen
+ constexpr uint32_t progress = axis_label;
+ constexpr uint32_t status_msg = axis_label;
+ #if ENABLED(TOUCH_UI_ROYAL_THEME)
+ constexpr uint32_t fan_speed = hsl_to_rgb(240, 0.5, 0.13);
+ constexpr uint32_t temp = hsl_to_rgb(343, 1.0, 0.23);
+ #else
+ constexpr uint32_t fan_speed = hsl_to_rgb(204, 0.47, 0.41);
+ constexpr uint32_t temp = hsl_to_rgb(311, 0.51, 0.35);
+ #endif
+
+ constexpr uint32_t disabled_icon = gray_color_1;
+
+ // Calibration Registers Screen
+ constexpr uint32_t transformA = 0x3010D0;
+ constexpr uint32_t transformB = 0x4010D0;
+ constexpr uint32_t transformC = 0x5010D0;
+ constexpr uint32_t transformD = 0x6010D0;
+ constexpr uint32_t transformE = 0x7010D0;
+ constexpr uint32_t transformF = 0x8010D0;
+ constexpr uint32_t transformVal = 0x104010;
+
+ constexpr btn_colors disabled_btn = {.bg = bg_color, .grad = fg_disabled, .fg = fg_disabled, .rgb = fg_disabled };
+ constexpr btn_colors normal_btn = {.bg = fg_action, .grad = 0xFFFFFF, .fg = fg_normal, .rgb = 0xFFFFFF };
+ constexpr btn_colors action_btn = {.bg = bg_color, .grad = 0xFFFFFF, .fg = fg_action, .rgb = 0xFFFFFF };
+ constexpr btn_colors red_btn = {.bg = 0xFF5555, .grad = 0xFFFFFF, .fg = 0xFF0000, .rgb = 0xFFFFFF };
+ constexpr btn_colors ui_slider = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = accent_color_3 };
+ constexpr btn_colors ui_toggle = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = 0xFFFFFF };
+
+ // Temperature color scale
+
+ const rgb_t cool_rgb ( 0, 0, 0);
+ const rgb_t low_rgb (128, 0, 0);
+ const rgb_t med_rgb (255, 128, 0);
+ const rgb_t high_rgb (255, 255, 128);
+};
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/fonts.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/fonts.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
index 5e01f0471c..a65cbea52a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
@@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0xADF3, 0x546C, 0x419D, 0x546F, 0x3D05,
#define LOGO_BACKGROUND logo_bg_rgb
#define LOGO_PAINT_PATHS \
- LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \
- LOGO_PAINT_PATH(logo_fill_rgb, logo_fill)
+ LOGO_PAINT_PATH(logo_fill_rgb, logo_fill) \
+ LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
index a5af7a14cd..a9c1d4049e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
@@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0x3C19, 0x70C5, 0x371A, 0x7159, 0x3302,
#define LOGO_BACKGROUND logo_bg_rgb
#define LOGO_PAINT_PATHS \
- LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \
- LOGO_PAINT_PATH(logo_fill_rgb, logo_fill)
+ LOGO_PAINT_PATH(logo_fill_rgb, logo_fill) \
+ LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/theme.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/theme.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
similarity index 92%
rename from Marlin/src/lcd/extensible_ui/ui_api.cpp
rename to Marlin/src/lcd/extui/ui_api.cpp
index 8c8133f22b..79e12f36d1 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -65,7 +65,7 @@
#endif
#if ENABLED(EMERGENCY_PARSER)
- #include "../../feature/emergency_parser.h"
+ #include "../../feature/e_parser.h"
#endif
#if ENABLED(SDSUPPORT)
@@ -75,7 +75,7 @@
#define IFSD(A,B) (B)
#endif
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "../../feature/tmc_util.h"
#include "../../module/stepper/indirection.h"
#endif
@@ -171,7 +171,7 @@ namespace ExtUI {
void enableHeater(const extruder_t extruder) {
#if HOTENDS && HEATER_IDLE_HANDLER
- thermalManager.reset_heater_idle_timer(extruder - E0);
+ thermalManager.reset_hotend_idle_timer(extruder - E0);
#else
UNUSED(extruder);
#endif
@@ -190,7 +190,7 @@ namespace ExtUI {
#endif
default:
#if HOTENDS
- thermalManager.reset_heater_idle_timer(heater - H0);
+ thermalManager.reset_hotend_idle_timer(heater - H0);
#endif
break;
}
@@ -389,14 +389,14 @@ namespace ExtUI {
#endif
current_position[axis] = constrain(position, min, max);
- line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m[axis]));
+ line_to_current_position(manual_feedrate_mm_s[axis]);
}
void setAxisPosition_mm(const float position, const extruder_t extruder) {
setActiveTool(extruder, true);
current_position.e = position;
- line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m.e));
+ line_to_current_position(manual_feedrate_mm_s.e);
}
void setActiveTool(const extruder_t extruder, bool no_move) {
@@ -445,7 +445,7 @@ namespace ExtUI {
void setSoftEndstopState(const bool value) { soft_endstops_enabled = value; }
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
float getAxisCurrent_mA(const axis_t axis) {
switch (axis) {
#if AXIS_IS_TMC(X)
@@ -481,6 +481,12 @@ namespace ExtUI {
#if AXIS_IS_TMC(E5)
case E5: return stepperE5.getMilliamps();
#endif
+ #if AXIS_IS_TMC(E6)
+ case E6: return stepperE6.getMilliamps();
+ #endif
+ #if AXIS_IS_TMC(E7)
+ case E7: return stepperE7.getMilliamps();
+ #endif
default: return NAN;
};
}
@@ -520,6 +526,12 @@ namespace ExtUI {
#if AXIS_IS_TMC(E5)
case E5: stepperE5.rms_current(constrain(mA, 500, 1500)); break;
#endif
+ #if AXIS_IS_TMC(E6)
+ case E6: stepperE6.rms_current(constrain(mA, 500, 1500)); break;
+ #endif
+ #if AXIS_IS_TMC(E7)
+ case E7: stepperE7.rms_current(constrain(mA, 500, 1500)); break;
+ #endif
default: break;
};
}
@@ -733,7 +745,7 @@ namespace ExtUI {
#if EXTRUDERS > 1
&& (linked_nozzles || active_extruder == 0)
#endif
- ) probe_offset.z += mm;
+ ) probe.offset.z += mm;
#else
UNUSED(mm);
#endif
@@ -771,9 +783,9 @@ namespace ExtUI {
float getZOffset_mm() {
#if HAS_BED_PROBE
- return probe_offset.z;
+ return probe.offset.z;
#elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
- return (planner.steps_to_mm[Z_AXIS] * babystep.axis_total[BS_TODO_AXIS(Z_AXIS)]);
+ return (planner.steps_to_mm[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]);
#else
return 0.0;
#endif
@@ -782,7 +794,7 @@ namespace ExtUI {
void setZOffset_mm(const float value) {
#if HAS_BED_PROBE
if (WITHIN(value, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX))
- probe_offset.z = value;
+ probe.offset.z = value;
#elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
babystep.add_mm(Z_AXIS, (value - getZOffset_mm()));
#else
@@ -814,6 +826,15 @@ namespace ExtUI {
#endif // HAS_HOTEND_OFFSET
+ #if HAS_BED_PROBE
+ float getProbeOffset_mm(const axis_t axis) {
+ return probe.offset.pos[axis];
+ }
+ void setProbeOffset_mm(const float val, const axis_t axis) {
+ probe.offset.pos[axis] = val;
+ }
+ #endif
+
#if ENABLED(BACKLASH_GCODE)
float getAxisBacklash_mm(const axis_t axis) { return backlash.distance_mm[axis]; }
void setAxisBacklash_mm(const float value, const axis_t axis)
@@ -873,6 +894,56 @@ namespace ExtUI {
float getFeedrate_percent() { return feedrate_percentage; }
+ #if ENABLED(PIDTEMP)
+ float getPIDValues_Kp(const extruder_t tool) {
+ return PID_PARAM(Kp, tool);
+ }
+
+ float getPIDValues_Ki(const extruder_t tool) {
+ return unscalePID_i(PID_PARAM(Ki, tool));
+ }
+
+ float getPIDValues_Kd(const extruder_t tool) {
+ return unscalePID_d(PID_PARAM(Kd, tool));
+ }
+
+ void setPIDValues(const float p, const float i, const float d, extruder_t tool) {
+ thermalManager.temp_hotend[tool].pid.Kp = p;
+ thermalManager.temp_hotend[tool].pid.Ki = scalePID_i(i);
+ thermalManager.temp_hotend[tool].pid.Kd = scalePID_d(d);
+ thermalManager.updatePID();
+ }
+
+ void startPIDTune(const float temp, extruder_t tool){
+ thermalManager.PID_autotune(temp, (heater_ind_t)tool, 8, true);
+ }
+ #endif
+
+ #if ENABLED(PIDTEMPBED)
+ float getBedPIDValues_Kp() {
+ return thermalManager.temp_bed.pid.Kp;
+ }
+
+ float getBedPIDValues_Ki() {
+ return unscalePID_i(thermalManager.temp_bed.pid.Ki);
+ }
+
+ float getBedPIDValues_Kd() {
+ return unscalePID_d(thermalManager.temp_bed.pid.Kd);
+ }
+
+ void setBedPIDValues(const float p, const float i, const float d) {
+ thermalManager.temp_bed.pid.Kp = p;
+ thermalManager.temp_bed.pid.Ki = scalePID_i(i);
+ thermalManager.temp_bed.pid.Kd = scalePID_d(d);
+ thermalManager.updatePID();
+ }
+
+ void startBedPIDTune(const float temp) {
+ thermalManager.PID_autotune(temp, H_BED, 4, true);
+ }
+ #endif
+
void injectCommands_P(PGM_P const gcode) {
queue.inject_P(gcode);
}
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
similarity index 93%
rename from Marlin/src/lcd/extensible_ui/ui_api.h
rename to Marlin/src/lcd/extui/ui_api.h
index 536da132c0..01e0d1b7a3 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -53,7 +53,7 @@ namespace ExtUI {
static constexpr size_t eeprom_data_size = 48;
enum axis_t : uint8_t { X, Y, Z };
- enum extruder_t : uint8_t { E0, E1, E2, E3, E4, E5 };
+ enum extruder_t : uint8_t { E0, E1, E2, E3, E4, E5, E6, E7 };
enum heater_t : uint8_t { H0, H1, H2, H3, H4, H5, BED, CHAMBER };
enum fan_t : uint8_t { FAN0, FAN1, FAN2, FAN3, FAN4, FAN5, FAN6, FAN7 };
enum result_t : uint8_t { PID_BAD_EXTRUDER_NUM, PID_TEMP_TOO_HIGH, PID_TUNING_TIMEOUT, PID_DONE };
@@ -97,7 +97,7 @@ namespace ExtUI {
void setSoftEndstopState(const bool);
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
float getAxisCurrent_mA(const axis_t);
float getAxisCurrent_mA(const extruder_t);
void setAxisCurrent_mA(const float, const axis_t);
@@ -211,6 +211,11 @@ namespace ExtUI {
float getZOffset_mm();
void setZOffset_mm(const float);
+ #if HAS_BED_PROBE
+ float getProbeOffset_mm(const axis_t);
+ void setProbeOffset_mm(const float, const axis_t);
+ #endif
+
#if ENABLED(BACKLASH_GCODE)
float getAxisBacklash_mm(const axis_t);
void setAxisBacklash_mm(const float, const axis_t);
@@ -244,6 +249,22 @@ namespace ExtUI {
#endif
#endif
+ #if ENABLED(PIDTEMP)
+ float getPIDValues_Kp(const extruder_t);
+ float getPIDValues_Ki(const extruder_t);
+ float getPIDValues_Kd(const extruder_t);
+ void setPIDValues(const float, const float, const float, extruder_t);
+ void startPIDTune(const float, extruder_t);
+ #endif
+
+ #if ENABLED(PIDTEMPBED)
+ float getBedPIDValues_Kp();
+ float getBedPIDValues_Ki();
+ float getBedPIDValues_Kd();
+ void setBedPIDValues(const float, const float, const float);
+ void startBedPIDTune(const float);
+ #endif
+
/**
* Delay and timing routines
* Should be used by the EXTENSIBLE_UI to safely pause or measure time
@@ -320,10 +341,10 @@ namespace ExtUI {
void onConfigurationStoreWritten(bool success);
void onConfigurationStoreRead(bool success);
#if ENABLED(POWER_LOSS_RECOVERY)
- void OnPowerLossResume();
+ void onPowerLossResume();
#endif
#if HAS_PID_HEATING
- void OnPidTuning(const result_t rst);
+ void onPidTuning(const result_t rst);
#endif
};
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui_dgus_lcd.cpp
index 04b30acf83..855d09033e 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui_dgus_lcd.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,9 +30,9 @@
#if HAS_DGUS_LCD
-#include "extensible_ui/ui_api.h"
-#include "extensible_ui/lib/dgus/DGUSDisplay.h"
-#include "extensible_ui/lib/dgus/DGUSDisplayDefinition.h"
+#include "extui/ui_api.h"
+#include "extui/lib/dgus/DGUSDisplay.h"
+#include "extui/lib/dgus/DGUSDisplayDef.h"
extern const char NUL_STR[];
@@ -123,7 +123,7 @@ namespace ExtUI {
}
#if ENABLED(POWER_LOSS_RECOVERY)
- void OnPowerLossResume() {
+ void onPowerLossResume() {
// Called on resume from power-loss
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POWER_LOSS);
}
@@ -131,21 +131,21 @@ namespace ExtUI {
#if HAS_PID_HEATING
- void OnPidTuning(const result_t rst) {
+ void onPidTuning(const result_t rst) {
// Called for temperature PID tuning result
- SERIAL_ECHOLNPAIR("OnPidTuning:",rst);
+ SERIAL_ECHOLNPAIR("onPidTuning:",rst);
switch(rst) {
case PID_BAD_EXTRUDER_NUM:
- ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_BAD_EXTRUDER_NUM));
+ ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_BAD_EXTRUDER_NUM));
break;
case PID_TEMP_TOO_HIGH:
- ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_TEMP_TOO_HIGH));
+ ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_TEMP_TOO_HIGH));
break;
case PID_TUNING_TIMEOUT:
- ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_TIMEOUT));
+ ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_TIMEOUT));
break;
case PID_DONE:
- ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_AUTOTUNE_FINISHED));
+ ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_AUTOTUNE_FINISHED));
break;
}
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN);
diff --git a/Marlin/src/lcd/extui_example.cpp b/Marlin/src/lcd/extui_example.cpp
index 5e65af7381..5c9a193ded 100644
--- a/Marlin/src/lcd/extui_example.cpp
+++ b/Marlin/src/lcd/extui_example.cpp
@@ -23,7 +23,7 @@
#if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
// To implement a new UI, complete the functions below and
// read or update Marlin's state using the methods in the
@@ -94,13 +94,13 @@ namespace ExtUI {
}
#if ENABLED(POWER_LOSS_RECOVERY)
- void OnPowerLossResume() {
+ void onPowerLossResume() {
// Called on resume from power-loss
}
#endif
#if HAS_PID_HEATING
- void OnPidTuning(const result_t rst) {
+ void onPidTuning(const result_t rst) {
// Called for temperature PID tuning result
}
#endif
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index d5bc483476..ddb8b846cb 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -47,7 +47,7 @@
#define DEBUG_MALYAN_LCD
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
#include "ultralcd.h"
#include "../sd/cardreader.h"
@@ -81,7 +81,7 @@ void write_to_lcd_P(PGM_P const message) {
char encoded_message[MAX_CURLY_COMMAND];
uint8_t message_length = _MIN(strlen_P(message), sizeof(encoded_message));
- for (uint8_t i = 0; i < message_length; i++)
+ LOOP_L_N(i, message_length)
encoded_message[i] = pgm_read_byte(&message[i]) | 0x80;
LCD_SERIAL.Print::write(encoded_message, message_length);
@@ -91,7 +91,7 @@ void write_to_lcd(const char * const message) {
char encoded_message[MAX_CURLY_COMMAND];
const uint8_t message_length = _MIN(strlen(message), sizeof(encoded_message));
- for (uint8_t i = 0; i < message_length; i++)
+ LOOP_L_N(i, message_length)
encoded_message[i] = message[i] | 0x80;
LCD_SERIAL.Print::write(encoded_message, message_length);
@@ -483,6 +483,7 @@ namespace ExtUI {
void onLoadSettings(const char*) {}
void onConfigurationStoreWritten(bool) {}
void onConfigurationStoreRead(bool) {}
+ void onPidTuning(const result_t) {}
}
#endif // MALYAN_LCD
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index c4fbbe1be6..8e7798d72d 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -125,7 +125,7 @@ namespace Language_an {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Contraste");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Alzar memoria");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Cargar memoria");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Restaurar memoria");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Restaurar memoria");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Tornar a cargar");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Informacion");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
@@ -151,7 +151,7 @@ namespace Language_an {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("Retraccion auto.");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Cambear filamento");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Cambear filamento *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Encetan. tarcheta");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Encetan. tarcheta");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Cambiar tarcheta");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda Z fuera");
PROGMEM Language_Str MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 19e0b90e52..1987c20766 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -110,7 +110,7 @@ namespace Language_bg {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD контраст");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Запази в EPROM");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Зареди от EPROM");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Фабрични настройки");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Фабрични настройки");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Обнови");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Преглед");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Действия");
@@ -136,7 +136,7 @@ namespace Language_bg {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("Автоoткат");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Смяна нишка");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Смяна нишка *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Иниц. SD-Карта");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Иниц. SD-Карта");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Смяна SD-Карта");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z-сондата е извадена");
PROGMEM Language_Str MSG_ZPROBE_ZOFFSET = _UxGT("Z Отстояние");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index d1cc0cf7bc..ef5334f878 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -120,7 +120,7 @@ namespace Language_ca {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Contrast de LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Desa memoria");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Carrega memoria");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Restaura valors");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Restaura valors");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Actualitza");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Pantalla Info.");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Prepara");
@@ -146,7 +146,7 @@ namespace Language_ca {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("Auto retraccio");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Canvia filament");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Canvia filament *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Inicialitza SD");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Inicialitza SD");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Canvia SD");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda Z fora");
PROGMEM Language_Str MSG_BLTOUCH_RESET = _UxGT("Reinicia BLTouch");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 6a65f09407..77e25b7332 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -310,7 +310,7 @@ namespace Language_cz {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Kontrast LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Uložit nastavení");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Načíst nastavení");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Obnovit výchozí");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Obnovit výchozí");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Inic. EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Aktualizace z SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reset tiskárny");
@@ -369,7 +369,7 @@ namespace Language_cz {
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Vysunout filament *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Vysunout vše");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Načíst médium");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Načíst médium");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Vyměnit médium");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Vysunout médium");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda Z mimo podl");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 67baf9d217..23d931c174 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -105,7 +105,7 @@ namespace Language_da {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD kontrast");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Gem i EEPROM");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Hent fra EEPROM");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Gendan failsafe");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Gendan Defaults");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Genopfrisk");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info skærm");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Forbered");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 6d5b665dbf..cd201ded34 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -236,6 +236,11 @@ namespace Language_de {
PROGMEM Language_Str MSG_FAN_SPEED_N = _UxGT("Lüfter ~");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("Geschw. Extralüfter");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Geschw. Extralüfter ~");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN = _UxGT("Lüfter Kontroller");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED = _UxGT("Lüfter Leerlauf");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON = _UxGT("Motorlast Modus");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED = _UxGT("Lüfter Motorlast");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION = _UxGT("Ausschalt Delay");
PROGMEM Language_Str MSG_FLOW = _UxGT("Flussrate");
PROGMEM Language_Str MSG_FLOW_N = _UxGT("Flussrate ~");
PROGMEM Language_Str MSG_CONTROL = _UxGT("Einstellungen");
@@ -290,7 +295,7 @@ namespace Language_de {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD-Kontrast");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Konfig. speichern");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Konfig. laden");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Standardwerte laden");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Standardwerte laden");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Werkseinstellungen");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("FW Update vom Medium");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Drucker neustarten");
@@ -343,23 +348,23 @@ namespace Language_de {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Filament entladen");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Filament entladen *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Alles entladen");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Medium initial."); // Manually initialize the SD-card via user interface
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Medium initial."); // Manually initialize the SD-card via user interface
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Medium getauscht"); // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Medium freigeben"); // if Marlin gets confused - M22
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z-Sonde außerhalb");
PROGMEM Language_Str MSG_SKEW_FACTOR = _UxGT("Korrekturfaktor");
PROGMEM Language_Str MSG_BLTOUCH = _UxGT("BLTouch");
- PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Selbsttest");
- PROGMEM Language_Str MSG_BLTOUCH_RESET = _UxGT("BLTouch zurücks.");
- PROGMEM Language_Str MSG_BLTOUCH_DEPLOY = _UxGT("BLTouch ausfahren");
- PROGMEM Language_Str MSG_BLTOUCH_SW_MODE = _UxGT("BLTouch SW-Modus");
- PROGMEM Language_Str MSG_BLTOUCH_5V_MODE = _UxGT("BLTouch 5V-Modus");
- PROGMEM Language_Str MSG_BLTOUCH_OD_MODE = _UxGT("BLTouch OD-Modus");
- PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE = _UxGT("BLTouch Mode Store");
- PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V = _UxGT("BLTouch auf 5V");
- PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD = _UxGT("BLTouch auf OD");
- PROGMEM Language_Str MSG_BLTOUCH_STOW = _UxGT("BLTouch einfahren");
- PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO = _UxGT("BLTouch Modus: ");
+ PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("Selbsttest");
+ PROGMEM Language_Str MSG_BLTOUCH_RESET = _UxGT("Zurücksetzen");
+ PROGMEM Language_Str MSG_BLTOUCH_DEPLOY = _UxGT("Ausfahren");
+ PROGMEM Language_Str MSG_BLTOUCH_SW_MODE = _UxGT("SW-Modus");
+ PROGMEM Language_Str MSG_BLTOUCH_5V_MODE = _UxGT("5V-Modus");
+ PROGMEM Language_Str MSG_BLTOUCH_OD_MODE = _UxGT("OD-Modus");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE = _UxGT("Mode-Store");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V = _UxGT("Setze auf 5V");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD = _UxGT("Setze auf OD");
+ PROGMEM Language_Str MSG_BLTOUCH_STOW = _UxGT("Einfahren");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO = _UxGT("Modus: ");
PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE = _UxGT("ACHTUNG: Falsche Einstellung - kann zu Beschädigung führen! Fortfahren?");
PROGMEM Language_Str MSG_TOUCHMI_PROBE = _UxGT("TouchMI");
PROGMEM Language_Str MSG_TOUCHMI_INIT = _UxGT("TouchMI initial.");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 6ebae11576..6cb177d108 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -136,7 +136,7 @@ namespace Language_el {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Κοντράστ LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Αποθήκευση");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Φόρτωση");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Επαναφορά ασφαλούς αντιγράφου"); //SHORTEN
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Επαναφορά ασφαλούς αντιγράφου"); //SHORTEN
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Ανανέωση");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Οθόνη πληροφόρησης");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Προετοιμασία");
@@ -162,7 +162,7 @@ namespace Language_el {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("Αυτόματη ανάσυρση");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Αλλαγή νήματος");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Αλλαγή νήματος *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Προετοιμασία κάρτας SD"); //SHORTEN
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία κάρτας SD"); //SHORTEN
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Αλλαγή κάρτας SD");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Διερεύνηση Z εκτός Επ.Εκτύπωσης"); //SHORTEN
PROGMEM Language_Str MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πριν από Ζ"); //SHORTEN
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index c2acbf400a..5213dc7db9 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -138,7 +138,7 @@ namespace Language_el_gr {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Κοντράστ LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Αποθήκευση");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Φόρτωση");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Επαναφορά ασφαλούς αντιγράφου");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Επαναφορά ασφαλούς αντιγράφου");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Ανανέωση");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Οθόνη πληροφόρησης");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Προετοιμασία");
@@ -164,7 +164,7 @@ namespace Language_el_gr {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("Αυτόματη ανάσυρση");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Αλλαγή νήματος");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Αλλαγή νήματος *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Προετοιμασία κάρτας SD");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία κάρτας SD");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Αλλαγή κάρτας SD");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Διερεύνηση Z εκτός κλίνης");
PROGMEM Language_Str MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πριν από Ζ");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index a0e54b5b31..a52d9652ac 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,6 +40,7 @@ namespace Language_en {
PROGMEM Language_Str LANGUAGE = _UxGT("English");
PROGMEM Language_Str WELCOME_MSG = MACHINE_NAME _UxGT(" Ready.");
+ PROGMEM Language_Str MSG_MARLIN = _UxGT("Marlin");
PROGMEM Language_Str MSG_YES = _UxGT("YES");
PROGMEM Language_Str MSG_NO = _UxGT("NO");
PROGMEM Language_Str MSG_BACK = _UxGT("Back");
@@ -246,6 +247,11 @@ namespace Language_en {
PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Stored Fan ~");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("Extra Fan Speed");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Extra Fan Speed ~");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN = _UxGT("Controller Fan");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED = _UxGT("Idle Speed");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON = _UxGT("Auto Mode");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED = _UxGT("Active Speed");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION = _UxGT("Idle Period");
PROGMEM Language_Str MSG_FLOW = _UxGT("Flow");
PROGMEM Language_Str MSG_FLOW_N = _UxGT("Flow ~");
PROGMEM Language_Str MSG_CONTROL = _UxGT("Control");
@@ -311,8 +317,11 @@ namespace Language_en {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD Contrast");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Store Settings");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Load Settings");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Restore failsafe");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Restore Defaults");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Initialize EEPROM");
+ PROGMEM Language_Str MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC");
+ PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("Err: EEPROM Index");
+ PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("Err: EEPROM Version");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Media Update");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reset Printer");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Refresh");
@@ -343,6 +352,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_PRINT_PAUSED = _UxGT("Print Paused");
PROGMEM Language_Str MSG_PRINTING = _UxGT("Printing...");
PROGMEM Language_Str MSG_PRINT_ABORTED = _UxGT("Print Aborted");
+ PROGMEM Language_Str MSG_PRINT_DONE = _UxGT("Print Done");
PROGMEM Language_Str MSG_NO_MOVE = _UxGT("No Move.");
PROGMEM Language_Str MSG_KILLED = _UxGT("KILLED. ");
PROGMEM Language_Str MSG_STOPPED = _UxGT("STOPPED. ");
@@ -369,7 +379,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Unload Filament");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Unload Filament *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Unload All");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Init. Media");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Attach Media");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Change Media");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Release Media");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z Probe Past Bed");
@@ -592,6 +602,9 @@ namespace Language_en {
PROGMEM Language_Str MSG_BACKLASH_C = LCD_STR_C;
PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Correction");
PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Smoothing");
+
+ PROGMEM Language_Str MSG_LEVEL_X_AXIS = _UxGT("Level X Axis");
+ PROGMEM Language_Str MSG_AUTO_CALIBRATE = _UxGT("Auto Calibrate");
}
#if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 1a54244c16..12d487b35b 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -284,7 +284,7 @@ namespace Language_es {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Contraste LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Guardar EEPROM");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Cargar EEPROM");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Rest. fábrica");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Rest. fábrica");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Inicializar EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Actualizar SD/USB");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetear Impresora");
@@ -337,7 +337,7 @@ namespace Language_es {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Descargar filamento");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Descargar fil. *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Descargar todo");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Iniciar SD/USB");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Iniciar SD/USB");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Cambiar SD/USB");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Lanzar SD/USB");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda Z fuera cama");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 1ef40626d6..a6a0a52518 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -187,7 +187,7 @@ namespace Language_eu {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD kontrastea");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Gorde memoria");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Kargatu memoria");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Larri. berriz.");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Larri. berriz.");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("EEPROM-a hasieratu");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Berriz kargatu");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Pantaila info");
@@ -221,7 +221,7 @@ namespace Language_eu {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Harizpia deskargatu");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Harizpia deskargatu *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Erabat deskargatu");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Hasieratu SD-a");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Hasieratu SD-a");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Aldatu txartela");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z zunda kanpora");
PROGMEM Language_Str MSG_SKEW_FACTOR = _UxGT("Okertze faktorea");
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index a9a65709a8..79124c0007 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -97,7 +97,7 @@ namespace Language_fi {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD kontrasti");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Tallenna muistiin");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Lataa muistista");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Palauta oletus");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Palauta oletus");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Päivitä");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Seuraa");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Valmistele");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 2d47744e49..e691d26ab4 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -93,7 +93,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Allumer alim.");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Eteindre alim.");
PROGMEM Language_Str MSG_EXTRUDE = _UxGT("Extrusion");
- PROGMEM Language_Str MSG_RETRACT = _UxGT("Rétraction");
+ PROGMEM Language_Str MSG_RETRACT = _UxGT("Rétractation");
PROGMEM Language_Str MSG_MOVE_AXIS = _UxGT("Déplacer un axe");
PROGMEM Language_Str MSG_BED_LEVELING = _UxGT("Régler Niv. lit");
PROGMEM Language_Str MSG_LEVEL_BED = _UxGT("Niveau du lit");
@@ -282,7 +282,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Contraste LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Enregistrer config.");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Charger config.");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Restaurer défauts");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Restaurer défauts");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Initialiser EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("MaJ Firmware SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("RaZ imprimante");
@@ -317,7 +317,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_NO_MOVE = _UxGT("Moteurs bloqués");
PROGMEM Language_Str MSG_KILLED = _UxGT("KILLED");
PROGMEM Language_Str MSG_STOPPED = _UxGT("STOPPÉ");
- PROGMEM Language_Str MSG_CONTROL_RETRACT = _UxGT("Rétraction mm");
+ PROGMEM Language_Str MSG_CONTROL_RETRACT = _UxGT("Rétractation mm");
PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP = _UxGT("Ech. rétr. mm");
PROGMEM Language_Str MSG_CONTROL_RETRACTF = _UxGT("Vit. rétract°");
PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP = _UxGT("Saut Z mm");
@@ -340,7 +340,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Retrait filament");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Retrait filament *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Retirer tout");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Charger le média");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Charger le média");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Actualiser média");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Retirer le média");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonde Z hors lit");
@@ -384,7 +384,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_SHORT_HOUR = _UxGT("h"); // One character only
PROGMEM Language_Str MSG_SHORT_MINUTE = _UxGT("m"); // One character only
- PROGMEM Language_Str MSG_HEATING = _UxGT("En chauffe...");
+ PROGMEM Language_Str MSG_HEATING = _UxGT("en chauffe...");
PROGMEM Language_Str MSG_COOLING = _UxGT("Refroidissement");
PROGMEM Language_Str MSG_BED_HEATING = _UxGT("Lit en chauffe...");
PROGMEM Language_Str MSG_BED_COOLING = _UxGT("Refroid. du lit...");
@@ -416,6 +416,9 @@ namespace Language_fr {
PROGMEM Language_Str MSG_INFO_EXTRUDERS = _UxGT("Extrudeurs");
PROGMEM Language_Str MSG_INFO_BAUDRATE = _UxGT("Bauds");
PROGMEM Language_Str MSG_INFO_PROTOCOL = _UxGT("Protocole");
+ PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF = _UxGT("Protection inactive");
+ PROGMEM Language_Str MSG_INFO_RUNAWAY_ON = _UxGT("Protection active");
+
PROGMEM Language_Str MSG_CASE_LIGHT = _UxGT("Lumière caisson");
PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Luminosité");
@@ -437,7 +440,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_INFO_MIN_TEMP = _UxGT("Temp Min");
PROGMEM Language_Str MSG_INFO_MAX_TEMP = _UxGT("Temp Max");
- PROGMEM Language_Str MSG_INFO_PSU = _UxGT("Alimentation");
+ PROGMEM Language_Str MSG_INFO_PSU = _UxGT("Alim.");
PROGMEM Language_Str MSG_DRIVE_STRENGTH = _UxGT("Puiss. moteur ");
PROGMEM Language_Str MSG_DAC_PERCENT_X = _UxGT("X Driver %");
PROGMEM Language_Str MSG_DAC_PERCENT_Y = _UxGT("Y Driver %");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index d6f6d941b6..6a8f166ff1 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -117,7 +117,7 @@ namespace Language_gl {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Constraste LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Gardar en memo.");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Cargar de memo.");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Cargar de firm.");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Cargar de firm.");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Volver a cargar");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Monitorizacion");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
@@ -143,7 +143,7 @@ namespace Language_gl {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("Retraccion auto.");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Cambiar filamen.");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Cambiar filamen. *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Iniciando SD");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Iniciando SD");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Cambiar SD");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda-Z sen cama");
PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("Comprobar BLTouch");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 65562204fc..740d7e5625 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -98,7 +98,7 @@ namespace Language_hr {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Kontrast LCD-a");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Pohrani u memoriju");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Učitaj memoriju");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Učitaj failsafe");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Učitaj Defaults");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Osvježi");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info screen");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Pripremi");
@@ -112,7 +112,7 @@ namespace Language_hr {
PROGMEM Language_Str MSG_STOPPED = _UxGT("ZAUSTAVLJEN. ");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Promijeni filament");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Promijeni filament *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Init. SD karticu");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Init. SD karticu");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Promijeni SD karticu");
PROGMEM Language_Str MSG_HEATING_FAILED_LCD = _UxGT("Grijanje neuspješno");
PROGMEM Language_Str MSG_HEATING = _UxGT("Grijanje...");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 66b45f2987..8d8112d523 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,6 +38,7 @@ namespace Language_it {
PROGMEM Language_Str LANGUAGE = _UxGT("Italian");
PROGMEM Language_Str WELCOME_MSG = MACHINE_NAME _UxGT(" pronto.");
+ PROGMEM Language_Str MSG_MARLIN = _UxGT("Marlin");
PROGMEM Language_Str MSG_YES = _UxGT("SI");
PROGMEM Language_Str MSG_NO = _UxGT("NO");
PROGMEM Language_Str MSG_BACK = _UxGT("Indietro");
@@ -244,6 +245,11 @@ namespace Language_it {
PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Ventola mem. ~"); // Max 15 characters
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("Extra vel.vent."); // Max 15 characters
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Extra v.vent. ~"); // Max 15 characters
+ PROGMEM Language_Str MSG_CONTROLLER_FAN = _UxGT("Controller vent.");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED = _UxGT("Vel. inattivo");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON = _UxGT("Modo autom.");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED = _UxGT("Vel. attivo");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION = _UxGT("Tempo inattivo");
PROGMEM Language_Str MSG_FLOW = _UxGT("Flusso");
PROGMEM Language_Str MSG_FLOW_N = _UxGT("Flusso ~");
PROGMEM Language_Str MSG_CONTROL = _UxGT("Controllo");
@@ -255,6 +261,16 @@ namespace Language_it {
PROGMEM Language_Str MSG_LCD_OFF = _UxGT("Off");
PROGMEM Language_Str MSG_PID_AUTOTUNE = _UxGT("PID Autotune");
PROGMEM Language_Str MSG_PID_AUTOTUNE_E = _UxGT("PID Autotune *");
+ PROGMEM Language_Str MSG_PID_P = _UxGT("PID-P");
+ PROGMEM Language_Str MSG_PID_P_E = _UxGT("PID-P *");
+ PROGMEM Language_Str MSG_PID_I = _UxGT("PID-I");
+ PROGMEM Language_Str MSG_PID_I_E = _UxGT("PID-I *");
+ PROGMEM Language_Str MSG_PID_D = _UxGT("PID-D");
+ PROGMEM Language_Str MSG_PID_D_E = _UxGT("PID-D *");
+ PROGMEM Language_Str MSG_PID_C = _UxGT("PID-C");
+ PROGMEM Language_Str MSG_PID_C_E = _UxGT("PID-C *");
+ PROGMEM Language_Str MSG_PID_F = _UxGT("PID-F");
+ PROGMEM Language_Str MSG_PID_F_E = _UxGT("PID-F *");
PROGMEM Language_Str MSG_SELECT = _UxGT("Seleziona");
PROGMEM Language_Str MSG_SELECT_E = _UxGT("Seleziona *");
PROGMEM Language_Str MSG_ACC = _UxGT("Accel");
@@ -299,8 +315,11 @@ namespace Language_it {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Contrasto LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Salva impostazioni");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Carica impostazioni");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Ripristina imp.");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Ripristina imp.");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Inizializza EEPROM");
+ PROGMEM Language_Str MSG_ERR_EEPROM_CRC = _UxGT("Err: CRC EEPROM");
+ PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("Err: Indice EEPROM");
+ PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versione EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Aggiorna media");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetta stampante");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Aggiorna");
@@ -357,7 +376,7 @@ namespace Language_it {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Rimuovi filamento");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Rimuovi filamento *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Rimuovi tutto");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Inizializ. media");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Collega media");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Cambia media");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Rilascia media");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z probe fuori piatto");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 81580b71ed..809ee83de8 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -141,7 +141,7 @@ namespace Language_jp_kana {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCDコントラスト"); // "LCD contrast"
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("EEPROMヘホゾン"); // "Store memory"
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("EEPROMカラヨミコミ"); // "Load memory"
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("セッテイリセット"); // "Restore failsafe"
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("セッテイリセット"); // "Restore Defaults"
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("リフレッシュ"); // "Refresh"
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("ジョウホウガメン"); // "Info screen"
PROGMEM Language_Str MSG_PREPARE = _UxGT("ジュンビセッテイ"); // "Prepare"
@@ -166,7 +166,7 @@ namespace Language_jp_kana {
PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF = _UxGT("ホショウソクド mm/s"); // "UnRet V"
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("ジドウヒキコミ"); // "AutoRetr."
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("フィラメントコウカン"); // "Change filament"
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("メディアサイヨミコミ"); // "Init. SD card"
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("メディアサイヨミコミ"); // "Init. SD card"
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("メディアコウカン"); // "Change SD card"
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Zプローブ ベッドガイ"); // "Z probe out. bed"
PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch ジコシンダン"); // "BLTouch Self-Test"
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index 7d33ccc508..4d8142e38b 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -84,7 +84,7 @@ namespace Language_ko_KR {
PROGMEM Language_Str MSG_MOTION = _UxGT("동작");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("설정 저장하기");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("설정 읽어오기");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("설정 되돌리기");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("설정 되돌리기");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("EEPROM 초기화");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("새로고침");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("처음으로");
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 1d9955c811..d5d46ecfe6 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -123,7 +123,7 @@ namespace Language_nl {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD contrast");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Geheugen opslaan");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Geheugen laden");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Noodstop reset");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Noodstop reset");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Ververs");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info scherm");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Voorbereiden");
@@ -149,7 +149,7 @@ namespace Language_nl {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("AutoRetr.");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Verv. Filament");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Verv. Filament *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Init. SD kaart");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Init. SD kaart");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Verv. SD Kaart");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z probe uit. bed");
PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Zelf-Test");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 972f5044b1..113c58629f 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -298,7 +298,7 @@ namespace Language_pl {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Kontrast LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Zapisz w pamięci");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Wczytaj z pamięci");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Ustaw. fabryczne");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Ustaw. fabryczne");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Initializuj EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Uaktualnij kartę");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetuj drukarkę");
@@ -350,7 +350,7 @@ namespace Language_pl {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Wyładuj Filament");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Wyładuj Filament *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Wyładuj wszystkie");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Inicjal. karty SD");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Inicjal. karty SD");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Zmiana karty SD");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Zwolnienie karty");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda Z za stołem");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index b96839e1f6..69c8be603f 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -113,7 +113,7 @@ namespace Language_pt {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Contraste");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Guardar na memoria");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Carregar da memoria");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Rest. de emergen.");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Rest. de emergen.");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT(" Recarregar");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Monitorizar");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
@@ -139,7 +139,7 @@ namespace Language_pt {
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT(" AutoRetr.");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Trocar filamento");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Trocar filamento *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Inici. cartão SD");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Inici. cartão SD");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Trocar cartão SD");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sensor fora/base");
PROGMEM Language_Str MSG_ZPROBE_ZOFFSET = _UxGT("Desvio Z");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 93451bc971..9ce6a7042b 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -252,7 +252,7 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Contraste");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Salvar Configuração");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Ler Configuração");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Restauro seguro");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Restauro seguro");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Iniciar EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Atualiz. SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetar Impressora");
@@ -293,7 +293,7 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_FILAMENTLOAD_E = _UxGT("Carregar Filamento *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Descarreg. Filamento *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Descarregar Todos");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Iniciar SD");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Iniciar SD");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Trocar SD");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda fora da mesa");
PROGMEM Language_Str MSG_SKEW_FACTOR = _UxGT("Fator de Cisalho");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index d7e4de5dd2..a7c971e8c7 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -50,7 +50,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_DISABLE_STEPPERS = _UxGT("Выключить двигатели");
PROGMEM Language_Str MSG_DEBUG_MENU = _UxGT("Меню отладки");
PROGMEM Language_Str MSG_PROGRESS_BAR_TEST = _UxGT("Тест индикатора");
- PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Автопарковка");
+ PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Парковка XYZ");
PROGMEM Language_Str MSG_AUTO_HOME_X = _UxGT("Парковка X");
PROGMEM Language_Str MSG_AUTO_HOME_Y = _UxGT("Парковка Y");
PROGMEM Language_Str MSG_AUTO_HOME_Z = _UxGT("Парковка Z");
@@ -63,20 +63,29 @@ namespace Language_ru {
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Коррекции применены");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Запомнить ноль");
PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Преднагрев ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" сопло");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" всё");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" стол");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" настр.");
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка");
PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Преднагрев ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" сопло");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" всё");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" стол");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" настр.");
+ PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло");
+ PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~");
+ PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё");
+ PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол");
+ PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение");
+ PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Управление лазером");
+ PROGMEM Language_Str MSG_LASER_OFF = _UxGT("Выключить лазер");
+ PROGMEM Language_Str MSG_LASER_ON = _UxGT("Включить лазер");
+ PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Мощность лазера");
+ PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("Шпиндель управление");
+ PROGMEM Language_Str MSG_SPINDLE_OFF = _UxGT("Выключить шпиндель");
+ PROGMEM Language_Str MSG_SPINDLE_ON = _UxGT("Включить шпиндель");
+ PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("Мощность шпинделя");
+ PROGMEM Language_Str MSG_SPINDLE_REVERSE = _UxGT("Инверсия шпинделя");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Включить питание");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Выключить питание");
PROGMEM Language_Str MSG_EXTRUDE = _UxGT("Экструзия");
@@ -87,7 +96,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_LEVEL_CORNERS = _UxGT("Выровнять углы");
PROGMEM Language_Str MSG_NEXT_CORNER = _UxGT("Следующий угол");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Редактировать сетку");
- PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Ред. сетки завершено");
+ PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Правка сетки окончена");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Точка сетки:");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Индекс X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Индекс Y");
@@ -108,10 +117,10 @@ namespace Language_ru {
PROGMEM Language_Str MSG_UBL_DOING_G29 = _UxGT("Выполняем G29");
PROGMEM Language_Str MSG_UBL_TOOLS = _UxGT("Утилиты UBL");
PROGMEM Language_Str MSG_UBL_LEVEL_BED = _UxGT("Калибровка UBL");
- PROGMEM Language_Str MSG_UBL_MANUAL_MESH = _UxGT("Постр. сетку от руки");
- PROGMEM Language_Str MSG_UBL_BC_INSERT = _UxGT("Пост. шимм и измер.");
+ PROGMEM Language_Str MSG_UBL_MANUAL_MESH = _UxGT("Правка сетки вручную");
+ PROGMEM Language_Str MSG_UBL_BC_INSERT = _UxGT("Z-пробник и замеры");
PROGMEM Language_Str MSG_UBL_BC_INSERT2 = _UxGT("Измерение");
- PROGMEM Language_Str MSG_UBL_BC_REMOVE = _UxGT("Удал. и измер. стол");
+ PROGMEM Language_Str MSG_UBL_BC_REMOVE = _UxGT("Убрать и замер стола");
PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT = _UxGT("Двигаемся дальше");
PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH = _UxGT("Активировать UBL");
PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH = _UxGT("Деактивировать UBL");
@@ -128,7 +137,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL;
PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL;
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить хол. сетку");
- PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Устан. высоту сетки");
+ PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Правка высоты сетки");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Высота");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Проверить сетку");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить сетку ") PREHEAT_1_LABEL;
@@ -213,6 +222,11 @@ namespace Language_ru {
PROGMEM Language_Str MSG_FAN_SPEED_N = _UxGT("Кулер ~");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("Кулер доп.");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Кулер доп. ~");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN = _UxGT("Обдув платы");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED = _UxGT("Обороты простоя");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON = _UxGT("Автовключение");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED = _UxGT("Рабочие обороты");
+ PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION = _UxGT("Простой после");
PROGMEM Language_Str MSG_FLOW = _UxGT("Поток");
PROGMEM Language_Str MSG_FLOW_N = _UxGT("Поток ~");
PROGMEM Language_Str MSG_CONTROL = _UxGT("Настройки");
@@ -220,8 +234,10 @@ namespace Language_ru {
PROGMEM Language_Str MSG_MAX = " " LCD_STR_THERMOMETER _UxGT(" Макс");
PROGMEM Language_Str MSG_FACTOR = " " LCD_STR_THERMOMETER _UxGT(" Фактор");
PROGMEM Language_Str MSG_AUTOTEMP = _UxGT("Автотемпература");
- PROGMEM Language_Str MSG_LCD_ON = _UxGT("Вкл.");
- PROGMEM Language_Str MSG_LCD_OFF = _UxGT("Выкл.");
+ PROGMEM Language_Str MSG_LCD_ON = _UxGT("Вкл");
+ PROGMEM Language_Str MSG_LCD_OFF = _UxGT("Выкл");
+ PROGMEM Language_Str MSG_PID_AUTOTUNE = _UxGT("Автонастройка");
+ PROGMEM Language_Str MSG_PID_AUTOTUNE_E = _UxGT("Автонастройка *");
PROGMEM Language_Str MSG_SELECT = _UxGT("Выбор");
PROGMEM Language_Str MSG_SELECT_E = _UxGT("Выбор *");
PROGMEM Language_Str MSG_ACC = _UxGT("Ускорение");
@@ -265,8 +281,8 @@ namespace Language_ru {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Контраст LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Сохранить настройки");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Загрузить настройки");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Вернуть настройки");
- PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Инициализация EEPROM");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Вернуть настройки");
+ PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Изначальный EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Обновление прошивки");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Сброс принтера");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Обновить");
@@ -317,7 +333,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_FILAMENTLOAD_E = _UxGT("Загрузка филамента *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Выгрузка филамента *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Выгрузить всё");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Активировать SD");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Активировать SD");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Сменить SD карту");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Деактивировать SD");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z-датчик вне стола");
@@ -332,9 +348,9 @@ namespace Language_ru {
PROGMEM Language_Str MSG_HOME_FIRST = _UxGT("Паркуй %s%s%s сначала");
PROGMEM Language_Str MSG_ZPROBE_OFFSETS = _UxGT("Отступы Z-датчика");
- PROGMEM Language_Str MSG_ZPROBE_XOFFSET = _UxGT("Смещение по X");
- PROGMEM Language_Str MSG_ZPROBE_YOFFSET = _UxGT("Смещение по Y");
- PROGMEM Language_Str MSG_ZPROBE_ZOFFSET = _UxGT("Смещение по Z");
+ PROGMEM Language_Str MSG_ZPROBE_XOFFSET = _UxGT("Смещение X");
+ PROGMEM Language_Str MSG_ZPROBE_YOFFSET = _UxGT("Смещение Y");
+ PROGMEM Language_Str MSG_ZPROBE_ZOFFSET = _UxGT("Смещение Z");
PROGMEM Language_Str MSG_BABYSTEP_X = _UxGT("Микрошаг X");
PROGMEM Language_Str MSG_BABYSTEP_Y = _UxGT("Микрошаг Y");
PROGMEM Language_Str MSG_BABYSTEP_Z = _UxGT("Микрошаг Z");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index b21e8d05bc..4205cd5988 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -67,9 +67,9 @@ namespace Language_sk {
PROGMEM Language_Str MSG_AUTO_HOME_Z = _UxGT("Domov os Z");
PROGMEM Language_Str MSG_AUTO_Z_ALIGN = _UxGT("Auto-zarovn. Z");
PROGMEM Language_Str MSG_LEVEL_BED_HOMING = _UxGT("Parkovanie XYZ");
- PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("Kliknutím spusťte");
+ PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("Kliknutím začnete");
PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("Ďalší bod");
- PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("Meranie hotové!");
+ PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("Vyrovnanie hotové!");
PROGMEM Language_Str MSG_Z_FADE_HEIGHT = _UxGT("Výška rovnania");
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastaviť ofsety");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené");
@@ -173,10 +173,10 @@ namespace Language_sk {
PROGMEM Language_Str MSG_UBL_SIDE_POINTS = _UxGT("Postranné body");
PROGMEM Language_Str MSG_UBL_MAP_TYPE = _UxGT("Typ siete bodov");
PROGMEM Language_Str MSG_UBL_OUTPUT_MAP = _UxGT("Exportovať sieť");
- PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST = _UxGT("Exportovať do PC");
- PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV = _UxGT("Exportovať do CSV");
- PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP = _UxGT("Záloha do PC");
- PROGMEM Language_Str MSG_UBL_INFO_UBL = _UxGT("Info. o UBL do PC");
+ PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST = _UxGT("Export do hosta");
+ PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV = _UxGT("Export do CSV");
+ PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP = _UxGT("Externá záloha");
+ PROGMEM Language_Str MSG_UBL_INFO_UBL = _UxGT("Info. o výst. UBL");
PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT = _UxGT("Hustota mriežky");
PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN = _UxGT("Ručné vyplnenie");
PROGMEM Language_Str MSG_UBL_SMART_FILLIN = _UxGT("Chytré vyplnenie");
@@ -302,8 +302,11 @@ namespace Language_sk {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Kontrast LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Uložiť nastavenie");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Načítať nastavenie");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Obnoviť nastavenie");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Obnoviť nastavenie");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Inicializ. EEPROM");
+ PROGMEM Language_Str MSG_ERR_EEPROM_CRC = _UxGT("Chyba: EEPROM CRC");
+ PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("Chyba: EEPROM Index");
+ PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("Chyba: Verzia EEPROM");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Aktualizovať z SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reštart. tlačiar.");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Obnoviť");
@@ -360,7 +363,7 @@ namespace Language_sk {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Vysunúť filament");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Vysunúť filament *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Vysunúť všetko");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Načítať SD kartu");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Načítať SD kartu");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Vymeniť SD kartu");
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Odpojiť SD kartu");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Sonda Z mimo podl.");
diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h
index 9278283a5a..465d3743f3 100644
--- a/Marlin/src/lcd/language/language_test.h
+++ b/Marlin/src/lcd/language/language_test.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -149,7 +149,7 @@ namespace Language_test {
PROGMEM Language_Str MSG_MOTION = STRG_OKTAL_4;
PROGMEM Language_Str MSG_FILAMENT = STRG_OKTAL_5;
PROGMEM Language_Str MSG_CONTRAST = STRG_OKTAL_6;
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = STRG_OKTAL_7;
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = STRG_OKTAL_7;
PROGMEM Language_Str MSG_NOZZLE = STRG_OKTAL_8;
PROGMEM Language_Str MSG_NOZZLE_N = STRG_OKTAL_8 " ~";
@@ -186,7 +186,7 @@ namespace Language_test {
PROGMEM Language_Str MSG_MOTION = STRG_OKTAL_4;
PROGMEM Language_Str MSG_FILAMENT = STRG_OKTAL_5;
PROGMEM Language_Str MSG_CONTRAST = STRG_OKTAL_6;
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = STRG_OKTAL_7;
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = STRG_OKTAL_7;
PROGMEM Language_Str MSG_NOZZLE = STRG_OKTAL_8;
PROGMEM Language_Str MSG_NOZZLE_N = STRG_OKTAL_8 " ~";
@@ -222,7 +222,7 @@ namespace Language_test {
PROGMEM Language_Str MSG_MOTION = STRG_OKTAL_4;
PROGMEM Language_Str MSG_FILAMENT = STRG_OKTAL_5;
PROGMEM Language_Str MSG_CONTRAST = STRG_OKTAL_6;
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = STRG_OKTAL_7;
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = STRG_OKTAL_7;
PROGMEM Language_Str MSG_NOZZLE = STRG_OKTAL_8;
PROGMEM Language_Str MSG_NOZZLE_N = STRG_OKTAL_8 " ~";
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index e68b62228d..096fef254c 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -1,6 +1,6 @@
- /**
+/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,9 +42,18 @@ namespace Language_tr {
PROGMEM Language_Str LANGUAGE = _UxGT("Turkish");
PROGMEM Language_Str WELCOME_MSG = MACHINE_NAME _UxGT(" hazır.");
+ PROGMEM Language_Str MSG_MARLIN = _UxGT("Marlin");
+ PROGMEM Language_Str MSG_YES = _UxGT("EVET");
+ PROGMEM Language_Str MSG_NO = _UxGT("HAYIR");
PROGMEM Language_Str MSG_BACK = _UxGT("Geri");
+ PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Durduruluyor...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("SD K. Yerleştirildi.");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("SD Kart Çıkarıldı.");
+ PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("SD Kart Serbest");
+ PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("SD Kart Bekleniyor");
+ PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Kart Okuma Hatası");
+ PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB Çıkarıldı");
+ PROGMEM Language_Str MSG_MEDIA_USB_FAILED = _UxGT("USB Başlat. Hatası");
PROGMEM Language_Str MSG_LCD_ENDSTOPS = _UxGT("Enstops"); // Max length 8 characters
PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS = _UxGT("Yazılımsal Endstops");
PROGMEM Language_Str MSG_MAIN = _UxGT("Ana");
@@ -64,8 +73,8 @@ namespace Language_tr {
PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("Sonraki Nokta");
PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("Hizalama Tamam!");
PROGMEM Language_Str MSG_Z_FADE_HEIGHT = _UxGT("Kaçınma Yüksekliği");
- PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Offset Ayarla");
- PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset Tamam");
+ PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ofset Ayarla");
+ PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle");
PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
@@ -82,7 +91,16 @@ namespace Language_tr {
PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla");
PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar");
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma");
- PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut");
+ PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut/(Durdur)");
+ PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Lazer Kontrolü");
+ PROGMEM Language_Str MSG_LASER_OFF = _UxGT("Lazeri Kapat");
+ PROGMEM Language_Str MSG_LASER_ON = _UxGT("Lazeri Aç");
+ PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Lazer Gücü");
+ PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("Spindle Kontrolü");
+ PROGMEM Language_Str MSG_SPINDLE_OFF = _UxGT("Spindle Kapat");
+ PROGMEM Language_Str MSG_SPINDLE_ON = _UxGT("Spindle Aç");
+ PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("Spindle Gücü");
+ PROGMEM Language_Str MSG_SPINDLE_REVERSE = _UxGT("Spindle Ters Yön");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Gücü Aç");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Gücü Kapat");
PROGMEM Language_Str MSG_EXTRUDE = _UxGT("Ekstrüzyon");
@@ -92,13 +110,19 @@ namespace Language_tr {
PROGMEM Language_Str MSG_LEVEL_BED = _UxGT("Tabla Hizası");
PROGMEM Language_Str MSG_LEVEL_CORNERS = _UxGT("Hizalama Köşeleri");
PROGMEM Language_Str MSG_NEXT_CORNER = _UxGT("Sonraki Köşe");
+ PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Mesh Editörü");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Mesh Düzenle");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Mesh Düzenleme Durdu");
+ PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Prop Noktası");
PROGMEM Language_Str MSG_MESH_X = _UxGT("İndeks X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("İndeks Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z Değeri");
PROGMEM Language_Str MSG_USER_MENU = _UxGT("Özel Komutlar");
+ PROGMEM Language_Str MSG_M48_TEST = _UxGT("M48 Prob Testi");
+ PROGMEM Language_Str MSG_M48_POINT = _UxGT("M48 Nokta");
+ PROGMEM Language_Str MSG_M48_DEVIATION = _UxGT("Sapma");
PROGMEM Language_Str MSG_IDEX_MENU = _UxGT("IDEX Modu");
+ PROGMEM Language_Str MSG_OFFSETS_MENU = _UxGT("Takım Ofsetleri");
PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK = _UxGT("Oto-Park");
PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE = _UxGT("Kopyala");
PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY = _UxGT("Yansıtılmış kopya");
@@ -109,6 +133,7 @@ namespace Language_tr {
PROGMEM Language_Str MSG_UBL_DOING_G29 = _UxGT("G29 Çalışıyor");
PROGMEM Language_Str MSG_UBL_TOOLS = _UxGT("UBL Araçları");
PROGMEM Language_Str MSG_UBL_LEVEL_BED = _UxGT("UBL Yatak Hizalama");
+ PROGMEM Language_Str MSG_LCD_TILTING_MESH = _UxGT("Eğim Noktası");
PROGMEM Language_Str MSG_UBL_MANUAL_MESH = _UxGT("Elle Mesh Oluştur");
PROGMEM Language_Str MSG_UBL_BC_INSERT = _UxGT("Altlık & Ölçü Ver");
PROGMEM Language_Str MSG_UBL_BC_INSERT2 = _UxGT("Ölçü");
@@ -135,6 +160,13 @@ namespace Language_tr {
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama");
+ PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası");
+ PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Isıtma Memesi");
+ PROGMEM Language_Str MSG_G26_MANUAL_PRIME = _UxGT("Manuel çalışma...");
+ PROGMEM Language_Str MSG_G26_FIXED_LENGTH = _UxGT("Birincil Sabit Uzunluk");
+ PROGMEM Language_Str MSG_G26_PRIME_DONE = _UxGT("Çalışma Tamamlandı");
+ PROGMEM Language_Str MSG_G26_CANCELED = _UxGT("G26 İptal edildi");
+ PROGMEM Language_Str MSG_G26_LEAVING = _UxGT("Çıkış G26");
PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tabla Mesh Devam et");
PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Mesh Hizalama");
PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Nokta Hizalama");
@@ -164,6 +196,7 @@ namespace Language_tr {
PROGMEM Language_Str MSG_UBL_NO_STORAGE = _UxGT("Depolama Yok");
PROGMEM Language_Str MSG_UBL_SAVE_ERROR = _UxGT("Hata: UBL Kayıt");
PROGMEM Language_Str MSG_UBL_RESTORE_ERROR = _UxGT("Hata: UBL Yenileme");
+ PROGMEM Language_Str MSG_UBL_Z_OFFSET = _UxGT("Z-Ofset: ");
PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z-Ofset Durduruldu");
PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Adım Adım UBL");
PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH = _UxGT("1.Soğuk Mesh Oluştur");
@@ -175,8 +208,8 @@ namespace Language_tr {
PROGMEM Language_Str MSG_UBL_7_SAVE_MESH = _UxGT("7.Yatak Mesh Kayıt Et");
PROGMEM Language_Str MSG_LED_CONTROL = _UxGT("LED Kontrolü");
- PROGMEM Language_Str MSG_LEDS = _UxGT("Işıklar");
- PROGMEM Language_Str MSG_LED_PRESETS = _UxGT("Işık Hazır Ayarları");
+ PROGMEM Language_Str MSG_LEDS = _UxGT("LEDler");
+ PROGMEM Language_Str MSG_LED_PRESETS = _UxGT("LED Hazır Ayarları");
PROGMEM Language_Str MSG_SET_LEDS_RED = _UxGT("Kırmızı");
PROGMEM Language_Str MSG_SET_LEDS_ORANGE = _UxGT("Turuncu");
PROGMEM Language_Str MSG_SET_LEDS_YELLOW = _UxGT("Sarı");
@@ -192,6 +225,7 @@ namespace Language_tr {
PROGMEM Language_Str MSG_INTENSITY_B = _UxGT("Mavi Şiddeti");
PROGMEM Language_Str MSG_INTENSITY_W = _UxGT("Beyaz Şiddeti");
PROGMEM Language_Str MSG_LED_BRIGHTNESS = _UxGT("Parlaklık");
+
PROGMEM Language_Str MSG_MOVING = _UxGT("Hareket Ediyor..");
PROGMEM Language_Str MSG_FREE_XY = _UxGT("Durdur XY");
PROGMEM Language_Str MSG_MOVE_X = _UxGT("X Hareketi");
@@ -209,8 +243,10 @@ namespace Language_tr {
PROGMEM Language_Str MSG_NOZZLE = _UxGT("Nozul");
PROGMEM Language_Str MSG_NOZZLE_N = _UxGT("Nozul ~");
PROGMEM Language_Str MSG_BED = _UxGT("Tabla");
+ PROGMEM Language_Str MSG_CHAMBER = _UxGT("Çevirme");
PROGMEM Language_Str MSG_FAN_SPEED = _UxGT("Fan Hızı");
PROGMEM Language_Str MSG_FAN_SPEED_N = _UxGT("Fan Hızı ~");
+ PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Depolanan Fan ~");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("Ekstra Fan Hızı");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Ekstra Fan Hızı ~");
PROGMEM Language_Str MSG_FLOW = _UxGT("Akış");
@@ -222,9 +258,22 @@ namespace Language_tr {
PROGMEM Language_Str MSG_AUTOTEMP = _UxGT("Oto. Sıcaklık");
PROGMEM Language_Str MSG_LCD_ON = _UxGT("Açık");
PROGMEM Language_Str MSG_LCD_OFF = _UxGT("Kapalı");
+ PROGMEM Language_Str MSG_PID_AUTOTUNE = _UxGT("PID Kalibrasyon");
+ PROGMEM Language_Str MSG_PID_AUTOTUNE_E = _UxGT("PID Kalibrasyon *");
+ PROGMEM Language_Str MSG_PID_P = _UxGT("PID-P");
+ PROGMEM Language_Str MSG_PID_P_E = _UxGT("PID-P *");
+ PROGMEM Language_Str MSG_PID_I = _UxGT("PID-I");
+ PROGMEM Language_Str MSG_PID_I_E = _UxGT("PID-I *");
+ PROGMEM Language_Str MSG_PID_D = _UxGT("PID-D");
+ PROGMEM Language_Str MSG_PID_D_E = _UxGT("PID-D *");
+ PROGMEM Language_Str MSG_PID_C = _UxGT("PID-C");
+ PROGMEM Language_Str MSG_PID_C_E = _UxGT("PID-C *");
+ PROGMEM Language_Str MSG_PID_F = _UxGT("PID-F");
+ PROGMEM Language_Str MSG_PID_F_E = _UxGT("PID-F *");
PROGMEM Language_Str MSG_SELECT = _UxGT("Seç");
PROGMEM Language_Str MSG_SELECT_E = _UxGT("Seç *");
PROGMEM Language_Str MSG_ACC = _UxGT("İvme");
+
PROGMEM Language_Str MSG_JERK = _UxGT("Sarsım");
PROGMEM Language_Str MSG_VA_JERK = _UxGT("V") LCD_STR_A _UxGT("-Sarsım");
PROGMEM Language_Str MSG_VB_JERK = _UxGT("V") LCD_STR_B _UxGT("-Sarsım");
@@ -266,17 +315,33 @@ namespace Language_tr {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD Kontrast");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Hafızaya Al");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Hafızadan Yükle");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Fabrika Ayarları");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Fabrika Ayarları");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("EEPROM'u başlat");
+ PROGMEM Language_Str MSG_ERR_EEPROM_CRC = _UxGT("Hata: EEPROM CRC");
+ PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("Hata: EEPROM Indeks");
+ PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("Hata: EEPROM Versiyonu");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("SD Güncellemesi");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Yazıcıyı Resetle");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Yenile");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Bilgi Ekranı");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Hazırlık");
PROGMEM Language_Str MSG_TUNE = _UxGT("Ayar");
+ PROGMEM Language_Str MSG_START_PRINT = _UxGT("Yaz. Başlat");
+ PROGMEM Language_Str MSG_BUTTON_NEXT = _UxGT("İleri");
+ PROGMEM Language_Str MSG_BUTTON_INIT = _UxGT("İçinde");
+ PROGMEM Language_Str MSG_BUTTON_STOP = _UxGT("Durdur");
+ PROGMEM Language_Str MSG_BUTTON_PRINT = _UxGT("Yazdır");
+ PROGMEM Language_Str MSG_BUTTON_RESET = _UxGT("Resetle");
+ PROGMEM Language_Str MSG_BUTTON_CANCEL = _UxGT("İptal");
+ PROGMEM Language_Str MSG_BUTTON_DONE = _UxGT("Tamamlandı");
+ PROGMEM Language_Str MSG_BUTTON_BACK = _UxGT("Geri");
+ PROGMEM Language_Str MSG_BUTTON_PROCEED = _UxGT("Devam ediyor");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Duraklat");
PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("Sürdür");
PROGMEM Language_Str MSG_STOP_PRINT = _UxGT("Durdur");
+ PROGMEM Language_Str MSG_PRINTING_OBJECT = _UxGT("Yazdırma Nesnesi");
+ PROGMEM Language_Str MSG_CANCEL_OBJECT = _UxGT("Nesneyi İptal Et");
+ PROGMEM Language_Str MSG_CANCEL_OBJECT_N = _UxGT("Nesneyi İptal Et =");
PROGMEM Language_Str MSG_OUTAGE_RECOVERY = _UxGT("Kesinti Kurtarma");
PROGMEM Language_Str MSG_MEDIA_MENU = _UxGT("SD Karttan Yazdır");
PROGMEM Language_Str MSG_NO_MEDIA = _UxGT("SD Kart Yok!");
@@ -298,10 +363,12 @@ namespace Language_tr {
PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF = _UxGT("S UnRet V");
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("Oto. Geri Çekme");
PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH = _UxGT("G.Çekme Boyu");
+ PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH = _UxGT("Tasfiye uzunluğu");
PROGMEM Language_Str MSG_TOOL_CHANGE = _UxGT("Takım Değişimi");
PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT = _UxGT("Z Yükselt");
PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD = _UxGT("Birincil Hız");
PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD = _UxGT("Geri Çekme Hızı");
+ PROGMEM Language_Str MSG_NOZZLE_STANDBY = _UxGT("Nozul Beklemede");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Filaman Değiştir");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Filaman Değiştir *");
PROGMEM Language_Str MSG_FILAMENTLOAD = _UxGT("Filaman Yükle");
@@ -309,31 +376,54 @@ namespace Language_tr {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Filaman Çıkart");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Filaman Çıkart *");
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Tümünü Çıkart");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("SD Kart Başlatılıyor");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("SD Kart Başlatılıyor");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("SD Kart Değiştir");
+ PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("SD Kart Çıkart");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z Prob Açık. Tabla");
PROGMEM Language_Str MSG_SKEW_FACTOR = _UxGT("Çarpıklık Faktörü");
PROGMEM Language_Str MSG_BLTOUCH = _UxGT("BLTouch");
- PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Self-Test");
- PROGMEM Language_Str MSG_BLTOUCH_RESET = _UxGT("Sıfırla BLTouch");
- PROGMEM Language_Str MSG_BLTOUCH_DEPLOY = _UxGT("BLTouch Aç");
- PROGMEM Language_Str MSG_BLTOUCH_STOW = _UxGT("BLTouch Kapat");
- PROGMEM Language_Str MSG_MANUAL_DEPLOY = _UxGT("Z-Prob Aç");
- PROGMEM Language_Str MSG_MANUAL_STOW = _UxGT("Z-Sensör Kapat");
- PROGMEM Language_Str MSG_HOME_FIRST = _UxGT("Sıfırla %s%s%s Önce");
+ PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch K. Test");
+ PROGMEM Language_Str MSG_BLTOUCH_RESET = _UxGT("Cmd: Reset");
+ PROGMEM Language_Str MSG_BLTOUCH_STOW = _UxGT("Cmd: Kapat");
+ PROGMEM Language_Str MSG_BLTOUCH_DEPLOY = _UxGT("Cmd: Aç");
+ PROGMEM Language_Str MSG_BLTOUCH_SW_MODE = _UxGT("Cmd: SW-Modu");
+ PROGMEM Language_Str MSG_BLTOUCH_5V_MODE = _UxGT("Cmd: 5V-Modu");
+ PROGMEM Language_Str MSG_BLTOUCH_OD_MODE = _UxGT("Cmd: OD-Modu");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE = _UxGT("Cmd: Mode-Store");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V = _UxGT("BLTouch 5V Ayarla");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD = _UxGT("BLTouch OD Ayarla");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO = _UxGT("Drenaj Raporu");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE = _UxGT("TEHLIKE: Kötü ayarlar hasara neden olabilir! Yine de devam edilsin mi?");
+ PROGMEM Language_Str MSG_TOUCHMI_PROBE = _UxGT("TouchMI");
+ PROGMEM Language_Str MSG_TOUCHMI_INIT = _UxGT("Init TouchMI");
+ PROGMEM Language_Str MSG_TOUCHMI_ZTEST = _UxGT("Z Ofset Testi");
+ PROGMEM Language_Str MSG_TOUCHMI_SAVE = _UxGT("Kaydet");
+ PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("TouchMI Aç");
+ PROGMEM Language_Str MSG_MANUAL_DEPLOY = _UxGT("Z-Probe Aç");
+ PROGMEM Language_Str MSG_MANUAL_STOW = _UxGT("Z-Probe Kapat");
+ PROGMEM Language_Str MSG_HOME_FIRST = _UxGT("Önce %s%s%s Sıfırla");
+ PROGMEM Language_Str MSG_ZPROBE_OFFSETS = _UxGT("Prob Ofsetleri");
+ PROGMEM Language_Str MSG_ZPROBE_XOFFSET = _UxGT("X Prob Ofset");
+ PROGMEM Language_Str MSG_ZPROBE_YOFFSET = _UxGT("Y Prob Ofset");
+ PROGMEM Language_Str MSG_ZPROBE_ZOFFSET = _UxGT("Z Prob Ofset");
PROGMEM Language_Str MSG_BABYSTEP_X = _UxGT("Miniadım X");
PROGMEM Language_Str MSG_BABYSTEP_Y = _UxGT("Miniadım Y");
PROGMEM Language_Str MSG_BABYSTEP_Z = _UxGT("Miniadım Z");
+ PROGMEM Language_Str MSG_BABYSTEP_TOTAL = _UxGT("Toplam");
PROGMEM Language_Str MSG_ENDSTOP_ABORT = _UxGT("Endstop iptal");
PROGMEM Language_Str MSG_HEATING_FAILED_LCD = _UxGT("Isınma başarısız");
PROGMEM Language_Str MSG_HEATING_FAILED_LCD_BED = _UxGT("Yatak Isınma Başrsız");
+ PROGMEM Language_Str MSG_HEATING_FAILED_LCD_CHAMBER = _UxGT("Oda Isıtma Hatası");
PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP = _UxGT("Hata: Sıcaklık Aşımı");
PROGMEM Language_Str MSG_THERMAL_RUNAWAY = _UxGT("TERMAL PROBLEM");
PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED = _UxGT("TABLA TERMAL PROBLEM");
+ PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER = _UxGT("ODA TERMAL PROBLEM");
PROGMEM Language_Str MSG_ERR_MAXTEMP = _UxGT("Hata: MAX.SICAKLIK");
PROGMEM Language_Str MSG_ERR_MINTEMP = _UxGT("Hata: MIN.SICAKLIK");
PROGMEM Language_Str MSG_ERR_MAXTEMP_BED = _UxGT("Hata: MAX.SIC. TABLA");
PROGMEM Language_Str MSG_ERR_MINTEMP_BED = _UxGT("Hata: MIN.SIC. TABLA");
+ PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER = _UxGT("Hata: MAX.SIC ODA");
+ PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER = _UxGT("Hata: MIN.SIC ODA");
PROGMEM Language_Str MSG_ERR_Z_HOMING = _UxGT("Önce XY Sıfırla");
PROGMEM Language_Str MSG_HALTED = _UxGT("YAZICI DURDURULDU");
PROGMEM Language_Str MSG_PLEASE_RESET = _UxGT("Lütfen Resetleyin");
@@ -344,6 +434,8 @@ namespace Language_tr {
PROGMEM Language_Str MSG_COOLING = _UxGT("Soğuyor...");
PROGMEM Language_Str MSG_BED_HEATING = _UxGT("Tabla Isınıyor...");
PROGMEM Language_Str MSG_BED_COOLING = _UxGT("Tabla Soğuyor...");
+ PROGMEM Language_Str MSG_CHAMBER_HEATING = _UxGT("Oda Isınıyor...");
+ PROGMEM Language_Str MSG_CHAMBER_COOLING = _UxGT("Oda Soğuyor...");
PROGMEM Language_Str MSG_DELTA_CALIBRATE = _UxGT("Delta Kalibrasyonu");
PROGMEM Language_Str MSG_DELTA_CALIBRATE_X = _UxGT("Ayarla X");
PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y = _UxGT("Ayarla Y");
@@ -371,7 +463,6 @@ namespace Language_tr {
PROGMEM Language_Str MSG_INFO_PROTOCOL = _UxGT("Protokol");
PROGMEM Language_Str MSG_CASE_LIGHT = _UxGT("Aydınlatmayı Aç");
PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Aydınlatma Parlaklğı");
-
PROGMEM Language_Str MSG_EXPECTED_PRINTER = _UxGT("Yanlış Yazıcı");
#if LCD_WIDTH >= 20
@@ -387,6 +478,7 @@ namespace Language_tr {
PROGMEM Language_Str MSG_INFO_PRINT_LONGEST = _UxGT("En Uzun");
PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT = _UxGT("Filaman");
#endif
+
PROGMEM Language_Str MSG_INFO_MIN_TEMP = _UxGT("Min Sıc.");
PROGMEM Language_Str MSG_INFO_MAX_TEMP = _UxGT("Max Sıc.");
PROGMEM Language_Str MSG_INFO_PSU = _UxGT("Güç Kaynağı");
@@ -395,7 +487,9 @@ namespace Language_tr {
PROGMEM Language_Str MSG_DAC_PERCENT_Y = _UxGT("Y Sürücü %");
PROGMEM Language_Str MSG_DAC_PERCENT_Z = _UxGT("Z Sürücü %");
PROGMEM Language_Str MSG_DAC_PERCENT_E = _UxGT("E Sürücü %");
+ PROGMEM Language_Str MSG_ERROR_TMC = _UxGT("TMC BAĞLANTI HATASI");
PROGMEM Language_Str MSG_DAC_EEPROM_WRITE = _UxGT("DAC EEPROM Yaz");
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER = _UxGT("FILAMAN DEGISTIR");
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE = _UxGT("BASKI DURAKLATILDI");
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD = _UxGT("FILAMAN YüKLE");
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD = _UxGT("FILAMAN ÇIKART");
@@ -404,15 +498,69 @@ namespace Language_tr {
PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Baskıyı sürdür");
PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozul: ");
PROGMEM Language_Str MSG_RUNOUT_SENSOR = _UxGT("Runout Sensörü");
+ PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM = _UxGT("Aşınma Farkı mm");
PROGMEM Language_Str MSG_LCD_HOMING_FAILED = _UxGT("Sıfırlama Başarısız");
PROGMEM Language_Str MSG_LCD_PROBING_FAILED = _UxGT("Probing Başarısız");
PROGMEM Language_Str MSG_M600_TOO_COLD = _UxGT("M600: Çok Soğuk");
+
+ PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER = _UxGT("FILAMAN SEÇ");
+ PROGMEM Language_Str MSG_MMU2_MENU = _UxGT("MMU");
+ PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE = _UxGT("MMU Yaz. Güncelle!");
+ PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING = _UxGT("MMU Dikkat Gerektirir.");
+ PROGMEM Language_Str MSG_MMU2_RESUME = _UxGT("Yaz. Devam Et");
+ PROGMEM Language_Str MSG_MMU2_RESUMING = _UxGT("Sürdürülüyor...");
+ PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT = _UxGT("Filaman Yükle");
+ PROGMEM Language_Str MSG_MMU2_LOAD_ALL = _UxGT("Tümünü Yükle");
+ PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE = _UxGT("Nozula Yükle");
+ PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT = _UxGT("Filaman Çıkart");
+ PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N = _UxGT("Filaman Çıkart ~");
+ PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT = _UxGT("Filamenti Boşalt");
+ PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT = _UxGT("Fil. Yükleniyor %i...");
+ PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT = _UxGT("Fil Çıkartılıyor. ...");
+ PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT = _UxGT("Fil. Boşaltılıyor....");
+ PROGMEM Language_Str MSG_MMU2_ALL = _UxGT("Tümü");
+ PROGMEM Language_Str MSG_MMU2_FILAMENT_N = _UxGT("Filaman ~");
+ PROGMEM Language_Str MSG_MMU2_RESET = _UxGT("MMU Resetle");
+ PROGMEM Language_Str MSG_MMU2_RESETTING = _UxGT("MMU Resetleniyot...");
+ PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER = _UxGT("Kaldır, tıkla");
+
+ PROGMEM Language_Str MSG_MIX = _UxGT("Karışım");
+ PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Bileşen =");
+ PROGMEM Language_Str MSG_MIXER = _UxGT("Karıştırıcı");
+ PROGMEM Language_Str MSG_GRADIENT = _UxGT("Gradyan");
+ PROGMEM Language_Str MSG_FULL_GRADIENT = _UxGT("Tam Gradyan");
+ PROGMEM Language_Str MSG_TOGGLE_MIX = _UxGT("Karışım Geçişi");
+ PROGMEM Language_Str MSG_CYCLE_MIX = _UxGT("Döngü Karışımı");
+ PROGMEM Language_Str MSG_GRADIENT_MIX = _UxGT("Gradyan Karışımı");
+ PROGMEM Language_Str MSG_REVERSE_GRADIENT = _UxGT("Ters Gradyan");
+ PROGMEM Language_Str MSG_ACTIVE_VTOOL = _UxGT("Aktif V-tool");
+ PROGMEM Language_Str MSG_START_VTOOL = _UxGT("Başlat V-tool");
+ PROGMEM Language_Str MSG_END_VTOOL = _UxGT(" Bitir V-tool");
+ PROGMEM Language_Str MSG_GRADIENT_ALIAS = _UxGT("Alias V-tool");
+ PROGMEM Language_Str MSG_RESET_VTOOLS = _UxGT("Reset V-tools");
+ PROGMEM Language_Str MSG_COMMIT_VTOOL = _UxGT("V-tool Karışıö Yap");
+ PROGMEM Language_Str MSG_VTOOLS_RESET = _UxGT("V-tools Resetlendi");
+ PROGMEM Language_Str MSG_START_Z = _UxGT("Başlat Z:");
+ PROGMEM Language_Str MSG_END_Z = _UxGT(" Bitir Z:");
+
+ PROGMEM Language_Str MSG_GAMES = _UxGT("Oyunlar");
+ PROGMEM Language_Str MSG_BRICKOUT = _UxGT("Brickout");
+ PROGMEM Language_Str MSG_INVADERS = _UxGT("Invaders");
+ PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
+ PROGMEM Language_Str MSG_MAZE = _UxGT("Maze");
+
+ #define MSG_1_LINE(A) A "\0" "\0"
+ #define MSG_2_LINE(A,B) A "\0" B "\0"
+ #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
+
//
- // Filament Değiştirme ekranları, 4 satırlı bir ekranda 3 satıra kadar gösterilir
+ // Filament Değişim ekranları 4 satırlı ekranda 3 satıra kadar gösterilir
// ...veya 3 satırlı ekranda 2 satıra kadar
+ //
#if LCD_HEIGHT >= 4
- // Up to 3 lines allowed
+
PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING = _UxGT(MSG_2_LINE("Baskıya devam etmek", "için Butona bas"));
+ PROGMEM Language_Str MSG_PAUSE_PRINT_INIT = _UxGT(MSG_1_LINE("Park Ediliyor..."));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT = _UxGT(MSG_3_LINE("Filaman değişimi", "için başlama", "bekleniyor"));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT = _UxGT(MSG_3_LINE("Filamanı yükle", "ve devam için", "tuşa bas..."));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT = _UxGT(MSG_2_LINE("Nozulü Isıtmak için", "Butona Bas."));
@@ -422,9 +570,9 @@ namespace Language_tr {
PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "için bekle"));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "bitirmek için tıkla"));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME = _UxGT(MSG_2_LINE("Baskının devam ", "etmesi için bekle"));
- #else // LCD_HEIGHT < 4
- // Up to 2 lines allowed
+ #else
PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING = _UxGT(MSG_1_LINE("Sürdürmek İçin Tıkla"));
+ PROGMEM Language_Str MSG_PAUSE_PRINT_INIT = _UxGT(MSG_1_LINE("Park Ediliyor..."));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT = _UxGT(MSG_1_LINE("Lütfen bekleyiniz..."));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT = _UxGT(MSG_1_LINE("Yükle ve bas"));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT = _UxGT(MSG_1_LINE("Isıtmak için Tıkla"));
@@ -434,5 +582,27 @@ namespace Language_tr {
PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE = _UxGT(MSG_1_LINE("Temizleniyor..."));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE = _UxGT(MSG_1_LINE("Bitirmek için Tıkla"));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME = _UxGT(MSG_1_LINE("Sürdürülüyor..."));
- #endif // LCD_HEIGHT < 4
+ #endif
+ PROGMEM Language_Str MSG_TMC_DRIVERS = _UxGT("TMC Sürücüleri");
+ PROGMEM Language_Str MSG_TMC_CURRENT = _UxGT("Sürücü Akımı");
+ PROGMEM Language_Str MSG_TMC_HYBRID_THRS = _UxGT("Hibrit Eşiği");
+ PROGMEM Language_Str MSG_TMC_HOMING_THRS = _UxGT("Sensörsüz Sıfırlama");
+ PROGMEM Language_Str MSG_TMC_STEPPING_MODE = _UxGT("Adım Modu");
+ PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED = _UxGT("StealthChop Aktif");
+ PROGMEM Language_Str MSG_SERVICE_RESET = _UxGT("Resetle");
+ PROGMEM Language_Str MSG_SERVICE_IN = _UxGT(" içinde:");
+ PROGMEM Language_Str MSG_BACKLASH = _UxGT("Ters Tepki");
+ PROGMEM Language_Str MSG_BACKLASH_A = LCD_STR_A;
+ PROGMEM Language_Str MSG_BACKLASH_B = LCD_STR_B;
+ PROGMEM Language_Str MSG_BACKLASH_C = LCD_STR_C;
+ PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Düzeltme");
+ PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Yumuşatma");
}
+
+#if FAN_COUNT == 1
+ #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
+ #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
+#else
+ #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
+ #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
+#endif
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index f7234fb83f..0d473bf0af 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -139,7 +139,7 @@ namespace Language_uk {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("контраст LCD");
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Зберегти в ПЗП");
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Зчитати з ПЗП");
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Відновити базові");
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Відновити базові");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Поновити");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Інформація");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Підготувати");
@@ -157,7 +157,7 @@ namespace Language_uk {
PROGMEM Language_Str MSG_STOPPED = _UxGT("ЗУПИНЕНО. ");
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Зміна волокна");
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Зміна волокна *");
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Старт SD картки");
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Старт SD картки");
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Заміна SD карти");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z дет. не в межах");
PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Само-Тест");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index b5ecd019ac..330db4b690 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -266,7 +266,7 @@ namespace Language_vi {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("Độ tương phản LCD"); // LCD contrast
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("Lưu các thiết lập"); // Store settings
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Tải các cài đặt"); // Load settings
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Khôi phục phòng hư"); // Restore failsafe
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Khôi phục phòng hư"); // Restore Defaults
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Khởi Tạo EEPROM"); // Initialize EEPROM
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Cập Nhật phương tiện"); // Update media
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Bặt Lại Máy In");
@@ -309,7 +309,7 @@ namespace Language_vi {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("Dỡ dây nhựa"); // unload filament
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("Dỡ dây nhựa *"); // unload filament
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("Dỡ tất cả"); // Unload All
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("Khởi tạo phương tiện"); // Init. media
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("Khởi tạo phương tiện"); // Attach media
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("Thay phương tiện"); // Change midea
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("Phát hành phương tiện");
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Đầu Dò Z qua bàn"); // Z Probe past bed
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 4e730924e2..742375c7d1 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -240,7 +240,7 @@ namespace Language_zh_CN {
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD对比度"); //"LCD contrast"
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("保存设置"); //"Store memory"
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("装载设置"); //"Load memory"
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("恢复安全值"); //"Restore failsafe"
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("恢复安全值"); //"Restore Defaults"
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("初始化设置"); // "Initialize EEPROM"
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("刷新"); //"Refresh"
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("信息屏"); //"Info screen"
@@ -274,7 +274,7 @@ namespace Language_zh_CN {
PROGMEM Language_Str MSG_FILAMENTUNLOAD = _UxGT("卸载丝料"); // "Unload filament"
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("卸载丝料 *"); // "Unload filament"
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("卸载全部"); // "Unload All"
- PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("初始化存储卡"); //"Init. SD card"
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("初始化存储卡"); //"Init. SD card"
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("更换存储卡"); //"Change SD card"
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z探针在热床之外"); //"Z probe out. bed" Z probe is not within the physical limits
PROGMEM Language_Str MSG_SKEW_FACTOR = _UxGT("偏斜因数"); // "Skew Factor"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index f260836916..06b19440f2 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,11 +35,23 @@ namespace Language_zh_TW {
PROGMEM Language_Str LANGUAGE = _UxGT("Traditional Chinese");
PROGMEM Language_Str WELCOME_MSG = MACHINE_NAME _UxGT("已就緒."); //" ready."
- PROGMEM Language_Str MSG_BACK = _UxGT("返回"); // ”Back“
+ PROGMEM Language_Str MSG_MARLIN = _UxGT("Marlin");
+ PROGMEM Language_Str MSG_YES = _UxGT("是"); //"YES"
+ PROGMEM Language_Str MSG_NO = _UxGT("否"); //"NO"
+ PROGMEM Language_Str MSG_BACK = _UxGT("返回"); // "Back"
+ PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("正在中止..."); //"Aborting..."
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("記憶卡已插入"); //"Card inserted"
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("記憶卡被拔出"); //"Card removed"
+ PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("記憶卡被釋放"); //"Media Released"
+ PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("等待記憶卡"); //"Waiting for media"
+ PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("記憶卡讀取錯誤"); //"Media read error"
+ PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB裝置已移除"); //"USB device removed"
+ PROGMEM Language_Str MSG_MEDIA_USB_FAILED = _UxGT("USB啟動失敗"); //"USB start failed"
PROGMEM Language_Str MSG_LCD_ENDSTOPS = _UxGT("擋塊"); //"Endstops" // Max length 8 characters
+ PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS = _UxGT("軟體擋塊"); //"Soft Endstops"
PROGMEM Language_Str MSG_MAIN = _UxGT("主選單"); //"Main"
+ PROGMEM Language_Str MSG_ADVANCED_SETTINGS = _UxGT("進階設置"); //"Advanced Settings"
+ PROGMEM Language_Str MSG_CONFIGURATION = _UxGT("設置"); //Configuration
PROGMEM Language_Str MSG_AUTOSTART = _UxGT("自動開始"); //"Autostart"
PROGMEM Language_Str MSG_DISABLE_STEPPERS = _UxGT("關閉步進馬達"); //"Disable steppers"
PROGMEM Language_Str MSG_DEBUG_MENU = _UxGT("除錯選單"); // "Debug Menu"
@@ -48,6 +60,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_AUTO_HOME_X = _UxGT("回X原點"); //"Home X"
PROGMEM Language_Str MSG_AUTO_HOME_Y = _UxGT("回Y原點"); //"Home Y"
PROGMEM Language_Str MSG_AUTO_HOME_Z = _UxGT("回Z原點"); //"Home Z"
+ PROGMEM Language_Str MSG_AUTO_Z_ALIGN = _UxGT("自動Z對齊"); //"Auto Z-Align"
PROGMEM Language_Str MSG_LEVEL_BED_HOMING = _UxGT("平台調平XYZ歸原點"); //"Homing XYZ"
PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("單擊開始熱床調平"); //"Click to Begin"
PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("下個熱床調平點"); //"Next Point"
@@ -70,7 +83,17 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All"
PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed"
PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf"
+ PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定預熱"); //"Preheat Custom"
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降溫"); //"Cooldown"
+ PROGMEM Language_Str MSG_LASER_MENU = _UxGT("激光控制"); //"Laser Control"
+ PROGMEM Language_Str MSG_LASER_OFF = _UxGT("激光 關"); //"Laser Off"
+ PROGMEM Language_Str MSG_LASER_ON = _UxGT("激光 開"); //"Laser On"
+ PROGMEM Language_Str MSG_LASER_POWER = _UxGT("激光電源"); //"Laser Power"
+ PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("主軸控告制"); //"Spindle Control"
+ PROGMEM Language_Str MSG_SPINDLE_OFF = _UxGT("主軸 關"); //"Spindle Off"
+ PROGMEM Language_Str MSG_SPINDLE_ON = _UxGT("主軸 開"); //"Spindle On"
+ PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("主軸電源"); //"Spindle Power"
+ PROGMEM Language_Str MSG_SPINDLE_REVERSE = _UxGT("主軸反轉"); //"Spindle Reverse"
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("電源打開"); //"Switch power on"
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("電源關閉"); //"Switch power off"
PROGMEM Language_Str MSG_EXTRUDE = _UxGT("擠出"); //"Extrude"
@@ -79,15 +102,31 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_BED_LEVELING = _UxGT("調平熱床"); //"Bed leveling"
PROGMEM Language_Str MSG_LEVEL_BED = _UxGT("調平熱床"); //"Level bed"
PROGMEM Language_Str MSG_LEVEL_CORNERS = _UxGT("調平邊角"); // "Level corners"
-
PROGMEM Language_Str MSG_NEXT_CORNER = _UxGT("下個邊角"); // "Next corner"
+ PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("網格編輯器"); //"Mesh Editor"
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("編輯網格"); // "Edit Mesh"
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("網格編輯已停止"); // "Mesh Editing Stopped"
- PROGMEM Language_Str MSG_USER_MENU = _UxGT("客制命令"); // "Custom Commands"
-
+ PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("探測點"); //"Probing Point"
+ PROGMEM Language_Str MSG_MESH_X = _UxGT("索引 X"); //"Index X"
+ PROGMEM Language_Str MSG_MESH_Y = _UxGT("索引 Y"); //"Index Y"
+ PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z 值"); //"Z Value"
+ PROGMEM Language_Str MSG_USER_MENU = _UxGT("自定命令"); // "Custom Commands"
+ PROGMEM Language_Str MSG_M48_TEST = _UxGT("M48 探測測試"); //"M48 Probe Test"
+ PROGMEM Language_Str MSG_M48_POINT = _UxGT("M48 探測點"); //"M48 Point"
+ PROGMEM Language_Str MSG_M48_DEVIATION = _UxGT("偏差"); //"Deviation"
+ PROGMEM Language_Str MSG_IDEX_MENU = _UxGT("IDEX Mode");
+ PROGMEM Language_Str MSG_OFFSETS_MENU = _UxGT("Tool Offsets");
+ PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK = _UxGT("Auto-Park");
+ PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE = _UxGT("Duplication");
+ PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY = _UxGT("Mirrored Copy");
+ PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL = _UxGT("Full Control");
+ PROGMEM Language_Str MSG_HOTEND_OFFSET_X = _UxGT("2nd Nozzle X");
+ PROGMEM Language_Str MSG_HOTEND_OFFSET_Y = _UxGT("2nd Nozzle Y");
+ PROGMEM Language_Str MSG_HOTEND_OFFSET_Z = _UxGT("2nd Nozzle Z");
PROGMEM Language_Str MSG_UBL_DOING_G29 = _UxGT("執行G29"); // "Doing G29"
PROGMEM Language_Str MSG_UBL_TOOLS = _UxGT("UBL工具"); // "UBL Tools"
PROGMEM Language_Str MSG_UBL_LEVEL_BED = _UxGT("統一熱床調平(UBL)"); // "Unified Bed Leveling"
+ PROGMEM Language_Str MSG_LCD_TILTING_MESH = _UxGT("傾斜點"); //"Tilting Point"
PROGMEM Language_Str MSG_UBL_MANUAL_MESH = _UxGT("手工建網"); // "Manually Build Mesh"
PROGMEM Language_Str MSG_UBL_BC_INSERT = _UxGT("放置墊片並測量"); // "Place shim & measure"
PROGMEM Language_Str MSG_UBL_BC_INSERT2 = _UxGT("測量"); // "Measure"
@@ -95,8 +134,10 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT = _UxGT("移動到下一個"); // "Moving to next"
PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH = _UxGT("啟動UBL"); // "Activate UBL"
PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH = _UxGT("關閉UBL"); // "Deactivate UBL"
- PROGMEM Language_Str MSG_UBL_SET_TEMP_BED = _UxGT("設置熱床溫度"); // "Bed Temp"
- PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND = _UxGT("熱端溫度"); // "Hotend Temp"
+ PROGMEM Language_Str MSG_UBL_SET_TEMP_BED = _UxGT("置設熱床溫度"); // "Bed Temp"
+ PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM = _UxGT("置設熱床溫度"); //"Bed Temp")
+ PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND = _UxGT("置設噴嘴溫度"); // "Hotend Temp"
+ PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("熱端溫度"); //"Hotend Temp"
PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("網格編輯"); // "Mesh Edit"
PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("編輯客戶網格"); // "Edit Custom Mesh"
PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("細調網格"); // "Fine Tuning Mesh"
@@ -112,6 +153,13 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh"
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh"
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客戶網格"); // "Validate Custom Mesh"
+ PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 加熱熱床"); //"G26 Heating Bed"
+ PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle"
+ PROGMEM Language_Str MSG_G26_MANUAL_PRIME = _UxGT("手動填裝"); //"Manual priming..."
+ PROGMEM Language_Str MSG_G26_FIXED_LENGTH = _UxGT("固定距離填裝"); //"Fixed Length Prime"
+ PROGMEM Language_Str MSG_G26_PRIME_DONE = _UxGT("完成填裝"); //"Done Priming"
+ PROGMEM Language_Str MSG_G26_CANCELED = _UxGT("G26已取消"); //"G26 Canceled"
+ PROGMEM Language_Str MSG_G26_LEAVING = _UxGT("離開 G26"); //"Leaving G26"
PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("繼續熱床網格"); // "Continue Bed Mesh"
PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("網格調平"); // "Mesh Leveling"
PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING = _UxGT("三點調平"); // "3-Point Leveling"
@@ -141,6 +189,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_UBL_NO_STORAGE = _UxGT("沒有存儲"); // "No storage"
PROGMEM Language_Str MSG_UBL_SAVE_ERROR = _UxGT("錯誤: UBL保存"); // "Err: UBL Save"
PROGMEM Language_Str MSG_UBL_RESTORE_ERROR = _UxGT("錯誤: UBL還原"); // "Err: UBL Restore"
+ PROGMEM Language_Str MSG_UBL_Z_OFFSET = _UxGT("Z-偏移:"); //"Z-Offset: "
PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z偏移已停止"); // "Z-Offset Stopped"
PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU = _UxGT("一步步UBL"); // "Step-By-Step UBL"
PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH = _UxGT("1. 創設冷網格");
@@ -162,7 +211,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_SET_LEDS_INDIGO = _UxGT("青"); // "Indigo")
PROGMEM Language_Str MSG_SET_LEDS_VIOLET = _UxGT("紫"); // "Violet")
PROGMEM Language_Str MSG_SET_LEDS_WHITE = _UxGT("白"); // "White")
- PROGMEM Language_Str MSG_SET_LEDS_DEFAULT = _UxGT("缺省"); // "Default")
+ PROGMEM Language_Str MSG_SET_LEDS_DEFAULT = _UxGT("復歸"); // "Default")
PROGMEM Language_Str MSG_CUSTOM_LEDS = _UxGT("定制燈"); // "Custom Lights")
PROGMEM Language_Str MSG_INTENSITY_R = _UxGT("紅飽和度"); // "Red Intensity")
PROGMEM Language_Str MSG_INTENSITY_G = _UxGT("綠飽和度"); // "Green Intensity")
@@ -176,7 +225,8 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_MOVE_Y = _UxGT("移動Y"); //"Move Y"
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("移動Z"); //"Move Z"
PROGMEM Language_Str MSG_MOVE_E = _UxGT("擠出機"); //"Extruder"
- PROGMEM Language_Str MSG_MOVE_EN = _UxGT("擠出機 *");
+ PROGMEM Language_Str MSG_MOVE_EN = _UxGT("擠出機 *"); //"Extruder *"
+ PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("噴嘴溫度不夠"); //"Hotend too cold"
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("移動 %s mm"); //"Move 0.025mm"
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("移動 0.1 mm"); //"Move 0.1mm"
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("移動 1 mm"); //"Move 1mm"
@@ -186,10 +236,12 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_NOZZLE = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴"); //"Nozzle" 噴嘴
PROGMEM Language_Str MSG_NOZZLE_N = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴 ~");
PROGMEM Language_Str MSG_BED = " " LCD_STR_THERMOMETER _UxGT(" 熱床"); //"Bed"
+ PROGMEM Language_Str MSG_CHAMBER = _UxGT("Enclosure");
PROGMEM Language_Str MSG_FAN_SPEED = _UxGT("風扇速率"); //"Fan speed"
- PROGMEM Language_Str MSG_FAN_SPEED_N = _UxGT("風扇速率 ~");
+ PROGMEM Language_Str MSG_FAN_SPEED_N = _UxGT("風扇速率 =");
+ PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Stored Fan =");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("額外風扇速率"); // "Extra fan speed"
- PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("額外風扇速率 ~");
+ PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("額外風扇速率 =");
PROGMEM Language_Str MSG_FLOW = _UxGT("擠出速率");
PROGMEM Language_Str MSG_FLOW_N = _UxGT("擠出速率 ~"); //"Flow"
PROGMEM Language_Str MSG_CONTROL = _UxGT("控制"); //"Control"
@@ -197,8 +249,20 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_MAX = " " LCD_STR_THERMOMETER _UxGT(" 最大"); //" " LCD_STR_THERMOMETER " Max"
PROGMEM Language_Str MSG_FACTOR = " " LCD_STR_THERMOMETER _UxGT(" 系數"); //" " LCD_STR_THERMOMETER " Fact"
PROGMEM Language_Str MSG_AUTOTEMP = _UxGT("自動控溫"); //"Autotemp"
- PROGMEM Language_Str MSG_LCD_ON = _UxGT("開"); //"On"
- PROGMEM Language_Str MSG_LCD_OFF = _UxGT("關"); //"Off"
+ PROGMEM Language_Str MSG_LCD_ON = _UxGT("開 "); //"On"
+ PROGMEM Language_Str MSG_LCD_OFF = _UxGT("關 "); //"Off"
+ PROGMEM Language_Str MSG_PID_AUTOTUNE = _UxGT("PID Autotune");
+ PROGMEM Language_Str MSG_PID_AUTOTUNE_E = _UxGT("PID Autotune *");
+ PROGMEM Language_Str MSG_PID_P = _UxGT("PID-P"); //"PID-P"
+ PROGMEM Language_Str MSG_PID_P_E = _UxGT("PID-P *");
+ PROGMEM Language_Str MSG_PID_I = _UxGT("PID-I"); //"PID-I"
+ PROGMEM Language_Str MSG_PID_I_E = _UxGT("PID-I *");
+ PROGMEM Language_Str MSG_PID_D = _UxGT("PID-D"); //"PID-D"
+ PROGMEM Language_Str MSG_PID_D_E = _UxGT("PID-D *");
+ PROGMEM Language_Str MSG_PID_C = _UxGT("PID-C"); //"PID-C"
+ PROGMEM Language_Str MSG_PID_C_E = _UxGT("PID-C *");
+ PROGMEM Language_Str MSG_PID_F = _UxGT("PID-F"); //"PID-F"
+ PROGMEM Language_Str MSG_PID_F_E = _UxGT("PID-F *");
PROGMEM Language_Str MSG_SELECT = _UxGT("選擇"); //"Select"
PROGMEM Language_Str MSG_SELECT_E = _UxGT("選擇 *");
PROGMEM Language_Str MSG_ACC = _UxGT("加速度"); //"Accel" acceleration
@@ -207,6 +271,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_VB_JERK = _UxGT("軸抖動速率") LCD_STR_B; //"Vb-jerk"
PROGMEM Language_Str MSG_VC_JERK = _UxGT("軸抖動速率") LCD_STR_C; //"Vc-jerk"
PROGMEM Language_Str MSG_VE_JERK = _UxGT("擠出機抖動速率"); //"Ve-jerk"
+ PROGMEM Language_Str MSG_JUNCTION_DEVIATION = _UxGT("Junction Dev");
PROGMEM Language_Str MSG_VELOCITY = _UxGT("速度"); // "Velocity"
PROGMEM Language_Str MSG_VMAX_A = _UxGT("最大進料速率") LCD_STR_A; //"Vmax " max_feedrate_mm_s
PROGMEM Language_Str MSG_VMAX_B = _UxGT("最大進料速率") LCD_STR_B;
@@ -237,23 +302,45 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_FILAMENT_DIAM_E = _UxGT("絲料直徑 *");
PROGMEM Language_Str MSG_FILAMENT_UNLOAD = _UxGT("卸載 mm"); // "Unload mm"
PROGMEM Language_Str MSG_FILAMENT_LOAD = _UxGT("装載 mm"); // "Load mm"
+ PROGMEM Language_Str MSG_ADVANCE_K = _UxGT("Advance K");
+ PROGMEM Language_Str MSG_ADVANCE_K_E = _UxGT("Advance K *");
PROGMEM Language_Str MSG_CONTRAST = _UxGT("LCD對比度"); //"LCD contrast"
PROGMEM Language_Str MSG_STORE_EEPROM = _UxGT("保存設置"); //"Store memory"
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("載入設置"); //"Load memory"
- PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("恢復安全值"); //"Restore failsafe"
+ PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("恢復安全值"); //"Restore failsafe"
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("初始化設置"); // "Initialize EEPROM"
- PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("刷新"); //"Refresh"
+ PROGMEM Language_Str MSG_ERR_EEPROM_CRC = _UxGT("錯誤: EEPROM CRC"); //"Err: EEPROM CRC"
+ PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("錯誤: EEPROM Index"); //"Err: EEPROM Index"
+ PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("錯誤: EEPROM Version"); //"EEPROM Version"
+ PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("媒體更新"); //"Media Update"
+ PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("重置打印機"); //"Reset Printer
+ PROGMEM Language_Str MSG_REFRESH = _UxGT("刷新"); //"Refresh"
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("資訊界面"); //"Info screen"
PROGMEM Language_Str MSG_PREPARE = _UxGT("準備"); //"Prepare"
PROGMEM Language_Str MSG_TUNE = _UxGT("調整"); //"Tune"
+ PROGMEM Language_Str MSG_START_PRINT = _UxGT("開始列印"); //"Start Print"
+ PROGMEM Language_Str MSG_BUTTON_NEXT = _UxGT("下一個"); //"Next"
+ PROGMEM Language_Str MSG_BUTTON_INIT = _UxGT("初始 "); //"Init"
+ PROGMEM Language_Str MSG_BUTTON_STOP = _UxGT("停止 "); //"Stop"
+ PROGMEM Language_Str MSG_BUTTON_PRINT = _UxGT("列印 "); //"Print"
+ PROGMEM Language_Str MSG_BUTTON_RESET = _UxGT("復歸 "); //"Reset"
+ PROGMEM Language_Str MSG_BUTTON_CANCEL = _UxGT("放棄 "); //"Cancel"
+ PROGMEM Language_Str MSG_BUTTON_DONE = _UxGT("確認 "); //"Done"
+ PROGMEM Language_Str MSG_BUTTON_BACK = _UxGT("返回 "); //"Back"
+ PROGMEM Language_Str MSG_BUTTON_PROCEED = _UxGT("繼續 "); //"Proceed"
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("暫停列印"); //"Pause print"
PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("恢復列印"); //"Resume print"
PROGMEM Language_Str MSG_STOP_PRINT = _UxGT("停止列印"); //"Stop print"
+ PROGMEM Language_Str MSG_PRINTING_OBJECT = _UxGT("列印物件"); //"Printing Object"
+ PROGMEM Language_Str MSG_CANCEL_OBJECT = _UxGT("中止物件"); //"Cancel Object"
+ PROGMEM Language_Str MSG_CANCEL_OBJECT_N = _UxGT("中止物件 ="); //"Cancel Object ="
+ PROGMEM Language_Str MSG_OUTAGE_RECOVERY = _UxGT("中斷恢復"); //"Outage Recovery"
PROGMEM Language_Str MSG_MEDIA_MENU = _UxGT("從記憶卡上列印"); //"Print from SD"
PROGMEM Language_Str MSG_NO_MEDIA = _UxGT("無記憶卡"); //"No SD card"
PROGMEM Language_Str MSG_DWELL = _UxGT("休眠 ..."); //"Sleep..."
PROGMEM Language_Str MSG_USERWAIT = _UxGT("點擊繼續 ..."); //"Click to resume..."
PROGMEM Language_Str MSG_PRINT_PAUSED = _UxGT("列印已暫停"); // "Print paused"
+ PROGMEM Language_Str MSG_PRINTING = _UxGT("列印中 ..."); //"Printing..."
PROGMEM Language_Str MSG_PRINT_ABORTED = _UxGT("已取消列印"); //"Print aborted"
PROGMEM Language_Str MSG_NO_MOVE = _UxGT("無移動"); //"No move."
PROGMEM Language_Str MSG_KILLED = _UxGT("已砍掉"); //"KILLED. "
@@ -267,6 +354,13 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF = _UxGT("回縮恢復後進料速率mm/s"); //"UnRet V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF = _UxGT("S UnRet V"); // "S UnRet V"
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("自動回縮"); //"AutoRetr." autoretract_enabled,
+ PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH = _UxGT("交換長度"); //"Swap Length"
+ PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH = _UxGT("清除長度"); //"Purge Length"
+ PROGMEM Language_Str MSG_TOOL_CHANGE = _UxGT("交換工具"); //"Tool Change"
+ PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT = _UxGT("Z軸提昇"); //"Z Raise"
+ PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD = _UxGT("最高速度"); //"Prime Speed"
+ PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD = _UxGT("收回速度"); //"Retract Speed"
+ PROGMEM Language_Str MSG_NOZZLE_STANDBY = _UxGT("噴嘴待機"); //"Nozzle Standby"
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("更換絲料"); //"Change filament"
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("更換絲料 *");
PROGMEM Language_Str MSG_FILAMENTLOAD = _UxGT("裝載絲料"); // "Load filament"
@@ -275,27 +369,54 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_FILAMENTUNLOAD_E = _UxGT("卸載絲料 *"); // "Unload filament"
PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL = _UxGT("卸載全部"); // "Unload All"
PROGMEM Language_Str MSG_INIT_MEDIA = _UxGT("初始化記憶卡"); //"Init. SD card"
+ PROGMEM Language_Str MSG_ATTACH_MEDIA = _UxGT("連接記憶卡"); //"Attach Media
PROGMEM Language_Str MSG_CHANGE_MEDIA = _UxGT("更換記憶卡"); //"Change SD card"
+ PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("釋放媒體"); //"Release Media"
PROGMEM Language_Str MSG_ZPROBE_OUT = _UxGT("Z探針在熱床之外"); //"Z probe out. bed" Z probe is not within the physical limits
PROGMEM Language_Str MSG_SKEW_FACTOR = _UxGT("偏斜因數"); // "Skew Factor"
PROGMEM Language_Str MSG_BLTOUCH = _UxGT("BLTouch"); // "BLTouch"
PROGMEM Language_Str MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch 自檢"); // "BLTouch Self-Test"
PROGMEM Language_Str MSG_BLTOUCH_RESET = _UxGT("重置BLTouch"); // "Reset BLTouch"
- PROGMEM Language_Str MSG_BLTOUCH_DEPLOY = _UxGT("部署BLTouch"); // "Deploy BLTouch"
PROGMEM Language_Str MSG_BLTOUCH_STOW = _UxGT("裝載BLTouch"); // "Stow BLTouch"
+ PROGMEM Language_Str MSG_BLTOUCH_DEPLOY = _UxGT("部署BLTouch"); // "Deploy BLTouch"
+ PROGMEM Language_Str MSG_BLTOUCH_SW_MODE = _UxGT("Cmd: SW-Mode");
+ PROGMEM Language_Str MSG_BLTOUCH_5V_MODE = _UxGT("Cmd: 5V-Mode");
+ PROGMEM Language_Str MSG_BLTOUCH_OD_MODE = _UxGT("Cmd: OD-Mode");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE = _UxGT("Cmd: Mode-Store");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V = _UxGT("Set BLTouch to 5V");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD = _UxGT("Set BLTouch to OD");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO = _UxGT("Report Drain");
+ PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE = _UxGT("DANGER: Bad settings can cause damage! Proceed anyway?");
+ PROGMEM Language_Str MSG_TOUCHMI_PROBE = _UxGT("TouchMI");
+ PROGMEM Language_Str MSG_TOUCHMI_INIT = _UxGT("Init TouchMI");
+ PROGMEM Language_Str MSG_TOUCHMI_ZTEST = _UxGT("Z Offset Test");
+ PROGMEM Language_Str MSG_TOUCHMI_SAVE = _UxGT("Save");
+ PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Deploy TouchMI");
+ PROGMEM Language_Str MSG_MANUAL_DEPLOY = _UxGT("Deploy Z-Probe");
+ PROGMEM Language_Str MSG_MANUAL_STOW = _UxGT("Stow Z-Probe");
PROGMEM Language_Str MSG_HOME_FIRST = _UxGT("歸位 %s%s%s 先"); //"Home ... first"
- PROGMEM Language_Str MSG_ZPROBE_ZOFFSET = _UxGT("Z偏移"); //"Z Offset"
+ PROGMEM Language_Str MSG_ZPROBE_OFFSETS = _UxGT("探針偏移"); //Probe Offsets
+ PROGMEM Language_Str MSG_ZPROBE_XOFFSET = _UxGT("探針X偏移量"); //Probe X Offset
+ PROGMEM Language_Str MSG_ZPROBE_YOFFSET = _UxGT("探針Y偏移量"); //Probe Y Offset
+ PROGMEM Language_Str MSG_ZPROBE_ZOFFSET = _UxGT("探針Z偏移量"); //Probe Z Offset
PROGMEM Language_Str MSG_BABYSTEP_X = _UxGT("微量調整X軸"); //"Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
PROGMEM Language_Str MSG_BABYSTEP_Y = _UxGT("微量調整Y軸"); //"Babystep Y"
PROGMEM Language_Str MSG_BABYSTEP_Z = _UxGT("微量調整Z軸"); //"Babystep Z"
+ PROGMEM Language_Str MSG_BABYSTEP_TOTAL = _UxGT("總計"); //"Total"
PROGMEM Language_Str MSG_ENDSTOP_ABORT = _UxGT("擋塊終止"); //"Endstop abort"
PROGMEM Language_Str MSG_HEATING_FAILED_LCD = _UxGT("加熱失敗"); //"Heating failed"
- PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP = _UxGT("錯誤：REDUNDANT TEMP"); //"Err: REDUNDANT TEMP"
- PROGMEM Language_Str MSG_THERMAL_RUNAWAY = _UxGT("溫控失控"); //"THERMAL RUNAWAY"
+ PROGMEM Language_Str MSG_HEATING_FAILED_LCD_BED = _UxGT("熱床加熱失敗"); //"Bed Heating Failed"
+ PROGMEM Language_Str MSG_HEATING_FAILED_LCD_CHAMBER = _UxGT("機箱加熱失敗"); //"Chamber Heating Fail"
+ PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP = _UxGT("錯誤：冗餘溫度"); //"Err: REDUNDANT TEMP"
+ PROGMEM Language_Str MSG_THERMAL_RUNAWAY = _UxGT("溫度失控"); //"THERMAL RUNAWAY"
+ PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED = _UxGT("熱床溫度失控"); //"BED THERMAL RUNAWAY"
+ PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER = _UxGT("機箱溫度失控"); //"CHAMBER T. RUNAWAY"
PROGMEM Language_Str MSG_ERR_MAXTEMP = _UxGT("錯誤：最高溫度"); //"Err: MAXTEMP"
PROGMEM Language_Str MSG_ERR_MINTEMP = _UxGT("錯誤：最低溫度"); //"Err: MINTEMP"
PROGMEM Language_Str MSG_ERR_MAXTEMP_BED = _UxGT("錯誤：最高熱床溫度"); //"Err: MAXTEMP BED"
PROGMEM Language_Str MSG_ERR_MINTEMP_BED = _UxGT("錯誤：最低熱床溫度"); //"Err: MINTEMP BED"
+ PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER = _UxGT("錯誤：最高機箱溫度"); //"Err: MAXTEMP CHAMBER"
+ PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER = _UxGT("錯誤：最低機箱溫度"); //"Err: MINTEMP CHAMBER"
PROGMEM Language_Str MSG_ERR_Z_HOMING = _UxGT("歸位 XY 先"); //"Home XY First"
PROGMEM Language_Str MSG_HALTED = _UxGT("印表機停機"); //"PRINTER HALTED"
PROGMEM Language_Str MSG_PLEASE_RESET = _UxGT("請重置"); //"Please reset"
@@ -303,7 +424,11 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_SHORT_HOUR = _UxGT("時"); //"h" // One character only
PROGMEM Language_Str MSG_SHORT_MINUTE = _UxGT("分"); //"m" // One character only
PROGMEM Language_Str MSG_HEATING = _UxGT("加熱中 ..."); //"Heating..."
+ PROGMEM Language_Str MSG_COOLING = _UxGT("冷卻中 ..."); //"Cooling..."
PROGMEM Language_Str MSG_BED_HEATING = _UxGT("加熱熱床中 ..."); //"Bed Heating..."
+ PROGMEM Language_Str MSG_BED_COOLING = _UxGT("熱床冷卻中 ..."); //"Bed Cooling..."
+ PROGMEM Language_Str MSG_CHAMBER_HEATING = _UxGT("機箱加熱中 .."); //"Chamber Heating..."
+ PROGMEM Language_Str MSG_CHAMBER_COOLING = _UxGT("機箱冷卻中 ..."); //Chamber Cooling...
PROGMEM Language_Str MSG_DELTA_CALIBRATE = _UxGT("⊿校準"); //"Delta Calibration"
PROGMEM Language_Str MSG_DELTA_CALIBRATE_X = _UxGT("⊿校準X"); //"Calibrate X"
PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y = _UxGT("⊿校準Y"); //"Calibrate Y"
@@ -312,6 +437,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_DELTA_SETTINGS = _UxGT("⊿設置"); // "Delta Settings"
PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE = _UxGT("⊿自動校準"); // "Auto Calibration"
PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE = _UxGT("設置⊿高度"); // "Set Delta Height"
+ PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE = _UxGT("Z偏移");
PROGMEM Language_Str MSG_DELTA_DIAG_ROD = _UxGT("⊿斜柱"); // "Diag Rod"
PROGMEM Language_Str MSG_DELTA_HEIGHT = _UxGT("⊿高度"); // "Height"
PROGMEM Language_Str MSG_DELTA_RADIUS = _UxGT("⊿半徑"); // "Radius"
@@ -319,18 +445,20 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_INFO_PRINTER_MENU = _UxGT("印表機訊息"); //"Printer Info"
PROGMEM Language_Str MSG_3POINT_LEVELING = _UxGT("三點調平"); // "3-Point Leveling"
PROGMEM Language_Str MSG_LINEAR_LEVELING = _UxGT("線性調平"); // "Linear Leveling"
- PROGMEM Language_Str MSG_BILINEAR_LEVELING = _UxGT("雙線性調平"); // "Bilinear Leveling"
+ PROGMEM Language_Str MSG_BILINEAR_LEVELING = _UxGT(" 雙線性調平"); // "Bilinear Leveling"
PROGMEM Language_Str MSG_UBL_LEVELING = _UxGT("統一熱床調平(UBL)"); // "Unified Bed Leveling"
PROGMEM Language_Str MSG_MESH_LEVELING = _UxGT("網格調平"); // "Mesh Leveling"
PROGMEM Language_Str MSG_INFO_STATS_MENU = _UxGT("印表機統計"); //"Printer Stats"
PROGMEM Language_Str MSG_INFO_BOARD_MENU = _UxGT("主板訊息"); //"Board Info"
PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU = _UxGT("溫度計"); //"Thermistors"
- PROGMEM Language_Str MSG_INFO_EXTRUDERS = _UxGT("擠出機"); //"Extruders"
+ PROGMEM Language_Str MSG_INFO_EXTRUDERS = _UxGT(" 擠出機"); //"Extruders"
PROGMEM Language_Str MSG_INFO_BAUDRATE = _UxGT("傳輸率"); //"Baud"
PROGMEM Language_Str MSG_INFO_PROTOCOL = _UxGT("協議"); //"Protocol"
+ PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF = _UxGT("監測溫度失控:關"); //"Runaway Watch: OFF"
+ PROGMEM Language_Str MSG_INFO_RUNAWAY_ON = _UxGT("監測溫度失控:開"); //"Runaway Watch: ON"
+
PROGMEM Language_Str MSG_CASE_LIGHT = _UxGT("外殼燈"); // "Case light"
PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("燈亮度"); // "Light BRIGHTNESS"
-
PROGMEM Language_Str MSG_EXPECTED_PRINTER = _UxGT("打印機不正確"); // "The printer is incorrect"
#if LCD_WIDTH >= 20
@@ -351,11 +479,14 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_INFO_MAX_TEMP = _UxGT("最高溫度"); //"Max Temp"
PROGMEM Language_Str MSG_INFO_PSU = _UxGT("電源供應"); //"Power Supply"
PROGMEM Language_Str MSG_DRIVE_STRENGTH = _UxGT("驅動力度"); // "Drive Strength"
- PROGMEM Language_Str MSG_DAC_PERCENT_X = _UxGT("X 驅動 %"); // "X Driver %"
- PROGMEM Language_Str MSG_DAC_PERCENT_Y = _UxGT("Y 驅動 %"); // "Y Driver %"
- PROGMEM Language_Str MSG_DAC_PERCENT_Z = _UxGT("Z 驅動 %"); // "Z Driver %"
- PROGMEM Language_Str MSG_DAC_PERCENT_E = _UxGT("E 驅動 %"); // "E Driver %"
+ PROGMEM Language_Str MSG_DAC_PERCENT = _UxGT("驅動 %"); // "Driver %"
+ PROGMEM Language_Str MSG_DAC_PERCENT_X = _UxGT("X 驅動 %"); //X Driver %
+ PROGMEM Language_Str MSG_DAC_PERCENT_Y = _UxGT("Y 驅動 %"); //Y Driver %
+ PROGMEM Language_Str MSG_DAC_PERCENT_Z = _UxGT("Z 驅動 %"); //Z Driver %
+ PROGMEM Language_Str MSG_DAC_PERCENT_E = _UxGT("E 驅動 %"); //E Driver %
+ PROGMEM Language_Str MSG_ERROR_TMC = _UxGT("TMC連接錯誤"); //"TMC CONNECTION ERROR"
PROGMEM Language_Str MSG_DAC_EEPROM_WRITE = _UxGT("保存驅動設置"); // "DAC EEPROM Write"
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER = _UxGT("更換絲料"); //"FILAMENT CHANGE"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE = _UxGT("列印已暫停"); // "PRINT PAUSED"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD = _UxGT("裝載絲料"); // "LOAD FILAMENT"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD = _UxGT("卸載絲料"); // "UNLOAD FILAMENT"
@@ -363,26 +494,112 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("清除更多"); // "Purge more"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("恢復列印"); //"Resume print"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" 噴嘴: "); // " Nozzle: "
+ PROGMEM Language_Str MSG_RUNOUT_SENSOR = _UxGT("斷絲偵測"); //"Runout Sensor"
+ PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM = _UxGT("絲距離mm"); //"Runout Dist mm"
PROGMEM Language_Str MSG_LCD_HOMING_FAILED = _UxGT("歸原位失敗"); // "Homing failed"
PROGMEM Language_Str MSG_LCD_PROBING_FAILED = _UxGT("探針探測失敗"); // "Probing failed"
PROGMEM Language_Str MSG_M600_TOO_COLD = _UxGT("M600: 太冷"); // "M600: Too cold"
+ PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER = _UxGT("CHOOSE FILAMENT");
+ PROGMEM Language_Str MSG_MMU2_MENU = _UxGT("MMU");
+ PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE = _UxGT("Update MMU Firmware!");
+ PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING = _UxGT("MMU Needs Attention.");
+ PROGMEM Language_Str MSG_MMU2_RESUME = _UxGT("Resume Print");
+ PROGMEM Language_Str MSG_MMU2_RESUMING = _UxGT("Resuming...");
+ PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT = _UxGT("Load Filament");
+ PROGMEM Language_Str MSG_MMU2_LOAD_ALL = _UxGT("Load All");
+ PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE = _UxGT("Load to Nozzle");
+ PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT = _UxGT("Eject Filament");
+ PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N = _UxGT("Eject Filament ~");
+ PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT = _UxGT("Unload Filament");
+ PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT = _UxGT("Loading Fil. %i...");
+ PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT = _UxGT("Ejecting Fil. ...");
+ PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT = _UxGT("Unloading Fil....");
+ PROGMEM Language_Str MSG_MMU2_ALL = _UxGT("All");
+ PROGMEM Language_Str MSG_MMU2_FILAMENT_N = _UxGT("Filament ~");
+ PROGMEM Language_Str MSG_MMU2_RESET = _UxGT("Reset MMU");
+ PROGMEM Language_Str MSG_MMU2_RESETTING = _UxGT("Resetting MMU...");
+ PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER = _UxGT("Remove, click");
+
+ PROGMEM Language_Str MSG_MIX = _UxGT("Mix");
+ PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Component =");
+ PROGMEM Language_Str MSG_MIXER = _UxGT("Mixer");
+ PROGMEM Language_Str MSG_GRADIENT = _UxGT("Gradient");
+ PROGMEM Language_Str MSG_FULL_GRADIENT = _UxGT("Full Gradient");
+ PROGMEM Language_Str MSG_TOGGLE_MIX = _UxGT("Toggle Mix");
+ PROGMEM Language_Str MSG_CYCLE_MIX = _UxGT("Cycle Mix");
+ PROGMEM Language_Str MSG_GRADIENT_MIX = _UxGT("Gradient Mix");
+ PROGMEM Language_Str MSG_REVERSE_GRADIENT = _UxGT("Reverse Gradient");
+ PROGMEM Language_Str MSG_ACTIVE_VTOOL = _UxGT("Active V-tool");
+ PROGMEM Language_Str MSG_START_VTOOL = _UxGT("Start V-tool");
+ PROGMEM Language_Str MSG_END_VTOOL = _UxGT(" End V-tool");
+ PROGMEM Language_Str MSG_GRADIENT_ALIAS = _UxGT("Alias V-tool");
+ PROGMEM Language_Str MSG_RESET_VTOOLS = _UxGT("Reset V-tools");
+ PROGMEM Language_Str MSG_COMMIT_VTOOL = _UxGT("Commit V-tool Mix");
+ PROGMEM Language_Str MSG_VTOOLS_RESET = _UxGT("V-tools Were Reset");
+ PROGMEM Language_Str MSG_START_Z = _UxGT("Start Z:");
+ PROGMEM Language_Str MSG_END_Z = _UxGT(" End Z:");
+
+ PROGMEM Language_Str MSG_GAMES = _UxGT("Games");
+ PROGMEM Language_Str MSG_BRICKOUT = _UxGT("Brickout");
+ PROGMEM Language_Str MSG_INVADERS = _UxGT("Invaders");
+ PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
+ PROGMEM Language_Str MSG_MAZE = _UxGT("Maze");
+
+ #define MSG_1_LINE(A) A "\0" "\0"
+ #define MSG_2_LINE(A,B) A "\0" B "\0"
+ #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
+
+ //
+ // Filament Change screens show up to 3 lines on a 4-line display
+ // ...or up to 2 lines on a 3-line display
+ //
#if LCD_HEIGHT >= 4
+ PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING = _UxGT(MSG_2_LINE("按下按鈕", "恢復列印")); //"Press Button to resume print"
+ PROGMEM Language_Str MSG_PAUSE_PRINT_INIT = _UxGT(MSG_1_LINE("停車中 ...")); //"Parking..."
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT = _UxGT(MSG_3_LINE("等待開始", "絲料", "變更")); //"Wait for start of the filament change"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD = _UxGT(MSG_2_LINE("等待", "卸下絲料")); //"Wait for filament unload"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT = _UxGT(MSG_3_LINE("插入絲料", "並按鍵", "繼續 ...")); //"Insert filament and press button to continue..."
- PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT = _UxGT(MSG_2_LINE("按下按鈕來", "加熱噴嘴.")); // "Press button to heat nozzle."
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT = _UxGT(MSG_2_LINE("按下按鈕", "加熱噴嘴.")); // "Press button to heat nozzle."
PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING = _UxGT(MSG_2_LINE("加熱噴嘴", "請等待 ...")); // "Heating nozzle Please wait..."
PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD = _UxGT(MSG_2_LINE("等待", "進料")); //"Wait for filament load"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE = _UxGT(MSG_2_LINE("等待", "絲料清除")); // "Wait for filament purge"
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE = _UxGT(MSG_2_LINE("按下完成","絲料清除")); //"Press button to filament purge"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME = _UxGT(MSG_2_LINE("等待列印", "恢復")); //"Wait for print to resume"
#else // LCD_HEIGHT < 4
+ PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING = _UxGT(MSG_1_LINE("按下繼續..")); //"Click to continue"
+ PROGMEM Language_Str MSG_PAUSE_PRINT_INIT = _UxGT(MSG_1_LINE("停車中 ...")); //"Parking..."
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT = _UxGT(MSG_1_LINE("請等待 ...")); //"Please wait..."
- PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD = _UxGT(MSG_1_LINE("退出中 ...")); //"Ejecting..."
PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT = _UxGT(MSG_1_LINE("插入並點擊")); //"Insert and Click"
- PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING = _UxGT(MSG_1_LINE("加熱中 ...")); // "Heating..."
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT = _UxGT(MSG_1_LINE("按下加熱..")); //"Click to heat"
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING = _UxGT(MSG_1_LINE("加熱中 ...")); //"Heating..."
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD = _UxGT(MSG_1_LINE("退出中 ...")); //"Ejecting..."
PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD = _UxGT(MSG_1_LINE("載入中 ...")); //"Loading..."
- PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE = _UxGT(MSG_1_LINE("清除中 ...")); // "Purging..."
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE = _UxGT(MSG_1_LINE("清除中 ...")); //"Purging..."
+ PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE = _UxGT(MSG_1_LINE("按下完成..")); //"Click to finish"
PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME = _UxGT(MSG_1_LINE("恢復中 ...")); //"Resuming..."
#endif // LCD_HEIGHT < 4
+
+ PROGMEM Language_Str MSG_TMC_DRIVERS = _UxGT("TMC Drivers");
+ PROGMEM Language_Str MSG_TMC_CURRENT = _UxGT("Driver Current");
+ PROGMEM Language_Str MSG_TMC_HYBRID_THRS = _UxGT("Hybrid Threshold");
+ PROGMEM Language_Str MSG_TMC_HOMING_THRS = _UxGT("Sensorless Homing");
+ PROGMEM Language_Str MSG_TMC_STEPPING_MODE = _UxGT("Stepping Mode");
+ PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED = _UxGT("StealthChop Enabled");
+ PROGMEM Language_Str MSG_SERVICE_RESET = _UxGT("Reset");
+ PROGMEM Language_Str MSG_SERVICE_IN = _UxGT(" in:");
+ PROGMEM Language_Str MSG_BACKLASH = _UxGT("Backlash");
+ PROGMEM Language_Str MSG_BACKLASH_A = LCD_STR_A;
+ PROGMEM Language_Str MSG_BACKLASH_B = LCD_STR_B;
+ PROGMEM Language_Str MSG_BACKLASH_C = LCD_STR_C;
+ PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Correction");
+ PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Smoothing");
}
+
+#if FAN_COUNT == 1
+ #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
+ #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
+#else
+ #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
+ #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
+#endif
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index 9f28e14080..b19ab38edb 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/brickout.cpp b/Marlin/src/lcd/menu/game/brickout.cpp
index 921a6f6e30..6fe0a31ffa 100644
--- a/Marlin/src/lcd/menu/game/brickout.cpp
+++ b/Marlin/src/lcd/menu/game/brickout.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -140,13 +140,13 @@ void BrickoutGame::game_screen() {
// Draw bricks
if (PAGE_CONTAINS(BRICK_TOP, BRICK_BOT)) {
- for (uint8_t y = 0; y < BRICK_ROWS; ++y) {
+ LOOP_L_N(y, BRICK_ROWS) {
const uint8_t yy = y * BRICK_H + BRICK_TOP;
if (PAGE_CONTAINS(yy, yy + BRICK_H - 1)) {
- for (uint8_t x = 0; x < BRICK_COLS; ++x) {
+ LOOP_L_N(x, BRICK_COLS) {
if (TEST(bdat.bricks[y], x)) {
const uint8_t xx = x * BRICK_W;
- for (uint8_t v = 0; v < BRICK_H - 1; ++v)
+ LOOP_L_N(v, BRICK_H - 1)
if (PAGE_CONTAINS(yy + v, yy + v))
u8g.drawHLine(xx, yy + v, BRICK_W - 1);
}
diff --git a/Marlin/src/lcd/menu/game/brickout.h b/Marlin/src/lcd/menu/game/brickout.h
index 9037e53830..2d23bf4c6e 100644
--- a/Marlin/src/lcd/menu/game/brickout.h
+++ b/Marlin/src/lcd/menu/game/brickout.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/game.cpp b/Marlin/src/lcd/menu/game/game.cpp
index 6f8d247692..18fb3c63dc 100644
--- a/Marlin/src/lcd/menu/game/game.cpp
+++ b/Marlin/src/lcd/menu/game/game.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/game.h b/Marlin/src/lcd/menu/game/game.h
index f168ccec79..3ebee563de 100644
--- a/Marlin/src/lcd/menu/game/game.h
+++ b/Marlin/src/lcd/menu/game/game.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/invaders.cpp b/Marlin/src/lcd/menu/game/invaders.cpp
index 4517c5f43c..31df47ce7f 100644
--- a/Marlin/src/lcd/menu/game/invaders.cpp
+++ b/Marlin/src/lcd/menu/game/invaders.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -170,7 +170,7 @@ inline void update_invader_data() {
uint8_t m = idat.bugs[y];
if (m) idat.botmost = y + 1;
inv_mask |= m;
- for (uint8_t x = 0; x < INVADER_COLS; ++x)
+ LOOP_L_N(x, INVADER_COLS)
if (TEST(m, x)) idat.shooters[sc++] = (y << 4) | x;
}
idat.leftmost = 0;
@@ -371,11 +371,11 @@ void InvadersGame::game_screen() {
// Draw invaders
if (PAGE_CONTAINS(idat.pos.y, idat.pos.y + idat.botmost * (INVADER_ROW_H) - 2 - 1)) {
int8_t yy = idat.pos.y;
- for (uint8_t y = 0; y < INVADER_ROWS; ++y) {
+ LOOP_L_N(y, INVADER_ROWS) {
const uint8_t type = inv_type[y];
if (PAGE_CONTAINS(yy, yy + INVADER_H - 1)) {
int8_t xx = idat.pos.x;
- for (uint8_t x = 0; x < INVADER_COLS; ++x) {
+ LOOP_L_N(x, INVADER_COLS) {
if (TEST(idat.bugs[y], x))
u8g.drawBitmapP(xx, yy, 2, INVADER_H, invader[type][idat.game_blink]);
xx += INVADER_COL_W;
diff --git a/Marlin/src/lcd/menu/game/invaders.h b/Marlin/src/lcd/menu/game/invaders.h
index f04e91da64..d2b8790ff0 100644
--- a/Marlin/src/lcd/menu/game/invaders.h
+++ b/Marlin/src/lcd/menu/game/invaders.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/maze.cpp b/Marlin/src/lcd/menu/game/maze.cpp
index 13784f0d76..d92f14ecd8 100644
--- a/Marlin/src/lcd/menu/game/maze.cpp
+++ b/Marlin/src/lcd/menu/game/maze.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -83,7 +83,7 @@ void MazeGame::game_screen() {
if (PAGE_UNDER(HEADER_H)) lcd_put_int(0, HEADER_H - 1, score);
// Draw the maze
- // for (uint8_t n = 0; n < head_ind; ++n) {
+ // LOOP_L_N(n, head_ind) {
// const pos_t &p = maze_walls[n], &q = maze_walls[n + 1];
// if (p.x == q.x) {
// const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
diff --git a/Marlin/src/lcd/menu/game/maze.h b/Marlin/src/lcd/menu/game/maze.h
index 5d7fff66af..7917bab0d8 100644
--- a/Marlin/src/lcd/menu/game/maze.h
+++ b/Marlin/src/lcd/menu/game/maze.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/snake.cpp b/Marlin/src/lcd/menu/game/snake.cpp
index 713c2ddd74..d6af224553 100644
--- a/Marlin/src/lcd/menu/game/snake.cpp
+++ b/Marlin/src/lcd/menu/game/snake.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -84,14 +84,14 @@ void shorten_tail() {
}
if (shift) {
sdat.head_ind--;
- for (uint8_t i = 0; i <= sdat.head_ind; ++i)
+ LOOP_LE_N(i, sdat.head_ind)
sdat.snake_tail[i] = sdat.snake_tail[i + 1];
}
}
// The food is on a line
inline bool food_on_line() {
- for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+ LOOP_L_N(n, sdat.head_ind) {
pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
if (p.x == q.x) {
if ((sdat.foodx == p.x - 1 || sdat.foodx == p.x) && WITHIN(sdat.foody, _MIN(p.y, q.y), _MAX(p.y, q.y)))
@@ -151,7 +151,7 @@ bool snake_overlap() {
// VERTICAL head segment?
if (h1.x == h2.x) {
// Loop from oldest to segment two away from head
- for (uint8_t n = 0; n < sdat.head_ind - 2; ++n) {
+ LOOP_L_N(n, sdat.head_ind - 2) {
// Segment p to q
const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
if (p.x != q.x) {
@@ -163,7 +163,7 @@ bool snake_overlap() {
}
else {
// Loop from oldest to segment two away from head
- for (uint8_t n = 0; n < sdat.head_ind - 2; ++n) {
+ LOOP_L_N(n, sdat.head_ind - 2) {
// Segment p to q
const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
if (p.y != q.y) {
@@ -240,7 +240,7 @@ void SnakeGame::game_screen() {
#if SNAKE_WH < 2
// At this scale just draw a line
- for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+ LOOP_L_N(n, sdat.head_ind) {
const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
if (p.x == q.x) {
const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
@@ -256,7 +256,7 @@ void SnakeGame::game_screen() {
#elif SNAKE_WH == 2
// At this scale draw two lines
- for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+ LOOP_L_N(n, sdat.head_ind) {
const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
if (p.x == q.x) {
const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
@@ -275,7 +275,7 @@ void SnakeGame::game_screen() {
#else
// Draw a series of boxes
- for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+ LOOP_L_N(n, sdat.head_ind) {
const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
if (p.x == q.x) {
const int8_t y1 = _MIN(p.y, q.y), y2 = _MAX(p.y, q.y);
diff --git a/Marlin/src/lcd/menu/game/snake.h b/Marlin/src/lcd/menu/game/snake.h
index ec8524f2ef..c846d56466 100644
--- a/Marlin/src/lcd/menu/game/snake.h
+++ b/Marlin/src/lcd/menu/game/snake.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/types.h b/Marlin/src/lcd/menu/game/types.h
index 872d034dca..16ff8d82b6 100644
--- a/Marlin/src/lcd/menu/game/types.h
+++ b/Marlin/src/lcd/menu/game/types.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 2bae1258e9..501120252a 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -127,7 +127,7 @@ void MenuItem_gcode::action(PGM_P const, PGM_P const pgcode) { queue.inject_P(pg
*
* The prerequisite is that in the header the type was already declared:
*
- * DEFINE_MENU_EDIT_ITEM_TYPE(int16_t, int3, i16tostr3, 1)
+ * DEFINE_MENU_EDIT_ITEM_TYPE(int3, int16_t, i16tostr3rj, 1)
*
* For example, DEFINE_MENU_EDIT_ITEM(int3) expands into:
*
@@ -193,7 +193,7 @@ DEFINE_MENU_EDIT_ITEM(uint16_3); // 123 right-justified
DEFINE_MENU_EDIT_ITEM(uint16_4); // 1234 right-justified
DEFINE_MENU_EDIT_ITEM(uint16_5); // 12345 right-justified
DEFINE_MENU_EDIT_ITEM(float3); // 123 right-justified
-DEFINE_MENU_EDIT_ITEM(float52); // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM(float42_52); // _2.34, 12.34, -2.34 or 123.45, -23.45
DEFINE_MENU_EDIT_ITEM(float43); // 1.234
DEFINE_MENU_EDIT_ITEM(float5); // 12345 right-justified
DEFINE_MENU_EDIT_ITEM(float5_25); // 12345 right-justified (25 increment)
@@ -324,9 +324,9 @@ void MarlinUI::_synchronize() {
if (should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, sync_message);
if (no_reentry) return;
// Make this the current handler till all moves are done
- no_reentry = true;
const screenFunc_t old_screen = currentScreen;
goto_screen(_synchronize);
+ no_reentry = true;
planner.synchronize(); // idle() is called until moves complete
no_reentry = false;
goto_screen(old_screen);
@@ -384,7 +384,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
void line_to_z(const float &z) {
current_position.z = z;
- line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m.z));
+ line_to_current_position(manual_feedrate_mm_s.z);
}
#endif
@@ -396,17 +396,13 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
void lcd_babystep_zoffset() {
if (ui.use_click()) return ui.goto_previous_screen_no_defer();
ui.defer_status_screen();
- #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
- const bool do_probe = (active_extruder == 0);
- #else
- constexpr bool do_probe = true;
- #endif
+ const bool do_probe = DISABLED(BABYSTEP_HOTEND_Z_OFFSET) || active_extruder == 0;
if (ui.encoderPosition) {
const int16_t babystep_increment = int16_t(ui.encoderPosition) * (BABYSTEP_MULTIPLICATOR_Z);
ui.encoderPosition = 0;
const float diff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
- new_probe_offset = probe_offset.z + diff,
+ new_probe_offset = probe.offset.z + diff,
new_offs =
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
do_probe ? new_probe_offset : hotend_offset[active_extruder].z - diff
@@ -418,7 +414,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
babystep.add_steps(Z_AXIS, babystep_increment);
- if (do_probe) probe_offset.z = new_offs;
+ if (do_probe) probe.offset.z = new_offs;
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
else hotend_offset[active_extruder].z = new_offs;
#endif
@@ -429,14 +425,14 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
if (ui.should_draw()) {
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
if (!do_probe)
- MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), LCD_Z_OFFSET_FUNC(hotend_offset[active_extruder].z));
- else
- #endif
- MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), LCD_Z_OFFSET_FUNC(probe_offset.z));
-
- #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
- if (do_probe) _lcd_zoffset_overlay_gfx(probe_offset.z);
+ MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), ftostr54sign(hotend_offset[active_extruder].z));
#endif
+ if (do_probe) {
+ MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z));
+ #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
+ _lcd_zoffset_overlay_gfx(probe.offset.z);
+ #endif
+ }
}
}
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 5c7fc77306..e9ec3b2496 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -47,12 +47,18 @@ typedef void (*selectFunc_t)();
void _lcd_zoffset_overlay_gfx(const float zvalue);
#endif
-#if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
- #define LCD_Z_OFFSET_FUNC(N) ftostr54sign(N)
- #define LCD_Z_OFFSET_TYPE float43
-#else
- #define LCD_Z_OFFSET_FUNC(N) ftostr52sign(N)
- #define LCD_Z_OFFSET_TYPE float52
+#if HAS_BED_PROBE
+ #if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+ #define LCD_Z_OFFSET_TYPE float43 // Values from -9.000 to +9.000
+ #else
+ #define LCD_Z_OFFSET_TYPE float42_52 // Values from -99.99 to 99.99
+ #endif
+#endif
+
+#if ENABLED(BABYSTEP_ZPROBE_OFFSET) && Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+ #define BABYSTEP_TO_STR(N) ftostr43sign(N)
+#elif ENABLED(BABYSTEPPING)
+ #define BABYSTEP_TO_STR(N) ftostr53sign(N)
#endif
////////////////////////////////////////////
@@ -234,10 +240,10 @@ template
class TMenuEditItem : MenuEditItemBase {
private:
typedef typename NAME::type_t type_t;
- static inline float unscale(const float value) { return value * (1.0f / NAME::scale); }
- static inline float scale(const float value) { return value * NAME::scale; }
- static void load(void *ptr, const int32_t value) { *((type_t*)ptr) = unscale(value); }
+ static inline float scale(const float value) { return NAME::scale(value); }
+ static inline float unscale(const float value) { return NAME::unscale(value); }
static const char* to_string(const int32_t value) { return NAME::strfunc(unscale(value)); }
+ static void load(void *ptr, const int32_t value) { *((type_t*)ptr) = unscale(value); }
public:
FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, type_t * const data, ...) {
MenuEditItemBase::draw(sel, row, pstr, NAME::strfunc(*(data)));
@@ -266,34 +272,37 @@ class TMenuEditItem : MenuEditItemBase {
// Provide a set of Edit Item Types which encompass a primitive
// type, a string function, and a scale factor for edit and display.
// These items call the Edit Item draw method passing the prepared string.
-#define DEFINE_MENU_EDIT_ITEM_TYPE(TYPE, NAME, STRFUNC, SCALE) \
+#define __DOFIXfloat PROBE()
+#define _DOFIX(TYPE,V) TYPE(TERN(IS_PROBE(__DOFIX##TYPE),FIXFLOAT(V),(V)))
+#define DEFINE_MENU_EDIT_ITEM_TYPE(NAME, TYPE, STRFUNC, SCALE, V...) \
struct MenuEditItemInfo_##NAME { \
typedef TYPE type_t; \
- static constexpr float scale = SCALE; \
- static inline const char* strfunc(const float value) { return STRFUNC((TYPE)value); } \
+ static inline float scale(const float value) { return value * (SCALE) + (V+0); } \
+ static inline float unscale(const float value) { return value / (SCALE) + (V+0); } \
+ static inline const char* strfunc(const float value) { return STRFUNC(_DOFIX(TYPE,value)); } \
}; \
typedef TMenuEditItem MenuItem_##NAME
-// TYPE NAME STRFUNC SCALE
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t, percent, ui8tostr4pct, 100.0/255); // 100% right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t, int3, i16tostr3, 1 ); // 123, -12 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t, int4, i16tostr4sign, 1 ); // 1234, -123 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int8_t, int8, i8tostr3, 1 ); // 123, -12 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t, uint8, ui8tostr3, 1 ); // 123 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_3, ui16tostr3, 1 ); // 123 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_4, ui16tostr4, 0.1 ); // 1234 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_5, ui16tostr5, 0.01 ); // 12345 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float3, ftostr3, 1 ); // 123 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float52, ftostr42_52, 100 ); // _2.34, 12.34, -2.34 or 123.45, -23.45
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float43, ftostr43sign, 1000 ); // 1.234
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float5, ftostr5rj, 1 ); // 12345 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float5_25, ftostr5rj, 0.04f ); // 12345 right-justified (25 increment)
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float51, ftostr51rj, 10 ); // 1234.5 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float41sign, ftostr41sign, 10 ); // +123.4
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float51sign, ftostr51sign, 10 ); // +1234.5
-DEFINE_MENU_EDIT_ITEM_TYPE(float, float52sign, ftostr52sign, 100 ); // +123.45
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5, ftostr5rj, 0.01f ); // 12345 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5_25, ftostr5rj, 0.04f ); // 12345 right-justified (25 increment)
+// NAME TYPE STRFUNC SCALE +ROUND
+DEFINE_MENU_EDIT_ITEM_TYPE(percent ,uint8_t ,ui8tostr4pctrj , 100.f/255.f, 0.5f); // 100% right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int3 ,int16_t ,i16tostr3rj , 1 ); // 123, -12 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int4 ,int16_t ,i16tostr4signrj , 1 ); // 1234, -123 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int8 ,int8_t ,i8tostr3rj , 1 ); // 123, -12 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint8 ,uint8_t ,ui8tostr3rj , 1 ); // 123 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_3 ,uint16_t ,ui16tostr3rj , 1 ); // 123 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_4 ,uint16_t ,ui16tostr4rj , 0.1f ); // 1234 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_5 ,uint16_t ,ui16tostr5rj , 0.01f ); // 12345 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float3 ,float ,ftostr3 , 1 ); // 123 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float42_52 ,float ,ftostr42_52 , 100 ); // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM_TYPE(float43 ,float ,ftostr43sign ,1000 ); // -1.234, _1.234, +1.234
+DEFINE_MENU_EDIT_ITEM_TYPE(float5 ,float ,ftostr5rj , 1 ); // 12345 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float5_25 ,float ,ftostr5rj , 0.04f ); // 12345 right-justified (25 increment)
+DEFINE_MENU_EDIT_ITEM_TYPE(float51 ,float ,ftostr51rj , 10 ); // 1234.5 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float41sign ,float ,ftostr41sign , 10 ); // +123.4
+DEFINE_MENU_EDIT_ITEM_TYPE(float51sign ,float ,ftostr51sign , 10 ); // +1234.5
+DEFINE_MENU_EDIT_ITEM_TYPE(float52sign ,float ,ftostr52sign , 100 ); // +123.45
+DEFINE_MENU_EDIT_ITEM_TYPE(long5 ,uint32_t ,ftostr5rj , 0.01f ); // 12345 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(long5_25 ,uint32_t ,ftostr5rj , 0.04f ); // 12345 right-justified (25 increment)
class MenuItem_bool : public MenuEditItemBase {
public:
@@ -321,10 +330,10 @@ class MenuItem_bool : public MenuEditItemBase {
* _menuLineNr is the menu item to draw and process
* _thisItemNr is the index of each MENU_ITEM or STATIC_ITEM
*/
-#define SCREEN_OR_MENU_LOOP(IS_MENU) \
- scroll_screen(IS_MENU ? 1 : LCD_HEIGHT, IS_MENU); \
- int8_t _menuLineNr = encoderTopLine, _thisItemNr; \
- bool _skipStatic = IS_MENU; \
+#define SCREEN_OR_MENU_LOOP(IS_MENU) \
+ scroll_screen(IS_MENU ? 1 : LCD_HEIGHT, IS_MENU); \
+ int8_t _menuLineNr = encoderTopLine, _thisItemNr = 0; \
+ bool _skipStatic = IS_MENU; UNUSED(_thisItemNr); \
for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
_thisItemNr = 0
diff --git a/Marlin/src/lcd/menu/menu_addon.h b/Marlin/src/lcd/menu/menu_addon.h
index e7553293a1..5f338c571a 100644
--- a/Marlin/src/lcd/menu/menu_addon.h
+++ b/Marlin/src/lcd/menu/menu_addon.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index e24b415155..f2327b75e5 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -84,14 +84,14 @@ void menu_cancelobject();
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
#define EDIT_CURRENT_PWM(LABEL,I) EDIT_ITEM_P(long5, PSTR(LABEL), &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
- #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
- EDIT_CURRENT_PWM(MSG_X MSG_Y, 0);
+ #if ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y)
+ EDIT_CURRENT_PWM(STR_X STR_Y, 0);
#endif
#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
- EDIT_CURRENT_PWM(MSG_Z, 1);
+ EDIT_CURRENT_PWM(STR_Z, 1);
#endif
#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
- EDIT_CURRENT_PWM(MSG_E, 2);
+ EDIT_CURRENT_PWM(STR_E, 2);
#endif
END_MENU();
}
@@ -112,10 +112,10 @@ void menu_cancelobject();
#if ENABLED(LIN_ADVANCE)
#if EXTRUDERS == 1
- EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+ EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
#elif EXTRUDERS > 1
- for (uint8_t n = 0; n < EXTRUDERS; n++)
- EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+ LOOP_L_N(n, EXTRUDERS)
+ EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
#endif
#endif
@@ -125,7 +125,7 @@ void menu_cancelobject();
if (parser.volumetric_enabled) {
EDIT_ITEM_FAST(float43, MSG_FILAMENT_DIAM, &planner.filament_size[active_extruder], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
#if EXTRUDERS > 1
- for (uint8_t n = 0; n < EXTRUDERS; n++)
+ LOOP_L_N(n, EXTRUDERS)
EDIT_ITEM_FAST_N(float43, n, MSG_FILAMENT_DIAM_E, &planner.filament_size[n], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
#endif
}
@@ -142,13 +142,13 @@ void menu_cancelobject();
EDIT_ITEM_FAST(float3, MSG_FILAMENT_UNLOAD, &fc_settings[active_extruder].unload_length, 0, extrude_maxlength);
#if EXTRUDERS > 1
- for (uint8_t n = 0; n < EXTRUDERS; n++)
+ LOOP_L_N(n, EXTRUDERS)
EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTUNLOAD_E, &fc_settings[n].unload_length, 0, extrude_maxlength);
#endif
EDIT_ITEM_FAST(float3, MSG_FILAMENT_LOAD, &fc_settings[active_extruder].load_length, 0, extrude_maxlength);
#if EXTRUDERS > 1
- for (uint8_t n = 0; n < EXTRUDERS; n++)
+ LOOP_L_N(n, EXTRUDERS)
EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTLOAD_E, &fc_settings[n].load_length, 0, extrude_maxlength);
#endif
#endif
@@ -228,35 +228,17 @@ void menu_cancelobject();
#if ENABLED(PID_AUTOTUNE_MENU)
#define DEFINE_PIDTEMP_FUNCS(N) \
_DEFINE_PIDTEMP_BASE_FUNCS(N); \
- void lcd_autotune_callback_E##N() { _lcd_autotune(N); } //
+ void lcd_autotune_callback_E##N() { _lcd_autotune(N); }
#else
- #define DEFINE_PIDTEMP_FUNCS(N) _DEFINE_PIDTEMP_BASE_FUNCS(N); //
+ #define DEFINE_PIDTEMP_FUNCS(N) _DEFINE_PIDTEMP_BASE_FUNCS(N);
#endif
#if HOTENDS
DEFINE_PIDTEMP_FUNCS(0);
#if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
- DEFINE_PIDTEMP_FUNCS(1);
- #if HOTENDS > 2
- DEFINE_PIDTEMP_FUNCS(2);
- #if HOTENDS > 3
- DEFINE_PIDTEMP_FUNCS(3);
- #if HOTENDS > 4
- DEFINE_PIDTEMP_FUNCS(4);
- #if HOTENDS > 5
- DEFINE_PIDTEMP_FUNCS(5);
- #if HOTENDS > 6
- DEFINE_PIDTEMP_FUNCS(6);
- #if HOTENDS > 7
- DEFINE_PIDTEMP_FUNCS(7);
- #endif // HOTENDS > 7
- #endif // HOTENDS > 6
- #endif // HOTENDS > 5
- #endif // HOTENDS > 4
- #endif // HOTENDS > 3
- #endif // HOTENDS > 2
- #endif // HOTENDS > 1 && PID_PARAMS_PER_HOTEND
-#endif // HOTENDS
+ REPEAT_S(1, HOTENDS, DEFINE_PIDTEMP_FUNCS)
+ #endif
+#endif
#define SHOW_MENU_ADVANCED_TEMPERATURE ((ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU))
@@ -275,7 +257,7 @@ void menu_cancelobject();
EDIT_ITEM(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
EDIT_ITEM(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
EDIT_ITEM(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
- EDIT_ITEM(float52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
+ EDIT_ITEM(float42_52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
#endif
//
@@ -306,7 +288,7 @@ void menu_cancelobject();
#if ENABLED(PID_FAN_SCALING)
#define _PID_EDIT_MENU_ITEMS(N) \
_PID_BASE_MENU_ITEMS(N); \
- EDIT_ITEM(float3, PID_LABEL(MSG_PID_F,N), &PID_PARAM(Kf, N), 1, 9990)
+ EDIT_ITEM_N(float3, N, MSG_PID_F_E, &PID_PARAM(Kf, N), 1, 9990)
#else
#define _PID_EDIT_MENU_ITEMS(N) _PID_BASE_MENU_ITEMS(N)
#endif
@@ -320,33 +302,15 @@ void menu_cancelobject();
#if ENABLED(PID_AUTOTUNE_MENU)
#define PID_EDIT_MENU_ITEMS(N) \
_PID_EDIT_MENU_ITEMS(N); \
- EDIT_ITEM_FAST_N(int3, N, MSG_PID_AUTOTUNE_E, &autotune_temp[N], 150, heater_maxtemp[N] - 15, []{ _lcd_autotune(MenuItemBase::itemIndex); })
+ EDIT_ITEM_FAST_N(int3, N, MSG_PID_AUTOTUNE_E, &autotune_temp[N], 150, heater_maxtemp[N] - 15, []{ _lcd_autotune(MenuItemBase::itemIndex); });
#else
- #define PID_EDIT_MENU_ITEMS(N) _PID_EDIT_MENU_ITEMS(N)
+ #define PID_EDIT_MENU_ITEMS(N) _PID_EDIT_MENU_ITEMS(N);
#endif
PID_EDIT_MENU_ITEMS(0);
#if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
- PID_EDIT_MENU_ITEMS(1);
- #if HOTENDS > 2
- PID_EDIT_MENU_ITEMS(2);
- #if HOTENDS > 3
- PID_EDIT_MENU_ITEMS(3);
- #if HOTENDS > 4
- PID_EDIT_MENU_ITEMS(4);
- #if HOTENDS > 5
- PID_EDIT_MENU_ITEMS(5);
- #if HOTENDS > 6
- PID_EDIT_MENU_ITEMS(6);
- #if HOTENDS > 7
- PID_EDIT_MENU_ITEMS(7);
- #endif // HOTENDS > 7
- #endif // HOTENDS > 6
- #endif // HOTENDS > 5
- #endif // HOTENDS > 4
- #endif // HOTENDS > 3
- #endif // HOTENDS > 2
- #endif // HOTENDS > 1 && PID_PARAMS_PER_HOTEND
+ REPEAT_S(1, HOTENDS, PID_EDIT_MENU_ITEMS)
+ #endif
END_MENU();
}
@@ -394,7 +358,7 @@ void menu_cancelobject();
EDIT_ITEM_FAST(float3, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
#endif
#if ENABLED(DISTINCT_E_FACTORS)
- for (uint8_t n = 0; n < E_STEPPERS; n++)
+ LOOP_L_N(n, E_STEPPERS)
EDIT_ITEM_FAST_N(float3, n, MSG_VMAX_EN, &planner.settings.max_feedrate_mm_s[E_AXIS_N(n)], 1, max_fr_edit_scaled.e);
#endif
@@ -412,12 +376,12 @@ void menu_cancelobject();
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
- static float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
+ const float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
// M204 P Acceleration
EDIT_ITEM_FAST(float5_25, MSG_ACC, &planner.settings.acceleration, 25, max_accel);
// M204 R Retract Acceleration
- EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, max_accel);
+ EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)]);
// M204 T Travel Acceleration
EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);
@@ -445,7 +409,7 @@ void menu_cancelobject();
#if ENABLED(DISTINCT_E_FACTORS)
EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
- for (uint8_t n = 0; n < E_STEPPERS; n++)
+ LOOP_L_N(n, E_STEPPERS)
EDIT_ITEM_FAST_N(long5_25, n, MSG_AMAX_EN, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(n)], 100, max_accel_edit_scaled.e, []{ _reset_e_acceleration_rate(MenuItemBase::itemIndex); });
#elif E_STEPPERS
EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
@@ -497,9 +461,11 @@ void menu_cancelobject();
void menu_probe_offsets() {
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
- EDIT_ITEM(float51sign, MSG_ZPROBE_XOFFSET, &probe_offset.x, -(X_BED_SIZE), X_BED_SIZE);
- EDIT_ITEM(float51sign, MSG_ZPROBE_YOFFSET, &probe_offset.y, -(Y_BED_SIZE), Y_BED_SIZE);
- EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+ #if HAS_PROBE_XY_OFFSET
+ EDIT_ITEM(float51sign, MSG_ZPROBE_XOFFSET, &probe.offset.x, -(X_BED_SIZE), X_BED_SIZE);
+ EDIT_ITEM(float51sign, MSG_ZPROBE_YOFFSET, &probe.offset.y, -(Y_BED_SIZE), Y_BED_SIZE);
+ #endif
+ EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
END_MENU();
}
#endif
@@ -518,7 +484,7 @@ void menu_advanced_steps_per_mm() {
#if ENABLED(DISTINCT_E_FACTORS)
EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, []{ planner.refresh_positioning(); });
- for (uint8_t n = 0; n < E_STEPPERS; n++)
+ LOOP_L_N(n, E_STEPPERS)
EDIT_ITEM_FAST_N(float51, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{ _planner_refresh_e_positioning(MenuItemBase::itemIndex); });
#elif E_STEPPERS
EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
@@ -578,7 +544,7 @@ void menu_advanced_settings() {
SUBMENU(MSG_DRIVE_STRENGTH, menu_pwm);
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
SUBMENU(MSG_TMC_DRIVERS, menu_tmc);
#endif
@@ -590,10 +556,10 @@ void menu_advanced_settings() {
SUBMENU(MSG_FILAMENT, menu_advanced_filament);
#elif ENABLED(LIN_ADVANCE)
#if EXTRUDERS == 1
- EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+ EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
#elif EXTRUDERS > 1
- for (uint8_t n = 0; n < E_STEPPERS; n++)
- EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+ LOOP_L_N(n, E_STEPPERS)
+ EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
#endif
#endif
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index cc0b3a2c99..720694bfff 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,9 +39,9 @@ void menu_backlash() {
EDIT_ITEM_FAST(percent, MSG_BACKLASH_CORRECTION, &backlash.correction, all_off, all_on);
#define EDIT_BACKLASH_DISTANCE(N) EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &backlash.distance_mm[_AXIS(N)], 0.0f, 9.9f);
- EDIT_BACKLASH_DISTANCE(A);
- EDIT_BACKLASH_DISTANCE(B);
- EDIT_BACKLASH_DISTANCE(C);
+ if (AXIS_CAN_CALIBRATE(A)) EDIT_BACKLASH_DISTANCE(A);
+ if (AXIS_CAN_CALIBRATE(B)) EDIT_BACKLASH_DISTANCE(B);
+ if (AXIS_CAN_CALIBRATE(C)) EDIT_BACKLASH_DISTANCE(C);
#ifdef BACKLASH_SMOOTHING_MM
EDIT_ITEM_FAST(float43, MSG_BACKLASH_SMOOTHING, &backlash.smoothing_mm, 0.0f, 9.9f);
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index a7fffb1e02..3d0a5bf2aa 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -55,33 +55,26 @@ static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Pleas
*/
static int8_t bed_corner;
static inline void _lcd_goto_next_corner() {
+ constexpr float lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
+ constexpr xy_pos_t lf { (X_MIN_BED) + lfrb[0], (Y_MIN_BED) + lfrb[1] },
+ rb { (X_MAX_BED) - lfrb[2], (Y_MAX_BED) - lfrb[3] };
line_to_z(LEVEL_CORNERS_Z_HOP);
switch (bed_corner) {
- case 0:
- current_position.set(X_MIN_BED + LEVEL_CORNERS_INSET, Y_MIN_BED + LEVEL_CORNERS_INSET);
- break;
- case 1:
- current_position.x = X_MAX_BED - (LEVEL_CORNERS_INSET);
- break;
- case 2:
- current_position.y = Y_MAX_BED - (LEVEL_CORNERS_INSET);
- break;
- case 3:
- current_position.x = X_MIN_BED + LEVEL_CORNERS_INSET;
- break;
+ case 0: current_position = lf; break; // copy xy
+ case 1: current_position.x = rb.x; break;
+ case 2: current_position.y = rb.y; break;
+ case 3: current_position.x = lf.x; break;
#if ENABLED(LEVEL_CENTER_TOO)
- case 4:
- current_position.set(X_CENTER, Y_CENTER);
- break;
+ case 4: current_position.set(X_CENTER, Y_CENTER); break;
#endif
}
- line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m.x));
+ line_to_current_position(manual_feedrate_mm_s.x);
line_to_z(LEVEL_CORNERS_HEIGHT);
- if (++bed_corner > 3
+ if (++bed_corner > (3
#if ENABLED(LEVEL_CENTER_TOO)
+ 1
#endif
- ) bed_corner = 0;
+ )) bed_corner = 0;
}
static inline void _lcd_level_bed_corners_homing() {
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 6cc40cab6c..5834b73ba4 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -279,7 +279,7 @@ void menu_bed_leveling() {
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE
- EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+ EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif
#if ENABLED(LEVEL_BED_CORNERS)
diff --git a/Marlin/src/lcd/menu/menu_cancelobject.cpp b/Marlin/src/lcd/menu/menu_cancelobject.cpp
index 162578a0c4..4d445a1848 100644
--- a/Marlin/src/lcd/menu/menu_cancelobject.cpp
+++ b/Marlin/src/lcd/menu/menu_cancelobject.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index c23017c3e9..6dbc680659 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../../feature/power_loss_recovery.h"
+ #include "../../feature/powerloss.h"
#endif
#if HAS_BED_PROBE
@@ -138,12 +138,12 @@ void menu_advanced_settings();
START_MENU();
BACK_ITEM(MSG_CONFIGURATION);
#if ENABLED(DUAL_X_CARRIAGE)
- EDIT_ITEM_FAST(float51, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
+ EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
#else
- EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
+ EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
#endif
- EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
- EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
+ EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
+ EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
#if ENABLED(EEPROM_SETTINGS)
ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
#endif
@@ -227,6 +227,24 @@ void menu_advanced_settings();
}
#endif
+#if ENABLED(CONTROLLER_FAN_MENU)
+
+ #include "../../feature/controllerfan.h"
+
+ void menu_controller_fan() {
+ START_MENU();
+ BACK_ITEM(MSG_CONFIGURATION);
+ EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+ EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode);
+ if (controllerFan.settings.auto_mode) {
+ EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+ EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800);
+ }
+ END_MENU();
+ }
+
+#endif
+
#if ENABLED(CASE_LIGHT_MENU)
#include "../../feature/caselight.h"
@@ -317,14 +335,18 @@ void menu_configuration() {
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE
- EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+ EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+ #endif
+
+ //
+ // Set Fan Controller speed
+ //
+ #if ENABLED(CONTROLLER_FAN_MENU)
+ SUBMENU(MSG_CONTROLLER_FAN, menu_controller_fan);
#endif
const bool busy = printer_busy();
if (!busy) {
- //
- // Delta Calibration
- //
#if EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
SUBMENU(MSG_DELTA_CALIBRATE, menu_delta_calibrate);
#endif
@@ -397,7 +419,7 @@ void menu_configuration() {
#endif
if (!busy)
- ACTION_ITEM(MSG_RESTORE_FAILSAFE, []{
+ ACTION_ITEM(MSG_RESTORE_DEFAULTS, []{
settings.reset();
#if HAS_BUZZER
ui.completion_feedback();
diff --git a/Marlin/src/lcd/menu/menu_custom.cpp b/Marlin/src/lcd/menu/menu_custom.cpp
index 8d50a1b25d..55297a8b92 100644
--- a/Marlin/src/lcd/menu/menu_custom.cpp
+++ b/Marlin/src/lcd/menu/menu_custom.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index e26a0966c2..ac80870ac8 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@
#endif
#if ENABLED(EXTENSIBLE_UI)
- #include "../../lcd/extensible_ui/ui_api.h"
+ #include "../../lcd/extui/ui_api.h"
#endif
void _man_probe_pt(const xy_pos_t &xy) {
@@ -61,16 +61,14 @@ void _man_probe_pt(const xy_pos_t &xy) {
float lcd_probe_pt(const xy_pos_t &xy) {
_man_probe_pt(xy);
- KEEPALIVE_STATE(PAUSED_FOR_USER);
ui.defer_status_screen();
- wait_for_user = true;
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR);
#endif
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress"));
#endif
- while (wait_for_user) idle();
+ wait_for_user_response();
ui.goto_previous_screen_no_defer();
return current_position.z;
}
@@ -103,7 +101,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
#endif
void lcd_delta_settings() {
- auto _recalc_delta_settings = []() {
+ auto _recalc_delta_settings = []{
#if HAS_LEVELING
reset_bed_level(); // After changing kinematics bed-level data is no longer valid
#endif
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 894d8de238..0c8f1f61c8 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -114,12 +114,12 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
GCODES_ITEM_P(msg, PSTR("M600 B0"));
#else
PGM_P const msg = GET_TEXT(MSG_FILAMENTCHANGE_E);
- for (uint8_t s = 0; s < E_STEPPERS; s++) {
+ LOOP_L_N(s, E_STEPPERS) {
if (thermalManager.targetTooColdToExtrude(s))
SUBMENU_N_P(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
else {
ACTION_ITEM_N_P(s, msg, []{
- char cmd[12];
+ char cmd[13];
sprintf_P(cmd, PSTR("M600 B0 T%i"), int(MenuItemBase::itemIndex));
lcd_enqueue_one_now(cmd);
});
@@ -138,7 +138,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
GCODES_ITEM_P(msg_load, PSTR("M701"));
#else
PGM_P const msg_load = GET_TEXT(MSG_FILAMENTLOAD_E);
- for (uint8_t s = 0; s < E_STEPPERS; s++) {
+ LOOP_L_N(s, E_STEPPERS) {
if (thermalManager.targetTooColdToExtrude(s))
SUBMENU_N_P(s, msg_load, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, MenuItemBase::itemIndex); });
else {
@@ -162,7 +162,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
#if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
{
bool too_cold = false;
- for (uint8_t s = 0; s < E_STEPPERS; s++) {
+ LOOP_L_N(s, E_STEPPERS) {
if (thermalManager.targetTooColdToExtrude(s)) {
too_cold = true; break;
}
@@ -174,7 +174,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
}
#endif
PGM_P const msg_unload = GET_TEXT(MSG_FILAMENTUNLOAD_E);
- for (uint8_t s = 0; s < E_STEPPERS; s++) {
+ LOOP_L_N(s, E_STEPPERS) {
if (thermalManager.targetTooColdToExtrude(s))
SUBMENU_N_P(s, msg_unload, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, MenuItemBase::itemIndex); });
else {
diff --git a/Marlin/src/lcd/menu/menu_game.cpp b/Marlin/src/lcd/menu/menu_game.cpp
index 68ccc39aff..c2ac9f62a9 100644
--- a/Marlin/src/lcd/menu/menu_game.cpp
+++ b/Marlin/src/lcd/menu/menu_game.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 5bbc8ce7dc..284c3eb1a5 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -265,7 +265,7 @@ void menu_info_board() {
void menu_info_printer() {
if (ui.use_click()) return ui.go_back();
START_SCREEN();
- STATIC_ITEM_P(PSTR(MSG_MARLIN), SS_CENTER|SS_INVERT); // Marlin
+ STATIC_ITEM(MSG_MARLIN, SS_CENTER|SS_INVERT); // Marlin
STATIC_ITEM_P(PSTR(SHORT_BUILD_VERSION)); // x.x.x-Branch
STATIC_ITEM_P(PSTR(STRING_DISTRIBUTION_DATE)); // YYYY-MM-DD HH:MM
STATIC_ITEM_P(PSTR(MACHINE_NAME)); // My3DPrinter
diff --git a/Marlin/src/lcd/menu/menu_job_recovery.cpp b/Marlin/src/lcd/menu/menu_job_recovery.cpp
index 1ac69aff75..31db50fe23 100644
--- a/Marlin/src/lcd/menu/menu_job_recovery.cpp
+++ b/Marlin/src/lcd/menu/menu_job_recovery.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,7 +31,7 @@
#include "menu.h"
#include "../../gcode/queue.h"
#include "../../sd/cardreader.h"
-#include "../../feature/power_loss_recovery.h"
+#include "../../feature/powerloss.h"
static void lcd_power_loss_recovery_resume() {
ui.return_to_status();
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index e6644c6852..b9e75422bc 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 85beddb6dc..d98670922c 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -134,7 +134,7 @@ void menu_main() {
#if PIN_EXISTS(SD_DETECT)
ACTION_ITEM(MSG_NO_MEDIA, nullptr);
#else
- GCODES_ITEM(MSG_INIT_MEDIA, M21_STR);
+ GCODES_ITEM(MSG_ATTACH_MEDIA, M21_STR);
ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
#endif
}
@@ -228,7 +228,7 @@ void menu_main() {
#if PIN_EXISTS(SD_DETECT)
ACTION_ITEM(MSG_NO_MEDIA, nullptr);
#else
- GCODES_ITEM(MSG_INIT_MEDIA, M21_STR);
+ GCODES_ITEM(MSG_ATTACH_MEDIA, M21_STR);
ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
#endif
}
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index a12c8b79bb..4e68894add 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index 51e24d9358..7230320fa2 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -181,8 +181,8 @@ void lcd_mixer_mix_edit() {
#if CHANNEL_MIX_EDITING
- for (uint8_t n = 1; n <= MIXING_STEPPERS; n++)
- EDIT_ITEM_FAST_N(float52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
+ LOOP_S_LE_N(n, 1, MIXING_STEPPERS)
+ EDIT_ITEM_FAST_N(float42_52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
ACTION_ITEM(MSG_CYCLE_MIX, _lcd_mixer_cycle_mix);
ACTION_ITEM(MSG_COMMIT_VTOOL, _lcd_mixer_commit_vtool);
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index ad3d649ee4..e2f5e8d658 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,7 +24,7 @@
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
-#include "../../feature/prusa_MMU2/mmu2.h"
+#include "../../feature/mmu2/mmu2.h"
#include "menu_mmu2.h"
#include "menu.h"
@@ -54,7 +54,7 @@ void _mmu2_load_filament(uint8_t index) {
ui.reset_status();
}
void action_mmu2_load_all() {
- for (uint8_t i = 0; i < EXTRUDERS; i++)
+ LOOP_L_N(i, EXTRUDERS)
_mmu2_load_filament(i);
ui.return_to_status();
}
diff --git a/Marlin/src/lcd/menu/menu_mmu2.h b/Marlin/src/lcd/menu/menu_mmu2.h
index 0f47092655..0221b4c765 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.h
+++ b/Marlin/src/lcd/menu/menu_mmu2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index cb1527cf81..b7f57c8146 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -250,7 +250,11 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
extern const char NUL_STR[];
SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
- MENU_ITEM_ADDON_START(0);
+ MENU_ITEM_ADDON_START(0
+ #if HAS_CHARACTER_LCD
+ + 1
+ #endif
+ );
char tmp[20], numstr[10];
// Determine digits needed right of decimal
const uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :
@@ -353,7 +357,7 @@ void menu_move() {
#elif E_MANUAL > 1
// Independent extruders with one E-stepper per hotend
- for (uint8_t n = 0; n < E_MANUAL; n++) SUBMENU_MOVE_E(n);
+ LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
#endif
@@ -389,9 +393,9 @@ void menu_motion() {
//
GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
#if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
- GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28 X"));
- GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28 Y"));
- GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28 Z"));
+ GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+ GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+ GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
#endif
//
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index 1c480577f1..fd42522839 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index d2483b9d3f..01cf39d7b3 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -111,7 +111,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
#if HAS_HEATED_BED
_PREHEAT_ITEMS(1,0);
#endif
- for (uint8_t n = 1; n < HOTENDS; n++) PREHEAT_ITEMS(1,n);
+ LOOP_S_L_N(n, 1, HOTENDS) PREHEAT_ITEMS(1,n);
ACTION_ITEM(MSG_PREHEAT_1_ALL, []() {
#if HAS_HEATED_BED
_preheat_bed(0);
@@ -139,7 +139,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
#if HAS_HEATED_BED
_PREHEAT_ITEMS(2,0);
#endif
- for (uint8_t n = 1; n < HOTENDS; n++) PREHEAT_ITEMS(2,n);
+ LOOP_S_L_N(n, 1, HOTENDS) PREHEAT_ITEMS(2,n);
ACTION_ITEM(MSG_PREHEAT_2_ALL, []() {
#if HAS_HEATED_BED
_preheat_bed(1);
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index ff6a50ccfc..296a132e14 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,40 +26,40 @@
#include "../../inc/MarlinConfigPre.h"
-#if HAS_TRINAMIC && HAS_LCD_MENU
+#if HAS_TRINAMIC_CONFIG && HAS_LCD_MENU
#include "menu.h"
#include "../../module/stepper/indirection.h"
#include "../../feature/tmc_util.h"
-#define TMC_EDIT_STORED_I_RMS(ST,MSG) EDIT_ITEM_P(uint16_4, PSTR(MSG), &stepper##ST.val_mA, 100, 3000, []{ stepper##ST.refresh_stepper_current(); })
+#define TMC_EDIT_STORED_I_RMS(ST,STR) EDIT_ITEM_P(uint16_4, PSTR(STR), &stepper##ST.val_mA, 100, 3000, []{ stepper##ST.refresh_stepper_current(); })
void menu_tmc_current() {
START_MENU();
BACK_ITEM(MSG_TMC_DRIVERS);
#if AXIS_IS_TMC(X)
- TMC_EDIT_STORED_I_RMS(X, MSG_X);
+ TMC_EDIT_STORED_I_RMS(X, STR_X);
#endif
#if AXIS_IS_TMC(Y)
- TMC_EDIT_STORED_I_RMS(Y, MSG_Y);
+ TMC_EDIT_STORED_I_RMS(Y, STR_Y);
#endif
#if AXIS_IS_TMC(Z)
- TMC_EDIT_STORED_I_RMS(Z, MSG_Z);
+ TMC_EDIT_STORED_I_RMS(Z, STR_Z);
#endif
#if AXIS_IS_TMC(X2)
- TMC_EDIT_STORED_I_RMS(X2, MSG_X2);
+ TMC_EDIT_STORED_I_RMS(X2, STR_X2);
#endif
#if AXIS_IS_TMC(Y2)
- TMC_EDIT_STORED_I_RMS(Y2, MSG_Y2);
+ TMC_EDIT_STORED_I_RMS(Y2, STR_Y2);
#endif
#if AXIS_IS_TMC(Z2)
- TMC_EDIT_STORED_I_RMS(Z2, MSG_Z2);
+ TMC_EDIT_STORED_I_RMS(Z2, STR_Z2);
#endif
#if AXIS_IS_TMC(Z3)
- TMC_EDIT_STORED_I_RMS(Z3, MSG_Z3);
+ TMC_EDIT_STORED_I_RMS(Z3, STR_Z3);
#endif
#if AXIS_IS_TMC(Z4)
- TMC_EDIT_STORED_I_RMS(Z4, MSG_Z4);
+ TMC_EDIT_STORED_I_RMS(Z4, STR_Z4);
#endif
#if AXIS_IS_TMC(E0)
TMC_EDIT_STORED_I_RMS(E0, LCD_STR_E0);
@@ -90,34 +90,34 @@ void menu_tmc_current() {
#if ENABLED(HYBRID_THRESHOLD)
- #define TMC_EDIT_STORED_HYBRID_THRS(ST, MSG) EDIT_ITEM_P(uint8, PSTR(MSG), &stepper##ST.stored.hybrid_thrs, 0, 255, []{ stepper##ST.refresh_hybrid_thrs(); });
+ #define TMC_EDIT_STORED_HYBRID_THRS(ST, STR) EDIT_ITEM_P(uint8, PSTR(STR), &stepper##ST.stored.hybrid_thrs, 0, 255, []{ stepper##ST.refresh_hybrid_thrs(); });
void menu_tmc_hybrid_thrs() {
START_MENU();
BACK_ITEM(MSG_TMC_DRIVERS);
#if AXIS_HAS_STEALTHCHOP(X)
- TMC_EDIT_STORED_HYBRID_THRS(X, MSG_X);
+ TMC_EDIT_STORED_HYBRID_THRS(X, STR_X);
#endif
#if AXIS_HAS_STEALTHCHOP(Y)
- TMC_EDIT_STORED_HYBRID_THRS(Y, MSG_Y);
+ TMC_EDIT_STORED_HYBRID_THRS(Y, STR_Y);
#endif
#if AXIS_HAS_STEALTHCHOP(Z)
- TMC_EDIT_STORED_HYBRID_THRS(Z, MSG_Z);
+ TMC_EDIT_STORED_HYBRID_THRS(Z, STR_Z);
#endif
#if AXIS_HAS_STEALTHCHOP(X2)
- TMC_EDIT_STORED_HYBRID_THRS(X2, MSG_X2);
+ TMC_EDIT_STORED_HYBRID_THRS(X2, STR_X2);
#endif
#if AXIS_HAS_STEALTHCHOP(Y2)
- TMC_EDIT_STORED_HYBRID_THRS(Y2, MSG_Y2);
+ TMC_EDIT_STORED_HYBRID_THRS(Y2, STR_Y2);
#endif
#if AXIS_HAS_STEALTHCHOP(Z2)
- TMC_EDIT_STORED_HYBRID_THRS(Z2, MSG_Z2);
+ TMC_EDIT_STORED_HYBRID_THRS(Z2, STR_Z2);
#endif
#if AXIS_HAS_STEALTHCHOP(Z3)
- TMC_EDIT_STORED_HYBRID_THRS(Z3, MSG_Z3);
+ TMC_EDIT_STORED_HYBRID_THRS(Z3, STR_Z3);
#endif
#if AXIS_HAS_STEALTHCHOP(Z4)
- TMC_EDIT_STORED_HYBRID_THRS(Z4, MSG_Z4);
+ TMC_EDIT_STORED_HYBRID_THRS(Z4, STR_Z4);
#endif
#if AXIS_HAS_STEALTHCHOP(E0)
TMC_EDIT_STORED_HYBRID_THRS(E0, LCD_STR_E0);
@@ -150,7 +150,7 @@ void menu_tmc_current() {
#if ENABLED(SENSORLESS_HOMING)
- #define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM_P(int4, PSTR(MSG_##ST), &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, []{ stepper##ST.refresh_homing_thrs(); });
+ #define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM_P(int4, PSTR(STR_##ST), &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, []{ stepper##ST.refresh_homing_thrs(); });
void menu_tmc_homing_thrs() {
START_MENU();
@@ -174,35 +174,35 @@ void menu_tmc_current() {
#if HAS_STEALTHCHOP
- #define TMC_EDIT_STEP_MODE(ST, MSG) EDIT_ITEM_P(bool, PSTR(MSG), &stepper##ST.stored.stealthChop_enabled, []{ stepper##ST.refresh_stepping_mode(); })
+ #define TMC_EDIT_STEP_MODE(ST, STR) EDIT_ITEM_P(bool, PSTR(STR), &stepper##ST.stored.stealthChop_enabled, []{ stepper##ST.refresh_stepping_mode(); })
void menu_tmc_step_mode() {
START_MENU();
STATIC_ITEM(MSG_TMC_STEALTH_ENABLED);
BACK_ITEM(MSG_TMC_DRIVERS);
#if AXIS_HAS_STEALTHCHOP(X)
- TMC_EDIT_STEP_MODE(X, MSG_X);
+ TMC_EDIT_STEP_MODE(X, STR_X);
#endif
#if AXIS_HAS_STEALTHCHOP(Y)
- TMC_EDIT_STEP_MODE(Y, MSG_Y);
+ TMC_EDIT_STEP_MODE(Y, STR_Y);
#endif
#if AXIS_HAS_STEALTHCHOP(Z)
- TMC_EDIT_STEP_MODE(Z, MSG_Z);
+ TMC_EDIT_STEP_MODE(Z, STR_Z);
#endif
#if AXIS_HAS_STEALTHCHOP(X2)
- TMC_EDIT_STEP_MODE(X2, MSG_X2);
+ TMC_EDIT_STEP_MODE(X2, STR_X2);
#endif
#if AXIS_HAS_STEALTHCHOP(Y2)
- TMC_EDIT_STEP_MODE(Y2, MSG_Y2);
+ TMC_EDIT_STEP_MODE(Y2, STR_Y2);
#endif
#if AXIS_HAS_STEALTHCHOP(Z2)
- TMC_EDIT_STEP_MODE(Z2, MSG_Z2);
+ TMC_EDIT_STEP_MODE(Z2, STR_Z2);
#endif
#if AXIS_HAS_STEALTHCHOP(Z3)
- TMC_EDIT_STEP_MODE(Z3, MSG_Z3);
+ TMC_EDIT_STEP_MODE(Z3, STR_Z3);
#endif
#if AXIS_HAS_STEALTHCHOP(Z4)
- TMC_EDIT_STEP_MODE(Z4, MSG_Z4);
+ TMC_EDIT_STEP_MODE(Z4, STR_Z4);
#endif
#if AXIS_HAS_STEALTHCHOP(E0)
TMC_EDIT_STEP_MODE(E0, LCD_STR_E0);
@@ -249,4 +249,4 @@ void menu_tmc() {
END_MENU();
}
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 1610c2d5eb..ac18e89df4 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -65,7 +65,7 @@
}
if (ui.should_draw()) {
const float spm = planner.steps_to_mm[axis];
- MenuEditItemBase::draw_edit_screen(msg, LCD_Z_OFFSET_FUNC(spm * babystep.accum));
+ MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(spm * babystep.accum));
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
const bool in_view = (true
#if HAS_GRAPHICAL_LCD
@@ -81,7 +81,7 @@
#endif
lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
lcd_put_wchar(':');
- lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_AXIS(axis)]));
+ lcd_put_u8str(BABYSTEP_TO_STR(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
}
#endif
}
@@ -222,7 +222,7 @@ void menu_tune() {
EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
// Flow En:
#if EXTRUDERS > 1
- for (uint8_t n = 0; n < EXTRUDERS; n++)
+ LOOP_L_N(n, EXTRUDERS)
EDIT_ITEM_N(int3, n, MSG_FLOW_N, &planner.flow_percentage[n], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
#endif
#endif
@@ -232,10 +232,10 @@ void menu_tune() {
//
#if ENABLED(LIN_ADVANCE) && DISABLED(SLIM_LCD_MENUS)
#if EXTRUDERS == 1
- EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+ EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
#elif EXTRUDERS > 1
- for (uint8_t n = 0; n < EXTRUDERS; n++)
- EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+ LOOP_L_N(n, EXTRUDERS)
+ EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
#endif
#endif
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 5e2bee4d35..8488c11c7d 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 17772d7880..7a464c30ab 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -85,7 +85,9 @@
#elif THERMISTOR_ID == 18
#define THERMISTOR_NAME "ATC Semitec 204GT-2"
#elif THERMISTOR_ID == 20
- #define THERMISTOR_NAME "Pt100 UltiMB"
+ #define THERMISTOR_NAME "Pt100 UltiMB 5v"
+#elif THERMISTOR_ID == 21
+ #define THERMISTOR_NAME "Pt100 UltiMB 3.3v"
#elif THERMISTOR_ID == 201
#define THERMISTOR_NAME "Pt100 OverLord"
#elif THERMISTOR_ID == 60
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 04ebd5079f..ff0331eb20 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -103,7 +103,7 @@ MarlinUI ui;
#include "../feature/bedlevel/bedlevel.h"
#endif
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "../feature/tmc_util.h"
#endif
@@ -227,7 +227,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0
SETCURSOR(col, row);
if (!string) return;
- auto _newline = [&col, &row]() {
+ auto _newline = [&col, &row]{
col = 0; row++; // Move col to string len (plus space)
SETCURSOR(0, row); // Simulate carriage return
};
@@ -351,10 +351,8 @@ void MarlinUI::init() {
#endif
#endif
- #if HAS_ENCODER_ACTION
- #if HAS_SLOW_BUTTONS
- slow_buttons = 0;
- #endif
+ #if HAS_ENCODER_ACTION && HAS_SLOW_BUTTONS
+ slow_buttons = 0;
#endif
update_buttons();
@@ -391,7 +389,7 @@ bool MarlinUI::get_blink() {
void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
- encoderPosition = dir;
+ ui.encoderPosition = dir;
switch (axis) {
case X_AXIS: lcd_move_x(); break;
case Y_AXIS: lcd_move_y(); break;
@@ -524,7 +522,7 @@ void MarlinUI::status_screen() {
#if PROGRESS_MSG_EXPIRE > 0
// Handle message expire
- if (expire_status_ms > 0) {
+ if (expire_status_ms) {
// Expire the message if a job is active and the bar has ticks
if (get_progress_percent() > 2 && !print_job_timer.isPaused()) {
@@ -673,7 +671,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
if (manual_move_axis != (int8_t)NO_AXIS && ELAPSED(millis(), manual_move_start_time) && !planner.is_full()) {
- const feedRate_t fr_mm_s = MMM_TO_MMS(manual_feedrate_mm_m[manual_move_axis]);
+ const feedRate_t fr_mm_s = manual_feedrate_mm_s[manual_move_axis];
#if IS_KINEMATIC
#if EXTRUDERS > 1
@@ -776,14 +774,20 @@ void MarlinUI::update() {
// If the action button is pressed...
static bool wait_for_unclick; // = false
- #if ENABLED(TOUCH_BUTTONS)
+ auto do_click = [&]{
+ wait_for_unclick = true; // - Set debounce flag to ignore continous clicks
+ lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click
+ wait_for_user = false; // - Any click clears wait for user
+ quick_feedback(); // - Always make a click sound
+ };
+ #if ENABLED(TOUCH_BUTTONS)
if (touch_buttons) {
RESET_STATUS_TIMEOUT();
- if (buttons & (EN_A | EN_B)) { // Menu arrows, in priority
+ if (touch_buttons & (EN_A | EN_B)) { // Menu arrows, in priority
if (ELAPSED(ms, next_button_update_ms)) {
encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * (ENCODER_PULSES_PER_STEP) * encoderDirection;
- if (buttons & EN_A) encoderDiff *= -1;
+ if (touch_buttons & EN_A) encoderDiff *= -1;
#if ENABLED(AUTO_BED_LEVELING_UBL)
if (external_control) ubl.encoder_diff = encoderDiff;
#endif
@@ -797,12 +801,8 @@ void MarlinUI::update() {
}
}
}
- else if (!wait_for_unclick && (buttons & EN_C)) { // OK button, if not waiting for a debounce release:
- wait_for_unclick = true; // - Set debounce flag to ignore continous clicks
- lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click
- wait_for_user = false; // - Any click clears wait for user
- quick_feedback(); // - Always make a click sound
- }
+ else if (!wait_for_unclick && (buttons & EN_C)) // OK button, if not waiting for a debounce release:
+ do_click();
}
else // keep wait_for_unclick value
@@ -811,12 +811,7 @@ void MarlinUI::update() {
{
// Integrated LCD click handling via button_pressed
if (!external_control && button_pressed()) {
- if (!wait_for_unclick) { // If not waiting for a debounce release:
- wait_for_unclick = true; // - Set debounce flag to ignore continous clicks
- lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click
- wait_for_user = false; // - Any click clears wait for user
- quick_feedback(); // - Always make a click sound
- }
+ if (!wait_for_unclick) do_click(); // Handle the click
}
else
wait_for_unclick = false;
@@ -1137,7 +1132,7 @@ void MarlinUI::update() {
thermalManager.current_ADCKey_raw = HAL_ADC_RANGE;
thermalManager.ADCKey_count = 0;
if (currentkpADCValue < adc_other_button)
- for (uint8_t i = 0; i < ADC_KEY_NUM; i++) {
+ LOOP_L_N(i, ADC_KEY_NUM) {
const uint16_t lo = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMin),
hi = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMax);
if (WITHIN(currentkpADCValue, lo, hi)) return pgm_read_byte(&stADCKeyTable[i].ADCKeyNo);
@@ -1150,27 +1145,6 @@ void MarlinUI::update() {
#if HAS_ENCODER_ACTION
- #if DISABLED(ADC_KEYPAD) && (ENABLED(REPRAPWORLD_KEYPAD) || !HAS_DIGITAL_BUTTONS)
-
- /**
- * Setup Rotary Encoder Bit Values (for two pin encoders to indicate movement)
- * These values are independent of which pins are used for EN_A and EN_B indications
- * The rotary encoder part is also independent to the chipset used for the LCD
- */
- #define GET_SHIFT_BUTTON_STATES(DST) \
- uint8_t new_##DST = 0; \
- WRITE(SHIFT_LD, LOW); \
- WRITE(SHIFT_LD, HIGH); \
- for (int8_t i = 0; i < 8; i++) { \
- new_##DST >>= 1; \
- if (READ(SHIFT_OUT)) SBI(new_##DST, 7); \
- WRITE(SHIFT_CLK, HIGH); \
- WRITE(SHIFT_CLK, LOW); \
- } \
- DST = ~new_##DST; //invert it, because a pressed switch produces a logical 0
-
- #endif
-
/**
* Read encoder buttons from the hardware registers
* Warning: This function is called from interrupt context!
@@ -1246,7 +1220,11 @@ void MarlinUI::update() {
| slow_buttons
#endif
#if ENABLED(TOUCH_BUTTONS) && HAS_ENCODER_ACTION
- | touch_buttons
+ | (touch_buttons
+ #if HAS_ENCODER_WHEEL
+ & (~(EN_A | EN_B))
+ #endif
+ )
#endif
);
@@ -1264,20 +1242,30 @@ void MarlinUI::update() {
#endif
#if HAS_SHIFT_ENCODER
-
- GET_SHIFT_BUTTON_STATES((
- #if ENABLED(REPRAPWORLD_KEYPAD)
- keypad_buttons
- #else
- buttons
- #endif
- ));
-
+ /**
+ * Set up Rotary Encoder bit values (for two pin encoders to indicate movement).
+ * These values are independent of which pins are used for EN_A / EN_B indications.
+ * The rotary encoder part is also independent of the LCD chipset.
+ */
+ uint8_t val = 0;
+ WRITE(SHIFT_LD, LOW);
+ WRITE(SHIFT_LD, HIGH);
+ LOOP_L_N(i, 8) {
+ val >>= 1;
+ if (READ(SHIFT_OUT)) SBI(val, 7);
+ WRITE(SHIFT_CLK, HIGH);
+ WRITE(SHIFT_CLK, LOW);
+ }
+ #if ENABLED(REPRAPWORLD_KEYPAD)
+ keypad_buttons = ~val;
+ #else
+ buttons = ~val;
+ #endif
#endif
} // next_button_update_ms
- #if HAS_ENCODER_WHEEL && DISABLED(TOUCH_BUTTONS)
+ #if HAS_ENCODER_WHEEL
static uint8_t lastEncoderBits;
#define encrot0 0
@@ -1317,7 +1305,7 @@ void MarlinUI::update() {
#if HAS_DISPLAY
#if ENABLED(EXTENSIBLE_UI)
- #include "extensible_ui/ui_api.h"
+ #include "extui/ui_api.h"
#endif
////////////////////////////////////////////
@@ -1345,15 +1333,19 @@ void MarlinUI::update() {
UNUSED(persist);
#endif
+ #if ENABLED(LCD_PROGRESS_BAR) || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+ const millis_t ms = millis();
+ #endif
+
#if ENABLED(LCD_PROGRESS_BAR)
- progress_bar_ms = millis();
+ progress_bar_ms = ms;
#if PROGRESS_MSG_EXPIRE > 0
- expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
+ expire_status_ms = persist ? 0 : ms + PROGRESS_MSG_EXPIRE;
#endif
#endif
#if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
- next_filament_display = millis() + 5000UL; // Show status message for 5s
+ next_filament_display = ms + 5000UL; // Show status message for 5s
#endif
#if HAS_SPI_LCD && ENABLED(STATUS_MESSAGE_SCROLLING)
@@ -1450,7 +1442,7 @@ void MarlinUI::update() {
/**
* Reset the status message
*/
- void MarlinUI::reset_status() {
+ void MarlinUI::reset_status(const bool no_welcome) {
PGM_P printing = GET_TEXT(MSG_PRINTING);
PGM_P welcome = GET_TEXT(WELCOME_MSG);
#if SERVICE_INTERVAL_1 > 0
@@ -1482,8 +1474,10 @@ void MarlinUI::update() {
else if (print_job_timer.needsService(3)) msg = service3;
#endif
- else
+ else if (!no_welcome)
msg = welcome;
+ else
+ return;
set_status_P(msg, -1);
}
@@ -1501,7 +1495,7 @@ void MarlinUI::update() {
host_action_cancel();
#endif
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), PSTR("Dismiss"));
+ host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), DISMISS_STR);
#endif
print_job_timer.stop();
set_status_P(GET_TEXT(MSG_PRINT_ABORTED));
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index c98d3d5627..2737a1a648 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,10 +27,18 @@
#include "../libs/buzzer.h"
#endif
-#define HAS_ENCODER_ACTION (HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY))
-#define HAS_ENCODER_WHEEL ((!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTON_EXISTS(EN1, EN2))
-#define HAS_DIGITAL_BUTTONS (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT))
-#define HAS_SHIFT_ENCODER (!HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL))))
+#if HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY)
+ #define HAS_ENCODER_ACTION 1
+#endif
+#if (!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTONS_EXIST(EN1, EN2)
+ #define HAS_ENCODER_WHEEL 1
+#endif
+#if HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)
+ #define HAS_DIGITAL_BUTTONS 1
+#endif
+#if !HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL)))
+ #define HAS_SHIFT_ENCODER 1
+#endif
// I2C buttons must be read in the main thread
#define HAS_SLOW_BUTTONS EITHER(LCD_I2C_VIKI, LCD_I2C_PANELOLU2)
@@ -265,7 +273,16 @@ public:
// LCD implementations
static void clear_lcd();
- static void init_lcd();
+
+ #if HAS_SPI_LCD
+ static bool detected();
+ static void init_lcd();
+ FORCE_INLINE static void refresh() { refresh(LCDVIEW_CLEAR_CALL_REDRAW); }
+ #else
+ static inline bool detected() { return true; }
+ static inline void init_lcd() {}
+ static inline void refresh() {}
+ #endif
#if HAS_DISPLAY
@@ -324,12 +341,9 @@ public:
static millis_t next_button_update_ms;
- static bool detected();
-
static LCDViewAction lcdDrawUpdate;
FORCE_INLINE static bool should_draw() { return bool(lcdDrawUpdate); }
FORCE_INLINE static void refresh(const LCDViewAction type) { lcdDrawUpdate = type; }
- FORCE_INLINE static void refresh() { refresh(LCDVIEW_CLEAR_CALL_REDRAW); }
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
static void draw_custom_bootscreen(const uint8_t frame=0);
@@ -337,6 +351,9 @@ public:
#endif
#if ENABLED(SHOW_BOOTSCREEN)
+ #ifndef BOOTSCREEN_TIMEOUT
+ #define BOOTSCREEN_TIMEOUT 2500
+ #endif
static void draw_marlin_bootscreen(const bool line2=false);
static void show_marlin_bootscreen();
static void show_bootscreen();
@@ -392,8 +409,6 @@ public:
static void status_screen();
- #else
- static void refresh() {}
#endif
static bool get_blink();
@@ -402,21 +417,20 @@ public:
static void set_status(const char* const message, const bool persist=false);
static void set_status_P(PGM_P const message, const int8_t level=0);
static void status_printf_P(const uint8_t level, PGM_P const fmt, ...);
- static void reset_status();
+ static void reset_status(const bool no_welcome=false);
#else // No LCD
// Send status to host as a notification
- void set_status(const char* message, const bool=false);
- void set_status_P(PGM_P message, const int8_t=0);
- void status_printf_P(const uint8_t, PGM_P message, ...);
+ static void set_status(const char* message, const bool=false);
+ static void set_status_P(PGM_P message, const int8_t=0);
+ static void status_printf_P(const uint8_t, PGM_P message, ...);
static inline void init() {}
static inline void update() {}
- static inline void refresh() {}
static inline void return_to_status() {}
static inline void set_alert_status_P(PGM_P const) {}
- static inline void reset_status() {}
+ static inline void reset_status(const bool=false) {}
static inline void reset_alert_level() {}
static constexpr bool has_status() { return false; }
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index cfa28586b6..ad70537141 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,39 +39,40 @@ L64XX_Marlin L64xxManager;
void echo_yes_no(const bool yes) { serialprintPGM(yes ? PSTR(" YES") : PSTR(" NO ")); }
-char L64XX_Marlin::index_to_axis[MAX_L64XX][3] = { "X ", "Y ", "Z ", "X2", "Y2", "Z2", "Z3", "Z4", "E0", "E1", "E2", "E3", "E4", "E5", "E6", "E7" };
+static const char str_X[] PROGMEM = "X ", str_Y[] PROGMEM = "Y ", str_Z[] PROGMEM = "Z ",
+ str_X2[] PROGMEM = "X2", str_Y2[] PROGMEM = "Y2",
+ str_Z2[] PROGMEM = "Z2", str_Z3[] PROGMEM = "Z3", str_Z4[] PROGMEM = "Z4",
+ str_E0[] PROGMEM = "E0", str_E1[] PROGMEM = "E1",
+ str_E2[] PROGMEM = "E2", str_E3[] PROGMEM = "E3",
+ str_E4[] PROGMEM = "E4", str_E5[] PROGMEM = "E5",
+ str_E6[] PROGMEM = "E6", str_E7[] PROGMEM = "E7"
+ ;
+
+PGM_P const L64XX_Marlin::index_to_axis[] PROGMEM = {
+ str_X, str_Y, str_Z, str_X2, str_Y2, str_Z2, str_Z3, str_Z4,
+ str_E0, str_E1, str_E2, str_E3, str_E4, str_E5, str_E6, str_E7
+};
#define DEBUG_OUT ENABLED(L6470_CHITCHAT)
#include "../../core/debug_out.h"
uint8_t L64XX_Marlin::dir_commands[MAX_L64XX]; // array to hold direction command for each driver
-uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = { (INVERT_X_DIR), // 0 X
- (INVERT_Y_DIR), // 1 Y
- (INVERT_Z_DIR), // 2 Z
- #if ENABLED(X_DUAL_STEPPER_DRIVERS) // 3 X2
- (INVERT_X_DIR) ^ (INVERT_X2_VS_X_DIR),
- #else
- (INVERT_X_DIR),
- #endif
- #if ENABLED(Y_DUAL_STEPPER_DRIVERS) // 4 Y2
- (INVERT_Y_DIR) ^ (INVERT_Y2_VS_Y_DIR),
- #else
- (INVERT_Y_DIR),
- #endif
- (INVERT_Z_DIR), // 5 Z2
- (INVERT_Z_DIR), // 6 Z3
- (INVERT_Z_DIR), // 7 Z4
+const uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = {
+ INVERT_X_DIR, INVERT_Y_DIR, INVERT_Z_DIR
+ , (INVERT_X_DIR) // X2
+ #if ENABLED(X_DUAL_STEPPER_DRIVERS)
+ ^ (INVERT_X2_VS_X_DIR)
+ #endif
+ , (INVERT_Y_DIR) // Y2
+ #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+ ^ (INVERT_Y2_VS_Y_DIR)
+ #endif
+ , INVERT_Z_DIR, INVERT_Z_DIR, INVERT_Z_DIR // Z2,Z3,Z4
- (INVERT_E0_DIR), // 8 E0
- (INVERT_E1_DIR), // 9 E1
- (INVERT_E2_DIR), // 10 E2
- (INVERT_E3_DIR), // 11 E3
- (INVERT_E4_DIR), // 12 E4
- (INVERT_E5_DIR), // 13 E5
- (INVERT_E6_DIR), // 14 E6
- (INVERT_E7_DIR) // 15 E7
- };
+ , INVERT_E0_DIR, INVERT_E1_DIR, INVERT_E2_DIR, INVERT_E3_DIR
+ , INVERT_E4_DIR, INVERT_E5_DIR, INVERT_E6_DIR, INVERT_E7_DIR
+};
volatile uint8_t L64XX_Marlin::spi_abort = false;
uint8_t L64XX_Marlin::spi_active = false;
@@ -126,6 +127,12 @@ void L6470_populate_chain_array() {
#if AXIS_IS_L64XX(E5)
_L6470_INIT_SPI(E5);
#endif
+ #if AXIS_IS_L64XX(E6)
+ _L6470_INIT_SPI(E6);
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ _L6470_INIT_SPI(E7);
+ #endif
}
@@ -239,6 +246,12 @@ uint16_t L64XX_Marlin::get_status(const L64XX_axis_t axis) {
#if AXIS_IS_L64XX(E5)
case E5: return STATUS_L6470(E5);
#endif
+ #if AXIS_IS_L64XX(E6)
+ case E6: return STATUS_L6470(E6);
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ case E7: return STATUS_L6470(E7);
+ #endif
}
return 0; // Not needed but kills a compiler warning
@@ -292,6 +305,12 @@ uint32_t L64XX_Marlin::get_param(const L64XX_axis_t axis, const uint8_t param) {
#if AXIS_IS_L64XX(E5)
case E5: return GET_L6470_PARAM(E5);
#endif
+ #if AXIS_IS_L64XX(E6)
+ case E6: return GET_L6470_PARAM(E6);
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ case E7: return GET_L6470_PARAM(E7);
+ #endif
}
return 0; // not needed but kills a compiler warning
@@ -345,6 +364,12 @@ void L64XX_Marlin::set_param(const L64XX_axis_t axis, const uint8_t param, const
#if AXIS_IS_L64XX(E5)
case E5: SET_L6470_PARAM(E5); break;
#endif
+ #if AXIS_IS_L64XX(E6)
+ case E6: SET_L6470_PARAM(E6); break;
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ case E7: SET_L6470_PARAM(E7); break;
+ #endif
}
}
@@ -379,35 +404,27 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
found_displacement = true;
displacement = _displacement;
uint8_t axis_offset = parser.byteval('J');
- axis_mon[0][0] = axis_codes[i]; // axis ASCII value (target character)
+ axis_mon[0][0] = axis_codes[i]; // Axis first character, one of XYZE
+ const bool single_or_e = axis_offset >= 2 || axis_mon[0][0] == 'E',
+ one_or_more = !single_or_e && axis_offset == 0;
uint8_t driver_count_local = 0; // Can't use "driver_count" directly as a subscript because it's passed by reference
- if (axis_offset >= 2 || axis_mon[0][0] == 'E') { // Single axis, E0, or E1
- axis_mon[0][1] = axis_offset + '0';
- for (j = 0; j < MAX_L64XX; j++) { // See how many drivers on this axis
- const char * const str = index_to_axis[j];
- if (axis_mon[0][0] == str[0]) {
- char * const mon = axis_mon[driver_count_local];
- mon[0] = str[0];
- mon[1] = str[1];
- mon[2] = str[2]; // append end of string
- axis_index[driver_count_local] = (L64XX_axis_t)j; // set axis index
+ if (single_or_e) // Single axis, E0, or E1
+ axis_mon[0][1] = axis_offset + '0'; // Index given by 'J' parameter
+
+ if (single_or_e || one_or_more) {
+ for (j = 0; j < MAX_L64XX; j++) { // Count up the drivers on this axis
+ PGM_P str = (PGM_P)pgm_read_ptr(&index_to_axis[j]); // Get a PGM_P from progmem
+ const char c = pgm_read_byte(str); // Get a char from progmem
+ if (axis_mon[0][0] == c) { // For each stepper on this axis...
+ char *mon = axis_mon[driver_count_local];
+ *mon++ = c; // Copy the 3 letter axis name
+ *mon++ = pgm_read_byte(&str[1]); // to the axis_mon array
+ *mon = pgm_read_byte(&str[2]);
+ axis_index[driver_count_local] = (L64XX_axis_t)j; // And store the L64XX axis index
driver_count_local++;
}
}
- }
- else if (axis_offset == 0) { // One or more axes
- for (j = 0; j < MAX_L64XX; j++) { // See how many drivers on this axis
- const char * const str = index_to_axis[j];
- if (axis_mon[0][0] == str[0]) {
- char * const mon = axis_mon[driver_count_local];
- mon[0] = str[0];
- mon[1] = str[1];
- mon[2] = str[2]; // append end of string
- axis_index[driver_count_local] = (L64XX_axis_t)j; // set axis index
- driver_count_local++;
- }
- }
- driver_count = driver_count_local;
+ if (one_or_more) driver_count = driver_count_local;
}
break; // only take first axis found
}
@@ -491,11 +508,11 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
// Work on the drivers
//
- for (uint8_t k = 0; k < driver_count; k++) {
+ LOOP_L_N(k, driver_count) {
uint8_t not_found = true;
for (j = 1; j <= L64XX::chain[0]; j++) {
- const char * const ind_axis = index_to_axis[L64XX::chain[j]];
- if (ind_axis[0] == axis_mon[k][0] && ind_axis[1] == axis_mon[k][1]) { // See if a L6470 driver
+ PGM_P const str = (PGM_P)pgm_read_ptr(&index_to_axis[L64XX::chain[j]]);
+ if (pgm_read_byte(&str[0]) == axis_mon[k][0] && pgm_read_byte(&str[1]) == axis_mon[k][1]) { // See if a L6470 driver
not_found = false;
break;
}
@@ -701,30 +718,37 @@ void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*
{ 6, 0, 0, 0, 0, 0, 0 },
#endif
#if AXIS_IS_L64XX(Z4)
- { 6, 0, 0, 0, 0, 0, 0 },
- #endif
- #if AXIS_IS_L64XX(E0)
{ 7, 0, 0, 0, 0, 0, 0 },
#endif
- #if AXIS_IS_L64XX(E1)
+ #if AXIS_IS_L64XX(E0)
{ 8, 0, 0, 0, 0, 0, 0 },
#endif
- #if AXIS_IS_L64XX(E2)
+ #if AXIS_IS_L64XX(E1)
{ 9, 0, 0, 0, 0, 0, 0 },
#endif
- #if AXIS_IS_L64XX(E3)
+ #if AXIS_IS_L64XX(E2)
{ 10, 0, 0, 0, 0, 0, 0 },
#endif
- #if AXIS_IS_L64XX(E4)
+ #if AXIS_IS_L64XX(E3)
{ 11, 0, 0, 0, 0, 0, 0 },
#endif
+ #if AXIS_IS_L64XX(E4)
+ { 12, 0, 0, 0, 0, 0, 0 },
+ #endif
#if AXIS_IS_L64XX(E5)
- { 12, 0, 0, 0, 0, 0, 0 }
+ { 13, 0, 0, 0, 0, 0, 0 }
+ #endif
+ #if AXIS_IS_L64XX(E6)
+ { 14, 0, 0, 0, 0, 0, 0 }
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ { 16, 0, 0, 0, 0, 0, 0 }
#endif
};
void L64XX_Marlin::append_stepper_err(char* &p, const uint8_t stepper_index, const char * const err/*=nullptr*/) {
- p += sprintf_P(p, PSTR("Stepper %c%c "), index_to_axis[stepper_index][0], index_to_axis[stepper_index][1]);
+ PGM_P const str = (PGM_P)pgm_read_ptr(&index_to_axis[stepper_index]);
+ p += sprintf_P(p, PSTR("Stepper %c%c "), pgm_read_byte(&str[0]), pgm_read_byte(&str[1]));
if (err) p += sprintf_P(p, err);
}
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index 9c233fdf03..371f0991c2 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,15 +33,16 @@
#define dSPIN_STEP_CLOCK 0x58
#define dSPIN_STEP_CLOCK_FWD dSPIN_STEP_CLOCK
#define dSPIN_STEP_CLOCK_REV dSPIN_STEP_CLOCK+1
-#define HAS_L64XX_EXTRUDER (AXIS_IS_L64XX(E0) || AXIS_IS_L64XX(E1) || AXIS_IS_L64XX(E2) || AXIS_IS_L64XX(E3) || AXIS_IS_L64XX(E4) || AXIS_IS_L64XX(E5))
+#define HAS_L64XX_EXTRUDER (AXIS_IS_L64XX(E0) || AXIS_IS_L64XX(E1) || AXIS_IS_L64XX(E2) || AXIS_IS_L64XX(E3) || AXIS_IS_L64XX(E4) || AXIS_IS_L64XX(E5) || AXIS_IS_L64XX(E6) || AXIS_IS_L64XX(E7))
enum L64XX_axis_t : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7, MAX_L64XX };
class L64XX_Marlin : public L64XXHelper {
public:
- static char index_to_axis[MAX_L64XX][3];
+ static PGM_P const index_to_axis[MAX_L64XX];
+
+ static const uint8_t index_to_dir[MAX_L64XX];
- static uint8_t index_to_dir[MAX_L64XX];
static uint8_t dir_commands[MAX_L64XX];
// Flags to guarantee graceful switch if stepper interrupts L6470 SPI transfer
@@ -69,7 +70,6 @@ public:
static void transfer(uint8_t L6470_buf[], const uint8_t length);
- //static char* index_to_axis(const uint8_t index);
static void say_axis(const L64XX_axis_t axis, const uint8_t label=true);
#if ENABLED(L6470_CHITCHAT)
static void error_status_decode(
diff --git a/Marlin/src/libs/bresenham.h b/Marlin/src/libs/bresenham.h
index 013e357d08..e18531498b 100644
--- a/Marlin/src/libs/bresenham.h
+++ b/Marlin/src/libs/bresenham.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/buzzer.cpp b/Marlin/src/libs/buzzer.cpp
index 549c76008e..3b0a239178 100644
--- a/Marlin/src/libs/buzzer.cpp
+++ b/Marlin/src/libs/buzzer.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,7 +28,7 @@
#include "../module/temperature.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
Buzzer::state_t Buzzer::state;
@@ -63,13 +63,13 @@ void Buzzer::tick() {
if (state.tone.frequency > 0) {
#if ENABLED(EXTENSIBLE_UI)
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
ExtUI::onPlayTone(state.tone.frequency, state.tone.duration);
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
#elif ENABLED(SPEAKER)
- CRITICAL_SECTION_START;
+ CRITICAL_SECTION_START();
::tone(BEEPER_PIN, state.tone.frequency, state.tone.duration);
- CRITICAL_SECTION_END;
+ CRITICAL_SECTION_END();
#else
on();
#endif
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index 026b9330f9..3a72a0bd86 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/circularqueue.h b/Marlin/src/libs/circularqueue.h
index 6b1923986d..54a6edaabe 100644
--- a/Marlin/src/libs/circularqueue.h
+++ b/Marlin/src/libs/circularqueue.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/crc16.cpp b/Marlin/src/libs/crc16.cpp
index fdb6395607..71cda50aeb 100644
--- a/Marlin/src/libs/crc16.cpp
+++ b/Marlin/src/libs/crc16.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/crc16.h b/Marlin/src/libs/crc16.h
index d625acce07..65e036d089 100644
--- a/Marlin/src/libs/crc16.h
+++ b/Marlin/src/libs/crc16.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/duration_t.h b/Marlin/src/libs/duration_t.h
index 0df3659b1b..897ea1e869 100644
--- a/Marlin/src/libs/duration_t.h
+++ b/Marlin/src/libs/duration_t.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/hex_print_routines.cpp b/Marlin/src/libs/hex_print_routines.cpp
index a30410641a..293192e6ef 100644
--- a/Marlin/src/libs/hex_print_routines.cpp
+++ b/Marlin/src/libs/hex_print_routines.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/hex_print_routines.h b/Marlin/src/libs/hex_print_routines.h
index 09d6d17013..ac47ed7701 100644
--- a/Marlin/src/libs/hex_print_routines.h
+++ b/Marlin/src/libs/hex_print_routines.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/least_squares_fit.cpp b/Marlin/src/libs/least_squares_fit.cpp
index 1353296794..aac83f9aca 100644
--- a/Marlin/src/libs/least_squares_fit.cpp
+++ b/Marlin/src/libs/least_squares_fit.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/least_squares_fit.h b/Marlin/src/libs/least_squares_fit.h
index acb29402c5..721c499dec 100644
--- a/Marlin/src/libs/least_squares_fit.h
+++ b/Marlin/src/libs/least_squares_fit.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index f9b09c2fa9..ecbfeb331e 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -54,7 +54,7 @@ Nozzle nozzle;
#endif
// Start the stroke pattern
- for (uint8_t i = 0; i < (strokes >> 1); i++) {
+ LOOP_L_N(i, strokes >> 1) {
do_blocking_move_to_xy(end);
do_blocking_move_to_xy(start);
}
@@ -91,7 +91,7 @@ Nozzle nozzle;
const bool horiz = ABS(diff.x) >= ABS(diff.y); // Do a horizontal wipe?
const float P = (horiz ? diff.x : diff.y) / zigs; // Period of each zig / zag
const xyz_pos_t *side;
- for (uint8_t j = 0; j < strokes; j++) {
+ LOOP_L_N(j, strokes) {
for (int8_t i = 0; i < zigs; i++) {
side = (i & 1) ? &end : &start;
if (horiz)
@@ -134,8 +134,8 @@ Nozzle nozzle;
do_blocking_move_to(start);
#endif
- for (uint8_t s = 0; s < strokes; s++)
- for (uint8_t i = 0; i < NOZZLE_CLEAN_CIRCLE_FN; i++)
+ LOOP_L_N(s, strokes)
+ LOOP_L_N(i, NOZZLE_CLEAN_CIRCLE_FN)
do_blocking_move_to_xy(
middle.x + sin((RADIANS(360) / NOZZLE_CLEAN_CIRCLE_FN) * i) * radius,
middle.y + cos((RADIANS(360) / NOZZLE_CLEAN_CIRCLE_FN) * i) * radius
diff --git a/Marlin/src/libs/nozzle.h b/Marlin/src/libs/nozzle.h
index 280f8b1a38..3ff0670ce8 100644
--- a/Marlin/src/libs/nozzle.h
+++ b/Marlin/src/libs/nozzle.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index 6054f877e5..1ed315ae07 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,7 +33,7 @@ char conv[8] = { 0 };
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
// Convert a full-range unsigned 8bit int to a percentage
-const char* ui8tostr4pct(const uint8_t i) {
+const char* ui8tostr4pctrj(const uint8_t i) {
const uint8_t n = ui8_to_percent(i);
conv[3] = RJDIGIT(n, 100);
conv[4] = RJDIGIT(n, 10);
@@ -43,7 +43,7 @@ const char* ui8tostr4pct(const uint8_t i) {
}
// Convert unsigned 8bit int to string 123 format
-const char* ui8tostr3(const uint8_t i) {
+const char* ui8tostr3rj(const uint8_t i) {
conv[4] = RJDIGIT(i, 100);
conv[5] = RJDIGIT(i, 10);
conv[6] = DIGIMOD(i, 1);
@@ -51,7 +51,7 @@ const char* ui8tostr3(const uint8_t i) {
}
// Convert signed 8bit int to rj string with 123 or -12 format
-const char* i8tostr3(const int8_t x) {
+const char* i8tostr3rj(const int8_t x) {
int xx = x;
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
conv[5] = RJDIGIT(xx, 10);
@@ -88,7 +88,7 @@ const char* i8tostr3(const int8_t x) {
#endif
// Convert unsigned 16bit int to string 12345 format
-const char* ui16tostr5(const uint16_t xx) {
+const char* ui16tostr5rj(const uint16_t xx) {
conv[2] = RJDIGIT(xx, 10000);
conv[3] = RJDIGIT(xx, 1000);
conv[4] = RJDIGIT(xx, 100);
@@ -98,7 +98,7 @@ const char* ui16tostr5(const uint16_t xx) {
}
// Convert unsigned 16bit int to string 1234 format
-const char* ui16tostr4(const uint16_t xx) {
+const char* ui16tostr4rj(const uint16_t xx) {
conv[3] = RJDIGIT(xx, 1000);
conv[4] = RJDIGIT(xx, 100);
conv[5] = RJDIGIT(xx, 10);
@@ -107,7 +107,7 @@ const char* ui16tostr4(const uint16_t xx) {
}
// Convert unsigned 16bit int to string 123 format
-const char* ui16tostr3(const uint16_t xx) {
+const char* ui16tostr3rj(const uint16_t xx) {
conv[4] = RJDIGIT(xx, 100);
conv[5] = RJDIGIT(xx, 10);
conv[6] = DIGIMOD(xx, 1);
@@ -115,7 +115,7 @@ const char* ui16tostr3(const uint16_t xx) {
}
// Convert signed 16bit int to rj string with 123 or -12 format
-const char* i16tostr3(const int16_t x) {
+const char* i16tostr3rj(const int16_t x) {
int xx = x;
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
conv[5] = RJDIGIT(xx, 10);
@@ -136,7 +136,7 @@ const char* i16tostr3left(const int16_t i) {
}
// Convert signed 16bit int to rj string with 1234, _123, -123, _-12, or __-1 format
-const char* i16tostr4sign(const int16_t i) {
+const char* i16tostr4signrj(const int16_t i) {
const bool neg = i < 0;
const int ii = neg ? -i : i;
if (i >= 1000) {
@@ -174,9 +174,9 @@ const char* ftostr12ns(const float &f) {
return &conv[3];
}
-// Convert signed float to fixed-length string with 12.34 / -2.34 format or 123.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
const char* ftostr42_52(const float &f) {
- if (f <= -10 || f >= 100) return ftostr52(f); // need more digits
+ if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45
long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000));
conv[3] = DIGIMOD(i, 100);
@@ -198,12 +198,38 @@ const char* ftostr52(const float &f) {
return &conv[1];
}
+// Convert signed float to fixed-length string with 12.345 / _2.345 / -2.345 or -23.45 / 123.45 format
+const char* ftostr53_63(const float &f) {
+ if (f <= -10 || f >= 100) return ftostr63(f); // -23.456 / 123.456
+ long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+ conv[1] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 10000));
+ conv[2] = DIGIMOD(i, 1000);
+ conv[3] = '.';
+ conv[4] = DIGIMOD(i, 100);
+ conv[5] = DIGIMOD(i, 10);
+ conv[6] = DIGIMOD(i, 1);
+ return &conv[1];
+}
+
+// Convert signed float to fixed-length string with 023.456 / -23.456 format
+const char* ftostr63(const float &f) {
+ long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+ conv[0] = MINUSOR(i, DIGIMOD(i, 100000));
+ conv[1] = DIGIMOD(i, 10000);
+ conv[2] = DIGIMOD(i, 1000);
+ conv[3] = '.';
+ conv[4] = DIGIMOD(i, 100);
+ conv[5] = DIGIMOD(i, 10);
+ conv[6] = DIGIMOD(i, 1);
+ return &conv[0];
+}
+
#if ENABLED(LCD_DECIMAL_SMALL_XY)
// Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
const char* ftostr4sign(const float &f) {
const int i = (f * 100 + (f < 0 ? -5: 5)) / 10;
- if (!WITHIN(i, -99, 999)) return i16tostr4sign((int)f);
+ if (!WITHIN(i, -99, 999)) return i16tostr4signrj((int)f);
const bool neg = i < 0;
const int ii = neg ? -i : i;
conv[3] = neg ? '-' : (ii >= 100 ? DIGIMOD(ii, 100) : ' ');
@@ -255,7 +281,7 @@ const char* ftostr54sign(const float &f, char plus/*=' '*/) {
// Convert unsigned float to rj string with 12345 format
const char* ftostr5rj(const float &f) {
const long i = ((f < 0 ? -f : f) * 10 + 5) / 10;
- return ui16tostr5(i);
+ return ui16tostr5rj(i);
}
// Convert signed float to string with +1234.5 format
@@ -284,7 +310,20 @@ const char* ftostr52sign(const float &f) {
return conv;
}
-// Convert unsigned float to string with 1234.5 format omitting trailing zeros
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f) {
+ long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+ conv[0] = MINUSOR(i, '+');
+ conv[1] = DIGIMOD(i, 10000);
+ conv[2] = DIGIMOD(i, 1000);
+ conv[3] = '.';
+ conv[4] = DIGIMOD(i, 100);
+ conv[5] = DIGIMOD(i, 10);
+ conv[6] = DIGIMOD(i, 1);
+ return conv;
+}
+
+// Convert unsigned float to string with ____4.5, __34.5, _234.5, 1234.5 format
const char* ftostr51rj(const float &f) {
const long i = ((f < 0 ? -f : f) * 100 + 5) / 10;
conv[0] = ' ';
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index f18df094a3..8b6b83391f 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,13 +24,13 @@
#include
// Convert a full-range unsigned 8bit int to a percentage
-const char* ui8tostr4pct(const uint8_t i);
+const char* ui8tostr4pctrj(const uint8_t i);
// Convert uint8_t to string with 123 format
-const char* ui8tostr3(const uint8_t i);
+const char* ui8tostr3rj(const uint8_t i);
// Convert int8_t to string with 123 format
-const char* i8tostr3(const int8_t x);
+const char* i8tostr3rj(const int8_t x);
#if HAS_PRINT_PROGRESS_PERMYRIAD
// Convert 16-bit unsigned permyriad value to percent: 100 / 23 / 23.4 / 3.45
@@ -38,32 +38,38 @@ const char* i8tostr3(const int8_t x);
#endif
// Convert uint16_t to string with 12345 format
-const char* ui16tostr5(const uint16_t x);
+const char* ui16tostr5rj(const uint16_t x);
// Convert uint16_t to string with 1234 format
-const char* ui16tostr4(const uint16_t x);
+const char* ui16tostr4rj(const uint16_t x);
// Convert uint16_t to string with 123 format
-const char* ui16tostr3(const uint16_t x);
+const char* ui16tostr3rj(const uint16_t x);
// Convert int16_t to string with 123 format
-const char* i16tostr3(const int16_t x);
+const char* i16tostr3rj(const int16_t x);
// Convert unsigned int to lj string with 123 format
const char* i16tostr3left(const int16_t xx);
// Convert signed int to rj string with _123, -123, _-12, or __-1 format
-const char* i16tostr4sign(const int16_t x);
+const char* i16tostr4signrj(const int16_t x);
// Convert unsigned float to string with 1.23 format
const char* ftostr12ns(const float &x);
-// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
const char* ftostr42_52(const float &x);
// Convert signed float to fixed-length string with 023.45 / -23.45 format
const char* ftostr52(const float &x);
+// Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
+const char* ftostr53_63(const float &x);
+
+// Convert signed float to fixed-length string with 023.456 / -23.456 format
+const char* ftostr63(const float &x);
+
// Convert float to fixed-length string with +123.4 / -123.4 format
const char* ftostr41sign(const float &x);
@@ -85,13 +91,16 @@ const char* ftostr52sp(const float &x);
// Convert signed float to string with +123.45 format
const char* ftostr52sign(const float &x);
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f);
+
// Convert unsigned float to string with 1234.5 format omitting trailing zeros
const char* ftostr51rj(const float &x);
#include "../core/macros.h"
// Convert float to rj string with 123 or -12 format
-FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
+FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3rj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
#include "../inc/MarlinConfigPre.h"
@@ -100,5 +109,5 @@ FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x +
const char* ftostr4sign(const float &fx);
#else
// Convert float to rj string with 1234, _123, -123, __12, _-12, ___1, or __-1 format
- FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4sign(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
+ FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4signrj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
#endif
diff --git a/Marlin/src/libs/private_spi.h b/Marlin/src/libs/private_spi.h
index a3f8621f0d..9ce68c4909 100644
--- a/Marlin/src/libs/private_spi.h
+++ b/Marlin/src/libs/private_spi.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/softspi.h b/Marlin/src/libs/softspi.h
index 5623496d9d..300eb93871 100644
--- a/Marlin/src/libs/softspi.h
+++ b/Marlin/src/libs/softspi.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/stopwatch.cpp b/Marlin/src/libs/stopwatch.cpp
index b80a1597d5..6b01158cb9 100644
--- a/Marlin/src/libs/stopwatch.cpp
+++ b/Marlin/src/libs/stopwatch.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,7 +25,7 @@
#include "../inc/MarlinConfig.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
Stopwatch::State Stopwatch::state;
diff --git a/Marlin/src/libs/stopwatch.h b/Marlin/src/libs/stopwatch.h
index 013c243cfe..4aac815c8d 100644
--- a/Marlin/src/libs/stopwatch.h
+++ b/Marlin/src/libs/stopwatch.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index c2bb347dac..c0da29e702 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -96,8 +96,8 @@ void apply_rotation_xyz(const matrix_3x3 &matrix, float &_x, float &_y, float &_
// Reset to identity. No rotate or translate.
void matrix_3x3::set_to_identity() {
- for (uint8_t i = 0; i < 3; i++)
- for (uint8_t j = 0; j < 3; j++)
+ LOOP_L_N(i, 3)
+ LOOP_L_N(j, 3)
vectors[i][j] = float(i == j);
}
@@ -134,8 +134,8 @@ matrix_3x3 matrix_3x3::create_look_at(const vector_3 &target) {
// Get a transposed copy of the matrix
matrix_3x3 matrix_3x3::transpose(const matrix_3x3 &original) {
matrix_3x3 new_matrix;
- for (uint8_t i = 0; i < 3; i++)
- for (uint8_t j = 0; j < 3; j++)
+ LOOP_L_N(i, 3)
+ LOOP_L_N(j, 3)
new_matrix.vectors[i][j] = original.vectors[j][i];
return new_matrix;
}
@@ -145,8 +145,8 @@ void matrix_3x3::debug(PGM_P const title) {
serialprintPGM(title);
SERIAL_EOL();
}
- for (uint8_t i = 0; i < 3; i++) {
- for (uint8_t j = 0; j < 3; j++) {
+ LOOP_L_N(i, 3) {
+ LOOP_L_N(j, 3) {
if (vectors[i][j] >= 0.0) SERIAL_CHAR('+');
SERIAL_ECHO_F(vectors[i][j], 6);
SERIAL_CHAR(' ');
diff --git a/Marlin/src/libs/vector_3.h b/Marlin/src/libs/vector_3.h
index e065697f05..bd596f2343 100644
--- a/Marlin/src/libs/vector_3.h
+++ b/Marlin/src/libs/vector_3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 85b0b850b0..a2beb322f9 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@
*/
// Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V75"
+#define EEPROM_VERSION "V77"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@@ -57,7 +57,7 @@
#include "../MarlinCore.h"
#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
- #include "../HAL/shared/persistent_store_api.h"
+ #include "../HAL/shared/eeprom_api.h"
#endif
#include "probe.h"
@@ -66,8 +66,12 @@
#include "../feature/bedlevel/bedlevel.h"
#endif
+#if ENABLED(Z_STEPPER_AUTO_ALIGN)
+ #include "../feature/z_stepper_align.h"
+#endif
+
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
#if HAS_SERVOS
@@ -83,7 +87,7 @@
#include "../feature/fwretract.h"
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../feature/power_loss_recovery.h"
+ #include "../feature/powerloss.h"
#endif
#include "../feature/pause.h"
@@ -97,7 +101,7 @@
#endif
#if ENABLED(EXTRA_LIN_ADVANCE_K)
- extern float saved_extruder_advance_K[EXTRUDERS];
+ extern float other_extruder_advance_K[EXTRUDERS];
#endif
#if EXTRUDERS > 1
@@ -109,21 +113,31 @@
#include "../feature/bltouch.h"
#endif
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "stepper/indirection.h"
#include "../feature/tmc_util.h"
#endif
#if ENABLED(PROBE_TEMP_COMPENSATION)
- #include "../feature/probe_temp_compensation.h"
+ #include "../feature/probe_temp_comp.h"
+#endif
+
+#include "../feature/controllerfan.h"
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+ void M710_report(const bool forReplay);
+#endif
+
+#define HAS_CASE_LIGHT_BRIGHTNESS (ENABLED(CASE_LIGHT_MENU) && DISABLED(CASE_LIGHT_NO_BRIGHTNESS))
+#if HAS_CASE_LIGHT_BRIGHTNESS
+ #include "../feature/caselight.h"
#endif
#pragma pack(push, 1) // No padding between variables
-typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stepper_current_t;
-typedef struct { uint32_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_hybrid_threshold_t;
-typedef struct { int16_t X, Y, Z, X2; } tmc_sgt_t;
-typedef struct { bool X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stealth_enabled_t;
+typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_stepper_current_t;
+typedef struct { uint32_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_hybrid_threshold_t;
+typedef struct { int16_t X, Y, Z, X2; } tmc_sgt_t;
+typedef struct { bool X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_stealth_enabled_t;
// Limit an index to an array size
#define ALIM(I,ARR) _MIN(I, COUNT(ARR) - 1)
@@ -177,11 +191,8 @@ typedef struct SettingsDataStruct {
//
float mbl_z_offset; // mbl.z_offset
uint8_t mesh_num_x, mesh_num_y; // GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y
- #if ENABLED(MESH_BED_LEVELING)
- float mbl_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y]; // mbl.z_values
- #else
- float mbl_z_values[3][3];
- #endif
+ float mbl_z_values[TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3)] // mbl.z_values
+ [TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_Y, 3)];
//
// HAS_BED_PROBE
@@ -251,6 +262,16 @@ typedef struct SettingsDataStruct {
z4_endstop_adj; // M666 (S4) Z
#endif
+ //
+ // Z_STEPPER_AUTO_ALIGN, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
+ //
+ #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+ xy_pos_t z_stepper_align_xy[NUM_Z_STEPPER_DRIVERS]; // M422 S X Y
+ #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ xy_pos_t z_stepper_align_stepper_xy[NUM_Z_STEPPER_DRIVERS]; // M422 W X Y
+ #endif
+ #endif
+
//
// ULTIPANEL
//
@@ -281,6 +302,11 @@ typedef struct SettingsDataStruct {
//
int16_t lcd_contrast; // M250 C
+ //
+ // Controller fan settings
+ //
+ controllerFan_settings_t controllerFan_settings; // M710
+
//
// POWER_LOSS_RECOVERY
//
@@ -299,7 +325,7 @@ typedef struct SettingsDataStruct {
float planner_filament_size[EXTRUDERS]; // M200 T D planner.filament_size[]
//
- // HAS_TRINAMIC
+ // HAS_TRINAMIC_CONFIG
//
tmc_stepper_current_t tmc_stepper_current; // M906 X Y Z X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
tmc_hybrid_threshold_t tmc_hybrid_threshold; // M913 X Y Z X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
@@ -309,7 +335,7 @@ typedef struct SettingsDataStruct {
//
// LIN_ADVANCE
//
- float planner_extruder_advance_K[EXTRUDERS]; // M900 K planner.extruder_advance_K
+ float planner_extruder_advance_K[_MAX(EXTRUDERS, 1)]; // M900 K planner.extruder_advance_K
//
// HAS_MOTOR_CURRENT_PWM
@@ -355,6 +381,13 @@ typedef struct SettingsDataStruct {
uint8_t extui_data[ExtUI::eeprom_data_size];
#endif
+ //
+ // HAS_CASE_LIGHT_BRIGHTNESS
+ //
+ #if HAS_CASE_LIGHT_BRIGHTNESS
+ uint8_t case_light_brightness;
+ #endif
+
} SettingsData;
//static_assert(sizeof(SettingsData) <= E2END + 1, "EEPROM too small to contain SettingsData!");
@@ -420,6 +453,10 @@ void MarlinSettings::postprocess() {
planner.recalculate_max_e_jerk();
#endif
+ #if HAS_CASE_LIGHT_BRIGHTNESS
+ update_case_light();
+ #endif
+
// Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
// and init stepper.count[], planner.position[] with current_position
planner.refresh_positioning();
@@ -511,7 +548,7 @@ void MarlinSettings::postprocess() {
* M500 - Store Configuration
*/
bool MarlinSettings::save() {
- float dummy = 0;
+ float dummyf = 0;
char ver[4] = "ERR";
uint16_t working_crc = 0;
@@ -519,11 +556,10 @@ void MarlinSettings::postprocess() {
EEPROM_START();
eeprom_error = false;
- #if ENABLED(FLASH_EEPROM_EMULATION)
- EEPROM_SKIP(ver); // Flash doesn't allow rewriting without erase
- #else
- EEPROM_WRITE(ver); // invalidate data first
- #endif
+
+ // Write or Skip version. (Flash doesn't allow rewrite without erase.)
+ TERN(FLASH_EEPROM_EMULATION, EEPROM_SKIP, EEPROM_WRITE)(ver);
+
EEPROM_SKIP(working_crc); // Skip the checksum slot
working_crc = 0; // clear before first "real data"
@@ -542,20 +578,18 @@ void MarlinSettings::postprocess() {
#if HAS_CLASSIC_JERK
EEPROM_WRITE(planner.max_jerk);
#if HAS_LINEAR_E_JERK
- dummy = float(DEFAULT_EJERK);
- EEPROM_WRITE(dummy);
+ dummyf = float(DEFAULT_EJERK);
+ EEPROM_WRITE(dummyf);
#endif
#else
const xyze_pos_t planner_max_jerk = { 10, 10, 0.4, float(DEFAULT_EJERK) };
EEPROM_WRITE(planner_max_jerk);
#endif
- #if DISABLED(CLASSIC_JERK)
- EEPROM_WRITE(planner.junction_deviation_mm);
- #else
- dummy = 0.02f;
- EEPROM_WRITE(dummy);
+ #if ENABLED(CLASSIC_JERK)
+ dummyf = 0.02f;
#endif
+ EEPROM_WRITE(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
}
//
@@ -575,7 +609,7 @@ void MarlinSettings::postprocess() {
#if HAS_HOTEND_OFFSET
// Skip hotend 0 which must be 0
- for (uint8_t e = 1; e < HOTENDS; e++)
+ LOOP_S_L_N(e, 1, HOTENDS)
EEPROM_WRITE(hotend_offset[e]);
#endif
}
@@ -587,12 +621,12 @@ void MarlinSettings::postprocess() {
#if HAS_FILAMENT_SENSOR
const bool &runout_sensor_enabled = runout.enabled;
#else
- const bool runout_sensor_enabled = true;
+ constexpr bool runout_sensor_enabled = true;
#endif
#if HAS_FILAMENT_SENSOR && defined(FILAMENT_RUNOUT_DISTANCE_MM)
const float &runout_distance_mm = runout.runout_distance();
#else
- const float runout_distance_mm = 0;
+ constexpr float runout_distance_mm = 0;
#endif
_FIELD_TEST(runout_sensor_enabled);
EEPROM_WRITE(runout_sensor_enabled);
@@ -603,13 +637,7 @@ void MarlinSettings::postprocess() {
// Global Leveling
//
{
- const float zfh = (
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
- planner.z_fade_height
- #else
- 10.0
- #endif
- );
+ const float zfh = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.z_fade_height, 10.0f);
EEPROM_WRITE(zfh);
}
@@ -618,23 +646,25 @@ void MarlinSettings::postprocess() {
//
{
#if ENABLED(MESH_BED_LEVELING)
- // Compile time test that sizeof(mbl.z_values) is as expected
static_assert(
sizeof(mbl.z_values) == (GRID_MAX_POINTS) * sizeof(mbl.z_values[0][0]),
"MBL Z array is the wrong size."
);
- const uint8_t mesh_num_x = GRID_MAX_POINTS_X, mesh_num_y = GRID_MAX_POINTS_Y;
- EEPROM_WRITE(mbl.z_offset);
- EEPROM_WRITE(mesh_num_x);
- EEPROM_WRITE(mesh_num_y);
+ #else
+ dummyf = 0;
+ #endif
+
+ const uint8_t mesh_num_x = TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3),
+ mesh_num_y = TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_Y, 3);
+
+ EEPROM_WRITE(TERN(MESH_BED_LEVELING, mbl.z_offset, dummyf));
+ EEPROM_WRITE(mesh_num_x);
+ EEPROM_WRITE(mesh_num_y);
+
+ #if ENABLED(MESH_BED_LEVELING)
EEPROM_WRITE(mbl.z_values);
- #else // For disabled MBL write a default mesh
- dummy = 0;
- const uint8_t mesh_num_x = 3, mesh_num_y = 3;
- EEPROM_WRITE(dummy); // z_offset
- EEPROM_WRITE(mesh_num_x);
- EEPROM_WRITE(mesh_num_y);
- for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummy);
+ #else
+ for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummyf);
#endif
}
@@ -643,7 +673,12 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(probe_offset);
- EEPROM_WRITE(probe_offset);
+ #if HAS_BED_PROBE
+ const xyz_pos_t &zpo = probe.offset;
+ #else
+ constexpr xyz_pos_t zpo{0};
+ #endif
+ EEPROM_WRITE(zpo);
}
//
@@ -653,8 +688,8 @@ void MarlinSettings::postprocess() {
#if ABL_PLANAR
EEPROM_WRITE(planner.bed_level_matrix);
#else
- dummy = 0;
- for (uint8_t q = 9; q--;) EEPROM_WRITE(dummy);
+ dummyf = 0;
+ for (uint8_t q = 9; q--;) EEPROM_WRITE(dummyf);
#endif
}
@@ -663,27 +698,26 @@ void MarlinSettings::postprocess() {
//
{
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
- // Compile time test that sizeof(z_values) is as expected
static_assert(
sizeof(z_values) == (GRID_MAX_POINTS) * sizeof(z_values[0][0]),
"Bilinear Z array is the wrong size."
);
- const uint8_t grid_max_x = GRID_MAX_POINTS_X, grid_max_y = GRID_MAX_POINTS_Y;
- EEPROM_WRITE(grid_max_x); // 1 byte
- EEPROM_WRITE(grid_max_y); // 1 byte
- EEPROM_WRITE(bilinear_grid_spacing); // 2 ints
- EEPROM_WRITE(bilinear_start); // 2 ints
+ #else
+ const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
+ #endif
+
+ const uint8_t grid_max_x = TERN(AUTO_BED_LEVELING_BILINEAR, GRID_MAX_POINTS_X, 3),
+ grid_max_y = TERN(AUTO_BED_LEVELING_BILINEAR, GRID_MAX_POINTS_Y, 3);
+ EEPROM_WRITE(grid_max_x);
+ EEPROM_WRITE(grid_max_y);
+ EEPROM_WRITE(bilinear_grid_spacing);
+ EEPROM_WRITE(bilinear_start);
+
+ #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
EEPROM_WRITE(z_values); // 9-256 floats
#else
- // For disabled Bilinear Grid write an empty 3x3 grid
- const uint8_t grid_max_x = 3, grid_max_y = 3;
- const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
- dummy = 0;
- EEPROM_WRITE(grid_max_x);
- EEPROM_WRITE(grid_max_y);
- EEPROM_WRITE(bilinear_grid_spacing);
- EEPROM_WRITE(bilinear_start);
- for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummy);
+ dummyf = 0;
+ for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
#endif
}
@@ -692,16 +726,10 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(planner_leveling_active);
-
- #if ENABLED(AUTO_BED_LEVELING_UBL)
- EEPROM_WRITE(planner.leveling_active);
- EEPROM_WRITE(ubl.storage_slot);
- #else
- const bool ubl_active = false;
- const int8_t storage_slot = -1;
- EEPROM_WRITE(ubl_active);
- EEPROM_WRITE(storage_slot);
- #endif // AUTO_BED_LEVELING_UBL
+ const bool ubl_active = TERN(AUTO_BED_LEVELING_UBL, planner.leveling_active, false);
+ const int8_t storage_slot = TERN(AUTO_BED_LEVELING_UBL, ubl.storage_slot, -1);
+ EEPROM_WRITE(ubl_active);
+ EEPROM_WRITE(storage_slot);
}
//
@@ -709,7 +737,6 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(servo_angles);
-
#if !HAS_SERVO_ANGLES
uint16_t servo_angles[EEPROM_NUM_SERVOS][2] = { { 0, 0 } };
#endif
@@ -734,11 +761,7 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(bltouch_last_written_mode);
- #if ENABLED(BLTOUCH)
- const bool &bltouch_last_written_mode = bltouch.last_written_mode;
- #else
- constexpr bool bltouch_last_written_mode = false;
- #endif
+ const bool bltouch_last_written_mode = TERN(BLTOUCH, bltouch.last_written_mode, false);
EEPROM_WRITE(bltouch_last_written_mode);
}
@@ -762,40 +785,33 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(x2_endstop_adj);
// Write dual endstops in X, Y, Z order. Unused = 0.0
- dummy = 0;
- #if ENABLED(X_DUAL_ENDSTOPS)
- EEPROM_WRITE(endstops.x2_endstop_adj); // 1 float
- #else
- EEPROM_WRITE(dummy);
- #endif
-
- #if ENABLED(Y_DUAL_ENDSTOPS)
- EEPROM_WRITE(endstops.y2_endstop_adj); // 1 float
- #else
- EEPROM_WRITE(dummy);
- #endif
-
- #if ENABLED(Z_MULTI_ENDSTOPS)
- EEPROM_WRITE(endstops.z2_endstop_adj); // 1 float
- #else
- EEPROM_WRITE(dummy);
- #endif
+ dummyf = 0;
+ EEPROM_WRITE(TERN(X_DUAL_ENDSTOPS, endstops.x2_endstop_adj, dummyf)); // 1 float
+ EEPROM_WRITE(TERN(Y_DUAL_ENDSTOPS, endstops.y2_endstop_adj, dummyf)); // 1 float
+ EEPROM_WRITE(TERN(Z_MULTI_ENDSTOPS, endstops.z2_endstop_adj, dummyf)); // 1 float
#if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
EEPROM_WRITE(endstops.z3_endstop_adj); // 1 float
#else
- EEPROM_WRITE(dummy);
+ EEPROM_WRITE(dummyf);
#endif
#if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
EEPROM_WRITE(endstops.z4_endstop_adj); // 1 float
#else
- EEPROM_WRITE(dummy);
+ EEPROM_WRITE(dummyf);
#endif
#endif
}
+ #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+ EEPROM_WRITE(z_stepper_align.xy);
+ #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ EEPROM_WRITE(z_stepper_align.stepper_xy);
+ #endif
+ #endif
+
//
// LCD Preheat settings
//
@@ -825,8 +841,8 @@ void MarlinSettings::postprocess() {
HOTEND_LOOP() {
PIDCF_t pidcf = {
#if DISABLED(PIDTEMP)
- DUMMY_PID_VALUE, DUMMY_PID_VALUE, DUMMY_PID_VALUE,
- DUMMY_PID_VALUE, DUMMY_PID_VALUE
+ NAN, NAN, NAN,
+ NAN, NAN
#else
PID_PARAM(Kp, e),
unscalePID_i(PID_PARAM(Ki, e)),
@@ -839,12 +855,10 @@ void MarlinSettings::postprocess() {
}
_FIELD_TEST(lpq_len);
- #if ENABLED(PID_EXTRUSION_SCALING)
- EEPROM_WRITE(thermalManager.lpq_len);
- #else
+ #if DISABLED(PID_EXTRUSION_SCALING)
const int16_t lpq_len = 20;
- EEPROM_WRITE(lpq_len);
#endif
+ EEPROM_WRITE(TERN(PID_EXTRUSION_SCALING, thermalManager.lpq_len, lpq_len));
}
//
@@ -855,7 +869,7 @@ void MarlinSettings::postprocess() {
const PID_t bed_pid = {
#if DISABLED(PIDTEMPBED)
- DUMMY_PID_VALUE, DUMMY_PID_VALUE, DUMMY_PID_VALUE
+ NAN, NAN, NAN
#else
// Store the unscaled PID values
thermalManager.temp_bed.pid.Kp,
@@ -885,8 +899,6 @@ void MarlinSettings::postprocess() {
const int16_t lcd_contrast =
#if HAS_LCD_CONTRAST
ui.contrast
- #elif defined(DEFAULT_LCD_CONTRAST)
- DEFAULT_LCD_CONTRAST
#else
127
#endif
@@ -894,19 +906,25 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(lcd_contrast);
}
+ //
+ // Controller Fan
+ //
+ {
+ _FIELD_TEST(controllerFan_settings);
+ #if ENABLED(USE_CONTROLLER_FAN)
+ const controllerFan_settings_t &cfs = controllerFan.settings;
+ #else
+ controllerFan_settings_t cfs = controllerFan_defaults;
+ #endif
+ EEPROM_WRITE(cfs);
+ }
+
//
// Power-Loss Recovery
//
{
_FIELD_TEST(recovery_enabled);
-
- const bool recovery_enabled =
- #if ENABLED(POWER_LOSS_RECOVERY)
- recovery.enabled
- #else
- true
- #endif
- ;
+ const bool recovery_enabled = TERN(POWER_LOSS_RECOVERY, recovery.enabled, ENABLED(PLR_ENABLED_DEFAULT));
EEPROM_WRITE(recovery_enabled);
}
@@ -915,19 +933,15 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(fwretract_settings);
-
- #if ENABLED(FWRETRACT)
- EEPROM_WRITE(fwretract.settings);
- #else
+ #if DISABLED(FWRETRACT)
const fwretract_settings_t autoretract_defaults = { 3, 45, 0, 0, 0, 13, 0, 8 };
- EEPROM_WRITE(autoretract_defaults);
#endif
- #if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
- EEPROM_WRITE(fwretract.autoretract_enabled);
- #else
+ EEPROM_WRITE(TERN(FWRETRACT, fwretract.settings, autoretract_defaults));
+
+ #if DISABLED(FWRETRACT_AUTORETRACT)
const bool autoretract_enabled = false;
- EEPROM_WRITE(autoretract_enabled);
#endif
+ EEPROM_WRITE(TERN(FWRETRACT_AUTORETRACT, fwretract.autoretract_enabled, autoretract_enabled));
}
//
@@ -944,9 +958,9 @@ void MarlinSettings::postprocess() {
#else
const bool volumetric_enabled = false;
- dummy = DEFAULT_NOMINAL_FILAMENT_DIA;
+ dummyf = DEFAULT_NOMINAL_FILAMENT_DIA;
EEPROM_WRITE(volumetric_enabled);
- for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummy);
+ for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummyf);
#endif
}
@@ -959,7 +973,7 @@ void MarlinSettings::postprocess() {
tmc_stepper_current_t tmc_stepper_current = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
#if AXIS_IS_TMC(X)
tmc_stepper_current.X = stepperX.getMilliamps();
#endif
@@ -1219,8 +1233,8 @@ void MarlinSettings::postprocess() {
#if ENABLED(LIN_ADVANCE)
EEPROM_WRITE(planner.extruder_advance_K);
#else
- dummy = 0;
- for (uint8_t q = _MAX(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummy);
+ dummyf = 0;
+ for (uint8_t q = _MAX(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummyf);
#endif
}
@@ -1233,7 +1247,7 @@ void MarlinSettings::postprocess() {
#if HAS_MOTOR_CURRENT_PWM
EEPROM_WRITE(stepper.motor_current_setting);
#else
- const xyz_ulong_t no_current{0};
+ const uint32_t no_current[3] = { 0 };
EEPROM_WRITE(no_current);
#endif
}
@@ -1244,12 +1258,10 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(coordinate_system);
- #if ENABLED(CNC_COORDINATE_SYSTEMS)
- EEPROM_WRITE(gcode.coordinate_system);
- #else
+ #if DISABLED(CNC_COORDINATE_SYSTEMS)
const xyz_pos_t coordinate_system[MAX_COORDINATE_SYSTEMS] = { { 0 } };
- EEPROM_WRITE(coordinate_system);
#endif
+ EEPROM_WRITE(TERN(CNC_COORDINATE_SYSTEMS, gcode.coordinate_system, coordinate_system));
//
// Skew correction factors
@@ -1313,6 +1325,13 @@ void MarlinSettings::postprocess() {
}
#endif
+ //
+ // Case Light Brightness
+ //
+ #if HAS_CASE_LIGHT_BRIGHTNESS
+ EEPROM_WRITE(case_light_brightness);
+ #endif
+
//
// Validate CRC and Data Size
//
@@ -1371,10 +1390,13 @@ void MarlinSettings::postprocess() {
}
DEBUG_ECHO_START();
DEBUG_ECHOLNPAIR("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
+ #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
+ LCD_MESSAGEPGM(MSG_ERR_EEPROM_VERSION);
+ #endif
eeprom_error = true;
}
else {
- float dummy = 0;
+ float dummyf = 0;
working_crc = 0; // Init to 0. Accumulated by EEPROM_READ
_FIELD_TEST(esteppers);
@@ -1413,17 +1435,13 @@ void MarlinSettings::postprocess() {
#if HAS_CLASSIC_JERK
EEPROM_READ(planner.max_jerk);
#if HAS_LINEAR_E_JERK
- EEPROM_READ(dummy);
+ EEPROM_READ(dummyf);
#endif
#else
- for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
+ for (uint8_t q = 4; q--;) EEPROM_READ(dummyf);
#endif
- #if DISABLED(CLASSIC_JERK)
- EEPROM_READ(planner.junction_deviation_mm);
- #else
- EEPROM_READ(dummy);
- #endif
+ EEPROM_READ(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
}
//
@@ -1448,7 +1466,7 @@ void MarlinSettings::postprocess() {
{
#if HAS_HOTEND_OFFSET
// Skip hotend 0 which must be 0
- for (uint8_t e = 1; e < HOTENDS; e++)
+ LOOP_S_L_N(e, 1, HOTENDS)
EEPROM_READ(hotend_offset[e]);
#endif
}
@@ -1458,7 +1476,7 @@ void MarlinSettings::postprocess() {
//
{
#if HAS_FILAMENT_SENSOR
- bool &runout_sensor_enabled = runout.enabled;
+ const bool &runout_sensor_enabled = runout.enabled;
#else
bool runout_sensor_enabled;
#endif
@@ -1475,25 +1493,19 @@ void MarlinSettings::postprocess() {
//
// Global Leveling
//
- {
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
- EEPROM_READ(new_z_fade_height);
- #else
- EEPROM_READ(dummy);
- #endif
- }
+ EEPROM_READ(TERN(ENABLE_LEVELING_FADE_HEIGHT, new_z_fade_height, dummyf));
//
// Mesh (Manual) Bed Leveling
//
{
uint8_t mesh_num_x, mesh_num_y;
- EEPROM_READ(dummy);
+ EEPROM_READ(dummyf);
EEPROM_READ_ALWAYS(mesh_num_x);
EEPROM_READ_ALWAYS(mesh_num_y);
#if ENABLED(MESH_BED_LEVELING)
- if (!validating) mbl.z_offset = dummy;
+ if (!validating) mbl.z_offset = dummyf;
if (mesh_num_x == GRID_MAX_POINTS_X && mesh_num_y == GRID_MAX_POINTS_Y) {
// EEPROM data fits the current mesh
EEPROM_READ(mbl.z_values);
@@ -1501,11 +1513,11 @@ void MarlinSettings::postprocess() {
else {
// EEPROM data is stale
if (!validating) mbl.reset();
- for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
+ for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummyf);
}
#else
// MBL is disabled - skip the stored data
- for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
+ for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummyf);
#endif // MESH_BED_LEVELING
}
@@ -1515,7 +1527,7 @@ void MarlinSettings::postprocess() {
{
_FIELD_TEST(probe_offset);
#if HAS_BED_PROBE
- xyz_pos_t &zpo = probe_offset;
+ const xyz_pos_t &zpo = probe.offset;
#else
xyz_pos_t zpo;
#endif
@@ -1529,7 +1541,7 @@ void MarlinSettings::postprocess() {
#if ABL_PLANAR
EEPROM_READ(planner.bed_level_matrix);
#else
- for (uint8_t q = 9; q--;) EEPROM_READ(dummy);
+ for (uint8_t q = 9; q--;) EEPROM_READ(dummyf);
#endif
}
@@ -1538,8 +1550,8 @@ void MarlinSettings::postprocess() {
//
{
uint8_t grid_max_x, grid_max_y;
- EEPROM_READ_ALWAYS(grid_max_x); // 1 byte
- EEPROM_READ_ALWAYS(grid_max_y); // 1 byte
+ EEPROM_READ_ALWAYS(grid_max_x); // 1 byte
+ EEPROM_READ_ALWAYS(grid_max_y); // 1 byte
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
if (grid_max_x == GRID_MAX_POINTS_X && grid_max_y == GRID_MAX_POINTS_Y) {
if (!validating) set_bed_leveling_enabled(false);
@@ -1554,7 +1566,7 @@ void MarlinSettings::postprocess() {
xy_pos_t bgs, bs;
EEPROM_READ(bgs);
EEPROM_READ(bs);
- for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummy);
+ for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummyf);
}
}
@@ -1563,16 +1575,15 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(planner_leveling_active);
-
#if ENABLED(AUTO_BED_LEVELING_UBL)
- EEPROM_READ(planner.leveling_active);
- EEPROM_READ(ubl.storage_slot);
+ const bool &planner_leveling_active = planner.leveling_active;
+ const int8_t &ubl_storage_slot = ubl.storage_slot;
#else
bool planner_leveling_active;
- uint8_t ubl_storage_slot;
- EEPROM_READ(planner_leveling_active);
- EEPROM_READ(ubl_storage_slot);
+ int8_t ubl_storage_slot;
#endif
+ EEPROM_READ(planner_leveling_active);
+ EEPROM_READ(ubl_storage_slot);
}
//
@@ -1580,7 +1591,6 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(servo_angles);
-
#if ENABLED(EDITABLE_SERVO_ANGLES)
uint16_t (&servo_angles_arr)[EEPROM_NUM_SERVOS][2] = servo_angles;
#else
@@ -1609,7 +1619,7 @@ void MarlinSettings::postprocess() {
{
_FIELD_TEST(bltouch_last_written_mode);
#if ENABLED(BLTOUCH)
- bool &bltouch_last_written_mode = bltouch.last_written_mode;
+ const bool &bltouch_last_written_mode = bltouch.last_written_mode;
#else
bool bltouch_last_written_mode;
#endif
@@ -1635,35 +1645,31 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(x2_endstop_adj);
- #if ENABLED(X_DUAL_ENDSTOPS)
- EEPROM_READ(endstops.x2_endstop_adj); // 1 float
- #else
- EEPROM_READ(dummy);
- #endif
- #if ENABLED(Y_DUAL_ENDSTOPS)
- EEPROM_READ(endstops.y2_endstop_adj); // 1 float
- #else
- EEPROM_READ(dummy);
- #endif
- #if ENABLED(Z_MULTI_ENDSTOPS)
- EEPROM_READ(endstops.z2_endstop_adj); // 1 float
- #else
- EEPROM_READ(dummy);
- #endif
+ EEPROM_READ(TERN(X_DUAL_ENDSTOPS, endstops.x2_endstop_adj, dummyf)); // 1 float
+ EEPROM_READ(TERN(Y_DUAL_ENDSTOPS, endstops.y2_endstop_adj, dummyf)); // 1 float
+ EEPROM_READ(TERN(Z_MULTI_ENDSTOPS, endstops.z2_endstop_adj, dummyf)); // 1 float
+
#if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
EEPROM_READ(endstops.z3_endstop_adj); // 1 float
#else
- EEPROM_READ(dummy);
+ EEPROM_READ(dummyf);
#endif
#if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
EEPROM_READ(endstops.z4_endstop_adj); // 1 float
#else
- EEPROM_READ(dummy);
+ EEPROM_READ(dummyf);
#endif
#endif
}
+ #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+ EEPROM_READ(z_stepper_align.xy);
+ #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+ EEPROM_READ(z_stepper_align.stepper_xy);
+ #endif
+ #endif
+
//
// LCD Preheat settings
//
@@ -1691,7 +1697,7 @@ void MarlinSettings::postprocess() {
PIDCF_t pidcf;
EEPROM_READ(pidcf);
#if ENABLED(PIDTEMP)
- if (!validating && pidcf.Kp != DUMMY_PID_VALUE) {
+ if (!validating && !isnan(pidcf.Kp)) {
// Scale PID values since EEPROM values are unscaled
PID_PARAM(Kp, e) = pidcf.Kp;
PID_PARAM(Ki, e) = scalePID_i(pidcf.Ki);
@@ -1713,11 +1719,11 @@ void MarlinSettings::postprocess() {
{
_FIELD_TEST(lpq_len);
#if ENABLED(PID_EXTRUSION_SCALING)
- EEPROM_READ(thermalManager.lpq_len);
+ const int16_t &lpq_len = thermalManager.lpq_len;
#else
int16_t lpq_len;
- EEPROM_READ(lpq_len);
#endif
+ EEPROM_READ(lpq_len);
}
//
@@ -1727,7 +1733,7 @@ void MarlinSettings::postprocess() {
PID_t pid;
EEPROM_READ(pid);
#if ENABLED(PIDTEMPBED)
- if (!validating && pid.Kp != DUMMY_PID_VALUE) {
+ if (!validating && !isnan(pid.Kp)) {
// Scale PID values since EEPROM values are unscaled
thermalManager.temp_bed.pid.Kp = pid.Kp;
thermalManager.temp_bed.pid.Ki = scalePID_i(pid.Ki);
@@ -1759,18 +1765,30 @@ void MarlinSettings::postprocess() {
#endif
}
+ //
+ // Controller Fan
+ //
+ {
+ _FIELD_TEST(controllerFan_settings);
+ #if ENABLED(CONTROLLER_FAN_EDITABLE)
+ const controllerFan_settings_t &cfs = controllerFan.settings;
+ #else
+ controllerFan_settings_t cfs = { 0 };
+ #endif
+ EEPROM_READ(cfs);
+ }
+
//
// Power-Loss Recovery
//
{
_FIELD_TEST(recovery_enabled);
-
#if ENABLED(POWER_LOSS_RECOVERY)
- EEPROM_READ(recovery.enabled);
+ const bool &recovery_enabled = recovery.enabled;
#else
bool recovery_enabled;
- EEPROM_READ(recovery_enabled);
#endif
+ EEPROM_READ(recovery_enabled);
}
//
@@ -1826,7 +1844,7 @@ void MarlinSettings::postprocess() {
tmc_stepper_current_t currents;
EEPROM_READ(currents);
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
#define SET_CURR(Q) stepper##Q.rms_current(currents.Q ? currents.Q : Q##_CURRENT)
if (!validating) {
@@ -1872,6 +1890,12 @@ void MarlinSettings::postprocess() {
#if AXIS_IS_TMC(E5)
SET_CURR(E5);
#endif
+ #if AXIS_IS_TMC(E6)
+ SET_CURR(E6);
+ #endif
+ #if AXIS_IS_TMC(E7)
+ SET_CURR(E7);
+ #endif
}
#endif
}
@@ -1926,6 +1950,12 @@ void MarlinSettings::postprocess() {
#if AXIS_HAS_STEALTHCHOP(E5)
stepperE5.set_pwm_thrs(tmc_hybrid_threshold.E5);
#endif
+ #if AXIS_HAS_STEALTHCHOP(E6)
+ stepperE6.set_pwm_thrs(tmc_hybrid_threshold.E6);
+ #endif
+ #if AXIS_HAS_STEALTHCHOP(E7)
+ stepperE7.set_pwm_thrs(tmc_hybrid_threshold.E7);
+ #endif
}
#endif
}
@@ -1986,7 +2016,7 @@ void MarlinSettings::postprocess() {
tmc_stealth_enabled_t tmc_stealth_enabled;
EEPROM_READ(tmc_stealth_enabled);
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
#define SET_STEPPING_MODE(ST) stepper##ST.stored.stealthChop_enabled = tmc_stealth_enabled.ST; stepper##ST.refresh_stepping_mode();
if (!validating) {
@@ -2032,6 +2062,12 @@ void MarlinSettings::postprocess() {
#if AXIS_HAS_STEALTHCHOP(E5)
SET_STEPPING_MODE(E5);
#endif
+ #if AXIS_HAS_STEALTHCHOP(E6)
+ SET_STEPPING_MODE(E6);
+ #endif
+ #if AXIS_HAS_STEALTHCHOP(E7)
+ SET_STEPPING_MODE(E7);
+ #endif
}
#endif
}
@@ -2120,14 +2156,14 @@ void MarlinSettings::postprocess() {
//
{
#if ENABLED(BACKLASH_GCODE)
- xyz_float_t &backlash_distance_mm = backlash.distance_mm;
- uint8_t &backlash_correction = backlash.correction;
+ const xyz_float_t &backlash_distance_mm = backlash.distance_mm;
+ const uint8_t &backlash_correction = backlash.correction;
#else
float backlash_distance_mm[XYZ];
uint8_t backlash_correction;
#endif
#if ENABLED(BACKLASH_GCODE) && defined(BACKLASH_SMOOTHING_MM)
- float &backlash_smoothing_mm = backlash.smoothing_mm;
+ const float &backlash_smoothing_mm = backlash.smoothing_mm;
#else
float backlash_smoothing_mm;
#endif
@@ -2150,15 +2186,29 @@ void MarlinSettings::postprocess() {
}
#endif
+ //
+ // Case Light Brightness
+ //
+ #if HAS_CASE_LIGHT_BRIGHTNESS
+ _FIELD_TEST(case_light_brightness);
+ EEPROM_READ(case_light_brightness);
+ #endif
+
eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET));
if (eeprom_error) {
DEBUG_ECHO_START();
DEBUG_ECHOLNPAIR("Index: ", int(eeprom_index - (EEPROM_OFFSET)), " Size: ", datasize());
+ #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
+ LCD_MESSAGEPGM(MSG_ERR_EEPROM_INDEX);
+ #endif
}
else if (working_crc != stored_crc) {
eeprom_error = true;
DEBUG_ERROR_START();
DEBUG_ECHOLNPAIR("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
+ #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
+ LCD_MESSAGEPGM(MSG_ERR_EEPROM_CRC);
+ #endif
}
else if (!validating) {
DEBUG_ECHO_START();
@@ -2202,8 +2252,10 @@ void MarlinSettings::postprocess() {
}
#if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
- if (!validating) report();
+ // Report the EEPROM settings
+ if (!validating && (DISABLED(EEPROM_BOOT_SILENT) || IsRunning())) report();
#endif
+
EEPROM_FINISH();
return !eeprom_error;
@@ -2437,6 +2489,14 @@ void MarlinSettings::reset() {
ExtUI::onFactoryReset();
#endif
+ //
+ // Case Light Brightness
+ //
+
+ #if HAS_CASE_LIGHT_BRIGHTNESS
+ case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS;
+ #endif
+
//
// Magnetic Parking Extruder
//
@@ -2461,19 +2521,27 @@ void MarlinSettings::reset() {
constexpr float dpo[] = NOZZLE_TO_PROBE_OFFSET;
static_assert(COUNT(dpo) == 3, "NOZZLE_TO_PROBE_OFFSET must contain offsets for X, Y, and Z.");
#if HAS_PROBE_XY_OFFSET
- LOOP_XYZ(a) probe_offset[a] = dpo[a];
+ LOOP_XYZ(a) probe.offset[a] = dpo[a];
#else
- probe_offset.x = probe_offset.y = 0;
- probe_offset.z = dpo[Z_AXIS];
+ probe.offset.x = probe.offset.y = 0;
+ probe.offset.z = dpo[Z_AXIS];
#endif
#endif
+ //
+ // Z Stepper Auto-alignment points
+ //
+
+ #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+ z_stepper_align.reset_to_default();
+ #endif
+
//
// Servo Angles
//
#if ENABLED(EDITABLE_SERVO_ANGLES)
- COPY(servo_angles, base_servo_angles);
+ COPY(servo_angles, base_servo_angles); // When not editable only one copy of servo angles exists
#endif
//
@@ -2597,12 +2665,19 @@ void MarlinSettings::reset() {
ui.set_contrast(DEFAULT_LCD_CONTRAST);
#endif
+ //
+ // Controller Fan
+ //
+ #if ENABLED(USE_CONTROLLER_FAN)
+ controllerFan.reset();
+ #endif
+
//
// Power-Loss Recovery
//
#if ENABLED(POWER_LOSS_RECOVERY)
- recovery.enable(true);
+ recovery.enable(ENABLED(PLR_ENABLED_DEFAULT));
#endif
//
@@ -2626,7 +2701,7 @@ void MarlinSettings::reset() {
false
#endif
;
- for (uint8_t q = 0; q < COUNT(planner.filament_size); q++)
+ LOOP_L_N(q, COUNT(planner.filament_size))
planner.filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
#endif
@@ -2649,7 +2724,7 @@ void MarlinSettings::reset() {
LOOP_L_N(i, EXTRUDERS) {
planner.extruder_advance_K[i] = LIN_ADVANCE_K;
#if ENABLED(EXTRA_LIN_ADVANCE_K)
- saved_extruder_advance_K[i] = LIN_ADVANCE_K;
+ other_extruder_advance_K[i] = LIN_ADVANCE_K;
#endif
}
#endif
@@ -2660,7 +2735,7 @@ void MarlinSettings::reset() {
#if HAS_MOTOR_CURRENT_PWM
constexpr uint32_t tmp_motor_current_setting[3] = PWM_MOTOR_CURRENT;
- for (uint8_t q = 3; q--;)
+ LOOP_L_N(q, 3)
stepper.digipot_current(q, (stepper.motor_current_setting[q] = tmp_motor_current_setting[q]));
#endif
@@ -2689,7 +2764,7 @@ void MarlinSettings::reset() {
//
#if ENABLED(ADVANCED_PAUSE_FEATURE)
- for (uint8_t e = 0; e < EXTRUDERS; e++) {
+ LOOP_L_N(e, EXTRUDERS) {
fc_settings[e].unload_length = FILAMENT_CHANGE_UNLOAD_LENGTH;
fc_settings[e].load_length = FILAMENT_CHANGE_FAST_LOAD_LENGTH;
}
@@ -2707,11 +2782,20 @@ void MarlinSettings::reset() {
#if DISABLED(DISABLE_M503)
+ static void config_heading(const bool repl, PGM_P const pstr, const bool eol=true) {
+ if (!repl) {
+ SERIAL_ECHO_START();
+ SERIAL_ECHOPGM("; ");
+ serialprintPGM(pstr);
+ if (eol) SERIAL_EOL();
+ }
+ }
+
#define CONFIG_ECHO_START() do{ if (!forReplay) SERIAL_ECHO_START(); }while(0)
#define CONFIG_ECHO_MSG(STR) do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); }while(0)
- #define CONFIG_ECHO_HEADING(STR) do{ if (!forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); } }while(0)
+ #define CONFIG_ECHO_HEADING(STR) config_heading(forReplay, PSTR(STR))
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
inline void say_M906(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM(" M906"); }
#if HAS_STEALTHCHOP
void say_M569(const bool forReplay, const char * const etc=nullptr, const bool newLine = false) {
@@ -2793,44 +2877,24 @@ void MarlinSettings::reset() {
* Volumetric extrusion M200
*/
if (!forReplay) {
- CONFIG_ECHO_START();
- SERIAL_ECHOPGM("Filament settings:");
+ config_heading(forReplay, PSTR("Filament settings:"), false);
if (parser.volumetric_enabled)
SERIAL_EOL();
else
SERIAL_ECHOLNPGM(" Disabled");
}
- CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
- #if EXTRUDERS > 1
+ #if EXTRUDERS == 1
CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 T1 D", LINEAR_UNIT(planner.filament_size[1]));
- #if EXTRUDERS > 2
+ SERIAL_ECHOLNPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
+ #elif EXTRUDERS
+ LOOP_L_N(i, EXTRUDERS) {
CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 T2 D", LINEAR_UNIT(planner.filament_size[2]));
- #if EXTRUDERS > 3
- CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 T3 D", LINEAR_UNIT(planner.filament_size[3]));
- #if EXTRUDERS > 4
- CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 T4 D", LINEAR_UNIT(planner.filament_size[4]));
- #if EXTRUDERS > 5
- CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 T5 D", LINEAR_UNIT(planner.filament_size[5]));
- #if EXTRUDERS > 6
- CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 T6 D", LINEAR_UNIT(planner.filament_size[6]));
- #if EXTRUDERS > 7
- CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(" M200 T7 D", LINEAR_UNIT(planner.filament_size[7]));
- #endif // EXTRUDERS > 7
- #endif // EXTRUDERS > 6
- #endif // EXTRUDERS > 5
- #endif // EXTRUDERS > 4
- #endif // EXTRUDERS > 3
- #endif // EXTRUDERS > 2
- #endif // EXTRUDERS > 1
+ SERIAL_ECHOPGM(" M200");
+ if (i) SERIAL_ECHOPAIR_P(SP_T_STR, int(i));
+ SERIAL_ECHOLNPAIR(" D", LINEAR_UNIT(planner.filament_size[i]));
+ }
+ #endif
if (!parser.volumetric_enabled)
CONFIG_ECHO_MSG(" M200 D0");
@@ -2852,7 +2916,7 @@ void MarlinSettings::reset() {
);
#if ENABLED(DISTINCT_E_FACTORS)
CONFIG_ECHO_START();
- for (uint8_t i = 0; i < E_STEPPERS; i++) {
+ LOOP_L_N(i, E_STEPPERS) {
SERIAL_ECHOLNPAIR_P(
PSTR(" M203 T"), (int)i
, SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
@@ -2872,7 +2936,7 @@ void MarlinSettings::reset() {
);
#if ENABLED(DISTINCT_E_FACTORS)
CONFIG_ECHO_START();
- for (uint8_t i = 0; i < E_STEPPERS; i++)
+ LOOP_L_N(i, E_STEPPERS)
SERIAL_ECHOLNPAIR_P(
PSTR(" M201 T"), (int)i
, SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
@@ -2881,31 +2945,29 @@ void MarlinSettings::reset() {
CONFIG_ECHO_HEADING("Acceleration (units/s2): P R T");
CONFIG_ECHO_START();
- SERIAL_ECHOLNPAIR(
- " M204 P", LINEAR_UNIT(planner.settings.acceleration)
- , " R", LINEAR_UNIT(planner.settings.retract_acceleration)
- , " T", LINEAR_UNIT(planner.settings.travel_acceleration)
+ SERIAL_ECHOLNPAIR_P(
+ PSTR(" M204 P"), LINEAR_UNIT(planner.settings.acceleration)
+ , PSTR(" R"), LINEAR_UNIT(planner.settings.retract_acceleration)
+ , SP_T_STR, LINEAR_UNIT(planner.settings.travel_acceleration)
);
- if (!forReplay) {
- CONFIG_ECHO_START();
- SERIAL_ECHOPGM("Advanced: B S T");
+ CONFIG_ECHO_HEADING(
+ "Advanced: B S T"
#if DISABLED(CLASSIC_JERK)
- SERIAL_ECHOPGM(" J");
+ " J"
#endif
#if HAS_CLASSIC_JERK
- SERIAL_ECHOPGM(" X Y Z");
+ " X Y Z"
#if HAS_CLASSIC_E_JERK
- SERIAL_ECHOPGM(" E");
+ " E"
#endif
#endif
- SERIAL_EOL();
- }
+ );
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR_P(
PSTR(" M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
, PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
- , PSTR(" T"), LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
+ , SP_T_STR, LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
#if DISABLED(CLASSIC_JERK)
, PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
#endif
@@ -2937,7 +2999,7 @@ void MarlinSettings::reset() {
#if HAS_HOTEND_OFFSET
CONFIG_ECHO_HEADING("Hotend offsets:");
CONFIG_ECHO_START();
- for (uint8_t e = 1; e < HOTENDS; e++) {
+ LOOP_S_L_N(e, 1, HOTENDS) {
SERIAL_ECHOPAIR_P(
PSTR(" M218 T"), (int)e,
SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
@@ -2958,10 +3020,11 @@ void MarlinSettings::reset() {
#elif ENABLED(AUTO_BED_LEVELING_UBL)
+ config_heading(forReplay, PSTR(""), false);
if (!forReplay) {
- CONFIG_ECHO_START();
ubl.echo_name();
- SERIAL_ECHOLNPGM(":");
+ SERIAL_CHAR(':');
+ SERIAL_EOL();
}
#elif HAS_ABL_OR_UBL
@@ -2981,8 +3044,8 @@ void MarlinSettings::reset() {
#if ENABLED(MESH_BED_LEVELING)
if (leveling_is_valid()) {
- for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
- for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
+ LOOP_L_N(py, GRID_MAX_POINTS_Y) {
+ LOOP_L_N(px, GRID_MAX_POINTS_X) {
CONFIG_ECHO_START();
SERIAL_ECHOPAIR_P(PSTR(" G29 S3 I"), (int)px, PSTR(" J"), (int)py);
SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
@@ -2997,8 +3060,12 @@ void MarlinSettings::reset() {
if (!forReplay) {
SERIAL_EOL();
ubl.report_state();
- SERIAL_ECHOLNPAIR("\nActive Mesh Slot: ", ubl.storage_slot);
- SERIAL_ECHOLNPAIR("EEPROM can hold ", calc_num_meshes(), " meshes.\n");
+ SERIAL_EOL();
+ config_heading(false, PSTR("Active Mesh Slot: "), false);
+ SERIAL_ECHOLN(ubl.storage_slot);
+ config_heading(false, PSTR("EEPROM can hold "), false);
+ SERIAL_ECHO(calc_num_meshes());
+ SERIAL_ECHOLNPGM(" meshes.\n");
}
//ubl.report_current_mesh(); // This is too verbose for large meshes. A better (more terse)
@@ -3006,8 +3073,8 @@ void MarlinSettings::reset() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
if (leveling_is_valid()) {
- for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
- for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
+ LOOP_L_N(py, GRID_MAX_POINTS_Y) {
+ LOOP_L_N(px, GRID_MAX_POINTS_X) {
CONFIG_ECHO_START();
SERIAL_ECHOPAIR(" G29 W I", (int)px, " J", (int)py);
SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(z_values[px][py]), 5);
@@ -3022,7 +3089,7 @@ void MarlinSettings::reset() {
#if ENABLED(EDITABLE_SERVO_ANGLES)
CONFIG_ECHO_HEADING("Servo Angles:");
- for (uint8_t i = 0; i < NUM_SERVOS; i++) {
+ LOOP_L_N(i, NUM_SERVOS) {
switch (i) {
#if ENABLED(SWITCHING_EXTRUDER)
case SWITCHING_EXTRUDER_SERVO_NR:
@@ -3031,7 +3098,7 @@ void MarlinSettings::reset() {
#endif
#elif ENABLED(SWITCHING_NOZZLE)
case SWITCHING_NOZZLE_SERVO_NR:
- #elif (ENABLED(BLTOUCH) && defined(BLTOUCH_ANGLES)) || (defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR))
+ #elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES))
case Z_PROBE_SERVO_NR:
#endif
CONFIG_ECHO_START();
@@ -3048,8 +3115,8 @@ void MarlinSettings::reset() {
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR_P(
PSTR(" M665 S"), delta_segments_per_second
- , PSTR(" P"), scara_home_offset.a
- , PSTR(" T"), scara_home_offset.b
+ , SP_P_STR, scara_home_offset.a
+ , SP_T_STR, scara_home_offset.b
, SP_Z_STR, LINEAR_UNIT(scara_home_offset.z)
);
@@ -3105,7 +3172,7 @@ void MarlinSettings::reset() {
#if HOTENDS && HAS_LCD_MENU
CONFIG_ECHO_HEADING("Material heatup parameters:");
- for (uint8_t i = 0; i < COUNT(ui.preheat_hotend_temp); i++) {
+ LOOP_L_N(i, COUNT(ui.preheat_hotend_temp)) {
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR(
" M145 S", (int)i
@@ -3127,7 +3194,7 @@ void MarlinSettings::reset() {
SERIAL_ECHOPAIR_P(
#if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
PSTR(" M301 E"), e,
- PSTR(" P")
+ SP_P_STR
#else
PSTR(" M301 P")
#endif
@@ -3159,7 +3226,7 @@ void MarlinSettings::reset() {
#if HAS_USER_THERMISTORS
CONFIG_ECHO_HEADING("User thermistors:");
- for (uint8_t i = 0; i < USER_THERMISTORS; i++)
+ LOOP_L_N(i, USER_THERMISTORS)
thermalManager.log_user_thermistor(i, true);
#endif
@@ -3169,6 +3236,10 @@ void MarlinSettings::reset() {
SERIAL_ECHOLNPAIR(" M250 C", ui.contrast);
#endif
+ #if ENABLED(CONTROLLER_FAN_EDITABLE)
+ M710_report(forReplay);
+ #endif
+
#if ENABLED(POWER_LOSS_RECOVERY)
CONFIG_ECHO_HEADING("Power-Loss Recovery:");
CONFIG_ECHO_START();
@@ -3208,21 +3279,18 @@ void MarlinSettings::reset() {
* Probe Offset
*/
#if HAS_BED_PROBE
- if (!forReplay) {
- CONFIG_ECHO_START();
- SERIAL_ECHOPGM("Z-Probe Offset");
- say_units(true);
- }
+ config_heading(forReplay, PSTR("Z-Probe Offset"), false);
+ if (!forReplay) say_units(true);
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR_P(
#if HAS_PROBE_XY_OFFSET
- PSTR(" M851 X"), LINEAR_UNIT(probe_offset_xy.x),
- SP_Y_STR, LINEAR_UNIT(probe_offset_xy.y),
+ PSTR(" M851 X"), LINEAR_UNIT(probe.offset_xy.x),
+ SP_Y_STR, LINEAR_UNIT(probe.offset_xy.y),
SP_Z_STR
#else
PSTR(" M851 X0 Y0 Z")
#endif
- , LINEAR_UNIT(probe_offset.z)
+ , LINEAR_UNIT(probe.offset.z)
);
#endif
@@ -3241,7 +3309,7 @@ void MarlinSettings::reset() {
#endif
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
/**
* TMC stepper driver current
@@ -3311,6 +3379,14 @@ void MarlinSettings::reset() {
say_M906(forReplay);
SERIAL_ECHOLNPAIR(" T5 E", stepperE5.getMilliamps());
#endif
+ #if AXIS_IS_TMC(E6)
+ say_M906(forReplay);
+ SERIAL_ECHOLNPAIR(" T6 E", stepperE6.getMilliamps());
+ #endif
+ #if AXIS_IS_TMC(E7)
+ say_M906(forReplay);
+ SERIAL_ECHOLNPAIR(" T7 E", stepperE7.getMilliamps());
+ #endif
SERIAL_EOL();
/**
@@ -3385,6 +3461,14 @@ void MarlinSettings::reset() {
say_M913(forReplay);
SERIAL_ECHOLNPAIR(" T5 E", stepperE5.get_pwm_thrs());
#endif
+ #if AXIS_HAS_STEALTHCHOP(E6)
+ say_M913(forReplay);
+ SERIAL_ECHOLNPAIR(" T6 E", stepperE6.get_pwm_thrs());
+ #endif
+ #if AXIS_HAS_STEALTHCHOP(E7)
+ say_M913(forReplay);
+ SERIAL_ECHOLNPAIR(" T7 E", stepperE7.get_pwm_thrs());
+ #endif
SERIAL_EOL();
#endif // HYBRID_THRESHOLD
@@ -3517,10 +3601,16 @@ void MarlinSettings::reset() {
#if AXIS_HAS_STEALTHCHOP(E5)
if (stepperE5.get_stealthChop_status()) { say_M569(forReplay, PSTR("T5 E"), true); }
#endif
+ #if AXIS_HAS_STEALTHCHOP(E6)
+ if (stepperE6.get_stealthChop_status()) { say_M569(forReplay, PSTR("T6 E"), true); }
+ #endif
+ #if AXIS_HAS_STEALTHCHOP(E7)
+ if (stepperE7.get_stealthChop_status()) { say_M569(forReplay, PSTR("T7 E"), true); }
+ #endif
#endif // HAS_STEALTHCHOP
- #endif // HAS_TRINAMIC
+ #endif // HAS_TRINAMIC_CONFIG
/**
* Linear Advance
@@ -3555,29 +3645,10 @@ void MarlinSettings::reset() {
say_M603(forReplay);
SERIAL_ECHOLNPAIR("L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length));
#else
- #define _ECHO_603(N) do{ say_M603(forReplay); SERIAL_ECHOLNPAIR("T" STRINGIFY(N) " L", LINEAR_UNIT(fc_settings[N].load_length), " U", LINEAR_UNIT(fc_settings[N].unload_length)); }while(0)
- _ECHO_603(0);
- _ECHO_603(1);
- #if EXTRUDERS > 2
- _ECHO_603(2);
- #if EXTRUDERS > 3
- _ECHO_603(3);
- #if EXTRUDERS > 4
- _ECHO_603(4);
- #if EXTRUDERS > 5
- _ECHO_603(5);
- #if EXTRUDERS > 6
- _ECHO_603(6);
- #if EXTRUDERS > 7
- _ECHO_603(7);
- #endif // EXTRUDERS > 7
- #endif // EXTRUDERS > 6
- #endif // EXTRUDERS > 5
- #endif // EXTRUDERS > 4
- #endif // EXTRUDERS > 3
- #endif // EXTRUDERS > 2
- #endif // EXTRUDERS == 1
- #endif // ADVANCED_PAUSE_FEATURE
+ #define _ECHO_603(N) do{ say_M603(forReplay); SERIAL_ECHOLNPAIR("T" STRINGIFY(N) " L", LINEAR_UNIT(fc_settings[N].load_length), " U", LINEAR_UNIT(fc_settings[N].unload_length)); }while(0);
+ REPEAT(EXTRUDERS, _ECHO_603)
+ #endif
+ #endif
#if EXTRUDERS > 1
CONFIG_ECHO_HEADING("Tool-changing:");
diff --git a/Marlin/src/module/configuration_store.h b/Marlin/src/module/configuration_store.h
index b8a64c5c68..f2e84c9664 100644
--- a/Marlin/src/module/configuration_store.h
+++ b/Marlin/src/module/configuration_store.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,7 +24,7 @@
#include "../inc/MarlinConfig.h"
#if ENABLED(EEPROM_SETTINGS)
- #include "../HAL/shared/persistent_store_api.h"
+ #include "../HAL/shared/eeprom_api.h"
#endif
class MarlinSettings {
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index bed5cd24cf..8821236fd1 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -95,7 +95,7 @@ void recalc_delta_settings() {
float delta_calibration_radius() {
return calibration_radius_factor * (
#if HAS_BED_PROBE
- FLOOR((DELTA_PRINTABLE_RADIUS) - _MAX(HYPOT(probe_offset_xy.x, probe_offset_xy.y), MIN_PROBE_EDGE))
+ FLOOR((DELTA_PRINTABLE_RADIUS) - _MAX(HYPOT(probe.offset_xy.x, probe.offset_xy.y), MIN_PROBE_EDGE))
#else
DELTA_PRINTABLE_RADIUS
#endif
@@ -251,7 +251,7 @@ void home_delta() {
// Move all carriages together linearly until an endstop is hit.
current_position.z = (delta_height + 10
#if HAS_BED_PROBE
- - probe_offset.z
+ - probe.offset.z
#endif
);
line_to_current_position(homing_feedrate(Z_AXIS));
diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index 3f61907e51..f263a28ddd 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,6 +26,7 @@
*/
#include "../core/types.h"
+#include "../core/macros.h"
extern float delta_height;
extern abc_float_t delta_endstop_adj;
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 7d8e270fed..1c8384cc53 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -256,7 +256,7 @@ void Endstops::init() {
#endif
#endif
- #if HAS_CALIBRATION_PIN
+ #if PIN_EXISTS(CALIBRATION)
#if ENABLED(CALIBRATION_PIN_PULLUP)
SET_INPUT_PULLUP(CALIBRATION_PIN);
#elif ENABLED(CALIBRATION_PIN_PULLDOWN)
@@ -386,7 +386,7 @@ void Endstops::event_handler() {
#define ENDSTOP_HIT_TEST_Z() _ENDSTOP_HIT_TEST(Z,'Z')
SERIAL_ECHO_START();
- SERIAL_ECHOPGM(MSG_ENDSTOPS_HIT);
+ SERIAL_ECHOPGM(STR_ENDSTOPS_HIT);
ENDSTOP_HIT_TEST_X();
ENDSTOP_HIT_TEST_Y();
ENDSTOP_HIT_TEST_Z();
@@ -403,7 +403,7 @@ void Endstops::event_handler() {
#if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)
if (planner.abort_on_endstop_hit) {
- card.stopSDPrint();
+ card.endFilePrint();
quickstop_stepper();
thermalManager.disable_all_heaters();
print_job_timer.stop();
@@ -415,7 +415,7 @@ void Endstops::event_handler() {
static void print_es_state(const bool is_hit, PGM_P const label=nullptr) {
if (label) serialprintPGM(label);
SERIAL_ECHOPGM(": ");
- serialprintPGM(is_hit ? PSTR(MSG_ENDSTOP_HIT) : PSTR(MSG_ENDSTOP_OPEN));
+ serialprintPGM(is_hit ? PSTR(STR_ENDSTOP_HIT) : PSTR(STR_ENDSTOP_OPEN));
SERIAL_EOL();
}
@@ -423,8 +423,8 @@ void _O2 Endstops::report_states() {
#if ENABLED(BLTOUCH)
bltouch._set_SW_mode();
#endif
- SERIAL_ECHOLNPGM(MSG_M119_REPORT);
- #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(MSG_##S))
+ SERIAL_ECHOLNPGM(STR_M119_REPORT);
+ #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(STR_##S))
#if HAS_X_MIN
ES_REPORT(X_MIN);
#endif
@@ -474,41 +474,24 @@ void _O2 Endstops::report_states() {
ES_REPORT(Z4_MAX);
#endif
#if HAS_CUSTOM_PROBE_PIN
- print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE));
+ print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(STR_Z_PROBE));
#endif
#if HAS_FILAMENT_SENSOR
#if NUM_RUNOUT_SENSORS == 1
- print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
+ print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
#else
- for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
+ #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
+ LOOP_S_LE_N(i, 1, NUM_RUNOUT_SENSORS) {
pin_t pin;
switch (i) {
default: continue;
- case 1: pin = FIL_RUNOUT_PIN; break;
- case 2: pin = FIL_RUNOUT2_PIN; break;
- #if NUM_RUNOUT_SENSORS >= 3
- case 3: pin = FIL_RUNOUT3_PIN; break;
- #if NUM_RUNOUT_SENSORS >= 4
- case 4: pin = FIL_RUNOUT4_PIN; break;
- #if NUM_RUNOUT_SENSORS >= 5
- case 5: pin = FIL_RUNOUT5_PIN; break;
- #if NUM_RUNOUT_SENSORS >= 6
- case 6: pin = FIL_RUNOUT6_PIN; break;
- #if NUM_RUNOUT_SENSORS >= 7
- case 7: pin = FIL_RUNOUT7_PIN; break;
- #if NUM_RUNOUT_SENSORS >= 8
- case 8: pin = FIL_RUNOUT8_PIN; break;
- #endif
- #endif
- #endif
- #endif
- #endif
- #endif
+ REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT)
}
- SERIAL_ECHOPGM(MSG_FILAMENT_RUNOUT_SENSOR);
+ SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR);
if (i > 1) SERIAL_CHAR(' ', '0' + i);
print_es_state(extDigitalRead(pin) != FIL_RUNOUT_INVERTING);
}
+ #undef _CASE_RUNOUT
#endif
#endif
#if ENABLED(BLTOUCH)
@@ -546,11 +529,11 @@ void Endstops::update() {
// With Dual X, endstops are only checked in the homing direction for the active extruder
#if ENABLED(DUAL_X_CARRIAGE)
#define E0_ACTIVE stepper.movement_extruder() == 0
- #define X_MIN_TEST ((X_HOME_DIR < 0 && E0_ACTIVE) || (X2_HOME_DIR < 0 && !E0_ACTIVE))
- #define X_MAX_TEST ((X_HOME_DIR > 0 && E0_ACTIVE) || (X2_HOME_DIR > 0 && !E0_ACTIVE))
+ #define X_MIN_TEST() ((X_HOME_DIR < 0 && E0_ACTIVE) || (X2_HOME_DIR < 0 && !E0_ACTIVE))
+ #define X_MAX_TEST() ((X_HOME_DIR > 0 && E0_ACTIVE) || (X2_HOME_DIR > 0 && !E0_ACTIVE))
#else
- #define X_MIN_TEST true
- #define X_MAX_TEST true
+ #define X_MIN_TEST() true
+ #define X_MAX_TEST() true
#endif
// Use HEAD for core axes, AXIS for others
@@ -707,7 +690,7 @@ void Endstops::update() {
#define _ENDSTOP_HIT(AXIS, MINMAX) SBI(hit_state, _ENDSTOP(AXIS, MINMAX))
// Call the endstop triggered routine for single endstops
- #define PROCESS_ENDSTOP(AXIS,MINMAX) do { \
+ #define PROCESS_ENDSTOP(AXIS, MINMAX) do { \
if (TEST_ENDSTOP(_ENDSTOP(AXIS, MINMAX))) { \
_ENDSTOP_HIT(AXIS, MINMAX); \
planner.endstop_triggered(_AXIS(AXIS)); \
@@ -715,36 +698,58 @@ void Endstops::update() {
}while(0)
// Call the endstop triggered routine for dual endstops
- #define PROCESS_DUAL_ENDSTOP(AXIS1, AXIS2, MINMAX) do { \
- const byte dual_hit = TEST_ENDSTOP(_ENDSTOP(AXIS1, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(AXIS2, MINMAX)) << 1); \
+ #define PROCESS_DUAL_ENDSTOP(A, MINMAX) do { \
+ const byte dual_hit = TEST_ENDSTOP(_ENDSTOP(A, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(A##2, MINMAX)) << 1); \
if (dual_hit) { \
- _ENDSTOP_HIT(AXIS1, MINMAX); \
+ _ENDSTOP_HIT(A, MINMAX); \
/* if not performing home or if both endstops were trigged during homing... */ \
if (!stepper.separate_multi_axis || dual_hit == 0b11) \
- planner.endstop_triggered(_AXIS(AXIS1)); \
+ planner.endstop_triggered(_AXIS(A)); \
} \
}while(0)
- #define PROCESS_TRIPLE_ENDSTOP(AXIS1, AXIS2, AXIS3, MINMAX) do { \
- const byte triple_hit = TEST_ENDSTOP(_ENDSTOP(AXIS1, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(AXIS2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(AXIS3, MINMAX)) << 2); \
+ #define PROCESS_TRIPLE_ENDSTOP(A, MINMAX) do { \
+ const byte triple_hit = TEST_ENDSTOP(_ENDSTOP(A, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(A##2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(A##3, MINMAX)) << 2); \
if (triple_hit) { \
- _ENDSTOP_HIT(AXIS1, MINMAX); \
+ _ENDSTOP_HIT(A, MINMAX); \
/* if not performing home or if both endstops were trigged during homing... */ \
if (!stepper.separate_multi_axis || triple_hit == 0b111) \
- planner.endstop_triggered(_AXIS(AXIS1)); \
+ planner.endstop_triggered(_AXIS(A)); \
} \
}while(0)
- #define PROCESS_QUAD_ENDSTOP(AXIS1, AXIS2, AXIS3, AXIS4, MINMAX) do { \
- const byte quad_hit = TEST_ENDSTOP(_ENDSTOP(AXIS1, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(AXIS2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(AXIS3, MINMAX)) << 2) | (TEST_ENDSTOP(_ENDSTOP(AXIS4, MINMAX)) << 3); \
+ #define PROCESS_QUAD_ENDSTOP(A, MINMAX) do { \
+ const byte quad_hit = TEST_ENDSTOP(_ENDSTOP(A, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(A##2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(A##3, MINMAX)) << 2) | (TEST_ENDSTOP(_ENDSTOP(A##4, MINMAX)) << 3); \
if (quad_hit) { \
- _ENDSTOP_HIT(AXIS1, MINMAX); \
+ _ENDSTOP_HIT(A, MINMAX); \
/* if not performing home or if both endstops were trigged during homing... */ \
if (!stepper.separate_multi_axis || quad_hit == 0b1111) \
- planner.endstop_triggered(_AXIS(AXIS1)); \
+ planner.endstop_triggered(_AXIS(A)); \
} \
}while(0)
+ #if ENABLED(X_DUAL_ENDSTOPS)
+ #define PROCESS_ENDSTOP_X(MINMAX) PROCESS_DUAL_ENDSTOP(X, MINMAX)
+ #else
+ #define PROCESS_ENDSTOP_X(MINMAX) if (X_##MINMAX##_TEST()) PROCESS_ENDSTOP(X, MINMAX)
+ #endif
+
+ #if ENABLED(Y_DUAL_ENDSTOPS)
+ #define PROCESS_ENDSTOP_Y(MINMAX) PROCESS_DUAL_ENDSTOP(Y, MINMAX)
+ #else
+ #define PROCESS_ENDSTOP_Y(MINMAX) PROCESS_ENDSTOP(Y, MINMAX)
+ #endif
+
+ #if DISABLED(Z_MULTI_ENDSTOPS)
+ #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_ENDSTOP(Z, MINMAX)
+ #elif NUM_Z_STEPPER_DRIVERS == 4
+ #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_QUAD_ENDSTOP(Z, MINMAX)
+ #elif NUM_Z_STEPPER_DRIVERS == 3
+ #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_TRIPLE_ENDSTOP(Z, MINMAX)
+ #else
+ #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_DUAL_ENDSTOP(Z, MINMAX)
+ #endif
+
#if ENABLED(G38_PROBE_TARGET) && PIN_EXISTS(Z_MIN_PROBE) && !(CORE_IS_XY || CORE_IS_XZ)
#if ENABLED(G38_PROBE_AWAY)
#define _G38_OPEN_STATE (G38_move >= 4)
@@ -764,20 +769,12 @@ void Endstops::update() {
if (stepper.axis_is_moving(X_AXIS)) {
if (stepper.motor_direction(X_AXIS_HEAD)) { // -direction
#if HAS_X_MIN || (X_SPI_SENSORLESS && X_HOME_DIR < 0)
- #if ENABLED(X_DUAL_ENDSTOPS)
- PROCESS_DUAL_ENDSTOP(X, X2, MIN);
- #else
- if (X_MIN_TEST) PROCESS_ENDSTOP(X, MIN);
- #endif
+ PROCESS_ENDSTOP_X(MIN);
#endif
}
else { // +direction
#if HAS_X_MAX || (X_SPI_SENSORLESS && X_HOME_DIR > 0)
- #if ENABLED(X_DUAL_ENDSTOPS)
- PROCESS_DUAL_ENDSTOP(X, X2, MAX);
- #else
- if (X_MAX_TEST) PROCESS_ENDSTOP(X, MAX);
- #endif
+ PROCESS_ENDSTOP_X(MAX);
#endif
}
}
@@ -785,44 +782,27 @@ void Endstops::update() {
if (stepper.axis_is_moving(Y_AXIS)) {
if (stepper.motor_direction(Y_AXIS_HEAD)) { // -direction
#if HAS_Y_MIN || (Y_SPI_SENSORLESS && Y_HOME_DIR < 0)
- #if ENABLED(Y_DUAL_ENDSTOPS)
- PROCESS_DUAL_ENDSTOP(Y, Y2, MIN);
- #else
- PROCESS_ENDSTOP(Y, MIN);
- #endif
+ PROCESS_ENDSTOP_Y(MIN);
#endif
}
else { // +direction
#if HAS_Y_MAX || (Y_SPI_SENSORLESS && Y_HOME_DIR > 0)
- #if ENABLED(Y_DUAL_ENDSTOPS)
- PROCESS_DUAL_ENDSTOP(Y, Y2, MAX);
- #else
- PROCESS_ENDSTOP(Y, MAX);
- #endif
+ PROCESS_ENDSTOP_Y(MAX);
#endif
}
}
if (stepper.axis_is_moving(Z_AXIS)) {
if (stepper.motor_direction(Z_AXIS_HEAD)) { // Z -direction. Gantry down, bed up.
+
#if HAS_Z_MIN || (Z_SPI_SENSORLESS && Z_HOME_DIR < 0)
- #if ENABLED(Z_MULTI_ENDSTOPS)
- #if NUM_Z_STEPPER_DRIVERS == 4
- PROCESS_QUAD_ENDSTOP(Z, Z2, Z3, Z4, MIN);
- #elif NUM_Z_STEPPER_DRIVERS == 3
- PROCESS_TRIPLE_ENDSTOP(Z, Z2, Z3, MIN);
- #else
- PROCESS_DUAL_ENDSTOP(Z, Z2, MIN);
- #endif
- #else
+ if (true
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
- if (z_probe_enabled) PROCESS_ENDSTOP(Z, MIN);
+ && z_probe_enabled
#elif HAS_CUSTOM_PROBE_PIN
- if (!z_probe_enabled) PROCESS_ENDSTOP(Z, MIN);
- #else
- PROCESS_ENDSTOP(Z, MIN);
+ && !z_probe_enabled
#endif
- #endif
+ ) PROCESS_ENDSTOP_Z(MIN);
#endif
// When closing the gap check the enabled probe
@@ -833,16 +813,8 @@ void Endstops::update() {
else { // Z +direction. Gantry up, bed down.
#if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_DIR > 0)
#if ENABLED(Z_MULTI_ENDSTOPS)
- #if NUM_Z_STEPPER_DRIVERS == 4
- PROCESS_QUAD_ENDSTOP(Z, Z2, Z3, Z4, MAX);
- #elif NUM_Z_STEPPER_DRIVERS == 3
- PROCESS_TRIPLE_ENDSTOP(Z, Z2, Z3, MAX);
- #else
- PROCESS_DUAL_ENDSTOP(Z, Z2, MAX);
- #endif
- #elif !HAS_CUSTOM_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN
- // If this pin is not hijacked for the bed probe
- // then it belongs to the Z endstop
+ PROCESS_ENDSTOP_Z(MAX);
+ #elif !HAS_CUSTOM_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN // No probe or probe is Z_MIN || Probe is not Z_MAX
PROCESS_ENDSTOP(Z, MAX);
#endif
#endif
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index a9abf52381..71353abb34 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 9d0422c4a6..1cc0a04712 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -55,6 +55,10 @@
#include "../lcd/ultralcd.h"
#endif
+#if HAS_FILAMENT_SENSOR
+ #include "../feature/runout.h"
+#endif
+
#if ENABLED(SENSORLESS_HOMING)
#include "../feature/tmc_util.h"
#endif
@@ -104,14 +108,20 @@ xyze_pos_t current_position = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
/**
* Cartesian Destination
* The destination for a move, filled in by G-code movement commands,
- * and expected by functions like 'prepare_move_to_destination'.
+ * and expected by functions like 'prepare_line_to_destination'.
* G-codes can set destination using 'get_destination_from_command'
*/
xyze_pos_t destination; // {0}
+// G60/G61 Position Save and Return
+#if SAVED_POSITIONS
+ uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3];
+ xyz_pos_t stored_position[SAVED_POSITIONS];
+#endif
+
// The active extruder (tool). Set with T command.
#if EXTRUDERS > 1
- uint8_t active_extruder; // = 0
+ uint8_t active_extruder = 0; // = 0
#endif
#if ENABLED(LCD_SHOW_E_TOTAL)
@@ -200,17 +210,56 @@ xyz_pos_t cartes;
/**
* Output the current position to serial
*/
-void report_current_position() {
- const xyz_pos_t lpos = current_position.asLogical();
- SERIAL_ECHOPAIR("X:", lpos.x, " Y:", lpos.y, " Z:", lpos.z, " E:", current_position.e);
+inline void report_more_positions() {
stepper.report_positions();
-
#if IS_SCARA
scara_report_positions();
#endif
}
+// Report the logical position for a given machine position
+inline void report_logical_position(const xyze_pos_t &rpos) {
+ const xyze_pos_t lpos = rpos.asLogical();
+ SERIAL_ECHOPAIR_P(X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z, SP_E_LBL, lpos.e);
+}
+
+// Report the real current position according to the steppers.
+// Forward kinematics and un-leveling are applied.
+void report_real_position() {
+ get_cartesian_from_steppers();
+ xyze_pos_t npos = cartes;
+ npos.e = planner.get_axis_position_mm(E_AXIS);
+
+ #if HAS_POSITION_MODIFIERS
+ planner.unapply_modifiers(npos
+ #if HAS_LEVELING
+ , true
+ #endif
+ );
+ #endif
+
+ report_logical_position(npos);
+ report_more_positions();
+}
+
+// Report the logical current position according to the most recent G-code command
+void report_current_position() {
+ report_logical_position(current_position);
+ report_more_positions();
+}
+
+/**
+ * Report the logical current position according to the most recent G-code command.
+ * The planner.position always corresponds to the last G-code too. This makes M114
+ * suitable for debugging kinematics and leveling while avoiding planner sync that
+ * definitively interrupts the printing flow.
+ */
+void report_current_position_projected() {
+ report_logical_position(current_position);
+ stepper.report_a_position(planner.position);
+}
+
/**
* sync_plan_position
*
@@ -235,11 +284,7 @@ void sync_plan_position_e() { planner.set_e_position_mm(current_position.e); }
*/
void get_cartesian_from_steppers() {
#if ENABLED(DELTA)
- forward_kinematics_DELTA(
- planner.get_axis_position_mm(A_AXIS),
- planner.get_axis_position_mm(B_AXIS),
- planner.get_axis_position_mm(C_AXIS)
- );
+ forward_kinematics_DELTA(planner.get_axis_positions_mm());
#else
#if IS_SCARA
forward_kinematics_SCARA(
@@ -266,20 +311,21 @@ void get_cartesian_from_steppers() {
*/
void set_current_from_steppers_for_axis(const AxisEnum axis) {
get_cartesian_from_steppers();
+ xyze_pos_t pos = cartes;
+ pos.e = planner.get_axis_position_mm(E_AXIS);
#if HAS_POSITION_MODIFIERS
- xyze_pos_t pos = { cartes.x, cartes.y, cartes.z, current_position.e };
planner.unapply_modifiers(pos
#if HAS_LEVELING
, true
#endif
);
- xyze_pos_t &cartes = pos;
#endif
+
if (axis == ALL_AXES)
- current_position = cartes;
+ current_position = pos;
else
- current_position[axis] = cartes[axis];
+ current_position[axis] = pos[axis];
}
/**
@@ -290,6 +336,17 @@ void line_to_current_position(const feedRate_t &fr_mm_s/*=feedrate_mm_s*/) {
planner.buffer_line(current_position, fr_mm_s, active_extruder);
}
+#if EXTRUDERS
+ void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s) {
+ #if HAS_FILAMENT_SENSOR
+ runout.reset();
+ #endif
+ current_position.e += length / planner.e_factor[active_extruder];
+ line_to_current_position(fr_mm_s);
+ planner.synchronize();
+ }
+#endif
+
#if IS_KINEMATIC
/**
@@ -333,7 +390,7 @@ void _internal_move_to_destination(const feedRate_t &fr_mm_s/*=0.0f*/
prepare_fast_move_to_destination();
else
#endif
- prepare_move_to_destination();
+ prepare_line_to_destination();
feedrate_mm_s = old_feedrate;
feedrate_percentage = old_pct;
@@ -541,7 +598,7 @@ void restore_feedrate_and_scaling() {
soft_endstop.min[axis] = base_min_pos(axis);
soft_endstop.max[axis] = (axis == Z_AXIS ? delta_height
#if HAS_BED_PROBE
- - probe_offset.z
+ - probe.offset.z
#endif
: base_max_pos(axis));
@@ -581,7 +638,7 @@ void restore_feedrate_and_scaling() {
#endif
if (DEBUGGING(LEVELING))
- SERIAL_ECHOLNPAIR("Axis ", axis_codes[axis], " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
+ SERIAL_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
}
/**
@@ -615,7 +672,7 @@ void restore_feedrate_and_scaling() {
) {
const float dist_2 = HYPOT2(target.x - offs.x, target.y - offs.y);
if (dist_2 > delta_max_radius_2)
- target *= delta_max_radius / SQRT(dist_2); // 200 / 300 = 0.66
+ target *= float(delta_max_radius / SQRT(dist_2)); // 200 / 300 = 0.66
}
#else
@@ -653,6 +710,16 @@ void restore_feedrate_and_scaling() {
#endif // HAS_SOFTWARE_ENDSTOPS
#if !UBL_SEGMENTED
+
+FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
+ const millis_t ms = millis();
+ if (ELAPSED(ms, next_idle_ms)) {
+ next_idle_ms = ms + 200UL;
+ return idle();
+ }
+ thermalManager.manage_heater(); // Returns immediately on most calls
+}
+
#if IS_KINEMATIC
#if IS_SCARA
@@ -672,7 +739,7 @@ void restore_feedrate_and_scaling() {
/**
* Prepare a linear move in a DELTA or SCARA setup.
*
- * Called from prepare_move_to_destination as the
+ * Called from prepare_line_to_destination as the
* default Delta/SCARA segmenter.
*
* This calls planner.buffer_line several times, adding
@@ -745,17 +812,10 @@ void restore_feedrate_and_scaling() {
xyze_pos_t raw = current_position;
// Calculate and execute the segments
+ millis_t next_idle_ms = millis() + 200UL;
while (--segments) {
-
- static millis_t next_idle_ms = millis() + 200UL;
- thermalManager.manage_heater(); // This returns immediately if not really needed.
- if (ELAPSED(millis(), next_idle_ms)) {
- next_idle_ms = millis() + 200UL;
- idle();
- }
-
+ segment_idle(next_idle_ms);
raw += segment_distance;
-
if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, cartesian_segment_mm
#if ENABLED(SCARA_FEEDRATE_SCALING)
, inv_duration
@@ -824,13 +884,9 @@ void restore_feedrate_and_scaling() {
xyze_pos_t raw = current_position;
// Calculate and execute the segments
+ millis_t next_idle_ms = millis() + 200UL;
while (--segments) {
- static millis_t next_idle_ms = millis() + 200UL;
- thermalManager.manage_heater(); // This returns immediately if not really needed.
- if (ELAPSED(millis(), next_idle_ms)) {
- next_idle_ms = millis() + 200UL;
- idle();
- }
+ segment_idle(next_idle_ms);
raw += segment_distance;
if (!planner.buffer_line(raw, fr_mm_s, active_extruder, cartesian_segment_mm
#if ENABLED(SCARA_FEEDRATE_SCALING)
@@ -859,7 +915,7 @@ void restore_feedrate_and_scaling() {
*
* Return true if 'current_position' was set to 'destination'
*/
- inline bool prepare_move_to_destination_cartesian() {
+ inline bool line_to_destination_cartesian() {
const float scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
#if HAS_MESH
if (planner.leveling_active && planner.leveling_active_at_z(destination.z)) {
@@ -1002,7 +1058,7 @@ void restore_feedrate_and_scaling() {
*
* Before exit, current_position is set to destination.
*/
-void prepare_move_to_destination() {
+void prepare_line_to_destination() {
apply_motion_limits(destination);
#if EITHER(PREVENT_COLD_EXTRUSION, PREVENT_LENGTHY_EXTRUDE)
@@ -1012,7 +1068,7 @@ void prepare_move_to_destination() {
#if ENABLED(PREVENT_COLD_EXTRUSION)
ignore_e = thermalManager.tooColdToExtrude(active_extruder);
- if (ignore_e) SERIAL_ECHO_MSG(MSG_ERR_COLD_EXTRUDE_STOP);
+ if (ignore_e) SERIAL_ECHO_MSG(STR_ERR_COLD_EXTRUDE_STOP);
#endif
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
@@ -1024,13 +1080,13 @@ void prepare_move_to_destination() {
MIXER_STEPPER_LOOP(e) {
if (e_delta * collector[e] > (EXTRUDE_MAXLENGTH)) {
ignore_e = true;
- SERIAL_ECHO_MSG(MSG_ERR_LONG_EXTRUDE_STOP);
+ SERIAL_ECHO_MSG(STR_ERR_LONG_EXTRUDE_STOP);
break;
}
}
#else
ignore_e = true;
- SERIAL_ECHO_MSG(MSG_ERR_LONG_EXTRUDE_STOP);
+ SERIAL_ECHO_MSG(STR_ERR_LONG_EXTRUDE_STOP);
#endif
}
#endif
@@ -1052,12 +1108,12 @@ void prepare_move_to_destination() {
#if IS_KINEMATIC // UBL using Kinematic / Cartesian cases as a workaround for now.
ubl.line_to_destination_segmented(MMS_SCALED(feedrate_mm_s))
#else
- prepare_move_to_destination_cartesian()
+ line_to_destination_cartesian()
#endif
#elif IS_KINEMATIC
line_to_destination_kinematic()
#else
- prepare_move_to_destination_cartesian()
+ line_to_destination_cartesian()
#endif
) return;
@@ -1170,15 +1226,9 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
#if ENABLED(SPI_ENDSTOPS)
switch (axis) {
- #if X_SPI_SENSORLESS
- case X_AXIS: endstops.tmc_spi_homing.x = true; break;
- #endif
- #if Y_SPI_SENSORLESS
- case Y_AXIS: endstops.tmc_spi_homing.y = true; break;
- #endif
- #if Z_SPI_SENSORLESS
- case Z_AXIS: endstops.tmc_spi_homing.z = true; break;
- #endif
+ case X_AXIS: if (ENABLED(X_SPI_SENSORLESS)) endstops.tmc_spi_homing.x = true; break;
+ case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = true; break;
+ case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = true; break;
default: break;
}
#endif
@@ -1242,15 +1292,9 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
#if ENABLED(SPI_ENDSTOPS)
switch (axis) {
- #if X_SPI_SENSORLESS
- case X_AXIS: endstops.tmc_spi_homing.x = false; break;
- #endif
- #if Y_SPI_SENSORLESS
- case Y_AXIS: endstops.tmc_spi_homing.y = false; break;
- #endif
- #if Z_SPI_SENSORLESS
- case Z_AXIS: endstops.tmc_spi_homing.z = false; break;
- #endif
+ case X_AXIS: if (ENABLED(X_SPI_SENSORLESS)) endstops.tmc_spi_homing.x = false; break;
+ case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = false; break;
+ case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = false; break;
default: break;
}
#endif
@@ -1263,27 +1307,21 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
*/
void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t fr_mm_s=0.0) {
+ const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
+
if (DEBUGGING(LEVELING)) {
DEBUG_ECHOPAIR(">>> do_homing_move(", axis_codes[axis], ", ", distance, ", ");
if (fr_mm_s)
DEBUG_ECHO(fr_mm_s);
else
- DEBUG_ECHOPAIR("[", homing_feedrate(axis), "]");
+ DEBUG_ECHOPAIR("[", real_fr_mm_s, "]");
DEBUG_ECHOLNPGM(")");
}
#if HOMING_Z_WITH_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
// Wait for bed to heat back up between probing points
- if (axis == Z_AXIS && distance < 0 && thermalManager.isHeatingBed()) {
- serialprintPGM(msg_wait_for_bed_heating);
- #if HAS_DISPLAY
- LCD_MESSAGEPGM(MSG_BED_HEATING);
- #endif
- thermalManager.wait_for_bed();
- #if HAS_DISPLAY
- ui.reset_status();
- #endif
- }
+ if (axis == Z_AXIS && distance < 0)
+ thermalManager.wait_for_bed_heating();
#endif
// Only do some things when moving towards an endstop
@@ -1301,7 +1339,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
if (is_home_dir) {
#if HOMING_Z_WITH_PROBE && QUIET_PROBING
- if (axis == Z_AXIS) probing_pause(true);
+ if (axis == Z_AXIS) probe.set_probing_paused(true);
#endif
// Disable stealthChop if used. Enable diag1 pin on driver.
@@ -1310,7 +1348,6 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
#endif
}
- const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
#if IS_SCARA
// Tell the planner the axis is at 0
current_position[axis] = 0;
@@ -1318,19 +1355,19 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
current_position[axis] = distance;
line_to_current_position(real_fr_mm_s);
#else
- abce_pos_t target = { planner.get_axis_position_mm(A_AXIS), planner.get_axis_position_mm(B_AXIS), planner.get_axis_position_mm(C_AXIS), planner.get_axis_position_mm(E_AXIS) };
+ abce_pos_t target = planner.get_axis_positions_mm();
target[axis] = 0;
planner.set_machine_position_mm(target);
target[axis] = distance;
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- const xyze_float_t delta_mm_cart{0};
+ #if HAS_DIST_MM_ARG
+ const xyze_float_t cart_dist_mm{0};
#endif
// Set delta/cartesian axes directly
planner.buffer_segment(target
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , cart_dist_mm
#endif
, real_fr_mm_s, active_extruder
);
@@ -1341,7 +1378,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
if (is_home_dir) {
#if HOMING_Z_WITH_PROBE && QUIET_PROBING
- if (axis == Z_AXIS) probing_pause(false);
+ if (axis == Z_AXIS) probe.set_probing_paused(false);
#endif
endstops.validate_homing_move();
@@ -1391,7 +1428,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
#elif ENABLED(DELTA)
current_position[axis] = (axis == Z_AXIS ? delta_height
#if HAS_BED_PROBE
- - probe_offset.z
+ - probe.offset.z
#endif
: base_home_pos(axis));
#else
@@ -1405,9 +1442,9 @@ void set_axis_is_at_home(const AxisEnum axis) {
if (axis == Z_AXIS) {
#if HOMING_Z_WITH_PROBE
- current_position.z -= probe_offset.z;
+ current_position.z -= probe.offset.z;
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> probe_offset.z = ", probe_offset.z);
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> probe.offset.z = ", probe.offset.z);
#else
@@ -1442,13 +1479,13 @@ void set_axis_is_at_home(const AxisEnum axis) {
/**
* Set an axis' to be unhomed.
*/
-void set_axis_is_not_at_home(const AxisEnum axis) {
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_is_not_at_home(", axis_codes[axis], ")");
+void set_axis_not_trusted(const AxisEnum axis) {
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_not_trusted(", axis_codes[axis], ")");
CBI(axis_known_position, axis);
CBI(axis_homed, axis);
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_is_not_at_home(", axis_codes[axis], ")");
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_not_trusted(", axis_codes[axis], ")");
#if ENABLED(I2C_POSITION_ENCODERS)
I2CPEM.unhomed(axis);
@@ -1503,7 +1540,7 @@ void homeaxis(const AxisEnum axis) {
// Homing Z towards the bed? Deploy the Z probe or endstop.
#if HOMING_Z_WITH_PROBE
- if (axis == Z_AXIS && DEPLOY_PROBE()) return;
+ if (axis == Z_AXIS && probe.deploy()) return;
#endif
// Set flags for X, Y, Z motor locking
@@ -1745,20 +1782,26 @@ void homeaxis(const AxisEnum axis) {
// Put away the Z probe
#if HOMING_Z_WITH_PROBE
- if (axis == Z_AXIS && STOW_PROBE()) return;
+ if (axis == Z_AXIS && probe.stow()) return;
#endif
#if DISABLED(DELTA) && defined(HOMING_BACKOFF_MM)
- constexpr xyz_float_t endstop_backoff = HOMING_BACKOFF_MM;
- const float backoff_mm = endstop_backoff[axis];
- if (backoff_mm) {
- current_position[axis] -= ABS(backoff_mm) * axis_home_dir;
+ const xyz_float_t endstop_backoff = HOMING_BACKOFF_MM;
+ if (endstop_backoff[axis]) {
+ current_position[axis] -= ABS(endstop_backoff[axis]) * axis_home_dir;
line_to_current_position(
#if HOMING_Z_WITH_PROBE
(axis == Z_AXIS) ? MMM_TO_MMS(Z_PROBE_SPEED_FAST) :
#endif
homing_feedrate(axis)
);
+
+ #if ENABLED(SENSORLESS_HOMING)
+ planner.synchronize();
+ #if IS_CORE
+ if (axis != NORMAL_AXIS) safe_delay(200); // Short delay to allow belts to spring back
+ #endif
+ #endif
}
#endif
@@ -1774,7 +1817,7 @@ void homeaxis(const AxisEnum axis) {
#if HAS_WORKSPACE_OFFSET
void update_workspace_offset(const AxisEnum axis) {
workspace_offset[axis] = home_offset[axis] + position_shift[axis];
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", axis_codes[axis], " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
}
#endif
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 43ae2b2303..e504f187f9 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,10 +30,6 @@
#include "../inc/MarlinConfig.h"
-#if HAS_BED_PROBE
- #include "probe.h"
-#endif
-
#if IS_SCARA
#include "scara.h"
#endif
@@ -58,13 +54,19 @@ FORCE_INLINE bool homing_needed() {
}
// Error margin to work around float imprecision
-constexpr float slop = 0.0001;
+constexpr float fslop = 0.0001;
extern bool relative_mode;
extern xyze_pos_t current_position, // High-level current tool position
destination; // Destination for a move
+// G60/G61 Position Save and Return
+#if SAVED_POSITIONS
+ extern uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3];
+ extern xyz_pos_t stored_position[SAVED_POSITIONS];
+#endif
+
// Scratch space for a cartesian result
extern xyz_pos_t cartes;
@@ -160,7 +162,9 @@ typedef struct { xyz_pos_t min, max; } axis_limits_t;
#define update_software_endstops(...) NOOP
#endif
+void report_real_position();
void report_current_position();
+void report_current_position_projected();
void get_cartesian_from_steppers();
void set_current_from_steppers_for_axis(const AxisEnum axis);
@@ -180,7 +184,11 @@ void sync_plan_position_e();
*/
void line_to_current_position(const feedRate_t &fr_mm_s=feedrate_mm_s);
-void prepare_move_to_destination();
+#if EXTRUDERS
+ void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s);
+#endif
+
+void prepare_line_to_destination();
void _internal_move_to_destination(const feedRate_t &fr_mm_s=0.0f
#if IS_KINEMATIC
@@ -240,7 +248,7 @@ bool axis_unhomed_error(uint8_t axis_bits=0x07);
void set_axis_is_at_home(const AxisEnum axis);
-void set_axis_is_not_at_home(const AxisEnum axis);
+void set_axis_not_trusted(const AxisEnum axis);
void homeaxis(const AxisEnum axis);
@@ -300,7 +308,7 @@ void homeaxis(const AxisEnum axis);
// Return true if the given point is within the printable area
inline bool position_is_reachable(const float &rx, const float &ry, const float inset=0) {
#if ENABLED(DELTA)
- return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + slop);
+ return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + fslop);
#elif IS_SCARA
const float R2 = HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y);
return (
@@ -316,67 +324,24 @@ void homeaxis(const AxisEnum axis);
return position_is_reachable(pos.x, pos.y, inset);
}
- #if HAS_BED_PROBE
-
- #if HAS_PROBE_XY_OFFSET
-
- // Return true if the both nozzle and the probe can reach the given point.
- // Note: This won't work on SCARA since the probe offset rotates with the arm.
- inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
- return position_is_reachable(rx - probe_offset.x, ry - probe_offset.y)
- && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE));
- }
-
- #else
-
- FORCE_INLINE bool position_is_reachable_by_probe(const float &rx, const float &ry) {
- return position_is_reachable(rx, ry, MIN_PROBE_EDGE);
- }
-
- #endif
-
- #endif // HAS_BED_PROBE
-
#else // CARTESIAN
// Return true if the given position is within the machine bounds.
inline bool position_is_reachable(const float &rx, const float &ry) {
- if (!WITHIN(ry, Y_MIN_POS - slop, Y_MAX_POS + slop)) return false;
+ if (!WITHIN(ry, Y_MIN_POS - fslop, Y_MAX_POS + fslop)) return false;
#if ENABLED(DUAL_X_CARRIAGE)
if (active_extruder)
- return WITHIN(rx, X2_MIN_POS - slop, X2_MAX_POS + slop);
+ return WITHIN(rx, X2_MIN_POS - fslop, X2_MAX_POS + fslop);
else
- return WITHIN(rx, X1_MIN_POS - slop, X1_MAX_POS + slop);
+ return WITHIN(rx, X1_MIN_POS - fslop, X1_MAX_POS + fslop);
#else
- return WITHIN(rx, X_MIN_POS - slop, X_MAX_POS + slop);
+ return WITHIN(rx, X_MIN_POS - fslop, X_MAX_POS + fslop);
#endif
}
inline bool position_is_reachable(const xy_pos_t &pos) { return position_is_reachable(pos.x, pos.y); }
- #if HAS_BED_PROBE
-
- /**
- * Return whether the given position is within the bed, and whether the nozzle
- * can reach the position required to put the probe at the given position.
- *
- * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
- * nozzle must be be able to reach +10,-10.
- */
- inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
- return position_is_reachable(rx - probe_offset_xy.x, ry - probe_offset_xy.y)
- && WITHIN(rx, probe_min_x() - slop, probe_max_x() + slop)
- && WITHIN(ry, probe_min_y() - slop, probe_max_y() + slop);
- }
-
- #endif // HAS_BED_PROBE
-
#endif // CARTESIAN
-#if !HAS_BED_PROBE
- FORCE_INLINE bool position_is_reachable_by_probe(const float &rx, const float &ry) { return position_is_reachable(rx, ry); }
-#endif
-FORCE_INLINE bool position_is_reachable_by_probe(const xy_pos_t &pos) { return position_is_reachable_by_probe(pos.x, pos.y); }
-
/**
* Duplication mode
*/
@@ -414,11 +379,13 @@ FORCE_INLINE bool position_is_reachable_by_probe(const xy_pos_t &pos) { return p
FORCE_INLINE int x_home_dir(const uint8_t extruder) { return extruder ? X2_HOME_DIR : X_HOME_DIR; }
-#elif ENABLED(MULTI_NOZZLE_DUPLICATION)
+#else
- enum DualXMode : char {
- DXC_DUPLICATION_MODE = 2
- };
+ #if ENABLED(MULTI_NOZZLE_DUPLICATION)
+ enum DualXMode : char { DXC_DUPLICATION_MODE = 2 };
+ #endif
+
+ FORCE_INLINE int x_home_dir(const uint8_t) { return home_dir(X_AXIS); }
#endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 0552206315..e1a050a459 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -101,7 +101,7 @@
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../feature/power_loss_recovery.h"
+ #include "../feature/powerloss.h"
#endif
#if HAS_CUTTER
@@ -709,6 +709,59 @@ void Planner::init() {
#define MINIMAL_STEP_RATE 120
+/**
+ * Get the current block for processing
+ * and mark the block as busy.
+ * Return nullptr if the buffer is empty
+ * or if there is a first-block delay.
+ *
+ * WARNING: Called from Stepper ISR context!
+ */
+block_t* Planner::get_current_block() {
+ // Get the number of moves in the planner queue so far
+ const uint8_t nr_moves = movesplanned();
+
+ // If there are any moves queued ...
+ if (nr_moves) {
+
+ // If there is still delay of delivery of blocks running, decrement it
+ if (delay_before_delivering) {
+ --delay_before_delivering;
+ // If the number of movements queued is less than 3, and there is still time
+ // to wait, do not deliver anything
+ if (nr_moves < 3 && delay_before_delivering) return nullptr;
+ delay_before_delivering = 0;
+ }
+
+ // If we are here, there is no excuse to deliver the block
+ block_t * const block = &block_buffer[block_buffer_tail];
+
+ // No trapezoid calculated? Don't execute yet.
+ if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) return nullptr;
+
+ #if HAS_SPI_LCD
+ block_buffer_runtime_us -= block->segment_time_us; // We can't be sure how long an active block will take, so don't count it.
+ #endif
+
+ // As this block is busy, advance the nonbusy block pointer
+ block_buffer_nonbusy = next_block_index(block_buffer_tail);
+
+ // Push block_buffer_planned pointer, if encountered.
+ if (block_buffer_tail == block_buffer_planned)
+ block_buffer_planned = block_buffer_nonbusy;
+
+ // Return the block
+ return block;
+ }
+
+ // The queue became empty
+ #if HAS_SPI_LCD
+ clear_block_buffer_runtime(); // paranoia. Buffer is empty now - so reset accumulated time to zero.
+ #endif
+
+ return nullptr;
+}
+
/**
* Calculate trapezoid parameters, multiplying the entry- and exit-speeds
* by the provided factors.
@@ -1252,13 +1305,13 @@ void Planner::check_axes_activity() {
// Disable inactive axes
//
#if ENABLED(DISABLE_X)
- if (!axis_active.x) disable_X();
+ if (!axis_active.x) DISABLE_AXIS_X();
#endif
#if ENABLED(DISABLE_Y)
- if (!axis_active.y) disable_Y();
+ if (!axis_active.y) DISABLE_AXIS_Y();
#endif
#if ENABLED(DISABLE_Z)
- if (!axis_active.z) disable_Z();
+ if (!axis_active.z) DISABLE_AXIS_Z();
#endif
#if ENABLED(DISABLE_E)
if (!axis_active.e) disable_e_steppers();
@@ -1355,7 +1408,7 @@ void Planner::check_axes_activity() {
* The multiplier converts a given E value into a length.
*/
void Planner::calculate_volumetric_multipliers() {
- for (uint8_t i = 0; i < COUNT(filament_size); i++) {
+ LOOP_L_N(i, COUNT(filament_size)) {
volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
refresh_e_factor(i);
}
@@ -1466,10 +1519,6 @@ void Planner::check_axes_activity() {
#endif
}
-
- #if ENABLED(SKEW_CORRECTION)
- unskew(raw);
- #endif
}
#endif // HAS_LEVELING
@@ -1498,8 +1547,7 @@ void Planner::quick_stop() {
// must be handled: The tail could change between the read and the assignment
// so this must be enclosed in a critical section
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ const bool was_enabled = stepper.suspend();
// Drop all queue entries
block_buffer_nonbusy = block_buffer_planned = block_buffer_head = block_buffer_tail;
@@ -1517,7 +1565,7 @@ void Planner::quick_stop() {
cleaning_buffer_counter = 1000;
// Reenable Stepper ISR
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+ if (was_enabled) stepper.wake_up();
// And stop the stepper ISR
stepper.quick_stop();
@@ -1548,13 +1596,12 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
if (axis == CORE_AXIS_1 || axis == CORE_AXIS_2) {
// Protect the access to the position.
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ const bool was_enabled = stepper.suspend();
const int32_t p1 = stepper.position(CORE_AXIS_1),
p2 = stepper.position(CORE_AXIS_2);
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+ if (was_enabled) stepper.wake_up();
// ((a1+a2)+(a1-a2))/2 -> (a1+a2+a1-a2)/2 -> (a1+a1)/2 -> a1
// ((a1+a2)-(a1-a2))/2 -> (a1+a2-a1+a2)/2 -> (a2+a2)/2 -> a2
@@ -1597,8 +1644,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
#if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float
#endif
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , const xyze_float_t &delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , const xyze_float_t &cart_dist_mm
#endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters
) {
@@ -1615,8 +1662,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
#if HAS_POSITION_FLOAT
, target_float
#endif
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , cart_dist_mm
#endif
, fr_mm_s, extruder, millimeters
)) {
@@ -1661,8 +1708,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float
#endif
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , const xyze_float_t &delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , const xyze_float_t &cart_dist_mm
#endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
) {
@@ -1697,7 +1744,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
position_float.e = target_float.e;
#endif
de = 0; // no difference
- SERIAL_ECHO_MSG(MSG_ERR_COLD_EXTRUDE_STOP);
+ SERIAL_ECHO_MSG(STR_ERR_COLD_EXTRUDE_STOP);
}
#endif // PREVENT_COLD_EXTRUSION
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
@@ -1719,7 +1766,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
position_float.e = target_float.e;
#endif
de = 0; // no difference
- SERIAL_ECHO_MSG(MSG_ERR_LONG_EXTRUDE_STOP);
+ SERIAL_ECHO_MSG(STR_ERR_LONG_EXTRUDE_STOP);
}
}
#endif // PREVENT_LENGTHY_EXTRUDE
@@ -1789,51 +1836,51 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
* So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning the real displacement of the Head.
* Having the real displacement of the head, we can calculate the total movement length and apply the desired speed.
*/
- struct DeltaMM : abce_float_t {
+ struct DistanceMM : abce_float_t {
#if IS_CORE
xyz_pos_t head;
#endif
- } delta_mm;
+ } steps_dist_mm;
#if IS_CORE
#if CORE_IS_XY
- delta_mm.head.x = da * steps_to_mm[A_AXIS];
- delta_mm.head.y = db * steps_to_mm[B_AXIS];
- delta_mm.z = dc * steps_to_mm[Z_AXIS];
- delta_mm.a = (da + db) * steps_to_mm[A_AXIS];
- delta_mm.b = CORESIGN(da - db) * steps_to_mm[B_AXIS];
+ steps_dist_mm.head.x = da * steps_to_mm[A_AXIS];
+ steps_dist_mm.head.y = db * steps_to_mm[B_AXIS];
+ steps_dist_mm.z = dc * steps_to_mm[Z_AXIS];
+ steps_dist_mm.a = (da + db) * steps_to_mm[A_AXIS];
+ steps_dist_mm.b = CORESIGN(da - db) * steps_to_mm[B_AXIS];
#elif CORE_IS_XZ
- delta_mm.head.x = da * steps_to_mm[A_AXIS];
- delta_mm.y = db * steps_to_mm[Y_AXIS];
- delta_mm.head.z = dc * steps_to_mm[C_AXIS];
- delta_mm.a = (da + dc) * steps_to_mm[A_AXIS];
- delta_mm.c = CORESIGN(da - dc) * steps_to_mm[C_AXIS];
+ steps_dist_mm.head.x = da * steps_to_mm[A_AXIS];
+ steps_dist_mm.y = db * steps_to_mm[Y_AXIS];
+ steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS];
+ steps_dist_mm.a = (da + dc) * steps_to_mm[A_AXIS];
+ steps_dist_mm.c = CORESIGN(da - dc) * steps_to_mm[C_AXIS];
#elif CORE_IS_YZ
- delta_mm.x = da * steps_to_mm[X_AXIS];
- delta_mm.head.y = db * steps_to_mm[B_AXIS];
- delta_mm.head.z = dc * steps_to_mm[C_AXIS];
- delta_mm.b = (db + dc) * steps_to_mm[B_AXIS];
- delta_mm.c = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
+ steps_dist_mm.x = da * steps_to_mm[X_AXIS];
+ steps_dist_mm.head.y = db * steps_to_mm[B_AXIS];
+ steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS];
+ steps_dist_mm.b = (db + dc) * steps_to_mm[B_AXIS];
+ steps_dist_mm.c = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
#endif
#else
- delta_mm.a = da * steps_to_mm[A_AXIS];
- delta_mm.b = db * steps_to_mm[B_AXIS];
- delta_mm.c = dc * steps_to_mm[C_AXIS];
+ steps_dist_mm.a = da * steps_to_mm[A_AXIS];
+ steps_dist_mm.b = db * steps_to_mm[B_AXIS];
+ steps_dist_mm.c = dc * steps_to_mm[C_AXIS];
#endif
#if EXTRUDERS
- delta_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
+ steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
#else
- delta_mm.e = 0.0f;
+ steps_dist_mm.e = 0.0f;
#endif
#if ENABLED(LCD_SHOW_E_TOTAL)
- e_move_accumulator += delta_mm.e;
+ e_move_accumulator += steps_dist_mm.e;
#endif
if (block->steps.a < MIN_STEPS_PER_SEGMENT && block->steps.b < MIN_STEPS_PER_SEGMENT && block->steps.c < MIN_STEPS_PER_SEGMENT) {
block->millimeters = (0
#if EXTRUDERS
- + ABS(delta_mm.e)
+ + ABS(steps_dist_mm.e)
#endif
);
}
@@ -1843,13 +1890,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
else
block->millimeters = SQRT(
#if CORE_IS_XY
- sq(delta_mm.head.x) + sq(delta_mm.head.y) + sq(delta_mm.z)
+ sq(steps_dist_mm.head.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.z)
#elif CORE_IS_XZ
- sq(delta_mm.head.x) + sq(delta_mm.y) + sq(delta_mm.head.z)
+ sq(steps_dist_mm.head.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.head.z)
#elif CORE_IS_YZ
- sq(delta_mm.x) + sq(delta_mm.head.y) + sq(delta_mm.head.z)
+ sq(steps_dist_mm.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.head.z)
#else
- sq(delta_mm.x) + sq(delta_mm.y) + sq(delta_mm.z)
+ sq(steps_dist_mm.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.z)
#endif
);
@@ -1905,29 +1952,29 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Enable active axes
#if CORE_IS_XY
if (block->steps.a || block->steps.b) {
- enable_X();
- enable_Y();
+ ENABLE_AXIS_X();
+ ENABLE_AXIS_Y();
}
#if DISABLED(Z_LATE_ENABLE)
- if (block->steps.z) enable_Z();
+ if (block->steps.z) ENABLE_AXIS_Z();
#endif
#elif CORE_IS_XZ
if (block->steps.a || block->steps.c) {
- enable_X();
- enable_Z();
+ ENABLE_AXIS_X();
+ ENABLE_AXIS_Z();
}
- if (block->steps.y) enable_Y();
+ if (block->steps.y) ENABLE_AXIS_Y();
#elif CORE_IS_YZ
if (block->steps.b || block->steps.c) {
- enable_Y();
- enable_Z();
+ ENABLE_AXIS_Y();
+ ENABLE_AXIS_Z();
}
- if (block->steps.x) enable_X();
+ if (block->steps.x) ENABLE_AXIS_X();
#else
- if (block->steps.x) enable_X();
- if (block->steps.y) enable_Y();
+ if (block->steps.x) ENABLE_AXIS_X();
+ if (block->steps.y) ENABLE_AXIS_Y();
#if DISABLED(Z_LATE_ENABLE)
- if (block->steps.z) enable_Z();
+ if (block->steps.z) ENABLE_AXIS_Z();
#endif
#endif
@@ -1940,32 +1987,32 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if ENABLED(DISABLE_INACTIVE_EXTRUDER) // Enable only the selected extruder
- for (uint8_t i = 0; i < EXTRUDERS; i++)
+ LOOP_L_N(i, EXTRUDERS)
if (g_uc_extruder_last_move[i] > 0) g_uc_extruder_last_move[i]--;
#if HAS_DUPLICATION_MODE
if (extruder_duplication_enabled && extruder == 0) {
- enable_E1();
+ ENABLE_AXIS_E1();
g_uc_extruder_last_move[1] = (BLOCK_BUFFER_SIZE) * 2;
}
#endif
#define ENABLE_ONE_E(N) do{ \
if (extruder == N) { \
- enable_E##N(); \
+ ENABLE_AXIS_E##N(); \
g_uc_extruder_last_move[N] = (BLOCK_BUFFER_SIZE) * 2; \
} \
else if (!g_uc_extruder_last_move[N]) \
- disable_E##N(); \
+ DISABLE_AXIS_E##N(); \
}while(0);
#else
- #define ENABLE_ONE_E(N) enable_E##N();
+ #define ENABLE_ONE_E(N) ENABLE_AXIS_E##N();
#endif
- REPEAT(EXTRUDERS, ENABLE_ONE_E);
+ REPEAT(EXTRUDERS, ENABLE_ONE_E); // (ENABLE_ONE_E must end with semicolon)
}
#endif // EXTRUDERS
@@ -1990,7 +2037,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#endif
#if ENABLED(SLOWDOWN)
- if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / 2 - 1)) {
+ #ifndef SLOWDOWN_DIVISOR
+ #define SLOWDOWN_DIVISOR 2
+ #endif
+ if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / (SLOWDOWN_DIVISOR) - 1)) {
if (segment_time_us < settings.min_segment_time_us) {
// buffer is draining, add extra time. The amount of time added increases if the buffer is still emptied more.
const uint32_t nst = segment_time_us + LROUND(2 * (settings.min_segment_time_us - segment_time_us) / moves_queued);
@@ -2004,13 +2054,12 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if HAS_SPI_LCD
// Protect the access to the position.
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ const bool was_enabled = stepper.suspend();
block_buffer_runtime_us += segment_time_us;
block->segment_time_us = segment_time_us;
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+ if (was_enabled) stepper.wake_up();
#endif
block->nominal_speed_sqr = sq(block->millimeters * inverse_secs); // (mm/sec)^2 Always > 0
@@ -2018,7 +2067,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if ENABLED(FILAMENT_WIDTH_SENSOR)
if (extruder == FILAMENT_SENSOR_EXTRUDER_NUM) // Only for extruder with filament sensor
- filwidth.advance_e(delta_mm.e);
+ filwidth.advance_e(steps_dist_mm.e);
#endif
// Calculate and limit speed in mm/sec
@@ -2028,7 +2077,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Linear axes first with less logic
LOOP_XYZ(i) {
- current_speed[i] = delta_mm[i] * inverse_secs;
+ current_speed[i] = steps_dist_mm[i] * inverse_secs;
const feedRate_t cs = ABS(current_speed[i]),
max_fr = settings.max_feedrate_mm_s[i];
if (cs > max_fr) NOMORE(speed_factor, max_fr / cs);
@@ -2037,7 +2086,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Limit speed on extruders, if any
#if EXTRUDERS
{
- current_speed.e = delta_mm.e * inverse_secs;
+ current_speed.e = steps_dist_mm.e * inverse_secs;
#if BOTH(MIXING_EXTRUDER, RETRACT_SYNC_MIXING)
// Move all mixing extruders at the specified rate
if (mixer.get_current_vtool() == MIXER_AUTORETRACT_TOOL)
@@ -2255,10 +2304,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
static xyze_float_t prev_unit_vec;
xyze_float_t unit_vec =
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ cart_dist_mm
#else
- { delta_mm.x, delta_mm.y, delta_mm.z, delta_mm.e }
+ { steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.e }
#endif
;
unit_vec *= inverse_millimeters;
@@ -2340,6 +2389,12 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Start with a safe speed (from which the machine may halt to stop immediately).
float safe_speed = nominal_speed;
+ #ifdef TRAVEL_EXTRA_XYJERK
+ const float extra_xyjerk = (de <= 0) ? TRAVEL_EXTRA_XYJERK : 0;
+ #else
+ constexpr float extra_xyjerk = 0;
+ #endif
+
uint8_t limited = 0;
#if HAS_LINEAR_E_JERK
LOOP_XYZ(i)
@@ -2348,7 +2403,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#endif
{
const float jerk = ABS(current_speed[i]), // cs : Starting from zero, change in speed for this axis
- maxj = max_jerk[i]; // mj : The max jerk setting for this axis
+ maxj = (max_jerk[i] + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0.0f)); // mj : The max jerk setting for this axis
if (jerk > maxj) { // cs > mj : New current speed too fast?
if (limited) { // limited already?
const float mjerk = nominal_speed * maxj; // ns*mj
@@ -2400,8 +2455,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
: // v_exit <= v_entry coasting axis reversal
( (v_entry < 0 || v_exit > 0) ? (v_entry - v_exit) : _MAX(-v_exit, v_entry) );
- if (jerk > max_jerk[axis]) {
- v_factor *= max_jerk[axis] / jerk;
+ const float maxj = (max_jerk[axis] + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0.0f));
+
+ if (jerk > maxj) {
+ v_factor *= maxj / jerk;
++limited;
}
}
@@ -2511,8 +2568,8 @@ void Planner::buffer_sync_block() {
* millimeters - the length of the movement, if known
*/
bool Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , const xyze_float_t &delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , const xyze_float_t &cart_dist_mm
#endif
, const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
) {
@@ -2561,21 +2618,24 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con
SERIAL_ECHOPAIR("->", target.a);
SERIAL_ECHOPAIR(") B:", b);
#else
- SERIAL_ECHOPAIR(" X:", a);
+ SERIAL_ECHOPAIR_P(SP_X_LBL, a);
SERIAL_ECHOPAIR(" (", position.x);
SERIAL_ECHOPAIR("->", target.x);
- SERIAL_ECHOPAIR(") Y:", b);
+ SERIAL_CHAR(')');
+ SERIAL_ECHOPAIR_P(SP_Y_LBL, b);
#endif
SERIAL_ECHOPAIR(" (", position.y);
SERIAL_ECHOPAIR("->", target.y);
#if ENABLED(DELTA)
SERIAL_ECHOPAIR(") C:", c);
#else
- SERIAL_ECHOPAIR(") Z:", c);
+ SERIAL_CHAR(')');
+ SERIAL_ECHOPAIR_P(SP_Z_LBL, c);
#endif
SERIAL_ECHOPAIR(" (", position.z);
SERIAL_ECHOPAIR("->", target.z);
- SERIAL_ECHOPAIR(") E:", e);
+ SERIAL_CHAR(')');
+ SERIAL_ECHOPAIR_P(SP_E_LBL, e);
SERIAL_ECHOPAIR(" (", position.e);
SERIAL_ECHOPAIR("->", target.e);
SERIAL_ECHOLNPGM(")");
@@ -2587,8 +2647,8 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con
#if HAS_POSITION_FLOAT
, target_float
#endif
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , cart_dist_mm
#endif
, fr_mm_s, extruder, millimeters
)
@@ -2622,17 +2682,17 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
#if IS_KINEMATIC
#if DISABLED(CLASSIC_JERK)
- const xyze_pos_t delta_mm_cart = {
+ const xyze_pos_t cart_dist_mm = {
rx - position_cart.x, ry - position_cart.y,
rz - position_cart.z, e - position_cart.e
};
#else
- const xyz_pos_t delta_mm_cart = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z };
+ const xyz_pos_t cart_dist_mm = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z };
#endif
float mm = millimeters;
if (mm == 0.0)
- mm = (delta_mm_cart.x != 0.0 || delta_mm_cart.y != 0.0) ? delta_mm_cart.magnitude() : ABS(delta_mm_cart.z);
+ mm = (cart_dist_mm.x != 0.0 || cart_dist_mm.y != 0.0) ? cart_dist_mm.magnitude() : ABS(cart_dist_mm.z);
// Cartesian XYZ to kinematic ABC, stored in global 'delta'
inverse_kinematics(machine);
@@ -2648,7 +2708,7 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
#endif
if (buffer_segment(delta.a, delta.b, delta.c, machine.e
#if DISABLED(CLASSIC_JERK)
- , delta_mm_cart
+ , cart_dist_mm
#endif
, feedrate, extruder, mm
)) {
@@ -2779,7 +2839,7 @@ void Planner::set_max_acceleration(const uint8_t axis, float targetValue) {
const xyze_float_t &max_acc_edit_scaled = max_accel_edit;
#else
constexpr xyze_float_t max_accel_edit = DEFAULT_MAX_ACCELERATION;
- const xyze_float_t max_acc_edit_scaled = max_accel_edit * 2;
+ constexpr xyze_float_t max_acc_edit_scaled = max_accel_edit * 2;
#endif
limit_and_warn(targetValue, axis, PSTR("Acceleration"), max_acc_edit_scaled);
#endif
@@ -2796,7 +2856,7 @@ void Planner::set_max_feedrate(const uint8_t axis, float targetValue) {
const xyze_float_t &max_fr_edit_scaled = max_fr_edit;
#else
constexpr xyze_float_t max_fr_edit = DEFAULT_MAX_FEEDRATE;
- const xyze_float_t max_fr_edit_scaled = max_fr_edit * 2;
+ constexpr xyze_float_t max_fr_edit_scaled = max_fr_edit * 2;
#endif
limit_and_warn(targetValue, axis, PSTR("Feedrate"), max_fr_edit_scaled);
#endif
@@ -2822,6 +2882,48 @@ void Planner::set_max_jerk(const AxisEnum axis, float targetValue) {
#endif
}
+#if HAS_SPI_LCD
+
+ uint16_t Planner::block_buffer_runtime() {
+ #ifdef __AVR__
+ // Protect the access to the variable. Only required for AVR, as
+ // any 32bit CPU offers atomic access to 32bit variables
+ const bool was_enabled = stepper.suspend();
+ #endif
+
+ millis_t bbru = block_buffer_runtime_us;
+
+ #ifdef __AVR__
+ // Reenable Stepper ISR
+ if (was_enabled) stepper.wake_up();
+ #endif
+
+ // To translate µs to ms a division by 1000 would be required.
+ // We introduce 2.4% error here by dividing by 1024.
+ // Doesn't matter because block_buffer_runtime_us is already too small an estimation.
+ bbru >>= 10;
+ // limit to about a minute.
+ NOMORE(bbru, 0xFFFFul);
+ return bbru;
+ }
+
+ void Planner::clear_block_buffer_runtime() {
+ #ifdef __AVR__
+ // Protect the access to the variable. Only required for AVR, as
+ // any 32bit CPU offers atomic access to 32bit variables
+ const bool was_enabled = stepper.suspend();
+ #endif
+
+ block_buffer_runtime_us = 0;
+
+ #ifdef __AVR__
+ // Reenable Stepper ISR
+ if (was_enabled) stepper.wake_up();
+ #endif
+ }
+
+#endif
+
#if ENABLED(AUTOTEMP)
void Planner::autotemp_M104_M109() {
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 52b6bc1ea4..24c02c01c5 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -57,7 +57,12 @@
// Feedrate for manual moves
#ifdef MANUAL_FEEDRATE
- constexpr xyze_feedrate_t manual_feedrate_mm_m = MANUAL_FEEDRATE;
+ constexpr xyze_feedrate_t _mf = MANUAL_FEEDRATE,
+ manual_feedrate_mm_s { _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f, _mf.e / 60.0f };
+#endif
+
+#if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
+ #define HAS_DIST_MM_ARG 1
#endif
enum BlockFlagBit : char {
@@ -288,6 +293,12 @@ class Planner {
static float extruder_advance_K[EXTRUDERS];
#endif
+ /**
+ * The current position of the tool in absolute steps
+ * Recalculated if any axis_steps_per_mm are changed by gcode
+ */
+ static xyze_long_t position;
+
#if HAS_POSITION_FLOAT
static xyze_pos_t position_float;
#endif
@@ -304,12 +315,6 @@ class Planner {
private:
- /**
- * The current position of the tool in absolute steps
- * Recalculated if any axis_steps_per_mm are changed by gcode
- */
- static xyze_long_t position;
-
/**
* Speed of previous path line segment
*/
@@ -402,7 +407,7 @@ class Planner {
FORCE_INLINE static void set_filament_size(const uint8_t e, const float &v) {
filament_size[e] = v;
// make sure all extruders have some sane value for the filament size
- for (uint8_t i = 0; i < COUNT(filament_size); i++)
+ LOOP_L_N(i, COUNT(filament_size))
if (!filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
}
@@ -587,8 +592,8 @@ class Planner {
#if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float
#endif
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , const xyze_float_t &delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , const xyze_float_t &cart_dist_mm
#endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
);
@@ -610,8 +615,8 @@ class Planner {
#if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float
#endif
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , const xyze_float_t &delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , const xyze_float_t &cart_dist_mm
#endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
);
@@ -642,21 +647,21 @@ class Planner {
* millimeters - the length of the movement, if known
*/
static bool buffer_segment(const float &a, const float &b, const float &c, const float &e
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , const xyze_float_t &delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , const xyze_float_t &cart_dist_mm
#endif
, const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
);
FORCE_INLINE static bool buffer_segment(abce_pos_t &abce
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , const xyze_float_t &delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , const xyze_float_t &cart_dist_mm
#endif
, const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
) {
return buffer_segment(abce.a, abce.b, abce.c, abce.e
- #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
- , delta_mm_cart
+ #if HAS_DIST_MM_ARG
+ , cart_dist_mm
#endif
, fr_mm_s, extruder, millimeters);
}
@@ -724,6 +729,16 @@ class Planner {
*/
static float get_axis_position_mm(const AxisEnum axis);
+ static inline abce_pos_t get_axis_positions_mm() {
+ const abce_pos_t out = {
+ get_axis_position_mm(A_AXIS),
+ get_axis_position_mm(B_AXIS),
+ get_axis_position_mm(C_AXIS),
+ get_axis_position_mm(E_AXIS)
+ };
+ return out;
+ }
+
// SCARA AB axes are in degrees, not mm
#if IS_SCARA
FORCE_INLINE static float get_axis_position_degrees(const AxisEnum axis) { return get_axis_position_mm(axis); }
@@ -762,60 +777,18 @@ class Planner {
FORCE_INLINE static bool has_blocks_queued() { return (block_buffer_head != block_buffer_tail); }
/**
- * The current block. nullptr if the buffer is empty.
- * This also marks the block as busy.
+ * Get the current block for processing
+ * and mark the block as busy.
+ * Return nullptr if the buffer is empty
+ * or if there is a first-block delay.
+ *
* WARNING: Called from Stepper ISR context!
*/
- static block_t* get_current_block() {
-
- // Get the number of moves in the planner queue so far
- const uint8_t nr_moves = movesplanned();
-
- // If there are any moves queued ...
- if (nr_moves) {
-
- // If there is still delay of delivery of blocks running, decrement it
- if (delay_before_delivering) {
- --delay_before_delivering;
- // If the number of movements queued is less than 3, and there is still time
- // to wait, do not deliver anything
- if (nr_moves < 3 && delay_before_delivering) return nullptr;
- delay_before_delivering = 0;
- }
-
- // If we are here, there is no excuse to deliver the block
- block_t * const block = &block_buffer[block_buffer_tail];
-
- // No trapezoid calculated? Don't execute yet.
- if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) return nullptr;
-
- #if HAS_SPI_LCD
- block_buffer_runtime_us -= block->segment_time_us; // We can't be sure how long an active block will take, so don't count it.
- #endif
-
- // As this block is busy, advance the nonbusy block pointer
- block_buffer_nonbusy = next_block_index(block_buffer_tail);
-
- // Push block_buffer_planned pointer, if encountered.
- if (block_buffer_tail == block_buffer_planned)
- block_buffer_planned = block_buffer_nonbusy;
-
- // Return the block
- return block;
- }
-
- // The queue became empty
- #if HAS_SPI_LCD
- clear_block_buffer_runtime(); // paranoia. Buffer is empty now - so reset accumulated time to zero.
- #endif
-
- return nullptr;
- }
+ static block_t* get_current_block();
/**
* "Discard" the block and "release" the memory.
* Called when the current block is no longer needed.
- * NB: There MUST be a current block to call this function!!
*/
FORCE_INLINE static void discard_current_block() {
if (has_blocks_queued())
@@ -823,47 +796,8 @@ class Planner {
}
#if HAS_SPI_LCD
-
- static uint16_t block_buffer_runtime() {
- #ifdef __AVR__
- // Protect the access to the variable. Only required for AVR, as
- // any 32bit CPU offers atomic access to 32bit variables
- bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
- #endif
-
- millis_t bbru = block_buffer_runtime_us;
-
- #ifdef __AVR__
- // Reenable Stepper ISR
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
- #endif
-
- // To translate µs to ms a division by 1000 would be required.
- // We introduce 2.4% error here by dividing by 1024.
- // Doesn't matter because block_buffer_runtime_us is already too small an estimation.
- bbru >>= 10;
- // limit to about a minute.
- NOMORE(bbru, 0xFFFFul);
- return bbru;
- }
-
- static void clear_block_buffer_runtime() {
- #ifdef __AVR__
- // Protect the access to the variable. Only required for AVR, as
- // any 32bit CPU offers atomic access to 32bit variables
- bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
- #endif
-
- block_buffer_runtime_us = 0;
-
- #ifdef __AVR__
- // Reenable Stepper ISR
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
- #endif
- }
-
+ static uint16_t block_buffer_runtime();
+ static void clear_block_buffer_runtime();
#endif
#if ENABLED(AUTOTEMP)
@@ -877,7 +811,7 @@ class Planner {
FORCE_INLINE static void recalculate_max_e_jerk() {
#define GET_MAX_E_JERK(N) SQRT(SQRT(0.5) * junction_deviation_mm * (N) * RECIPROCAL(1.0 - SQRT(0.5)))
#if ENABLED(DISTINCT_E_FACTORS)
- for (uint8_t i = 0; i < EXTRUDERS; i++)
+ LOOP_L_N(i, EXTRUDERS)
max_e_jerk[i] = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS_N(i)]);
#else
max_e_jerk = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS]);
diff --git a/Marlin/src/module/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
index db1f204444..7ea3956436 100644
--- a/Marlin/src/module/planner_bezier.cpp
+++ b/Marlin/src/module/planner_bezier.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/planner_bezier.h b/Marlin/src/module/planner_bezier.h
index d0aa82858c..e7ef4719e1 100644
--- a/Marlin/src/module/planner_bezier.h
+++ b/Marlin/src/module/planner_bezier.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 6753a075eb..3623c88a13 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,12 +30,12 @@ Stopwatch print_job_timer; // Global Print Job Timer instance
#else // PRINTCOUNTER
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
#include "printcounter.h"
#include "../MarlinCore.h"
-#include "../HAL/shared/persistent_store_api.h"
+#include "../HAL/shared/eeprom_api.h"
#if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0
#include "../libs/buzzer.h"
@@ -183,7 +183,7 @@ void PrintCounter::saveStats() {
#if HAS_SERVICE_INTERVALS
inline void _service_when(char buffer[], const char * const msg, const uint32_t when) {
- SERIAL_ECHOPGM(MSG_STATS);
+ SERIAL_ECHOPGM(STR_STATS);
serialprintPGM(msg);
SERIAL_ECHOLNPAIR(" in ", duration_t(when).toString(buffer));
}
@@ -192,7 +192,7 @@ void PrintCounter::saveStats() {
void PrintCounter::showStats() {
char buffer[21];
- SERIAL_ECHOPGM(MSG_STATS);
+ SERIAL_ECHOPGM(STR_STATS);
SERIAL_ECHOLNPAIR(
"Prints: ", data.totalPrints,
", Finished: ", data.finishedPrints,
@@ -200,7 +200,7 @@ void PrintCounter::showStats() {
- ((isRunning() || isPaused()) ? 1 : 0) // Remove 1 from failures with an active counter
);
- SERIAL_ECHOPGM(MSG_STATS);
+ SERIAL_ECHOPGM(STR_STATS);
duration_t elapsed = data.printTime;
elapsed.toString(buffer);
SERIAL_ECHOPAIR("Total time: ", buffer);
@@ -217,7 +217,7 @@ void PrintCounter::showStats() {
SERIAL_CHAR(')');
#endif
- SERIAL_ECHOPAIR("\n" MSG_STATS "Filament used: ", data.filamentUsed / 1000);
+ SERIAL_ECHOPAIR("\n" STR_STATS "Filament used: ", data.filamentUsed / 1000);
SERIAL_CHAR('m');
SERIAL_EOL();
diff --git a/Marlin/src/module/printcounter.h b/Marlin/src/module/printcounter.h
index fcc03a570e..39a237cc44 100644
--- a/Marlin/src/module/printcounter.h
+++ b/Marlin/src/module/printcounter.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,7 +28,7 @@
// Print debug messages with M111 S2
//#define DEBUG_PRINTCOUNTER
-#if EITHER(I2C_EEPROM, SPI_EEPROM)
+#if USE_WIRED_EEPROM
// round up address to next page boundary (assuming 32 byte pages)
#define STATS_EEPROM_ADDRESS 0x40
#else
@@ -57,7 +57,7 @@ class PrintCounter: public Stopwatch {
private:
typedef Stopwatch super;
- #if EITHER(I2C_EEPROM, SPI_EEPROM) || defined(CPU_32_BIT)
+ #if USE_WIRED_EEPROM || defined(CPU_32_BIT)
typedef uint32_t eeprom_address_t;
#else
typedef uint16_t eeprom_address_t;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 31c1128369..6e3f2baa66 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,7 +21,7 @@
*/
/**
- * probe.cpp
+ * module/probe.cpp
*/
#include "../inc/MarlinConfig.h"
@@ -78,20 +78,20 @@
#endif
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
#include "../core/debug_out.h"
+Probe probe;
-xyz_pos_t probe_offset; // Initialized by settings.load()
+xyz_pos_t Probe::offset; // Initialized by settings.load()
#if HAS_PROBE_XY_OFFSET
- xyz_pos_t &probe_offset_xy = probe_offset;
+ const xyz_pos_t &Probe::offset_xy = Probe::offset;
#endif
-
#if ENABLED(Z_PROBE_SLED)
#ifndef SLED_DOCKING_OFFSET
@@ -104,7 +104,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
* stow[in] If false, move to MAX_X and engage the solenoid
* If true, move to MAX_X and release the solenoid
*/
- static void dock_sled(bool stow) {
+ static void dock_sled(const bool stow) {
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("dock_sled(", stow, ")");
// Dock sled a bit closer to ensure proper capturing
@@ -118,7 +118,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
#elif ENABLED(TOUCH_MI_PROBE)
// Move to the magnet to unlock the probe
- void run_deploy_moves_script() {
+ inline void run_deploy_moves_script() {
#ifndef TOUCH_MI_DEPLOY_XPOS
#define TOUCH_MI_DEPLOY_XPOS X_MIN_POS
#elif TOUCH_MI_DEPLOY_XPOS > X_MAX_BED
@@ -134,12 +134,10 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
LCD_MESSAGEPGM(MSG_MANUAL_DEPLOY_TOUCHMI);
ui.return_to_status();
- KEEPALIVE_STATE(PAUSED_FOR_USER);
- wait_for_user = true; // LCD click or M108 will clear this
#if ENABLED(HOST_PROMPT_SUPPORT)
- host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI probe."), CONTINUE_STR);
+ host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR);
#endif
- while (wait_for_user) idle();
+ wait_for_user_response();
ui.reset_status();
ui.goto_screen(prev_screen);
@@ -153,7 +151,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
}
// Move down to the bed to stow the probe
- void run_stow_moves_script() {
+ inline void run_stow_moves_script() {
const xyz_pos_t oldpos = current_position;
endstops.enable_z_probe(false);
do_blocking_move_to_z(TOUCH_MI_RETRACT_Z, MMM_TO_MMS(HOMING_FEEDRATE_Z));
@@ -162,7 +160,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
#elif ENABLED(Z_PROBE_ALLEN_KEY)
- void run_deploy_moves_script() {
+ inline void run_deploy_moves_script() {
#ifdef Z_PROBE_ALLEN_KEY_DEPLOY_1
#ifndef Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE
#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE 0.0
@@ -200,7 +198,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
#endif
}
- void run_stow_moves_script() {
+ inline void run_stow_moves_script() {
#ifdef Z_PROBE_ALLEN_KEY_STOW_1
#ifndef Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE
#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE 0.0
@@ -241,7 +239,8 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
#endif // Z_PROBE_ALLEN_KEY
#if QUIET_PROBING
- void probing_pause(const bool p) {
+
+ void Probe::set_probing_paused(const bool p) {
#if ENABLED(PROBING_HEATERS_OFF)
thermalManager.pause(p);
#endif
@@ -251,7 +250,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
#if ENABLED(PROBING_STEPPERS_OFF)
disable_e_steppers();
#if NONE(DELTA, HOME_AFTER_DEACTIVATE)
- disable_X(); disable_Y();
+ DISABLE_AXIS_X(); DISABLE_AXIS_Y();
#endif
#endif
if (p) safe_delay(
@@ -262,16 +261,17 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
#endif
);
}
+
#endif // QUIET_PROBING
/**
* Raise Z to a minimum height to make room for a probe to move
*/
-inline void do_probe_raise(const float z_raise) {
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("do_probe_raise(", z_raise, ")");
+void Probe::do_z_raise(const float z_raise) {
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probe::move_z(", z_raise, ")");
float z_dest = z_raise;
- if (probe_offset.z < 0) z_dest -= probe_offset.z;
+ if (offset.z < 0) z_dest -= offset.z;
NOMORE(z_dest, Z_MAX_POS);
@@ -295,15 +295,13 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
serialprintPGM(ds_str);
SERIAL_EOL();
- KEEPALIVE_STATE(PAUSED_FOR_USER);
- wait_for_user = true;
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR);
#endif
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe"));
#endif
- while (wait_for_user) idle();
+ wait_for_user_response();
ui.reset_status();
} while(
@@ -351,11 +349,15 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
#endif
}
-// returns false for ok and true for failure
-bool set_probe_deployed(const bool deploy) {
+/**
+ * Attempt to deploy or stow the probe
+ *
+ * Return TRUE if the probe could not be deployed/stowed
+ */
+bool Probe::set_deployed(const bool deploy) {
if (DEBUGGING(LEVELING)) {
- DEBUG_POS("set_probe_deployed", current_position);
+ DEBUG_POS("Probe::set_deployed", current_position);
DEBUG_ECHOLNPAIR("deploy: ", deploy);
}
@@ -378,7 +380,7 @@ bool set_probe_deployed(const bool deploy) {
#endif
if (deploy_stow_condition && unknown_condition)
- do_probe_raise(_MAX(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
+ do_z_raise(_MAX(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
#if EITHER(Z_PROBE_SLED, Z_PROBE_ALLEN_KEY)
if (axis_unhomed_error(
@@ -386,7 +388,7 @@ bool set_probe_deployed(const bool deploy) {
_BV(X_AXIS)
#endif
)) {
- SERIAL_ERROR_MSG(MSG_STOP_UNHOMED);
+ SERIAL_ERROR_MSG(STR_STOP_UNHOMED);
stop();
return true;
}
@@ -433,7 +435,7 @@ bool set_probe_deployed(const bool deploy) {
#ifdef Z_AFTER_PROBING
// After probing move to a preferred Z position
- void move_z_after_probing() {
+ void Probe::move_z_after_probing() {
if (current_position.z != Z_AFTER_PROBING) {
do_blocking_move_to_z(Z_AFTER_PROBING);
current_position.z = Z_AFTER_PROBING;
@@ -449,21 +451,21 @@ bool set_probe_deployed(const bool deploy) {
* @return true to indicate an error
*/
-#if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
- const char msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
-#endif
-
-static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
- if (DEBUGGING(LEVELING)) DEBUG_POS(">>> do_probe_move", current_position);
+/**
+ * @brief Move down until the probe triggers or the low limit is reached
+ *
+ * @details Used by run_z_probe to get each bed Z height measurement.
+ * Sets current_position.z to the height where the probe triggered
+ * (according to the Z stepper count). The float Z is propagated
+ * back to the planner.position to preempt any rounding error.
+ *
+ * @return TRUE if the probe failed to trigger.
+ */
+bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
+ if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::probe_down_to_z", current_position);
#if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
- // Wait for bed to heat back up between probing points
- if (thermalManager.isHeatingBed()) {
- serialprintPGM(msg_wait_for_bed_heating);
- LCD_MESSAGEPGM(MSG_BED_HEATING);
- thermalManager.wait_for_bed();
- ui.reset_status();
- }
+ thermalManager.wait_for_bed_heating();
#endif
#if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
@@ -482,7 +484,7 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
#endif
#if QUIET_PROBING
- probing_pause(true);
+ set_probing_paused(true);
#endif
// Move down until the probe is triggered
@@ -504,7 +506,7 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
;
#if QUIET_PROBING
- probing_pause(false);
+ set_probing_paused(false);
#endif
// Re-enable stealthChop if used. Disable diag1 pin on driver.
@@ -530,7 +532,7 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
// Tell the planner where we actually are
sync_plan_position();
- if (DEBUGGING(LEVELING)) DEBUG_POS("<<< do_probe_move", current_position);
+ if (DEBUGGING(LEVELING)) DEBUG_POS("<<< Probe::probe_down_to_z", current_position);
return !probe_triggered;
}
@@ -543,19 +545,21 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
*
* @return The Z position of the bed at the current XY or NAN on error.
*/
-static float run_z_probe() {
+float Probe::run_z_probe(const bool sanity_check/*=true*/) {
- if (DEBUGGING(LEVELING)) DEBUG_POS(">>> run_z_probe", current_position);
+ if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::run_z_probe", current_position);
// Stop the probe before it goes too low to prevent damage.
// If Z isn't known then probe to -10mm.
- const float z_probe_low_point = TEST(axis_known_position, Z_AXIS) ? -probe_offset.z + Z_PROBE_LOW_POINT : -10.0;
+ const float z_probe_low_point = TEST(axis_known_position, Z_AXIS) ? -offset.z + Z_PROBE_LOW_POINT : -10.0;
// Double-probing does a fast probe followed by a slow probe
#if TOTAL_PROBING == 2
// Do a first probe at the fast speed
- if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) {
+ if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST)) // No probe trigger?
+ || (sanity_check && current_position.z > -offset.z + _MAX(Z_CLEARANCE_BETWEEN_PROBES, 4) / 2) // Probe triggered too high?
+ ) {
if (DEBUGGING(LEVELING)) {
DEBUG_ECHOLNPGM("FAST Probe fail!");
DEBUG_POS("<<< run_z_probe", current_position);
@@ -574,10 +578,10 @@ static float run_z_probe() {
// If the nozzle is well over the travel height then
// move down quickly before doing the slow probe
- const float z = Z_CLEARANCE_DEPLOY_PROBE + 5.0 + (probe_offset.z < 0 ? -probe_offset.z : 0);
+ const float z = Z_CLEARANCE_DEPLOY_PROBE + 5.0 + (offset.z < 0 ? -offset.z : 0);
if (current_position.z > z) {
// Probe down fast. If the probe never triggered, raise for probe clearance
- if (!do_probe_move(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
+ if (!probe_down_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
do_blocking_move_to_z(current_position.z + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
}
#endif
@@ -587,7 +591,7 @@ static float run_z_probe() {
#endif
#if TOTAL_PROBING > 2
- float probes_total = 0;
+ float probes_z_sum = 0;
for (
#if EXTRA_PROBING
uint8_t p = 0; p < TOTAL_PROBING; p++
@@ -598,7 +602,9 @@ static float run_z_probe() {
#endif
{
// Probe downward slowly to find the bed
- if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) {
+ if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW)) // No probe trigger?
+ || (sanity_check && current_position.z > -offset.z + _MAX(Z_CLEARANCE_MULTI_PROBE, 4) / 2) // Probe triggered too high?
+ ) {
if (DEBUGGING(LEVELING)) {
DEBUG_ECHOLNPGM("SLOW Probe fail!");
DEBUG_POS("<<< run_z_probe", current_position);
@@ -614,7 +620,7 @@ static float run_z_probe() {
#if EXTRA_PROBING
// Insert Z measurement into probes[]. Keep it sorted ascending.
- for (uint8_t i = 0; i <= p; i++) { // Iterate the saved Zs to insert the new Z
+ LOOP_LE_N(i, p) { // Iterate the saved Zs to insert the new Z
if (i == p || probes[i] > z) { // Last index or new Z is smaller than this Z
for (int8_t m = p; --m >= i;) probes[m + 1] = probes[m]; // Shift items down after the insertion point
probes[i] = z; // Insert the new Z measurement
@@ -622,7 +628,7 @@ static float run_z_probe() {
}
}
#elif TOTAL_PROBING > 2
- probes_total += z;
+ probes_z_sum += z;
#else
UNUSED(z);
#endif
@@ -652,12 +658,12 @@ static float run_z_probe() {
max_avg_idx--; else min_avg_idx++;
// Return the average value of all remaining probes.
- for (uint8_t i = min_avg_idx; i <= max_avg_idx; i++)
- probes_total += probes[i];
+ LOOP_S_LE_N(i, min_avg_idx, max_avg_idx)
+ probes_z_sum += probes[i];
#endif
- const float measured_z = probes_total * RECIPROCAL(MULTIPLE_PROBING);
+ const float measured_z = probes_z_sum * RECIPROCAL(MULTIPLE_PROBING);
#elif TOTAL_PROBING == 2
@@ -689,10 +695,10 @@ static float run_z_probe() {
* - Raise to the BETWEEN height
* - Return the probed Z position
*/
-float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) {
+float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/, const bool sanity_check/*=true*/) {
if (DEBUGGING(LEVELING)) {
DEBUG_ECHOLNPAIR(
- ">>> probe_at_point(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
+ ">>> Probe::probe_at_point(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
", ", int(verbose_level),
", ", probe_relative ? "probe" : "nozzle", "_relative)"
@@ -700,11 +706,18 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
DEBUG_POS("", current_position);
}
+ #if BOTH(BLTOUCH, BLTOUCH_HS_MODE)
+ if (bltouch.triggered()) bltouch._reset();
+ #endif
+
// TODO: Adapt for SCARA, where the offset rotates
xyz_pos_t npos = { rx, ry };
- if (probe_relative) {
- if (!position_is_reachable_by_probe(npos)) return NAN; // The given position is in terms of the probe
- npos -= probe_offset_xy; // Get the nozzle position
+ if (probe_relative) { // The given position is in terms of the probe
+ if (!can_reach(npos)) {
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
+ return NAN;
+ }
+ npos -= offset_xy; // Get the nozzle position
}
else if (!position_is_reachable(npos)) return NAN; // The given position is in terms of the nozzle
@@ -724,38 +737,37 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
do_blocking_move_to(npos);
float measured_z = NAN;
- if (!DEPLOY_PROBE()) {
- measured_z = run_z_probe() + probe_offset.z;
-
+ if (!deploy()) measured_z = run_z_probe(sanity_check) + offset.z;
+ if (!isnan(measured_z)) {
const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
if (big_raise || raise_after == PROBE_PT_RAISE)
do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
else if (raise_after == PROBE_PT_STOW)
- if (STOW_PROBE()) measured_z = NAN;
- }
+ if (stow()) measured_z = NAN; // Error on stow?
- if (verbose_level > 2) {
- SERIAL_ECHOPAIR_F("Bed X: ", LOGICAL_X_POSITION(rx), 3);
- SERIAL_ECHOPAIR_F(" Y: ", LOGICAL_Y_POSITION(ry), 3);
- SERIAL_ECHOLNPAIR_F(" Z: ", measured_z, 3);
+ if (verbose_level > 2) {
+ SERIAL_ECHOPAIR_F("Bed X: ", LOGICAL_X_POSITION(rx), 3);
+ SERIAL_ECHOPAIR_F( " Y: ", LOGICAL_Y_POSITION(ry), 3);
+ SERIAL_ECHOLNPAIR_F( " Z: ", measured_z, 3);
+ }
}
feedrate_mm_s = old_feedrate_mm_s;
if (isnan(measured_z)) {
- STOW_PROBE();
+ stow();
LCD_MESSAGEPGM(MSG_LCD_PROBING_FAILED);
- SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
+ SERIAL_ERROR_MSG(STR_ERR_PROBING_FAILED);
}
- if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< probe_at_point");
+ if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< Probe::probe_at_point");
return measured_z;
}
#if HAS_Z_SERVO_PROBE
- void servo_probe_init() {
+ void Probe::servo_probe_init() {
/**
* Set position of Z Servo Endstop
*
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index a6e8bf4eab..083867ab48 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,132 +22,195 @@
#pragma once
/**
- * probe.h - Move, deploy, enable, etc.
+ * module/probe.h - Move, deploy, enable, etc.
*/
#include "../inc/MarlinConfig.h"
+#include "motion.h"
+
#if HAS_BED_PROBE
-
- extern xyz_pos_t probe_offset;
-
- #if HAS_PROBE_XY_OFFSET
- extern xyz_pos_t &probe_offset_xy;
- #else
- constexpr xy_pos_t probe_offset_xy{0};
- #endif
-
- bool set_probe_deployed(const bool deploy);
- #ifdef Z_AFTER_PROBING
- void move_z_after_probing();
- #endif
- enum ProbePtRaise : unsigned char {
- PROBE_PT_NONE, // No raise or stow after run_z_probe
- PROBE_PT_STOW, // Do a complete stow after run_z_probe
- PROBE_PT_RAISE, // Raise to "between" clearance after run_z_probe
+ enum ProbePtRaise : uint8_t {
+ PROBE_PT_NONE, // No raise or stow after run_z_probe
+ PROBE_PT_STOW, // Do a complete stow after run_z_probe
+ PROBE_PT_RAISE, // Raise to "between" clearance after run_z_probe
PROBE_PT_BIG_RAISE // Raise to big clearance after run_z_probe
};
- float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true);
- inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true) {
- return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative);
- }
- #define DEPLOY_PROBE() set_probe_deployed(true)
- #define STOW_PROBE() set_probe_deployed(false)
- #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
- extern const char msg_wait_for_bed_heating[25];
- #endif
-
-#else
-
- constexpr xyz_pos_t probe_offset{0};
- constexpr xy_pos_t probe_offset_xy{0};
-
- #define DEPLOY_PROBE()
- #define STOW_PROBE()
-
#endif
-#if HAS_BED_PROBE || HAS_LEVELING
- #if IS_KINEMATIC
- constexpr float printable_radius = (
- #if ENABLED(DELTA)
- DELTA_PRINTABLE_RADIUS
- #elif IS_SCARA
- SCARA_PRINTABLE_RADIUS
- #endif
- );
+class Probe {
+public:
- inline float probe_radius() {
- return printable_radius - _MAX(MIN_PROBE_EDGE, HYPOT(probe_offset_xy.x, probe_offset_xy.y));
+ #if HAS_BED_PROBE
+
+ static xyz_pos_t offset;
+
+ static bool set_deployed(const bool deploy);
+
+
+ #if IS_KINEMATIC
+
+ #if HAS_PROBE_XY_OFFSET
+ // Return true if the both nozzle and the probe can reach the given point.
+ // Note: This won't work on SCARA since the probe offset rotates with the arm.
+ static inline bool can_reach(const float &rx, const float &ry) {
+ return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y) // The nozzle can go where it needs to go?
+ && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE)); // Can the nozzle also go near there?
+ }
+ #else
+ FORCE_INLINE static bool can_reach(const float &rx, const float &ry) {
+ return position_is_reachable(rx, ry, MIN_PROBE_EDGE);
+ }
+ #endif
+
+ #else
+
+ /**
+ * Return whether the given position is within the bed, and whether the nozzle
+ * can reach the position required to put the probe at the given position.
+ *
+ * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
+ * nozzle must be be able to reach +10,-10.
+ */
+ static inline bool can_reach(const float &rx, const float &ry) {
+ return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y)
+ && WITHIN(rx, min_x() - fslop, max_x() + fslop)
+ && WITHIN(ry, min_y() - fslop, max_y() + fslop);
+ }
+
+ #endif
+
+ #ifdef Z_AFTER_PROBING
+ static void move_z_after_probing();
+ #endif
+ static float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true);
+ static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true) {
+ return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative, sanity_check);
}
+
+ #else
+
+ static constexpr xyz_pos_t offset = xyz_pos_t({ 0, 0, 0 }); // See #16767
+
+ static bool set_deployed(const bool) { return false; }
+
+ FORCE_INLINE static bool can_reach(const float &rx, const float &ry) { return position_is_reachable(rx, ry); }
+
#endif
- inline float probe_min_x() {
+ FORCE_INLINE static bool can_reach(const xy_pos_t &pos) { return can_reach(pos.x, pos.y); }
+
+ FORCE_INLINE static bool good_bounds(const xy_pos_t &lf, const xy_pos_t &rb) {
return (
#if IS_KINEMATIC
- (X_CENTER) - probe_radius()
+ can_reach(lf.x, 0) && can_reach(rb.x, 0) && can_reach(0, lf.y) && can_reach(0, rb.y)
#else
- _MAX((X_MIN_BED) + (MIN_PROBE_EDGE_LEFT), (X_MIN_POS) + probe_offset_xy.x)
- #endif
- );
- }
- inline float probe_max_x() {
- return (
- #if IS_KINEMATIC
- (X_CENTER) + probe_radius()
- #else
- _MIN((X_MAX_BED) - (MIN_PROBE_EDGE_RIGHT), (X_MAX_POS) + probe_offset_xy.x)
- #endif
- );
- }
- inline float probe_min_y() {
- return (
- #if IS_KINEMATIC
- (Y_CENTER) - probe_radius()
- #else
- _MAX((Y_MIN_BED) + (MIN_PROBE_EDGE_FRONT), (Y_MIN_POS) + probe_offset_xy.y)
- #endif
- );
- }
- inline float probe_max_y() {
- return (
- #if IS_KINEMATIC
- (Y_CENTER) + probe_radius()
- #else
- _MIN((Y_MAX_BED) - (MIN_PROBE_EDGE_BACK), (Y_MAX_POS) + probe_offset_xy.y)
+ can_reach(lf) && can_reach(rb)
#endif
);
}
- #if NEEDS_THREE_PROBE_POINTS
- // Retrieve three points to probe the bed. Any type exposing set(X,Y) may be used.
- template
- inline void get_three_probe_points(T points[3]) {
- #if ENABLED(HAS_FIXED_3POINT)
- points[0].set(PROBE_PT_1_X, PROBE_PT_1_Y);
- points[1].set(PROBE_PT_2_X, PROBE_PT_2_Y);
- points[2].set(PROBE_PT_3_X, PROBE_PT_3_Y);
- #else
- #if IS_KINEMATIC
- constexpr float SIN0 = 0.0, SIN120 = 0.866025, SIN240 = -0.866025,
- COS0 = 1.0, COS120 = -0.5 , COS240 = -0.5;
- points[0].set((X_CENTER) + probe_radius() * COS0, (Y_CENTER) + probe_radius() * SIN0);
- points[1].set((X_CENTER) + probe_radius() * COS120, (Y_CENTER) + probe_radius() * SIN120);
- points[2].set((X_CENTER) + probe_radius() * COS240, (Y_CENTER) + probe_radius() * SIN240);
- #else
- points[0].set(probe_min_x(), probe_min_y());
- points[1].set(probe_max_x(), probe_min_y());
- points[2].set((probe_max_x() - probe_min_x()) / 2, probe_max_y());
+ // Use offset_xy for read only access
+ // More optimal the XY offset is known to always be zero.
+ #if HAS_PROBE_XY_OFFSET
+ static const xyz_pos_t &offset_xy;
+ #else
+ static constexpr xy_pos_t offset_xy = xy_pos_t({ 0, 0 }); // See #16767
+ #endif
+
+ static inline bool deploy() { return set_deployed(true); }
+ static inline bool stow() { return set_deployed(false); }
+
+ #if HAS_BED_PROBE || HAS_LEVELING
+ #if IS_KINEMATIC
+ static constexpr float printable_radius = (
+ #if ENABLED(DELTA)
+ DELTA_PRINTABLE_RADIUS
+ #elif IS_SCARA
+ SCARA_PRINTABLE_RADIUS
#endif
- #endif
+ );
+
+ static inline float probe_radius() {
+ return printable_radius - _MAX(MIN_PROBE_EDGE, HYPOT(offset_xy.x, offset_xy.y));
+ }
+ #endif
+
+ static inline float min_x() {
+ return (
+ #if IS_KINEMATIC
+ (X_CENTER) - probe_radius()
+ #else
+ _MAX((X_MIN_BED) + (MIN_PROBE_EDGE_LEFT), (X_MIN_POS) + offset_xy.x)
+ #endif
+ );
}
+ static inline float max_x() {
+ return (
+ #if IS_KINEMATIC
+ (X_CENTER) + probe_radius()
+ #else
+ _MIN((X_MAX_BED) - (MIN_PROBE_EDGE_RIGHT), (X_MAX_POS) + offset_xy.x)
+ #endif
+ );
+ }
+ static inline float min_y() {
+ return (
+ #if IS_KINEMATIC
+ (Y_CENTER) - probe_radius()
+ #else
+ _MAX((Y_MIN_BED) + (MIN_PROBE_EDGE_FRONT), (Y_MIN_POS) + offset_xy.y)
+ #endif
+ );
+ }
+ static inline float max_y() {
+ return (
+ #if IS_KINEMATIC
+ (Y_CENTER) + probe_radius()
+ #else
+ _MIN((Y_MAX_BED) - (MIN_PROBE_EDGE_BACK), (Y_MAX_POS) + offset_xy.y)
+ #endif
+ );
+ }
+
+ #if NEEDS_THREE_PROBE_POINTS
+ // Retrieve three points to probe the bed. Any type exposing set(X,Y) may be used.
+ template
+ static inline void get_three_points(T points[3]) {
+ #if HAS_FIXED_3POINT
+ points[0].set(PROBE_PT_1_X, PROBE_PT_1_Y);
+ points[1].set(PROBE_PT_2_X, PROBE_PT_2_Y);
+ points[2].set(PROBE_PT_3_X, PROBE_PT_3_Y);
+ #else
+ #if IS_KINEMATIC
+ constexpr float SIN0 = 0.0, SIN120 = 0.866025, SIN240 = -0.866025,
+ COS0 = 1.0, COS120 = -0.5 , COS240 = -0.5;
+ points[0].set((X_CENTER) + probe_radius() * COS0, (Y_CENTER) + probe_radius() * SIN0);
+ points[1].set((X_CENTER) + probe_radius() * COS120, (Y_CENTER) + probe_radius() * SIN120);
+ points[2].set((X_CENTER) + probe_radius() * COS240, (Y_CENTER) + probe_radius() * SIN240);
+ #else
+ points[0].set(min_x(), min_y());
+ points[1].set(max_x(), min_y());
+ points[2].set((max_x() - min_x()) / 2, max_y());
+ #endif
+ #endif
+ }
+ #endif
+
+ #endif // HAS_BED_PROBE
+
+ #if HAS_Z_SERVO_PROBE
+ static void servo_probe_init();
#endif
-#endif
-#if HAS_Z_SERVO_PROBE
- void servo_probe_init();
-#endif
+ #if QUIET_PROBING
+ static void set_probing_paused(const bool p);
+ #endif
-#if QUIET_PROBING
- void probing_pause(const bool p);
-#endif
+private:
+ static bool probe_down_to_z(const float z, const feedRate_t fr_mm_s);
+ static void do_z_raise(const float z_raise);
+ static float run_z_probe(const bool sanity_check=true);
+};
+
+extern Probe probe;
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index 3a82ef47fd..5fbbfd65a6 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -53,11 +53,13 @@ void scara_set_axis_is_at_home(const AxisEnum axis) {
current_position[axis] = cartes[axis];
#else
// MP_SCARA uses a Cartesian XY home position
- // SERIAL_ECHOLNPAIR("homeposition X:", homeposition.x, " Y:", homeposition.y);
+ // SERIAL_ECHOPGM("homeposition");
+ // SERIAL_ECHOLNPAIR_P(SP_X_LBL, homeposition.x, SP_Y_LBL, homeposition.y);
current_position[axis] = homeposition[axis];
#endif
- // SERIAL_ECHOLNPAIR("Cartesian X:", current_position.x, " Y:", current_position.y);
+ // SERIAL_ECHOPGM("Cartesian");
+ // SERIAL_ECHOLNPAIR_P(SP_X_LBL, current_position.x, SP_Y_LBL, current_position.y);
update_software_endstops(axis);
}
}
diff --git a/Marlin/src/module/scara.h b/Marlin/src/module/scara.h
index cde1d1bcd6..2f60ebbf15 100644
--- a/Marlin/src/module/scara.h
+++ b/Marlin/src/module/scara.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index c9d0431538..c49f939d0f 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 4ead93cd5c..335ce698e0 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,46 +31,65 @@
#if HAS_SERVO_ANGLES
#if ENABLED(SWITCHING_EXTRUDER)
- #ifndef SWITCHING_EXTRUDER_E23_SERVO_NR
- #define SWITCHING_EXTRUDER_E23_SERVO_NR -1
- #endif
+ // Switching extruder can have 2 or 4 angles
#if EXTRUDERS > 3
#define REQ_ANGLES 4
#else
#define REQ_ANGLES 2
#endif
- #define SADATA SWITCHING_EXTRUDER_SERVO_ANGLES
- #define ASRC(N,E) (SWITCHING_EXTRUDER_SERVO_NR == N ? asrc[E] : SWITCHING_EXTRUDER_E23_SERVO_NR == N ? asrc[E+2] : 0)
- #elif ENABLED(SWITCHING_NOZZLE)
- #define SADATA SWITCHING_NOZZLE_SERVO_ANGLES
- #define ASRC(N,E) (SWITCHING_NOZZLE_SERVO_NR == N ? asrc[E] : 0)
- #elif defined(Z_PROBE_SERVO_NR)
- #define ASRC(N,E) (Z_PROBE_SERVO_NR == N ? asrc[E] : 0)
+ constexpr uint16_t sase[] = SWITCHING_EXTRUDER_SERVO_ANGLES;
+ static_assert(COUNT(sase) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
+ #else
+ constexpr uint16_t sase[4] = { 0 };
+ #endif
+
+ #if ENABLED(SWITCHING_NOZZLE)
+ constexpr uint16_t sasn[] = SWITCHING_NOZZLE_SERVO_ANGLES;
+ static_assert(COUNT(sasn) == 2, "SWITCHING_NOZZLE_SERVO_ANGLES needs 2 angles.");
+ #else
+ constexpr uint16_t sasn[2] = { 0 };
+ #endif
+
+ #ifdef Z_PROBE_SERVO_NR
#if ENABLED(BLTOUCH)
#include "../feature/bltouch.h"
+ #undef Z_SERVO_ANGLES
+ #define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
#endif
- #ifdef BLTOUCH_ANGLES
- #define SADATA BLTOUCH_ANGLES
- #elif defined(Z_SERVO_ANGLES)
- #define SADATA Z_SERVO_ANGLES
- #else
- #error "Servo angles are needed!"
- #endif
+ constexpr uint16_t sazp[] = Z_SERVO_ANGLES;
+ static_assert(COUNT(sazp) == 2, "Z_SERVO_ANGLES needs 2 angles.");
+ #else
+ constexpr uint16_t sazp[2] = { 0 };
#endif
+ #ifndef SWITCHING_EXTRUDER_SERVO_NR
+ #define SWITCHING_EXTRUDER_SERVO_NR -1
+ #endif
+ #ifndef SWITCHING_EXTRUDER_E23_SERVO_NR
+ #define SWITCHING_EXTRUDER_E23_SERVO_NR -1
+ #endif
+ #ifndef SWITCHING_NOZZLE_SERVO_NR
+ #define SWITCHING_NOZZLE_SERVO_NR -1
+ #endif
+ #ifndef Z_PROBE_SERVO_NR
+ #define Z_PROBE_SERVO_NR -1
+ #endif
+
+ #define ASRC(N,I) ( \
+ N == SWITCHING_EXTRUDER_SERVO_NR ? sase[I] \
+ : N == SWITCHING_EXTRUDER_E23_SERVO_NR ? sase[I+2] \
+ : N == SWITCHING_NOZZLE_SERVO_NR ? sasn[I] \
+ : N == Z_PROBE_SERVO_NR ? sazp[I] \
+ : 0 )
+
#if ENABLED(EDITABLE_SERVO_ANGLES)
extern uint16_t servo_angles[NUM_SERVOS][2];
- #define BASE_SERVO_ANGLES base_servo_angles
+ #define CONST_SERVO_ANGLES base_servo_angles
#else
- #define BASE_SERVO_ANGLES servo_angles
+ #define CONST_SERVO_ANGLES servo_angles
#endif
- constexpr uint16_t asrc[] = SADATA;
- #if REQ_ANGLES
- static_assert(COUNT(asrc) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
- #endif
-
- constexpr uint16_t BASE_SERVO_ANGLES [NUM_SERVOS][2] = {
+ constexpr uint16_t CONST_SERVO_ANGLES [NUM_SERVOS][2] = {
{ ASRC(0,0), ASRC(0,1) }
#if NUM_SERVOS > 1
, { ASRC(1,0), ASRC(1,1) }
diff --git a/Marlin/src/module/speed_lookuptable.h b/Marlin/src/module/speed_lookuptable.h
index b4cf8b94b8..088cb23c7f 100644
--- a/Marlin/src/module/speed_lookuptable.h
+++ b/Marlin/src/module/speed_lookuptable.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 6e4977984f..ed48b83d5a 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -81,6 +81,8 @@
Stepper stepper; // Singleton
+#define BABYSTEPPING_EXTRA_DIR_WAIT
+
#if HAS_MOTOR_CURRENT_PWM
bool Stepper::initialized; // = false
#endif
@@ -101,6 +103,10 @@ Stepper stepper; // Singleton
#include "../MarlinCore.h"
#include "../HAL/shared/Delay.h"
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+ #include "../feature/babystep.h"
+#endif
+
#if MB(ALLIGATOR)
#include "../feature/dac/dac_dac084s085.h"
#endif
@@ -124,7 +130,7 @@ Stepper stepper; // Singleton
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../feature/power_loss_recovery.h"
+ #include "../feature/powerloss.h"
#endif
// public:
@@ -203,11 +209,8 @@ uint32_t Stepper::advance_divisor = 0,
bool Stepper::bezier_2nd_half; // =false If Bézier curve has been initialized or not
#endif
-uint32_t Stepper::nextMainISR = 0;
-
#if ENABLED(LIN_ADVANCE)
- constexpr uint32_t LA_ADV_NEVER = 0xFFFFFFFF;
uint32_t Stepper::nextAdvanceISR = LA_ADV_NEVER,
Stepper::LA_isr_rate = LA_ADV_NEVER;
uint16_t Stepper::LA_current_adv_steps = 0,
@@ -220,6 +223,10 @@ uint32_t Stepper::nextMainISR = 0;
#endif // LIN_ADVANCE
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+ uint32_t Stepper::nextBabystepISR = BABYSTEP_NEVER;
+#endif
+
int32_t Stepper::ticks_nominal = -1;
#if DISABLED(S_CURVE_ACCELERATION)
uint32_t Stepper::acc_step_rate; // needed for deceleration start point
@@ -402,17 +409,25 @@ constexpr uint32_t NS_TO_PULSE_TIMER_TICKS(uint32_t NS) { return (NS + (NS_PER_P
#define PULSE_HIGH_TICK_COUNT hal_timer_t(NS_TO_PULSE_TIMER_TICKS(_MIN_PULSE_HIGH_NS - _MIN(_MIN_PULSE_HIGH_NS, TIMER_SETUP_NS)))
#define PULSE_LOW_TICK_COUNT hal_timer_t(NS_TO_PULSE_TIMER_TICKS(_MIN_PULSE_LOW_NS - _MIN(_MIN_PULSE_LOW_NS, TIMER_SETUP_NS)))
-#define START_TIMED_PULSE(DIR) (end_tick_count = HAL_timer_get_count(PULSE_TIMER_NUM) + PULSE_##DIR##_TICK_COUNT)
-#define AWAIT_TIMED_PULSE() while (HAL_timer_get_count(PULSE_TIMER_NUM) < end_tick_count) { }
+#define USING_TIMED_PULSE() hal_timer_t start_pulse_count = 0
+#define START_TIMED_PULSE(DIR) (start_pulse_count = HAL_timer_get_count(PULSE_TIMER_NUM))
+#define AWAIT_TIMED_PULSE(DIR) while (PULSE_##DIR##_TICK_COUNT > HAL_timer_get_count(PULSE_TIMER_NUM) - start_pulse_count) { }
#define START_HIGH_PULSE() START_TIMED_PULSE(HIGH)
+#define AWAIT_HIGH_PULSE() AWAIT_TIMED_PULSE(HIGH)
#define START_LOW_PULSE() START_TIMED_PULSE(LOW)
-#define AWAIT_HIGH_PULSE() AWAIT_TIMED_PULSE()
-#define AWAIT_LOW_PULSE() AWAIT_TIMED_PULSE()
+#define AWAIT_LOW_PULSE() AWAIT_TIMED_PULSE(LOW)
-void Stepper::wake_up() {
- // TCNT1 = 0;
- ENABLE_STEPPER_DRIVER_INTERRUPT();
-}
+#if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
+ #define DIR_WAIT_BEFORE() DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY)
+#else
+ #define DIR_WAIT_BEFORE()
+#endif
+
+#if MINIMUM_STEPPER_POST_DIR_DELAY > 0
+ #define DIR_WAIT_AFTER() DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY)
+#else
+ #define DIR_WAIT_AFTER()
+#endif
/**
* Set the stepper direction of each axis
@@ -423,9 +438,7 @@ void Stepper::wake_up() {
*/
void Stepper::set_directions() {
- #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
- DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);
- #endif
+ DIR_WAIT_BEFORE();
#define SET_STEP_DIR(A) \
if (motor_direction(_AXIS(A))) { \
@@ -494,10 +507,7 @@ void Stepper::set_directions() {
}
#endif
- // A small delay may be needed after changing direction
- #if MINIMUM_STEPPER_POST_DIR_DELAY > 0
- DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);
- #endif
+ DIR_WAIT_AFTER();
}
#if ENABLED(S_CURVE_ACCELERATION)
@@ -1326,6 +1336,9 @@ HAL_STEP_TIMER_ISR() {
#endif
void Stepper::isr() {
+
+ static uint32_t nextMainISR = 0; // Interval until the next main Stepper Pulse phase (0 = Now)
+
#ifndef __AVR__
// Disable interrupts, to avoid ISR preemption while we reprogram the period
// (AVR enters the ISR with global interrupts disabled, so no need to do it here)
@@ -1349,38 +1362,58 @@ void Stepper::isr() {
// Enable ISRs to reduce USART processing latency
ENABLE_ISRS();
- // Run main stepping pulse phase ISR if we have to
- if (!nextMainISR) Stepper::stepper_pulse_phase_isr();
+ if (!nextMainISR) pulse_phase_isr(); // 0 = Do coordinated axes Stepper pulses
#if ENABLED(LIN_ADVANCE)
- // Run linear advance stepper ISR if we have to
- if (!nextAdvanceISR) nextAdvanceISR = Stepper::advance_isr();
+ if (!nextAdvanceISR) nextAdvanceISR = advance_isr(); // 0 = Do Linear Advance E Stepper pulses
+ #endif
+
+ #if ENABLED(INTEGRATED_BABYSTEPPING)
+ const bool is_babystep = (nextBabystepISR == 0); // 0 = Do Babystepping (XY)Z pulses
+ if (is_babystep) nextBabystepISR = babystepping_isr();
#endif
// ^== Time critical. NOTHING besides pulse generation should be above here!!!
- // Run main stepping block processing ISR if we have to
- if (!nextMainISR) nextMainISR = Stepper::stepper_block_phase_isr();
+ if (!nextMainISR) nextMainISR = block_phase_isr(); // Manage acc/deceleration, get next block
- uint32_t interval =
+ #if ENABLED(INTEGRATED_BABYSTEPPING)
+ if (is_babystep) // Avoid ANY stepping too soon after baby-stepping
+ NOLESS(nextMainISR, (BABYSTEP_TICKS) / 8); // FULL STOP for 125µs after a baby-step
+
+ if (nextBabystepISR != BABYSTEP_NEVER) // Avoid baby-stepping too close to axis Stepping
+ NOLESS(nextBabystepISR, nextMainISR / 2); // TODO: Only look at axes enabled for baby-stepping
+ #endif
+
+ // Get the interval to the next ISR call
+ const uint32_t interval = _MIN(
+ nextMainISR // Time until the next Pulse / Block phase
#if ENABLED(LIN_ADVANCE)
- _MIN(nextAdvanceISR, nextMainISR) // Nearest time interval
- #else
- nextMainISR // Remaining stepper ISR time
+ , nextAdvanceISR // Come back early for Linear Advance?
#endif
- ;
+ #if ENABLED(INTEGRATED_BABYSTEPPING)
+ , nextBabystepISR // Come back early for Babystepping?
+ #endif
+ , uint32_t(HAL_TIMER_TYPE_MAX) // Come back in a very long time
+ );
- // Limit the value to the maximum possible value of the timer
- NOMORE(interval, uint32_t(HAL_TIMER_TYPE_MAX));
+ //
+ // Compute remaining time for each ISR phase
+ // NEVER : The phase is idle
+ // Zero : The phase will occur on the next ISR call
+ // Non-zero : The phase will occur on a future ISR call
+ //
- // Compute the time remaining for the main isr
nextMainISR -= interval;
#if ENABLED(LIN_ADVANCE)
- // Compute the time remaining for the advance isr
if (nextAdvanceISR != LA_ADV_NEVER) nextAdvanceISR -= interval;
#endif
+ #if ENABLED(INTEGRATED_BABYSTEPPING)
+ if (nextBabystepISR != BABYSTEP_NEVER) nextBabystepISR -= interval;
+ #endif
+
/**
* This needs to avoid a race-condition caused by interleaving
* of interrupts required by both the LA and Stepper algorithms.
@@ -1463,7 +1496,7 @@ void Stepper::isr() {
* call to this method that might cause variation in the timing. The aim
* is to keep pulse timing as regular as possible.
*/
-void Stepper::stepper_pulse_phase_isr() {
+void Stepper::pulse_phase_isr() {
// If we must abort the current block, do so!
if (abort_current_block) {
@@ -1488,15 +1521,15 @@ void Stepper::stepper_pulse_phase_isr() {
// Take multiple steps per interrupt (For high speed moves)
#if ISR_MULTI_STEPS
bool firstStep = true;
- hal_timer_t end_tick_count = 0;
+ USING_TIMED_PULSE();
#endif
xyze_bool_t step_needed{0};
do {
- #define _APPLY_STEP(AXIS) AXIS ##_APPLY_STEP
+ #define _APPLY_STEP(AXIS, INV, ALWAYS) AXIS ##_APPLY_STEP(INV, ALWAYS)
#define _INVERT_STEP_PIN(AXIS) INVERT_## AXIS ##_STEP_PIN
- // Determine if pulses are needed
+ // Determine if a pulse is needed using Bresenham
#define PULSE_PREP(AXIS) do{ \
delta_error[_AXIS(AXIS)] += advance_dividend[_AXIS(AXIS)]; \
step_needed[_AXIS(AXIS)] = (delta_error[_AXIS(AXIS)] >= 0); \
@@ -1509,14 +1542,14 @@ void Stepper::stepper_pulse_phase_isr() {
// Start an active pulse, if Bresenham says so, and update position
#define PULSE_START(AXIS) do{ \
if (step_needed[_AXIS(AXIS)]) { \
- _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), 0); \
+ _APPLY_STEP(AXIS, !_INVERT_STEP_PIN(AXIS), 0); \
} \
}while(0)
// Stop an active pulse, if any, and adjust error term
#define PULSE_STOP(AXIS) do { \
if (step_needed[_AXIS(AXIS)]) { \
- _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS), 0); \
+ _APPLY_STEP(AXIS, _INVERT_STEP_PIN(AXIS), 0); \
} \
}while(0)
@@ -1540,7 +1573,7 @@ void Stepper::stepper_pulse_phase_isr() {
// Don't step E here - But remember the number of steps to perform
motor_direction(E_AXIS) ? --LA_steps : ++LA_steps;
#else
- step_needed.e = delta_error.e >= 0;
+ step_needed.e = true;
#endif
}
#elif HAS_E0_STEP
@@ -1596,20 +1629,14 @@ void Stepper::stepper_pulse_phase_isr() {
#if DISABLED(LIN_ADVANCE)
#if ENABLED(MIXING_EXTRUDER)
-
if (delta_error.e >= 0) {
delta_error.e -= advance_divisor;
E_STEP_WRITE(mixer.get_stepper(), INVERT_E_STEP_PIN);
}
-
- #else // !MIXING_EXTRUDER
-
- #if HAS_E0_STEP
- PULSE_STOP(E);
- #endif
-
- #endif // !MIXING_EXTRUDER
- #endif // !LIN_ADVANCE
+ #elif HAS_E0_STEP
+ PULSE_STOP(E);
+ #endif
+ #endif
#if ISR_MULTI_STEPS
if (events_to_do) START_LOW_PULSE();
@@ -1622,10 +1649,10 @@ void Stepper::stepper_pulse_phase_isr() {
// properly schedules blocks from the planner. This is executed after creating
// the step pulses, so it is not time critical, as pulses are already done.
-uint32_t Stepper::stepper_block_phase_isr() {
+uint32_t Stepper::block_phase_isr() {
- // If no queued movements, just wait 1ms for the next move
- uint32_t interval = (STEPPER_TIMER_RATE) / 1000;
+ // If no queued movements, just wait 1ms for the next block
+ uint32_t interval = (STEPPER_TIMER_RATE) / 1000UL;
// If there is a current block
if (current_block) {
@@ -1659,16 +1686,14 @@ uint32_t Stepper::stepper_block_phase_isr() {
// acc_step_rate is in steps/second
// step_rate to timer interval and steps per stepper isr
- interval = calc_timer_interval(acc_step_rate, oversampling_factor, &steps_per_isr);
+ interval = calc_timer_interval(acc_step_rate, &steps_per_isr);
acceleration_time += interval;
#if ENABLED(LIN_ADVANCE)
- if (LA_use_advance_lead) {
- // Fire ISR if final adv_rate is reached
- if (LA_steps && LA_isr_rate != current_block->advance_speed) nextAdvanceISR = 0;
- }
- else if (LA_steps) nextAdvanceISR = 0;
- #endif // LIN_ADVANCE
+ // Fire ISR if final adv_rate is reached
+ if (LA_steps && (!LA_use_advance_lead || LA_isr_rate != current_block->advance_speed))
+ initiateLA();
+ #endif
}
// Are we in Deceleration phase ?
else if (step_events_completed > decelerate_after) {
@@ -1704,32 +1729,32 @@ uint32_t Stepper::stepper_block_phase_isr() {
// step_rate is in steps/second
// step_rate to timer interval and steps per stepper isr
- interval = calc_timer_interval(step_rate, oversampling_factor, &steps_per_isr);
+ interval = calc_timer_interval(step_rate, &steps_per_isr);
deceleration_time += interval;
#if ENABLED(LIN_ADVANCE)
if (LA_use_advance_lead) {
// Wake up eISR on first deceleration loop and fire ISR if final adv_rate is reached
if (step_events_completed <= decelerate_after + steps_per_isr || (LA_steps && LA_isr_rate != current_block->advance_speed)) {
- nextAdvanceISR = 0;
+ initiateLA();
LA_isr_rate = current_block->advance_speed;
}
}
- else if (LA_steps) nextAdvanceISR = 0;
- #endif // LIN_ADVANCE
+ else if (LA_steps) initiateLA();
+ #endif
}
// We must be in cruise phase otherwise
else {
#if ENABLED(LIN_ADVANCE)
// If there are any esteps, fire the next advance_isr "now"
- if (LA_steps && LA_isr_rate != current_block->advance_speed) nextAdvanceISR = 0;
+ if (LA_steps && LA_isr_rate != current_block->advance_speed) initiateLA();
#endif
// Calculate the ticks_nominal for this nominal speed, if not done yet
if (ticks_nominal < 0) {
// step_rate to timer interval and loops for the nominal speed
- ticks_nominal = calc_timer_interval(current_block->nominal_rate, oversampling_factor, &steps_per_isr);
+ ticks_nominal = calc_timer_interval(current_block->nominal_rate, &steps_per_isr);
}
// The timer interval is just the nominal value for the nominal speed
@@ -1838,17 +1863,17 @@ uint32_t Stepper::stepper_block_phase_isr() {
// No acceleration / deceleration time elapsed so far
acceleration_time = deceleration_time = 0;
- uint8_t oversampling = 0; // Assume we won't use it
+ uint8_t oversampling = 0; // Assume no axis smoothing (via oversampling)
#if ENABLED(ADAPTIVE_STEP_SMOOTHING)
- // At this point, we must decide if we can use Stepper movement axis smoothing.
+ // Decide if axis smoothing is possible
uint32_t max_rate = current_block->nominal_rate; // Get the maximum rate (maximum event speed)
- while (max_rate < MIN_STEP_ISR_FREQUENCY) {
- max_rate <<= 1;
- if (max_rate >= MAX_STEP_ISR_FREQUENCY_1X) break;
- ++oversampling;
+ while (max_rate < MIN_STEP_ISR_FREQUENCY) { // As long as more ISRs are possible...
+ max_rate <<= 1; // Try to double the rate
+ if (max_rate >= MAX_STEP_ISR_FREQUENCY_1X) break; // Don't exceed the estimated ISR limit
+ ++oversampling; // Increase the oversampling (used for left-shift)
}
- oversampling_factor = oversampling;
+ oversampling_factor = oversampling; // For all timer interval calculations
#endif
// Based on the oversampling factor, do the calculations
@@ -1886,8 +1911,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
if ((LA_use_advance_lead = current_block->use_advance_lead)) {
LA_final_adv_steps = current_block->final_adv_steps;
LA_max_adv_steps = current_block->max_adv_steps;
- //Start the ISR
- nextAdvanceISR = 0;
+ initiateLA(); // Start the ISR
LA_isr_rate = current_block->advance_speed;
}
else LA_isr_rate = LA_ADV_NEVER;
@@ -1927,7 +1951,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
// If delayed Z enable, enable it now. This option will severely interfere with
// timing between pulses when chaining motion between blocks, and it could lead
// to lost steps in both X and Y axis, so avoid using it unless strictly necessary!!
- if (current_block->steps.z) enable_Z();
+ if (current_block->steps.z) ENABLE_AXIS_Z();
#endif
// Mark the time_nominal as not calculated yet
@@ -1946,7 +1970,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
#endif
// Calculate the initial timer interval
- interval = calc_timer_interval(current_block->initial_rate, oversampling_factor, &steps_per_isr);
+ interval = calc_timer_interval(current_block->initial_rate, &steps_per_isr);
}
}
@@ -1978,9 +2002,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
else
interval = LA_ADV_NEVER;
- #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
- DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);
- #endif
+ DIR_WAIT_BEFORE();
#if ENABLED(MIXING_EXTRUDER)
// We don't know which steppers will be stepped because LA loop follows,
@@ -1996,17 +2018,14 @@ uint32_t Stepper::stepper_block_phase_isr() {
REV_E_DIR(stepper_extruder);
#endif
- // A small delay may be needed after changing direction
- #if MINIMUM_STEPPER_POST_DIR_DELAY > 0
- DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);
- #endif
+ DIR_WAIT_AFTER();
//const hal_timer_t added_step_ticks = hal_timer_t(ADDED_STEP_TICKS);
// Step E stepper if we have steps
#if ISR_MULTI_STEPS
bool firstStep = true;
- hal_timer_t end_tick_count = 0;
+ USING_TIMED_PULSE();
#endif
while (LA_steps) {
@@ -2051,8 +2070,19 @@ uint32_t Stepper::stepper_block_phase_isr() {
return interval;
}
+
#endif // LIN_ADVANCE
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+
+ // Timer interrupt for baby-stepping
+ uint32_t Stepper::babystepping_isr() {
+ babystep.task();
+ return babystep.has_steps() ? BABYSTEP_TICKS : BABYSTEP_NEVER;
+ }
+
+#endif
+
// Check if the given block is busy or not - Must not be called from ISR contexts
// The current_block could change in the middle of the read by an Stepper ISR, so
// we must explicitly prevent that!
@@ -2086,11 +2116,11 @@ void Stepper::init() {
#if MB(ALLIGATOR)
const float motor_current[] = MOTOR_CURRENT;
unsigned int digipot_motor = 0;
- for (uint8_t i = 0; i < 3 + EXTRUDERS; i++) {
+ LOOP_L_N(i, 3 + EXTRUDERS) {
digipot_motor = 255 * (motor_current[i] / 2.5);
dac084s085::setValue(i, digipot_motor);
}
- #endif//MB(ALLIGATOR)
+ #endif
// Init Microstepping Pins
#if HAS_MICROSTEPS
@@ -2215,12 +2245,12 @@ void Stepper::init() {
#define _STEP_INIT(AXIS) AXIS ##_STEP_INIT()
#define _WRITE_STEP(AXIS, HIGHLOW) AXIS ##_STEP_WRITE(HIGHLOW)
- #define _DISABLE(AXIS) disable_## AXIS()
+ #define _DISABLE_AXIS(AXIS) DISABLE_AXIS_## AXIS()
#define AXIS_INIT(AXIS, PIN) \
_STEP_INIT(AXIS); \
_WRITE_STEP(AXIS, _INVERT_STEP_PIN(PIN)); \
- _DISABLE(AXIS)
+ _DISABLE_AXIS(AXIS)
#define E_AXIS_INIT(NUM) AXIS_INIT(E## NUM, E)
@@ -2284,7 +2314,7 @@ void Stepper::init() {
#if DISABLED(I2S_STEPPER_STREAM)
HAL_timer_start(STEP_TIMER_NUM, 122); // Init Stepper ISR to 122 Hz for quick starting
- ENABLE_STEPPER_DRIVER_INTERRUPT();
+ wake_up();
sei();
#endif
@@ -2338,19 +2368,43 @@ int32_t Stepper::position(const AxisEnum axis) {
#ifdef __AVR__
// Protect the access to the position. Only required for AVR, as
// any 32bit CPU offers atomic access to 32bit variables
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ const bool was_enabled = suspend();
#endif
const int32_t v = count_position[axis];
#ifdef __AVR__
// Reenable Stepper ISR
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+ if (was_enabled) wake_up();
#endif
return v;
}
+// Set the current position in steps
+void Stepper::set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e) {
+ planner.synchronize();
+ const bool was_enabled = suspend();
+ _set_position(a, b, c, e);
+ if (was_enabled) wake_up();
+}
+
+void Stepper::set_axis_position(const AxisEnum a, const int32_t &v) {
+ planner.synchronize();
+
+ #ifdef __AVR__
+ // Protect the access to the position. Only required for AVR, as
+ // any 32bit CPU offers atomic access to 32bit variables
+ const bool was_enabled = suspend();
+ #endif
+
+ count_position[a] = v;
+
+ #ifdef __AVR__
+ // Reenable Stepper ISR
+ if (was_enabled) wake_up();
+ #endif
+}
+
// Signal endstops were triggered - This function can be called from
// an ISR context (Temperature, Stepper or limits ISR), so we must
// be very careful here. If the interrupt being preempted was the
@@ -2359,8 +2413,7 @@ int32_t Stepper::position(const AxisEnum axis) {
// is properly canceled
void Stepper::endstop_triggered(const AxisEnum axis) {
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ const bool was_enabled = suspend();
endstops_trigsteps[axis] = (
#if IS_CORE
(axis == CORE_AXIS_2
@@ -2375,55 +2428,62 @@ void Stepper::endstop_triggered(const AxisEnum axis) {
// Discard the rest of the move if there is a current block
quick_stop();
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+ if (was_enabled) wake_up();
}
int32_t Stepper::triggered_position(const AxisEnum axis) {
#ifdef __AVR__
// Protect the access to the position. Only required for AVR, as
// any 32bit CPU offers atomic access to 32bit variables
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ const bool was_enabled = suspend();
#endif
const int32_t v = endstops_trigsteps[axis];
#ifdef __AVR__
// Reenable Stepper ISR
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+ if (was_enabled) wake_up();
#endif
return v;
}
+void Stepper::report_a_position(const xyz_long_t &pos) {
+ #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
+ SERIAL_ECHOPAIR(STR_COUNT_A, pos.x, " B:", pos.y);
+ #else
+ SERIAL_ECHOPAIR_P(PSTR(STR_COUNT_X), pos.x, SP_Y_LBL, pos.y);
+ #endif
+ #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
+ SERIAL_ECHOLNPAIR(" C:", pos.z);
+ #else
+ SERIAL_ECHOLNPAIR_P(SP_Z_LBL, pos.z);
+ #endif
+}
+
void Stepper::report_positions() {
#ifdef __AVR__
// Protect the access to the position.
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ const bool was_enabled = suspend();
#endif
const xyz_long_t pos = count_position;
#ifdef __AVR__
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+ if (was_enabled) wake_up();
#endif
- #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
- SERIAL_ECHOPAIR(MSG_COUNT_A, pos.x, " B:", pos.y);
- #else
- SERIAL_ECHOPAIR(MSG_COUNT_X, pos.x, " Y:", pos.y);
- #endif
- #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
- SERIAL_ECHOLNPAIR(" C:", pos.z);
- #else
- SERIAL_ECHOLNPAIR(" Z:", pos.z);
- #endif
+ report_a_position(pos);
}
#if ENABLED(BABYSTEPPING)
+ #define _ENABLE_AXIS(AXIS) ENABLE_AXIS_## AXIS()
+ #define _READ_DIR(AXIS) AXIS ##_DIR_READ()
+ #define _INVERT_DIR(AXIS) INVERT_## AXIS ##_DIR
+ #define _APPLY_DIR(AXIS, INVERT) AXIS ##_APPLY_DIR(INVERT, true)
+
#if MINIMUM_STEPPER_PULSE
#define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
#else
@@ -2437,44 +2497,76 @@ void Stepper::report_positions() {
#endif
#define EXTRA_CYCLES_BABYSTEP (STEP_PULSE_CYCLES - (CYCLES_EATEN_BABYSTEP))
- #define _ENABLE(AXIS) enable_## AXIS()
- #define _READ_DIR(AXIS) AXIS ##_DIR_READ()
- #define _INVERT_DIR(AXIS) INVERT_## AXIS ##_DIR
- #define _APPLY_DIR(AXIS, INVERT) AXIS ##_APPLY_DIR(INVERT, true)
-
#if EXTRA_CYCLES_BABYSTEP > 20
- #define _SAVE_START const hal_timer_t pulse_start = HAL_timer_get_count(PULSE_TIMER_NUM)
- #define _PULSE_WAIT while (EXTRA_CYCLES_BABYSTEP > (uint32_t)(HAL_timer_get_count(PULSE_TIMER_NUM) - pulse_start) * (PULSE_TIMER_PRESCALE)) { /* nada */ }
+ #define _SAVE_START() const hal_timer_t pulse_start = HAL_timer_get_count(PULSE_TIMER_NUM)
+ #define _PULSE_WAIT() while (EXTRA_CYCLES_BABYSTEP > (uint32_t)(HAL_timer_get_count(PULSE_TIMER_NUM) - pulse_start) * (PULSE_TIMER_PRESCALE)) { /* nada */ }
#else
- #define _SAVE_START NOOP
+ #define _SAVE_START() NOOP
#if EXTRA_CYCLES_BABYSTEP > 0
- #define _PULSE_WAIT DELAY_NS(EXTRA_CYCLES_BABYSTEP * NANOSECONDS_PER_CYCLE)
+ #define _PULSE_WAIT() DELAY_NS(EXTRA_CYCLES_BABYSTEP * NANOSECONDS_PER_CYCLE)
#elif ENABLED(DELTA)
- #define _PULSE_WAIT DELAY_US(2);
+ #define _PULSE_WAIT() DELAY_US(2);
#elif STEP_PULSE_CYCLES > 0
- #define _PULSE_WAIT NOOP
+ #define _PULSE_WAIT() NOOP
#else
- #define _PULSE_WAIT DELAY_US(4);
+ #define _PULSE_WAIT() DELAY_US(4);
#endif
#endif
- #define BABYSTEP_AXIS(AXIS, INVERT, DIR) { \
+ #if ENABLED(BABYSTEPPING_EXTRA_DIR_WAIT)
+ #define EXTRA_DIR_WAIT_BEFORE DIR_WAIT_BEFORE
+ #define EXTRA_DIR_WAIT_AFTER DIR_WAIT_AFTER
+ #else
+ #define EXTRA_DIR_WAIT_BEFORE()
+ #define EXTRA_DIR_WAIT_AFTER()
+ #endif
+
+ #if DISABLED(DELTA)
+
+ #define BABYSTEP_AXIS(AXIS, INV, DIR) do{ \
const uint8_t old_dir = _READ_DIR(AXIS); \
- _ENABLE(AXIS); \
- DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY); \
- _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT); \
- DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY); \
- _SAVE_START; \
- _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \
- _PULSE_WAIT; \
- _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS), true); \
+ _ENABLE_AXIS(AXIS); \
+ DIR_WAIT_BEFORE(); \
+ _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INV); \
+ DIR_WAIT_AFTER(); \
+ _SAVE_START(); \
+ _APPLY_STEP(AXIS, !_INVERT_STEP_PIN(AXIS), true); \
+ _PULSE_WAIT(); \
+ _APPLY_STEP(AXIS, _INVERT_STEP_PIN(AXIS), true); \
+ EXTRA_DIR_WAIT_BEFORE(); \
_APPLY_DIR(AXIS, old_dir); \
- }
+ EXTRA_DIR_WAIT_AFTER(); \
+ }while(0)
+
+ #elif IS_CORE
+
+ #define BABYSTEP_CORE(A, B, INV, DIR, ALT) do{ \
+ const xy_byte_t old_dir = { _READ_DIR(A), _READ_DIR(B) }; \
+ _ENABLE_AXIS(A); _ENABLE_AXIS(B); \
+ DIR_WAIT_BEFORE(); \
+ _APPLY_DIR(A, _INVERT_DIR(A)^DIR^INV); \
+ _APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^ALT); \
+ DIR_WAIT_AFTER(); \
+ _SAVE_START(); \
+ _APPLY_STEP(A, !_INVERT_STEP_PIN(A), true); \
+ _APPLY_STEP(B, !_INVERT_STEP_PIN(B), true); \
+ _PULSE_WAIT(); \
+ _APPLY_STEP(A, _INVERT_STEP_PIN(A), true); \
+ _APPLY_STEP(B, _INVERT_STEP_PIN(B), true); \
+ EXTRA_DIR_WAIT_BEFORE(); \
+ _APPLY_DIR(A, old_dir.a); _APPLY_DIR(B, old_dir.b); \
+ EXTRA_DIR_WAIT_AFTER(); \
+ }while(0)
+
+ #endif
// MUST ONLY BE CALLED BY AN ISR,
// No other ISR should ever interrupt this!
- void Stepper::babystep(const AxisEnum axis, const bool direction) {
- cli();
+ void Stepper::do_babystep(const AxisEnum axis, const bool direction) {
+
+ #if DISABLED(INTEGRATED_BABYSTEPPING)
+ cli();
+ #endif
switch (axis) {
@@ -2482,25 +2574,21 @@ void Stepper::report_positions() {
case X_AXIS:
#if CORE_IS_XY
- BABYSTEP_AXIS(X, false, direction);
- BABYSTEP_AXIS(Y, false, direction);
+ BABYSTEP_CORE(X, Y, 0, direction, 0);
#elif CORE_IS_XZ
- BABYSTEP_AXIS(X, false, direction);
- BABYSTEP_AXIS(Z, false, direction);
+ BABYSTEP_CORE(X, Z, 0, direction, 0);
#else
- BABYSTEP_AXIS(X, false, direction);
+ BABYSTEP_AXIS(X, 0, direction);
#endif
break;
case Y_AXIS:
#if CORE_IS_XY
- BABYSTEP_AXIS(X, false, direction);
- BABYSTEP_AXIS(Y, false, direction^(CORESIGN(1)<0));
+ BABYSTEP_CORE(X, Y, 0, direction, (CORESIGN(1)<0));
#elif CORE_IS_YZ
- BABYSTEP_AXIS(Y, false, direction);
- BABYSTEP_AXIS(Z, false, direction^(CORESIGN(1)<0));
+ BABYSTEP_CORE(Y, Z, 0, direction, (CORESIGN(1)<0));
#else
- BABYSTEP_AXIS(Y, false, direction);
+ BABYSTEP_AXIS(Y, 0, direction);
#endif
break;
@@ -2509,13 +2597,9 @@ void Stepper::report_positions() {
case Z_AXIS: {
#if CORE_IS_XZ
- BABYSTEP_AXIS(X, BABYSTEP_INVERT_Z, direction);
- BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction^(CORESIGN(1)<0));
-
+ BABYSTEP_CORE(X, Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
#elif CORE_IS_YZ
- BABYSTEP_AXIS(Y, BABYSTEP_INVERT_Z, direction);
- BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction^(CORESIGN(1)<0));
-
+ BABYSTEP_CORE(Y, Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
#elif DISABLED(DELTA)
BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction);
@@ -2523,42 +2607,40 @@ void Stepper::report_positions() {
const bool z_direction = direction ^ BABYSTEP_INVERT_Z;
- enable_X();
- enable_Y();
- enable_Z();
+ ENABLE_AXIS_X();
+ ENABLE_AXIS_Y();
+ ENABLE_AXIS_Z();
- #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
- DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);
- #endif
+ DIR_WAIT_BEFORE();
- const uint8_t old_x_dir_pin = X_DIR_READ(),
- old_y_dir_pin = Y_DIR_READ(),
- old_z_dir_pin = Z_DIR_READ();
+ const xyz_byte_t old_dir = { X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ() };
X_DIR_WRITE(INVERT_X_DIR ^ z_direction);
Y_DIR_WRITE(INVERT_Y_DIR ^ z_direction);
Z_DIR_WRITE(INVERT_Z_DIR ^ z_direction);
- #if MINIMUM_STEPPER_POST_DIR_DELAY > 0
- DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);
- #endif
+ DIR_WAIT_AFTER();
- _SAVE_START;
+ _SAVE_START();
X_STEP_WRITE(!INVERT_X_STEP_PIN);
Y_STEP_WRITE(!INVERT_Y_STEP_PIN);
Z_STEP_WRITE(!INVERT_Z_STEP_PIN);
- _PULSE_WAIT;
+ _PULSE_WAIT();
X_STEP_WRITE(INVERT_X_STEP_PIN);
Y_STEP_WRITE(INVERT_Y_STEP_PIN);
Z_STEP_WRITE(INVERT_Z_STEP_PIN);
// Restore direction bits
- X_DIR_WRITE(old_x_dir_pin);
- Y_DIR_WRITE(old_y_dir_pin);
- Z_DIR_WRITE(old_z_dir_pin);
+ EXTRA_DIR_WAIT_BEFORE();
+
+ X_DIR_WRITE(old_dir.x);
+ Y_DIR_WRITE(old_dir.y);
+ Z_DIR_WRITE(old_dir.z);
+
+ EXTRA_DIR_WAIT_AFTER();
#endif
@@ -2566,7 +2648,10 @@ void Stepper::report_positions() {
default: break;
}
- sei();
+
+ #if DISABLED(INTEGRATED_BABYSTEPPING)
+ sei();
+ #endif
}
#endif // BABYSTEPPING
@@ -2671,7 +2756,7 @@ void Stepper::report_positions() {
SPI.begin();
SET_OUTPUT(DIGIPOTSS_PIN);
- for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++) {
+ LOOP_L_N(i, COUNT(digipot_motor_current)) {
//digitalPotWrite(digipot_ch[i], digipot_motor_current[i]);
digipot_current(i, digipot_motor_current[i]);
}
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 808f4630d4..46c6c1c16a 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -321,13 +321,18 @@ class Stepper {
static bool bezier_2nd_half; // If Bézier curve has been initialized or not
#endif
- static uint32_t nextMainISR; // time remaining for the next Step ISR
#if ENABLED(LIN_ADVANCE)
+ static constexpr uint32_t LA_ADV_NEVER = 0xFFFFFFFF;
static uint32_t nextAdvanceISR, LA_isr_rate;
static uint16_t LA_current_adv_steps, LA_final_adv_steps, LA_max_adv_steps; // Copy from current executed block. Needed because current_block is set to NULL "too early".
static int8_t LA_steps;
static bool LA_use_advance_lead;
- #endif // LIN_ADVANCE
+ #endif
+
+ #if ENABLED(INTEGRATED_BABYSTEPPING)
+ static constexpr uint32_t BABYSTEP_NEVER = 0xFFFFFFFF;
+ static uint32_t nextBabystepISR;
+ #endif
static int32_t ticks_nominal;
#if DISABLED(S_CURVE_ACCELERATION)
@@ -351,28 +356,47 @@ class Stepper {
public:
- //
- // Constructor / initializer
- //
- Stepper() {};
-
// Initialize stepper hardware
static void init();
- // Interrupt Service Routines
+ // Interrupt Service Routine and phases
+
+ // The stepper subsystem goes to sleep when it runs out of things to execute.
+ // Call this to notify the subsystem that it is time to go to work.
+ static inline void wake_up() { ENABLE_STEPPER_DRIVER_INTERRUPT(); }
+
+ static inline bool is_awake() { return STEPPER_ISR_ENABLED(); }
+
+ static inline bool suspend() {
+ const bool awake = is_awake();
+ if (awake) DISABLE_STEPPER_DRIVER_INTERRUPT();
+ return awake;
+ }
// The ISR scheduler
static void isr();
- // The stepper pulse phase ISR
- static void stepper_pulse_phase_isr();
+ // The stepper pulse ISR phase
+ static void pulse_phase_isr();
- // The stepper block processing phase ISR
- static uint32_t stepper_block_phase_isr();
+ // The stepper block processing ISR phase
+ static uint32_t block_phase_isr();
#if ENABLED(LIN_ADVANCE)
- // The Linear advance stepper ISR
+ // The Linear advance ISR phase
static uint32_t advance_isr();
+ FORCE_INLINE static void initiateLA() { nextAdvanceISR = 0; }
+ #endif
+
+ #if ENABLED(INTEGRATED_BABYSTEPPING)
+ // The Babystepping ISR phase
+ static uint32_t babystepping_isr();
+ FORCE_INLINE static void initiateBabystepping() {
+ if (nextBabystepISR == BABYSTEP_NEVER) {
+ nextBabystepISR = 0;
+ wake_up();
+ }
+ }
#endif
// Check if the given block is busy or not - Must not be called from ISR contexts
@@ -381,12 +405,14 @@ class Stepper {
// Get the position of a stepper, in steps
static int32_t position(const AxisEnum axis);
- // Report the positions of the steppers, in steps
- static void report_positions();
+ // Set the current position in steps
+ static void set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e);
+ static inline void set_position(const xyze_long_t &abce) { set_position(abce.a, abce.b, abce.c, abce.e); }
+ static void set_axis_position(const AxisEnum a, const int32_t &v);
- // The stepper subsystem goes to sleep when it runs out of things to execute. Call this
- // to notify the subsystem that it is time to go to work.
- static void wake_up();
+ // Report the positions of the steppers, in steps
+ static void report_a_position(const xyz_long_t &pos);
+ static void report_positions();
// Quickly stop all steppers
FORCE_INLINE static void quick_stop() { abort_current_block = true; }
@@ -446,41 +472,13 @@ class Stepper {
#endif
#if ENABLED(BABYSTEPPING)
- static void babystep(const AxisEnum axis, const bool direction); // perform a short step with a single stepper motor, outside of any convention
+ static void do_babystep(const AxisEnum axis, const bool direction); // perform a short step with a single stepper motor, outside of any convention
#endif
#if HAS_MOTOR_CURRENT_PWM
static void refresh_motor_power();
#endif
- // Set the current position in steps
- static inline void set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e) {
- planner.synchronize();
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
- _set_position(a, b, c, e);
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
- }
- static inline void set_position(const xyze_long_t &abce) { set_position(abce.a, abce.b, abce.c, abce.e); }
-
- static inline void set_axis_position(const AxisEnum a, const int32_t &v) {
- planner.synchronize();
-
- #ifdef __AVR__
- // Protect the access to the position. Only required for AVR, as
- // any 32bit CPU offers atomic access to 32bit variables
- const bool was_enabled = STEPPER_ISR_ENABLED();
- if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
- #endif
-
- count_position[a] = v;
-
- #ifdef __AVR__
- // Reenable Stepper ISR
- if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
- #endif
- }
-
// Set direction bits for all steppers
static void set_directions();
@@ -490,11 +488,11 @@ class Stepper {
static void _set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e);
FORCE_INLINE static void _set_position(const abce_long_t &spos) { _set_position(spos.a, spos.b, spos.c, spos.e); }
- FORCE_INLINE static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t scale, uint8_t* loops) {
+ FORCE_INLINE static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t* loops) {
uint32_t timer;
// Scale the frequency, as requested by the caller
- step_rate <<= scale;
+ step_rate <<= oversampling_factor;
uint8_t multistep = 1;
#if DISABLED(DISABLE_MULTI_STEPPING)
diff --git a/Marlin/src/module/stepper/L64xx.cpp b/Marlin/src/module/stepper/L64xx.cpp
index 40f74c175a..74f2e12fed 100644
--- a/Marlin/src/module/stepper/L64xx.cpp
+++ b/Marlin/src/module/stepper/L64xx.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -73,6 +73,12 @@
#if AXIS_IS_L64XX(E5)
L64XX_CLASS(E5) stepperE5(L6470_CHAIN_SS_PIN);
#endif
+#if AXIS_IS_L64XX(E6)
+ L64XX_CLASS(E6) stepperE6(L6470_CHAIN_SS_PIN);
+#endif
+#if AXIS_IS_L64XX(E7)
+ L64XX_CLASS(E7) stepperE7(L6470_CHAIN_SS_PIN);
+#endif
// Not using L64XX class init method because it
// briefly sends power to the steppers
@@ -208,6 +214,12 @@ void L64XX_Marlin::init_to_defaults() {
#if AXIS_IS_L64XX(E5)
L6470_INIT_CHIP(E5);
#endif
+ #if AXIS_IS_L64XX(E6)
+ L6470_INIT_CHIP(E6);
+ #endif
+ #if AXIS_IS_L64XX(E7)
+ L6470_INIT_CHIP(E7);
+ #endif
}
#endif // HAS_L64XX
diff --git a/Marlin/src/module/stepper/L64xx.h b/Marlin/src/module/stepper/L64xx.h
index 35b3d723de..4449618e0b 100644
--- a/Marlin/src/module/stepper/L64xx.h
+++ b/Marlin/src/module/stepper/L64xx.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -55,6 +55,9 @@
#define X_DIR_INIT() NOOP
#define X_DIR_WRITE(STATE) L64XX_DIR_WRITE(X, STATE)
#define X_DIR_READ() (stepper##X.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_X(L6470)
+ #define DISABLE_STEPPER_X() stepperX.free()
+ #endif
#endif
#endif
@@ -72,6 +75,9 @@
#define Y_DIR_INIT() NOOP
#define Y_DIR_WRITE(STATE) L64XX_DIR_WRITE(Y, STATE)
#define Y_DIR_READ() (stepper##Y.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_Y(L6470)
+ #define DISABLE_STEPPER_Y() stepperY.free()
+ #endif
#endif
#endif
@@ -89,6 +95,9 @@
#define Z_DIR_INIT() NOOP
#define Z_DIR_WRITE(STATE) L64XX_DIR_WRITE(Z, STATE)
#define Z_DIR_READ() (stepper##Z.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_Z(L6470)
+ #define DISABLE_STEPPER_Z() stepperZ.free()
+ #endif
#endif
#endif
@@ -109,6 +118,10 @@
#endif
#endif
+#if AXIS_DRIVER_TYPE_X2(L6470)
+ #define DISABLE_STEPPER_X2() stepperX2.free()
+#endif
+
// Y2 Stepper
#if HAS_Y2_ENABLE && AXIS_IS_L64XX(Y2)
extern L64XX_CLASS(Y2) stepperY2;
@@ -126,6 +139,10 @@
#endif
#endif
+#if AXIS_DRIVER_TYPE_Y2(L6470)
+ #define DISABLE_STEPPER_Y2() stepperY2.free()
+#endif
+
// Z2 Stepper
#if HAS_Z2_ENABLE && AXIS_IS_L64XX(Z2)
extern L64XX_CLASS(Z2) stepperZ2;
@@ -143,6 +160,10 @@
#endif
#endif
+#if AXIS_DRIVER_TYPE_Z2(L6470)
+ #define DISABLE_STEPPER_Z2() stepperZ2.free()
+#endif
+
// Z3 Stepper
#if HAS_Z3_ENABLE && AXIS_IS_L64XX(Z3)
extern L64XX_CLASS(Z3) stepperZ3;
@@ -160,6 +181,10 @@
#endif
#endif
+#if AXIS_DRIVER_TYPE_Z3(L6470)
+ #define DISABLE_STEPPER_Z3() stepperZ3.free()
+#endif
+
// Z4 Stepper
#if HAS_Z4_ENABLE && AXIS_IS_L64XX(Z4)
extern L64XX_CLASS(Z4) stepperZ4;
@@ -177,6 +202,10 @@
#endif
#endif
+#if AXIS_DRIVER_TYPE_Z4(L6470)
+ #define DISABLE_STEPPER_Z4() stepperZ4.free()
+#endif
+
// E0 Stepper
#if AXIS_IS_L64XX(E0)
extern L64XX_CLASS(E0) stepperE0;
@@ -191,6 +220,9 @@
#define E0_DIR_INIT() NOOP
#define E0_DIR_WRITE(STATE) L64XX_DIR_WRITE(E0, STATE)
#define E0_DIR_READ() (stepper##E0.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_E0(L6470)
+ #define DISABLE_STEPPER_E0() do{ stepperE0.free(); CBI(axis_known_position, E_AXIS); }while(0)
+ #endif
#endif
#endif
@@ -208,6 +240,9 @@
#define E1_DIR_INIT() NOOP
#define E1_DIR_WRITE(STATE) L64XX_DIR_WRITE(E1, STATE)
#define E1_DIR_READ() (stepper##E1.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_E1(L6470)
+ #define DISABLE_STEPPER_E1() do{ stepperE1.free(); CBI(axis_known_position, E_AXIS); }while(0)
+ #endif
#endif
#endif
@@ -225,6 +260,9 @@
#define E2_DIR_INIT() NOOP
#define E2_DIR_WRITE(STATE) L64XX_DIR_WRITE(E2, STATE)
#define E2_DIR_READ() (stepper##E2.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_E2(L6470)
+ #define DISABLE_STEPPER_E2() do{ stepperE2.free(); CBI(axis_known_position, E_AXIS); }while(0)
+ #endif
#endif
#endif
@@ -259,6 +297,9 @@
#define E4_DIR_INIT() NOOP
#define E4_DIR_WRITE(STATE) L64XX_DIR_WRITE(E4, STATE)
#define E4_DIR_READ() (stepper##E4.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_E4(L6470)
+ #define DISABLE_STEPPER_E4() do{ stepperE4.free(); CBI(axis_known_position, E_AXIS); }while(0)
+ #endif
#endif
#endif
@@ -276,6 +317,9 @@
#define E5_DIR_INIT() NOOP
#define E5_DIR_WRITE(STATE) L64XX_DIR_WRITE(E5, STATE)
#define E5_DIR_READ() (stepper##E5.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_E5(L6470)
+ #define DISABLE_STEPPER_E5() do{ stepperE5.free(); CBI(axis_known_position, E_AXIS); }while(0)
+ #endif
#endif
#endif
@@ -293,6 +337,9 @@
#define E6_DIR_INIT() NOOP
#define E6_DIR_WRITE(STATE) L64XX_DIR_WRITE(E6, STATE)
#define E6_DIR_READ() (stepper##E6.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_E6(L6470)
+ #define DISABLE_STEPPER_E6() do{ stepperE6.free(); CBI(axis_known_position, E_AXIS); }while(0)
+ #endif
#endif
#endif
@@ -310,5 +357,8 @@
#define E7_DIR_INIT() NOOP
#define E7_DIR_WRITE(STATE) L64XX_DIR_WRITE(E7, STATE)
#define E7_DIR_READ() (stepper##E7.getStatus() & STATUS_DIR);
+ #if AXIS_DRIVER_TYPE_E7(L6470)
+ #define DISABLE_STEPPER_E7() do{ stepperE7.free(); CBI(axis_known_position, E_AXIS); }while(0)
+ #endif
#endif
#endif
diff --git a/Marlin/src/module/stepper/TMC26X.cpp b/Marlin/src/module/stepper/TMC26X.cpp
index 58d9463a2d..08c0b3e782 100644
--- a/Marlin/src/module/stepper/TMC26X.cpp
+++ b/Marlin/src/module/stepper/TMC26X.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/TMC26X.h b/Marlin/src/module/stepper/TMC26X.h
index 73cba31706..39192cea25 100644
--- a/Marlin/src/module/stepper/TMC26X.h
+++ b/Marlin/src/module/stepper/TMC26X.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,7 +32,7 @@
#include
#if defined(STM32GENERIC) && defined(STM32F7)
- #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h"
+ #include "../../HAL/STM32_F4_F7/STM32F7/TMC2660.h"
#else
#include
#endif
diff --git a/Marlin/src/module/stepper/indirection.cpp b/Marlin/src/module/stepper/indirection.cpp
index f784d4911c..2ddbfe62e3 100644
--- a/Marlin/src/module/stepper/indirection.cpp
+++ b/Marlin/src/module/stepper/indirection.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,7 +33,7 @@
#include "indirection.h"
void restore_stepper_drivers() {
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
restore_trinamic_drivers();
#endif
}
@@ -47,7 +47,7 @@ void reset_stepper_drivers() {
L64xxManager.init_to_defaults();
#endif
- #if HAS_TRINAMIC
+ #if HAS_TRINAMIC_CONFIG
reset_trinamic_drivers();
#endif
}
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index d05c7e3db3..0b36a5d0c0 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,7 +40,7 @@
#include "TMC26X.h"
#endif
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "trinamic.h"
#endif
@@ -185,18 +185,18 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#ifndef Z4_ENABLE_INIT
#define Z4_ENABLE_INIT() SET_OUTPUT(Z4_ENABLE_PIN)
#define Z4_ENABLE_WRITE(STATE) WRITE(Z4_ENABLE_PIN,STATE)
- #define Z4_ENABLE_READ() READ(Z4_ENABLE_PIN)
+ #define Z4_ENABLE_READ() bool(READ(Z4_ENABLE_PIN))
#endif
#ifndef Z4_DIR_INIT
#define Z4_DIR_INIT() SET_OUTPUT(Z4_DIR_PIN)
#define Z4_DIR_WRITE(STATE) WRITE(Z4_DIR_PIN,STATE)
- #define Z4_DIR_READ() READ(Z4_DIR_PIN)
+ #define Z4_DIR_READ() bool(READ(Z4_DIR_PIN))
#endif
- #define Z4_STEP_INIT SET_OUTPUT(Z4_STEP_PIN)
+ #define Z4_STEP_INIT() SET_OUTPUT(Z4_STEP_PIN)
#ifndef Z4_STEP_WRITE
#define Z4_STEP_WRITE(STATE) WRITE(Z4_STEP_PIN,STATE)
#endif
- #define Z4_STEP_READ READ(Z4_STEP_PIN)
+ #define Z4_STEP_READ() bool(READ(Z4_STEP_PIN))
#else
#define Z4_DIR_WRITE(STATE) NOOP
#endif
@@ -594,320 +594,392 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#endif
//
-// X, Y, Z Stepper enable / disable
-//
-#if AXIS_DRIVER_TYPE_X(L6470)
- extern L6470 stepperX;
- #define X_enable() NOOP
- #define X_disable() stepperX.free()
-#elif HAS_X_ENABLE
- #define X_enable() X_ENABLE_WRITE( X_ENABLE_ON)
- #define X_disable() X_ENABLE_WRITE(!X_ENABLE_ON)
-#else
- #define X_enable() NOOP
- #define X_disable() NOOP
-#endif
-
-#if AXIS_DRIVER_TYPE_X2(L6470)
- extern L6470 stepperX2;
- #define X2_enable() NOOP
- #define X2_disable() stepperX2.free()
-#elif HAS_X2_ENABLE
- #define X2_enable() X2_ENABLE_WRITE( X_ENABLE_ON)
- #define X2_disable() X2_ENABLE_WRITE(!X_ENABLE_ON)
-#else
- #define X2_enable() NOOP
- #define X2_disable() NOOP
-#endif
-
-#define enable_X() do{ X_enable(); X2_enable(); }while(0)
-#define disable_X() do{ X_disable(); X2_disable(); CBI(axis_known_position, X_AXIS); }while(0)
-
-#if AXIS_DRIVER_TYPE_Y(L6470)
- extern L6470 stepperY;
- #define Y_enable() NOOP
- #define Y_disable() stepperY.free()
-#elif HAS_Y_ENABLE
- #define Y_enable() Y_ENABLE_WRITE( Y_ENABLE_ON)
- #define Y_disable() Y_ENABLE_WRITE(!Y_ENABLE_ON)
-#else
- #define Y_enable() NOOP
- #define Y_disable() NOOP
-#endif
-
-#if AXIS_DRIVER_TYPE_Y2(L6470)
- extern L6470 stepperY2;
- #define Y2_enable() NOOP
- #define Y2_disable() stepperY2.free()
-#elif HAS_Y2_ENABLE
- #define Y2_enable() Y2_ENABLE_WRITE( Y_ENABLE_ON)
- #define Y2_disable() Y2_ENABLE_WRITE(!Y_ENABLE_ON)
-#else
- #define Y2_enable() NOOP
- #define Y2_disable() NOOP
-#endif
-
-#define enable_Y() do{ Y_enable(); Y2_enable(); }while(0)
-#define disable_Y() do{ Y_disable(); Y2_disable(); CBI(axis_known_position, Y_AXIS); }while(0)
-
-#if AXIS_DRIVER_TYPE_Z(L6470)
- extern L6470 stepperZ;
- #define Z_enable() NOOP
- #define Z_disable() stepperZ.free()
-#elif HAS_Z_ENABLE
- #define Z_enable() Z_ENABLE_WRITE( Z_ENABLE_ON)
- #define Z_disable() Z_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
- #define Z_enable() NOOP
- #define Z_disable() NOOP
-#endif
-
-#if AXIS_DRIVER_TYPE_Z2(L6470)
- extern L6470 stepperZ2;
- #define Z2_enable() NOOP
- #define Z2_disable() stepperZ2.free()
-#elif HAS_Z2_ENABLE
- #define Z2_enable() Z2_ENABLE_WRITE( Z_ENABLE_ON)
- #define Z2_disable() Z2_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
- #define Z2_enable() NOOP
- #define Z2_disable() NOOP
-#endif
-
-#if AXIS_DRIVER_TYPE_Z3(L6470)
- extern L6470 stepperZ3;
- #define Z3_enable() NOOP
- #define Z3_disable() stepperZ3.free()
-#elif HAS_Z3_ENABLE
- #define Z3_enable() Z3_ENABLE_WRITE( Z_ENABLE_ON)
- #define Z3_disable() Z3_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
- #define Z3_enable() NOOP
- #define Z3_disable() NOOP
-#endif
-
-#if AXIS_DRIVER_TYPE_Z4(L6470)
- extern L6470 stepperZ4;
- #define Z4_enable() NOOP
- #define Z4_disable() stepperZ4.free()
-#elif HAS_Z4_ENABLE
- #define Z4_enable() Z4_ENABLE_WRITE( Z_ENABLE_ON)
- #define Z4_disable() Z4_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
- #define Z4_enable() NOOP
- #define Z4_disable() NOOP
-#endif
-
-#define enable_Z() do{ Z_enable(); Z2_enable(); Z3_enable(); Z4_enable(); }while(0)
-#define disable_Z() do{ Z_disable(); Z2_disable(); Z3_disable(); Z4_disable(); CBI(axis_known_position, Z_AXIS); }while(0)
-
-//
-// Extruder Stepper enable / disable
+// Individual stepper enable / disable macros
//
-// define the individual enables/disables
-#if AXIS_DRIVER_TYPE_E0(L6470)
- extern L6470 stepperE0;
- #define E0_enable() NOOP
- #define E0_disable() do{ stepperE0.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif HAS_E0_ENABLE
- #define E0_enable() E0_ENABLE_WRITE( E_ENABLE_ON)
- #define E0_disable() E0_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E0_enable() NOOP
- #define E0_disable() NOOP
+#ifndef ENABLE_STEPPER_X
+ #if HAS_X_ENABLE
+ #define ENABLE_STEPPER_X() X_ENABLE_WRITE( X_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_X() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_X
+ #if HAS_X_ENABLE
+ #define DISABLE_STEPPER_X() X_ENABLE_WRITE(!X_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_X() NOOP
+ #endif
#endif
-#if AXIS_DRIVER_TYPE_E1(L6470)
- extern L6470 stepperE1;
- #define E1_enable() NOOP
- #define E1_disable() do{ stepperE1.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 1 && HAS_E1_ENABLE
- #define E1_enable() E1_ENABLE_WRITE( E_ENABLE_ON)
- #define E1_disable() E1_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E1_enable() NOOP
- #define E1_disable() NOOP
+#ifndef ENABLE_STEPPER_X2
+ #if HAS_X2_ENABLE
+ #define ENABLE_STEPPER_X2() X2_ENABLE_WRITE( X_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_X2() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_X2
+ #if HAS_X2_ENABLE
+ #define DISABLE_STEPPER_X2() X2_ENABLE_WRITE(!X_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_X2() NOOP
+ #endif
#endif
-#if AXIS_DRIVER_TYPE_E2(L6470)
- extern L6470 stepperE2;
- #define E2_enable() NOOP
- #define E2_disable() do{ stepperE2.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 2 && HAS_E2_ENABLE
- #define E2_enable() E2_ENABLE_WRITE( E_ENABLE_ON)
- #define E2_disable() E2_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E2_enable() NOOP
- #define E2_disable() NOOP
+#ifndef ENABLE_STEPPER_Y
+ #if HAS_Y_ENABLE
+ #define ENABLE_STEPPER_Y() Y_ENABLE_WRITE( Y_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_Y() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_Y
+ #if HAS_Y_ENABLE
+ #define DISABLE_STEPPER_Y() Y_ENABLE_WRITE(!Y_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_Y() NOOP
+ #endif
#endif
-#if AXIS_DRIVER_TYPE_E3(L6470)
- extern L6470 stepperE3;
- #define E3_enable() NOOP
- #define E3_disable() do{ stepperE3.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 3 && HAS_E3_ENABLE
- #define E3_enable() E3_ENABLE_WRITE( E_ENABLE_ON)
- #define E3_disable() E3_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E3_enable() NOOP
- #define E3_disable() NOOP
+#ifndef ENABLE_STEPPER_Y2
+ #if HAS_Y2_ENABLE
+ #define ENABLE_STEPPER_Y2() Y2_ENABLE_WRITE( Y_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_Y2() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_Y2
+ #if HAS_Y2_ENABLE
+ #define DISABLE_STEPPER_Y2() Y2_ENABLE_WRITE(!Y_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_Y2() NOOP
+ #endif
#endif
-#if AXIS_DRIVER_TYPE_E4(L6470)
- extern L6470 stepperE4;
- #define E4_enable() NOOP
- #define E4_disable() do{ stepperE4.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 4 && HAS_E4_ENABLE
- #define E4_enable() E4_ENABLE_WRITE( E_ENABLE_ON)
- #define E4_disable() E4_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E4_enable() NOOP
- #define E4_disable() NOOP
+#ifndef ENABLE_STEPPER_Z
+ #if HAS_Z_ENABLE
+ #define ENABLE_STEPPER_Z() Z_ENABLE_WRITE( Z_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_Z() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_Z
+ #if HAS_Z_ENABLE
+ #define DISABLE_STEPPER_Z() Z_ENABLE_WRITE(!Z_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_Z() NOOP
+ #endif
#endif
-#if AXIS_DRIVER_TYPE_E5(L6470)
- extern L6470 stepperE5;
- #define E5_enable() NOOP
- #define E5_disable() do{ stepperE5.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 5 && HAS_E5_ENABLE
- #define E5_enable() E5_ENABLE_WRITE( E_ENABLE_ON)
- #define E5_disable() E5_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E5_enable() NOOP
- #define E5_disable() NOOP
+#ifndef ENABLE_STEPPER_Z2
+ #if HAS_Z2_ENABLE
+ #define ENABLE_STEPPER_Z2() Z2_ENABLE_WRITE( Z_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_Z2() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_Z2
+ #if HAS_Z2_ENABLE
+ #define DISABLE_STEPPER_Z2() Z2_ENABLE_WRITE(!Z_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_Z2() NOOP
+ #endif
#endif
-#if AXIS_DRIVER_TYPE_E6(L6470)
- extern L6470 stepperE6;
- #define E6_enable() NOOP
- #define E6_disable() do{ stepperE6.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 6 && HAS_E6_ENABLE
- #define E6_enable() E6_ENABLE_WRITE( E_ENABLE_ON)
- #define E6_disable() E6_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E6_enable() NOOP
- #define E6_disable() NOOP
+#ifndef ENABLE_STEPPER_Z3
+ #if HAS_Z3_ENABLE
+ #define ENABLE_STEPPER_Z3() Z3_ENABLE_WRITE( Z_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_Z3() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_Z3
+ #if HAS_Z3_ENABLE
+ #define DISABLE_STEPPER_Z3() Z3_ENABLE_WRITE(!Z_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_Z3() NOOP
+ #endif
#endif
-#if AXIS_DRIVER_TYPE_E7(L6470)
- extern L6470 stepperE7;
- #define E7_enable() NOOP
- #define E7_disable() do{ stepperE7.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 7 && HAS_E7_ENABLE
- #define E7_enable() E7_ENABLE_WRITE( E_ENABLE_ON)
- #define E7_disable() E7_ENABLE_WRITE(!E_ENABLE_ON)
-#else
- #define E7_enable() NOOP
- #define E7_disable() NOOP
+#ifndef ENABLE_STEPPER_Z4
+ #if HAS_Z4_ENABLE
+ #define ENABLE_STEPPER_Z4() Z4_ENABLE_WRITE( Z_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_Z4() NOOP
+ #endif
#endif
+#ifndef DISABLE_STEPPER_Z4
+ #if HAS_Z4_ENABLE
+ #define DISABLE_STEPPER_Z4() Z4_ENABLE_WRITE(!Z_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_Z4() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E0
+ #if HAS_E0_ENABLE
+ #define ENABLE_STEPPER_E0() E0_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E0() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E0
+ #if HAS_E0_ENABLE
+ #define DISABLE_STEPPER_E0() E0_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E0() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E1
+ #if E_STEPPERS > 1 && HAS_E1_ENABLE
+ #define ENABLE_STEPPER_E1() E1_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E1() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E1
+ #if E_STEPPERS > 1 && HAS_E1_ENABLE
+ #define DISABLE_STEPPER_E1() E1_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E1() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E2
+ #if E_STEPPERS > 2 && HAS_E2_ENABLE
+ #define ENABLE_STEPPER_E2() E2_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E2() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E2
+ #if E_STEPPERS > 2 && HAS_E2_ENABLE
+ #define DISABLE_STEPPER_E2() E2_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E2() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E3
+ #if E_STEPPERS > 3 && HAS_E3_ENABLE
+ #define ENABLE_STEPPER_E3() E3_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E3() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E3
+ #if E_STEPPERS > 3 && HAS_E3_ENABLE
+ #define DISABLE_STEPPER_E3() E3_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E3() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E4
+ #if E_STEPPERS > 4 && HAS_E4_ENABLE
+ #define ENABLE_STEPPER_E4() E4_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E4() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E4
+ #if E_STEPPERS > 4 && HAS_E4_ENABLE
+ #define DISABLE_STEPPER_E4() E4_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E4() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E5
+ #if E_STEPPERS > 5 && HAS_E5_ENABLE
+ #define ENABLE_STEPPER_E5() E5_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E5() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E5
+ #if E_STEPPERS > 5 && HAS_E5_ENABLE
+ #define DISABLE_STEPPER_E5() E5_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E5() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E6
+ #if E_STEPPERS > 6 && HAS_E6_ENABLE
+ #define ENABLE_STEPPER_E6() E6_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E6() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E6
+ #if E_STEPPERS > 6 && HAS_E6_ENABLE
+ #define DISABLE_STEPPER_E6() E6_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E6() NOOP
+ #endif
+#endif
+
+#ifndef ENABLE_STEPPER_E7
+ #if E_STEPPERS > 7 && HAS_E7_ENABLE
+ #define ENABLE_STEPPER_E7() E7_ENABLE_WRITE( E_ENABLE_ON)
+ #else
+ #define ENABLE_STEPPER_E7() NOOP
+ #endif
+#endif
+#ifndef DISABLE_STEPPER_E7
+ #if E_STEPPERS > 7 && HAS_E7_ENABLE
+ #define DISABLE_STEPPER_E7() E7_ENABLE_WRITE(!E_ENABLE_ON)
+ #else
+ #define DISABLE_STEPPER_E7() NOOP
+ #endif
+#endif
+
+//
+// Axis steppers enable / disable macros
+//
+
+#define ENABLE_AXIS_X() do{ ENABLE_STEPPER_X(); ENABLE_STEPPER_X2(); }while(0)
+#define DISABLE_AXIS_X() do{ DISABLE_STEPPER_X(); DISABLE_STEPPER_X2(); CBI(axis_known_position, X_AXIS); }while(0)
+
+#define ENABLE_AXIS_Y() do{ ENABLE_STEPPER_Y(); ENABLE_STEPPER_Y2(); }while(0)
+#define DISABLE_AXIS_Y() do{ DISABLE_STEPPER_Y(); DISABLE_STEPPER_Y2(); CBI(axis_known_position, Y_AXIS); }while(0)
+
+#define ENABLE_AXIS_Z() do{ ENABLE_STEPPER_Z(); ENABLE_STEPPER_Z2(); ENABLE_STEPPER_Z3(); ENABLE_STEPPER_Z4(); }while(0)
+#define DISABLE_AXIS_Z() do{ DISABLE_STEPPER_Z(); DISABLE_STEPPER_Z2(); DISABLE_STEPPER_Z3(); DISABLE_STEPPER_Z4(); CBI(axis_known_position, Z_AXIS); }while(0)
+
+//
+// Extruder steppers enable / disable macros
+//
#if ENABLED(MIXING_EXTRUDER)
-
/**
- * Mixing steppers synchronize their enable (and direction) together
+ * Mixing steppers keep all their enable (and direction) states synchronized
*/
- #if MIXING_STEPPERS > 7
- #define enable_E0() { E0_enable(); E1_enable(); E2_enable(); E3_enable(); E4_enable(); E5_enable(); E6_enable(); E7_enable(); }
- #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); E5_disable(); E6_disable(); E7_disable(); }
- #elif MIXING_STEPPERS > 6
- #define enable_E0() { E0_enable(); E1_enable(); E2_enable(); E3_enable(); E4_enable(); E5_enable(); E6_enable(); }
- #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); E5_disable(); E6_disable(); }
- #elif MIXING_STEPPERS > 5
- #define enable_E0() { E0_enable(); E1_enable(); E2_enable(); E3_enable(); E4_enable(); E5_enable(); }
- #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); E5_disable(); }
- #elif MIXING_STEPPERS > 4
- #define enable_E0() { E0_enable(); E1_enable(); E2_enable(); E3_enable(); E4_enable(); }
- #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); }
- #elif MIXING_STEPPERS > 3
- #define enable_E0() { E0_enable(); E1_enable(); E2_enable(); E3_enable(); }
- #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); }
- #elif MIXING_STEPPERS > 2
- #define enable_E0() { E0_enable(); E1_enable(); E2_enable(); }
- #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); }
+ #define _CALL_ENA_E(N) ENABLE_STEPPER_E##N () ;
+ #define _CALL_DIS_E(N) DISABLE_STEPPER_E##N () ;
+ #define ENABLE_AXIS_E0() { RREPEAT(MIXING_STEPPERS, _CALL_ENA_E) }
+ #define DISABLE_AXIS_E0() { RREPEAT(MIXING_STEPPERS, _CALL_DIS_E) }
+#endif
+
+#ifndef ENABLE_AXIS_E0
+ #if E_STEPPERS > 0 && HAS_E0_ENABLE
+ #define ENABLE_AXIS_E0() ENABLE_STEPPER_E0()
#else
- #define enable_E0() { E0_enable(); E1_enable(); }
- #define disable_E0() { E0_disable(); E1_disable(); }
+ #define ENABLE_AXIS_E0() NOOP
#endif
- #define enable_E1() NOOP
- #define disable_E1() NOOP
- #define enable_E2() NOOP
- #define disable_E2() NOOP
- #define enable_E3() NOOP
- #define disable_E3() NOOP
- #define enable_E4() NOOP
- #define disable_E4() NOOP
- #define enable_E5() NOOP
- #define disable_E5() NOOP
- #define enable_E6() NOOP
- #define disable_E6() NOOP
- #define enable_E7() NOOP
- #define disable_E7() NOOP
-
-#else // !MIXING_EXTRUDER
-
- #if HAS_E0_ENABLE
- #define enable_E0() E0_enable()
- #define disable_E0() E0_disable()
+#endif
+#ifndef DISABLE_AXIS_E0
+ #if E_STEPPERS > 0 && HAS_E0_ENABLE
+ #define DISABLE_AXIS_E0() DISABLE_STEPPER_E0()
#else
- #define enable_E0() NOOP
- #define disable_E0() NOOP
+ #define DISABLE_AXIS_E0() NOOP
#endif
+#endif
+#ifndef ENABLE_AXIS_E1
#if E_STEPPERS > 1 && HAS_E1_ENABLE
- #define enable_E1() E1_enable()
- #define disable_E1() E1_disable()
+ #define ENABLE_AXIS_E1() ENABLE_STEPPER_E1()
#else
- #define enable_E1() NOOP
- #define disable_E1() NOOP
+ #define ENABLE_AXIS_E1() NOOP
#endif
+#endif
+#ifndef DISABLE_AXIS_E1
+ #if E_STEPPERS > 1 && HAS_E1_ENABLE
+ #define DISABLE_AXIS_E1() DISABLE_STEPPER_E1()
+ #else
+ #define DISABLE_AXIS_E1() NOOP
+ #endif
+#endif
+#ifndef ENABLE_AXIS_E2
#if E_STEPPERS > 2 && HAS_E2_ENABLE
- #define enable_E2() E2_enable()
- #define disable_E2() E2_disable()
+ #define ENABLE_AXIS_E2() ENABLE_STEPPER_E2()
#else
- #define enable_E2() NOOP
- #define disable_E2() NOOP
+ #define ENABLE_AXIS_E2() NOOP
#endif
+#endif
+#ifndef DISABLE_AXIS_E2
+ #if E_STEPPERS > 2 && HAS_E2_ENABLE
+ #define DISABLE_AXIS_E2() DISABLE_STEPPER_E2()
+ #else
+ #define DISABLE_AXIS_E2() NOOP
+ #endif
+#endif
+#ifndef ENABLE_AXIS_E3
#if E_STEPPERS > 3 && HAS_E3_ENABLE
- #define enable_E3() E3_enable()
- #define disable_E3() E3_disable()
+ #define ENABLE_AXIS_E3() ENABLE_STEPPER_E3()
#else
- #define enable_E3() NOOP
- #define disable_E3() NOOP
+ #define ENABLE_AXIS_E3() NOOP
#endif
+#endif
+#ifndef DISABLE_AXIS_E3
+ #if E_STEPPERS > 3 && HAS_E3_ENABLE
+ #define DISABLE_AXIS_E3() DISABLE_STEPPER_E3()
+ #else
+ #define DISABLE_AXIS_E3() NOOP
+ #endif
+#endif
+#ifndef ENABLE_AXIS_E4
#if E_STEPPERS > 4 && HAS_E4_ENABLE
- #define enable_E4() E4_enable()
- #define disable_E4() E4_disable()
+ #define ENABLE_AXIS_E4() ENABLE_STEPPER_E4()
#else
- #define enable_E4() NOOP
- #define disable_E4() NOOP
+ #define ENABLE_AXIS_E4() NOOP
#endif
+#endif
+#ifndef DISABLE_AXIS_E4
+ #if E_STEPPERS > 4 && HAS_E4_ENABLE
+ #define DISABLE_AXIS_E4() DISABLE_STEPPER_E4()
+ #else
+ #define DISABLE_AXIS_E4() NOOP
+ #endif
+#endif
+#ifndef ENABLE_AXIS_E5
#if E_STEPPERS > 5 && HAS_E5_ENABLE
- #define enable_E5() E5_enable()
- #define disable_E5() E5_disable()
+ #define ENABLE_AXIS_E5() ENABLE_STEPPER_E5()
#else
- #define enable_E5() NOOP
- #define disable_E5() NOOP
+ #define ENABLE_AXIS_E5() NOOP
#endif
+#endif
+#ifndef DISABLE_AXIS_E5
+ #if E_STEPPERS > 5 && HAS_E5_ENABLE
+ #define DISABLE_AXIS_E5() DISABLE_STEPPER_E5()
+ #else
+ #define DISABLE_AXIS_E5() NOOP
+ #endif
+#endif
+#ifndef ENABLE_AXIS_E6
#if E_STEPPERS > 6 && HAS_E6_ENABLE
- #define enable_E6() E6_enable()
- #define disable_E6() E6_disable()
+ #define ENABLE_AXIS_E6() ENABLE_STEPPER_E6()
#else
- #define enable_E6() NOOP
- #define disable_E6() NOOP
+ #define ENABLE_AXIS_E6() NOOP
#endif
+#endif
+#ifndef DISABLE_AXIS_E6
+ #if E_STEPPERS > 6 && HAS_E6_ENABLE
+ #define DISABLE_AXIS_E6() DISABLE_STEPPER_E6()
+ #else
+ #define DISABLE_AXIS_E6() NOOP
+ #endif
+#endif
+#ifndef ENABLE_AXIS_E7
#if E_STEPPERS > 7 && HAS_E7_ENABLE
- #define enable_E7() E7_enable()
- #define disable_E7() E7_disable()
+ #define ENABLE_AXIS_E7() ENABLE_STEPPER_E7()
#else
- #define enable_E7() NOOP
- #define disable_E7() NOOP
+ #define ENABLE_AXIS_E7() NOOP
#endif
-
-#endif // !MIXING_EXTRUDER
+#endif
+#ifndef DISABLE_AXIS_E7
+ #if E_STEPPERS > 7 && HAS_E7_ENABLE
+ #define DISABLE_AXIS_E7() DISABLE_STEPPER_E7()
+ #else
+ #define DISABLE_AXIS_E7() NOOP
+ #endif
+#endif
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index ba65c32eb6..f0ac48f514 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,7 +27,7 @@
#include "../../inc/MarlinConfig.h"
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
#include "trinamic.h"
#include "../stepper.h"
@@ -36,7 +36,7 @@
#include
enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
-#define _TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX])
+#define TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX])
// IC = TMC model number
// ST = Stepper object letter
@@ -44,13 +44,13 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
// AI = Axis Enum Index
// SWHW = SW/SH UART selection
#if ENABLED(TMC_USE_SW_SPI)
- #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_CS_PIN, ST##_RSENSE, TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK, ST##_CHAIN_POS)
+ #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK, ST##_CHAIN_POS)
#else
- #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_CS_PIN, ST##_RSENSE, ST##_CHAIN_POS)
+ #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), ST##_CHAIN_POS)
#endif
-#define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(&ST##_HARDWARE_SERIAL, ST##_RSENSE, ST##_SLAVE_ADDRESS)
-#define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, ST##_RSENSE, ST##_SLAVE_ADDRESS, ST##_SERIAL_RX_PIN > -1)
+#define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(&ST##_HARDWARE_SERIAL, float(ST##_RSENSE), ST##_SLAVE_ADDRESS)
+#define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, float(ST##_RSENSE), ST##_SLAVE_ADDRESS, ST##_SERIAL_RX_PIN > -1)
#define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
#define TMC_SPI_DEFINE(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS)
@@ -109,14 +109,29 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#if AXIS_HAS_SPI(E5)
TMC_SPI_DEFINE_E(5);
#endif
+#if AXIS_HAS_SPI(E6)
+ TMC_SPI_DEFINE_E(6);
+#endif
+#if AXIS_HAS_SPI(E7)
+ TMC_SPI_DEFINE_E(7);
+#endif
#ifndef TMC_BAUD_RATE
- #define TMC_BAUD_RATE 115200
+ #if HAS_TMC_SW_SERIAL
+ // Reduce baud rate for boards not already overriding TMC_BAUD_RATE for software serial.
+ // Testing has shown that 115200 is not 100% reliable on AVR platforms, occasionally
+ // failing to read status properly. 32-bit platforms typically define an even lower
+ // TMC_BAUD_RATE, due to differences in how SoftwareSerial libraries work on different
+ // platforms.
+ #define TMC_BAUD_RATE 57600
+ #else
+ #define TMC_BAUD_RATE 115200
+ #endif
#endif
#if HAS_DRIVER(TMC2130)
template
- void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+ void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
st.begin();
CHOPCONF_t chopconf{0};
@@ -146,9 +161,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
st.PWMCONF(pwmconf.sr);
#if ENABLED(HYBRID_THRESHOLD)
- st.set_pwm_thrs(thrs);
+ st.set_pwm_thrs(hyb_thrs);
#else
- UNUSED(thrs);
+ UNUSED(hyb_thrs);
#endif
st.GSTAT(); // Clear GSTAT
@@ -157,7 +172,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#if HAS_DRIVER(TMC2160)
template
- void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+ void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
st.begin();
CHOPCONF_t chopconf{0};
@@ -190,9 +205,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
st.PWMCONF(pwmconf.sr);
#if ENABLED(HYBRID_THRESHOLD)
- st.set_pwm_thrs(thrs);
+ st.set_pwm_thrs(hyb_thrs);
#else
- UNUSED(thrs);
+ UNUSED(hyb_thrs);
#endif
st.GSTAT(); // Clear GSTAT
@@ -316,115 +331,126 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#endif
#endif
+ enum TMCAxis : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7, TOTAL };
+
void tmc_serial_begin() {
+ struct {
+ const void *ptr[TMCAxis::TOTAL];
+ bool began(const TMCAxis a, const void * const p) {
+ LOOP_L_N(i, a) if (p == ptr[i]) return true;
+ ptr[a] = p; return false;
+ };
+ } sp_helper;
+ #define HW_SERIAL_BEGIN(A) do{ if (sp_helper.began(TMCAxis::A, &A##_HARDWARE_SERIAL)) \
+ A##_HARDWARE_SERIAL.begin(TMC_BAUD_RATE); }while(0)
#if AXIS_HAS_UART(X)
#ifdef X_HARDWARE_SERIAL
- X_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(X);
#else
stepperX.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(X2)
#ifdef X2_HARDWARE_SERIAL
- X2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(X2);
#else
stepperX2.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(Y)
#ifdef Y_HARDWARE_SERIAL
- Y_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(Y);
#else
stepperY.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(Y2)
#ifdef Y2_HARDWARE_SERIAL
- Y2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(Y2);
#else
stepperY2.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(Z)
#ifdef Z_HARDWARE_SERIAL
- Z_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(Z);
#else
stepperZ.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(Z2)
#ifdef Z2_HARDWARE_SERIAL
- Z2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(Z2);
#else
stepperZ2.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(Z3)
#ifdef Z3_HARDWARE_SERIAL
- Z3_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(Z3);
#else
stepperZ3.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(Z4)
#ifdef Z4_HARDWARE_SERIAL
- Z4_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(Z4);
#else
stepperZ4.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E0)
#ifdef E0_HARDWARE_SERIAL
- E0_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E0);
#else
stepperE0.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E1)
#ifdef E1_HARDWARE_SERIAL
- E1_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E1);
#else
stepperE1.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E2)
#ifdef E2_HARDWARE_SERIAL
- E2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E2);
#else
stepperE2.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E3)
#ifdef E3_HARDWARE_SERIAL
- E3_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E3);
#else
stepperE3.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E4)
#ifdef E4_HARDWARE_SERIAL
- E4_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E4);
#else
stepperE4.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E5)
#ifdef E5_HARDWARE_SERIAL
- E5_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E5);
#else
stepperE5.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E6)
#ifdef E6_HARDWARE_SERIAL
- E6_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E6);
#else
stepperE6.beginSerial(TMC_BAUD_RATE);
#endif
#endif
#if AXIS_HAS_UART(E7)
#ifdef E7_HARDWARE_SERIAL
- E7_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+ HW_SERIAL_BEGIN(E7);
#else
stepperE7.beginSerial(TMC_BAUD_RATE);
#endif
@@ -434,7 +460,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#if HAS_DRIVER(TMC2208)
template
- void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+ void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
TMC2208_n::GCONF_t gconf{0};
gconf.pdn_disable = true; // Use UART
gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -470,9 +496,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
st.PWMCONF(pwmconf.sr);
#if ENABLED(HYBRID_THRESHOLD)
- st.set_pwm_thrs(thrs);
+ st.set_pwm_thrs(hyb_thrs);
#else
- UNUSED(thrs);
+ UNUSED(hyb_thrs);
#endif
st.GSTAT(0b111); // Clear
@@ -482,7 +508,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#if HAS_DRIVER(TMC2209)
template
- void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+ void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
TMC2208_n::GCONF_t gconf{0};
gconf.pdn_disable = true; // Use UART
gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -518,9 +544,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
st.PWMCONF(pwmconf.sr);
#if ENABLED(HYBRID_THRESHOLD)
- st.set_pwm_thrs(thrs);
+ st.set_pwm_thrs(hyb_thrs);
#else
- UNUSED(thrs);
+ UNUSED(hyb_thrs);
#endif
st.GSTAT(0b111); // Clear
@@ -557,7 +583,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#if HAS_DRIVER(TMC5130)
template
- void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+ void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
st.begin();
CHOPCONF_t chopconf{0};
@@ -587,9 +613,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
st.PWMCONF(pwmconf.sr);
#if ENABLED(HYBRID_THRESHOLD)
- st.set_pwm_thrs(thrs);
+ st.set_pwm_thrs(hyb_thrs);
#else
- UNUSED(thrs);
+ UNUSED(hyb_thrs);
#endif
st.GSTAT(); // Clear GSTAT
@@ -598,7 +624,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#if HAS_DRIVER(TMC5160)
template
- void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+ void tmc_init(TMCMarlin &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
st.begin();
CHOPCONF_t chopconf{0};
@@ -631,9 +657,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
st.PWMCONF(pwmconf.sr);
#if ENABLED(HYBRID_THRESHOLD)
- st.set_pwm_thrs(thrs);
+ st.set_pwm_thrs(hyb_thrs);
#else
- UNUSED(thrs);
+ UNUSED(hyb_thrs);
#endif
st.GSTAT(); // Clear GSTAT
}
@@ -712,52 +738,52 @@ void reset_trinamic_drivers() {
};
#if AXIS_IS_TMC(X)
- _TMC_INIT(X, STEALTH_AXIS_XY);
+ TMC_INIT(X, STEALTH_AXIS_XY);
#endif
#if AXIS_IS_TMC(X2)
- _TMC_INIT(X2, STEALTH_AXIS_XY);
+ TMC_INIT(X2, STEALTH_AXIS_XY);
#endif
#if AXIS_IS_TMC(Y)
- _TMC_INIT(Y, STEALTH_AXIS_XY);
+ TMC_INIT(Y, STEALTH_AXIS_XY);
#endif
#if AXIS_IS_TMC(Y2)
- _TMC_INIT(Y2, STEALTH_AXIS_XY);
+ TMC_INIT(Y2, STEALTH_AXIS_XY);
#endif
#if AXIS_IS_TMC(Z)
- _TMC_INIT(Z, STEALTH_AXIS_Z);
+ TMC_INIT(Z, STEALTH_AXIS_Z);
#endif
#if AXIS_IS_TMC(Z2)
- _TMC_INIT(Z2, STEALTH_AXIS_Z);
+ TMC_INIT(Z2, STEALTH_AXIS_Z);
#endif
#if AXIS_IS_TMC(Z3)
- _TMC_INIT(Z3, STEALTH_AXIS_Z);
+ TMC_INIT(Z3, STEALTH_AXIS_Z);
#endif
#if AXIS_IS_TMC(Z4)
- _TMC_INIT(Z4, STEALTH_AXIS_Z);
+ TMC_INIT(Z4, STEALTH_AXIS_Z);
#endif
#if AXIS_IS_TMC(E0)
- _TMC_INIT(E0, STEALTH_AXIS_E);
+ TMC_INIT(E0, STEALTH_AXIS_E);
#endif
#if AXIS_IS_TMC(E1)
- _TMC_INIT(E1, STEALTH_AXIS_E);
+ TMC_INIT(E1, STEALTH_AXIS_E);
#endif
#if AXIS_IS_TMC(E2)
- _TMC_INIT(E2, STEALTH_AXIS_E);
+ TMC_INIT(E2, STEALTH_AXIS_E);
#endif
#if AXIS_IS_TMC(E3)
- _TMC_INIT(E3, STEALTH_AXIS_E);
+ TMC_INIT(E3, STEALTH_AXIS_E);
#endif
#if AXIS_IS_TMC(E4)
- _TMC_INIT(E4, STEALTH_AXIS_E);
+ TMC_INIT(E4, STEALTH_AXIS_E);
#endif
#if AXIS_IS_TMC(E5)
- _TMC_INIT(E5, STEALTH_AXIS_E);
+ TMC_INIT(E5, STEALTH_AXIS_E);
#endif
#if AXIS_IS_TMC(E6)
- _TMC_INIT(E6, STEALTH_AXIS_E);
+ TMC_INIT(E6, STEALTH_AXIS_E);
#endif
#if AXIS_IS_TMC(E7)
- _TMC_INIT(E7, STEALTH_AXIS_E);
+ TMC_INIT(E7, STEALTH_AXIS_E);
#endif
#if USE_SENSORLESS
@@ -803,4 +829,4 @@ void reset_trinamic_drivers() {
stepper.set_directions();
}
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index afa8847108..262e20840e 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index eba7afd81a..af2f1a10e8 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,11 +33,11 @@
#include "../core/language.h"
#include "../HAL/shared/Delay.h"
#if ENABLED(EXTENSIBLE_UI)
- #include "../lcd/extensible_ui/ui_api.h"
+ #include "../lcd/extui/ui_api.h"
#endif
#if ENABLED(MAX6675_IS_MAX31865)
- #include "Adafruit_MAX31865.h"
+ #include
#ifndef MAX31865_CS_PIN
#define MAX31865_CS_PIN MAX6675_SS_PIN // HW:49 SW:65 for example
#endif
@@ -59,21 +59,18 @@
);
#endif
-#define MAX6675_SEPARATE_SPI (EITHER(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675) && PIN_EXISTS(MAX6675_SCK, MAX6675_DO))
+#define MAX6675_SEPARATE_SPI (EITHER(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675) && PINS_EXIST(MAX6675_SCK, MAX6675_DO))
#if MAX6675_SEPARATE_SPI
#include "../libs/private_spi.h"
#endif
-#if EITHER(BABYSTEPPING, PID_EXTRUSION_SCALING)
+#if ENABLED(PID_EXTRUSION_SCALING)
#include "stepper.h"
#endif
-#if ENABLED(BABYSTEPPING)
+#if ENABLED(BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
#include "../feature/babystep.h"
- #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
- #include "../gcode/gcode.h"
- #endif
#endif
#include "printcounter.h"
@@ -83,7 +80,7 @@
#endif
#if ENABLED(EMERGENCY_PARSER)
- #include "../feature/emergency_parser.h"
+ #include "../feature/e_parser.h"
#endif
#if ENABLED(PRINTER_EVENT_LEDS)
@@ -104,16 +101,21 @@
#if HOTEND_USES_THERMISTOR
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
- static void* heater_ttbl_map[2] = { (void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE };
+ static const void* heater_ttbl_map[2] = { (void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE };
static constexpr uint8_t heater_ttbllen_map[2] = { HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN };
#else
- static void* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS((void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE, (void*)HEATER_2_TEMPTABLE, (void*)HEATER_3_TEMPTABLE, (void*)HEATER_4_TEMPTABLE, (void*)HEATER_5_TEMPTABLE);
- static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN, HEATER_3_TEMPTABLE_LEN, HEATER_4_TEMPTABLE_LEN, HEATER_5_TEMPTABLE_LEN);
+ #define NEXT_TEMPTABLE(N) ,HEATER_##N##_TEMPTABLE
+ #define NEXT_TEMPTABLE_LEN(N) ,HEATER_##N##_TEMPTABLE_LEN
+ static const void* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE));
+ static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE_LEN REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE_LEN));
#endif
#endif
Temperature thermalManager;
+const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
+ str_t_heating_failed[] PROGMEM = STR_T_HEATING_FAILED;
+
/**
* Macros to include the heater id in temp errors. The compiler's dead-code
* elimination should (hopefully) optimize out the unused strings.
@@ -220,10 +222,10 @@ Temperature thermalManager;
#endif // FAN_COUNT > 0
#if WATCH_HOTENDS
- heater_watch_t Temperature::watch_hotend[HOTENDS]; // = { { 0 } }
+ hotend_watch_t Temperature::watch_hotend[HOTENDS]; // = { { 0 } }
#endif
#if HEATER_IDLE_HANDLER
- heater_idle_t Temperature::hotend_idle[HOTENDS]; // = { { 0 } }
+ hotend_idle_t Temperature::hotend_idle[HOTENDS]; // = { { 0 } }
#endif
#if HAS_HEATED_BED
@@ -236,13 +238,13 @@ Temperature thermalManager;
int16_t Temperature::maxtemp_raw_BED = HEATER_BED_RAW_HI_TEMP;
#endif
#if WATCH_BED
- heater_watch_t Temperature::watch_bed; // = { 0 }
+ bed_watch_t Temperature::watch_bed; // = { 0 }
#endif
#if DISABLED(PIDTEMPBED)
millis_t Temperature::next_bed_check_ms;
#endif
#if HEATER_IDLE_HANDLER
- heater_idle_t Temperature::bed_idle; // = { 0 }
+ hotend_idle_t Temperature::bed_idle; // = { 0 }
#endif
#endif // HAS_HEATED_BED
@@ -256,7 +258,7 @@ Temperature thermalManager;
int16_t Temperature::maxtemp_raw_CHAMBER = HEATER_CHAMBER_RAW_HI_TEMP;
#endif
#if WATCH_CHAMBER
- heater_watch_t Temperature::watch_chamber{0};
+ chamber_watch_t Temperature::watch_chamber{0};
#endif
millis_t Temperature::next_chamber_check_ms;
#endif // HAS_HEATED_CHAMBER
@@ -287,7 +289,7 @@ Temperature thermalManager;
float Temperature::redundant_temperature = 0.0;
#endif
-volatile bool Temperature::temp_meas_ready = false;
+volatile bool Temperature::raw_temps_ready = false;
#if ENABLED(PID_EXTRUSION_SCALING)
int32_t Temperature::last_e_position, Temperature::lpq[LPQ_MAX_LEN];
@@ -407,14 +409,14 @@ volatile bool Temperature::temp_meas_ready = false;
#endif
if (target > GHV(BED_MAXTEMP - 10, temp_range[heater].maxtemp - 15)) {
- SERIAL_ECHOLNPGM(MSG_PID_TEMP_TOO_HIGH);
+ SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
#if ENABLED(EXTENSIBLE_UI)
- ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
+ ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
#endif
return;
}
- SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_START);
+ SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_START);
disable_all_heaters();
@@ -435,7 +437,7 @@ volatile bool Temperature::temp_meas_ready = false;
const millis_t ms = millis();
- if (temp_meas_ready) { // temp sample ready
+ if (raw_temps_ready) { // temp sample ready
updateTemperaturesFromRawValues();
// Get the current temperature and constrain it
@@ -475,27 +477,27 @@ volatile bool Temperature::temp_meas_ready = false;
LIMIT(bias, 20, max_pow - 20);
d = (bias > max_pow >> 1) ? max_pow - 1 - bias : bias;
- SERIAL_ECHOPAIR(MSG_BIAS, bias, MSG_D, d, MSG_T_MIN, minT, MSG_T_MAX, maxT);
+ SERIAL_ECHOPAIR(STR_BIAS, bias, STR_D_COLON, d, STR_T_MIN, minT, STR_T_MAX, maxT);
if (cycles > 2) {
const float Ku = (4.0f * d) / (float(M_PI) * (maxT - minT) * 0.5f),
Tu = float(t_low + t_high) * 0.001f,
pf = isbed ? 0.2f : 0.6f,
df = isbed ? 1.0f / 3.0f : 1.0f / 8.0f;
- SERIAL_ECHOPAIR(MSG_KU, Ku, MSG_TU, Tu);
+ SERIAL_ECHOPAIR(STR_KU, Ku, STR_TU, Tu);
if (isbed) { // Do not remove this otherwise PID autotune won't work right for the bed!
tune_pid.Kp = Ku * 0.2f;
tune_pid.Ki = 2 * tune_pid.Kp / Tu;
tune_pid.Kd = tune_pid.Kp * Tu / 3;
SERIAL_ECHOLNPGM("\n" " No overshoot"); // Works far better for the bed. Classic and some have bad ringing.
- SERIAL_ECHOLNPAIR(MSG_KP, tune_pid.Kp, MSG_KI, tune_pid.Ki, MSG_KD, tune_pid.Kd);
+ SERIAL_ECHOLNPAIR(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
}
else {
tune_pid.Kp = Ku * pf;
tune_pid.Kd = tune_pid.Kp * Tu * df;
tune_pid.Ki = 2 * tune_pid.Kp / Tu;
- SERIAL_ECHOLNPGM("\n" MSG_CLASSIC_PID);
- SERIAL_ECHOLNPAIR(MSG_KP, tune_pid.Kp, MSG_KI, tune_pid.Ki, MSG_KD, tune_pid.Kd);
+ SERIAL_ECHOLNPGM("\n" STR_CLASSIC_PID);
+ SERIAL_ECHOLNPAIR(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
}
/**
@@ -523,9 +525,9 @@ volatile bool Temperature::temp_meas_ready = false;
#define MAX_OVERSHOOT_PID_AUTOTUNE 30
#endif
if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
- SERIAL_ECHOLNPGM(MSG_PID_TEMP_TOO_HIGH);
+ SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
#if ENABLED(EXTENSIBLE_UI)
- ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
+ ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
#endif
break;
}
@@ -540,26 +542,18 @@ volatile bool Temperature::temp_meas_ready = false;
// Make sure heating is actually working
#if WATCH_BED || WATCH_HOTENDS
- if (
- #if WATCH_BED && WATCH_HOTENDS
- true
- #elif WATCH_HOTENDS
- !isbed
- #else
- isbed
- #endif
- ) {
- if (!heated) { // If not yet reached target...
- if (current_temp > next_watch_temp) { // Over the watch temp?
- next_watch_temp = current_temp + watch_temp_increase; // - set the next temp to watch for
- temp_change_ms = ms + watch_temp_period * 1000UL; // - move the expiration timer up
- if (current_temp > watch_temp_target) heated = true; // - Flag if target temperature reached
+ if (BOTH(WATCH_BED, WATCH_HOTENDS) || isbed == DISABLED(WATCH_HOTENDS)) {
+ if (!heated) { // If not yet reached target...
+ if (current_temp > next_watch_temp) { // Over the watch temp?
+ next_watch_temp = current_temp + watch_temp_increase; // - set the next temp to watch for
+ temp_change_ms = ms + watch_temp_period * 1000UL; // - move the expiration timer up
+ if (current_temp > watch_temp_target) heated = true; // - Flag if target temperature reached
}
- else if (ELAPSED(ms, temp_change_ms)) // Watch timer expired
- _temp_error(heater, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
+ else if (ELAPSED(ms, temp_change_ms)) // Watch timer expired
+ _temp_error(heater, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
}
else if (current_temp < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far?
- _temp_error(heater, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+ _temp_error(heater, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
}
#endif
} // every 2 seconds
@@ -570,14 +564,14 @@ volatile bool Temperature::temp_meas_ready = false;
#endif
if (((ms - t1) + (ms - t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) {
#if ENABLED(EXTENSIBLE_UI)
- ExtUI::OnPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT);
+ ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT);
#endif
- SERIAL_ECHOLNPGM(MSG_PID_TIMEOUT);
+ SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
break;
}
if (cycles > ncycles && cycles > 2) {
- SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_FINISHED);
+ SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_FINISHED);
#if HAS_PID_FOR_BOTH
const char * const estring = GHV(PSTR("bed"), NUL_STR);
@@ -621,7 +615,7 @@ volatile bool Temperature::temp_meas_ready = false;
printerEventLEDs.onPidTuningDone(color);
#endif
#if ENABLED(EXTENSIBLE_UI)
- ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE);
+ ExtUI::onPidTuning(ExtUI::result_t::PID_DONE);
#endif
goto EXIT_M303;
@@ -635,7 +629,7 @@ volatile bool Temperature::temp_meas_ready = false;
printerEventLEDs.onPidTuningDone(color);
#endif
#if ENABLED(EXTENSIBLE_UI)
- ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE);
+ ExtUI::onPidTuning(ExtUI::result_t::PID_DONE);
#endif
EXIT_M303:
@@ -679,25 +673,8 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
static const uint8_t fanBit[] PROGMEM = {
0
#if HOTENDS > 1
- , REPEAT2(1,_EFAN,1) 1
- #if HOTENDS > 2
- , REPEAT2(2,_EFAN,2) 2
- #if HOTENDS > 3
- , REPEAT2(3,_EFAN,3) 3
- #if HOTENDS > 4
- , REPEAT2(4,_EFAN,4) 4
- #if HOTENDS > 5
- , REPEAT2(5,_EFAN,5) 5
- #if HOTENDS > 6
- , REPEAT2(6,_EFAN,6) 6
- #if HOTENDS > 7
- , REPEAT2(7,_EFAN,7) 7
- #endif
- #endif
- #endif
- #endif
- #endif
- #endif
+ #define _NEXT_FAN(N) , REPEAT2(N,_EFAN,N) N
+ RREPEAT_S(1, HOTENDS, _NEXT_FAN)
#endif
#if HAS_AUTO_CHAMBER_FAN
#define _CFAN(B) _FANOVERLAP(CHAMBER,B) ? B :
@@ -723,7 +700,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
}while(0)
uint8_t fanDone = 0;
- for (uint8_t f = 0; f < COUNT(fanBit); f++) {
+ LOOP_L_N(f, COUNT(fanBit)) {
const uint8_t realFan = pgm_read_byte(&fanBit[f]);
if (TEST(fanDone, realFan)) continue;
const bool fan_on = TEST(fanState, realFan);
@@ -780,7 +757,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
//
inline void loud_kill(PGM_P const lcd_msg, const heater_ind_t heater) {
- Running = false;
+ marlin_state = MF_KILLED;
#if USE_BEEPER
for (uint8_t i = 20; i--;) {
WRITE(BEEPER_PIN, HIGH); delay(25);
@@ -802,12 +779,12 @@ void Temperature::_temp_error(const heater_ind_t heater, PGM_P const serial_msg,
) {
SERIAL_ERROR_START();
serialprintPGM(serial_msg);
- SERIAL_ECHOPGM(MSG_STOPPED_HEATER);
+ SERIAL_ECHOPGM(STR_STOPPED_HEATER);
if (heater >= 0) SERIAL_ECHO((int)heater);
#if HAS_HEATED_CHAMBER
- else if (heater == H_CHAMBER) SERIAL_ECHOPGM(MSG_HEATER_CHAMBER);
+ else if (heater == H_CHAMBER) SERIAL_ECHOPGM(STR_HEATER_CHAMBER);
#endif
- else SERIAL_ECHOPGM(MSG_HEATER_BED);
+ else SERIAL_ECHOPGM(STR_HEATER_BED);
SERIAL_EOL();
}
@@ -837,14 +814,17 @@ void Temperature::_temp_error(const heater_ind_t heater, PGM_P const serial_msg,
}
void Temperature::max_temp_error(const heater_ind_t heater) {
- _temp_error(heater, PSTR(MSG_T_MAXTEMP), GET_TEXT(MSG_ERR_MAXTEMP));
+ _temp_error(heater, PSTR(STR_T_MAXTEMP), GET_TEXT(MSG_ERR_MAXTEMP));
}
void Temperature::min_temp_error(const heater_ind_t heater) {
- _temp_error(heater, PSTR(MSG_T_MINTEMP), GET_TEXT(MSG_ERR_MINTEMP));
+ _temp_error(heater, PSTR(STR_T_MINTEMP), GET_TEXT(MSG_ERR_MINTEMP));
}
#if HOTENDS
+ #if ENABLED(PID_DEBUG)
+ extern bool PID_Debug_Flag;
+ #endif
float Temperature::get_pid_output_hotend(const uint8_t E_NAME) {
const uint8_t ee = HOTEND_INDEX;
@@ -926,24 +906,15 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
#endif // PID_OPENLOOP
#if ENABLED(PID_DEBUG)
- if (ee == active_extruder) {
+ if (ee == active_extruder && PID_Debug_Flag) {
SERIAL_ECHO_START();
- SERIAL_ECHOPAIR(
- MSG_PID_DEBUG, ee,
- MSG_PID_DEBUG_INPUT, temp_hotend[ee].celsius,
- MSG_PID_DEBUG_OUTPUT, pid_output
- );
+ SERIAL_ECHOPAIR(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output);
#if DISABLED(PID_OPENLOOP)
- {
- SERIAL_ECHOPAIR(
- MSG_PID_DEBUG_PTERM, work_pid[ee].Kp,
- MSG_PID_DEBUG_ITERM, work_pid[ee].Ki,
- MSG_PID_DEBUG_DTERM, work_pid[ee].Kd
+ SERIAL_ECHOPAIR( STR_PID_DEBUG_PTERM, work_pid[ee].Kp, STR_PID_DEBUG_ITERM, work_pid[ee].Ki, STR_PID_DEBUG_DTERM, work_pid[ee].Kd
#if ENABLED(PID_EXTRUSION_SCALING)
- , MSG_PID_DEBUG_CTERM, work_pid[ee].Kc
+ , STR_PID_DEBUG_CTERM, work_pid[ee].Kc
#endif
);
- }
#endif
SERIAL_EOL();
}
@@ -1016,9 +987,9 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
SERIAL_ECHOLNPAIR(
" PID_BED_DEBUG : Input ", temp_bed.celsius, " Output ", pid_output,
#if DISABLED(PID_OPENLOOP)
- MSG_PID_DEBUG_PTERM, work_pid.Kp,
- MSG_PID_DEBUG_ITERM, work_pid.Ki,
- MSG_PID_DEBUG_DTERM, work_pid.Kd,
+ STR_PID_DEBUG_PTERM, work_pid.Kp,
+ STR_PID_DEBUG_ITERM, work_pid.Ki,
+ STR_PID_DEBUG_DTERM, work_pid.Kd,
#endif
);
}
@@ -1045,15 +1016,11 @@ void Temperature::manage_heater() {
if (!inited) return watchdog_refresh();
#endif
- #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
- static bool last_pause_state;
- #endif
-
#if ENABLED(EMERGENCY_PARSER)
- if (emergency_parser.killed_by_M112) kill();
+ if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
#endif
- if (!temp_meas_ready) return;
+ if (!raw_temps_ready) return;
updateTemperaturesFromRawValues(); // also resets the watchdog
@@ -1074,7 +1041,7 @@ void Temperature::manage_heater() {
HOTEND_LOOP() {
#if ENABLED(THERMAL_PROTECTION_HOTENDS)
if (degHotend(e) > temp_range[e].maxtemp)
- _temp_error((heater_ind_t)e, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+ _temp_error((heater_ind_t)e, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
#endif
#if HEATER_IDLE_HANDLER
@@ -1090,10 +1057,10 @@ void Temperature::manage_heater() {
#if WATCH_HOTENDS
// Make sure temperature is increasing
- if (watch_hotend[e].next_ms && ELAPSED(ms, watch_hotend[e].next_ms)) { // Time to check this extruder?
- if (degHotend(e) < watch_hotend[e].target) // Failed to increase enough?
- _temp_error((heater_ind_t)e, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
- else // Start again if the target is still far off
+ if (watch_hotend[e].next_ms && ELAPSED(ms, watch_hotend[e].next_ms)) { // Time to check this extruder?
+ if (degHotend(e) < watch_hotend[e].target) // Failed to increase enough?
+ _temp_error((heater_ind_t)e, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
+ else // Start again if the target is still far off
start_watching_hotend(e);
}
#endif
@@ -1101,7 +1068,7 @@ void Temperature::manage_heater() {
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
// Make sure measured temperatures are close together
if (ABS(temp_hotend[0].celsius - redundant_temperature) > MAX_REDUNDANT_TEMP_SENSOR_DIFF)
- _temp_error(H_E0, PSTR(MSG_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
+ _temp_error(H_E0, PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
#endif
} // HOTEND_LOOP
@@ -1127,29 +1094,34 @@ void Temperature::manage_heater() {
#if ENABLED(THERMAL_PROTECTION_BED)
if (degBed() > BED_MAXTEMP)
- _temp_error(H_BED, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+ _temp_error(H_BED, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
#endif
#if WATCH_BED
// Make sure temperature is increasing
if (watch_bed.elapsed(ms)) { // Time to check the bed?
if (degBed() < watch_bed.target) // Failed to increase enough?
- _temp_error(H_BED, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
+ _temp_error(H_BED, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
else // Start again if the target is still far off
start_watching_bed();
}
#endif // WATCH_BED
+ #define PAUSE_CHANGE_REQD BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+ #if PAUSE_CHANGE_REQD
+ static bool last_pause_state;
+ #endif
+
do {
#if DISABLED(PIDTEMPBED)
if (PENDING(ms, next_bed_check_ms)
- #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+ #if PAUSE_CHANGE_REQD
&& paused == last_pause_state
#endif
) break;
next_bed_check_ms = ms + BED_CHECK_INTERVAL;
- #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+ #if PAUSE_CHANGE_REQD
last_pause_state = paused;
#endif
#endif
@@ -1205,14 +1177,14 @@ void Temperature::manage_heater() {
#if ENABLED(THERMAL_PROTECTION_CHAMBER)
if (degChamber() > CHAMBER_MAXTEMP)
- _temp_error(H_CHAMBER, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+ _temp_error(H_CHAMBER, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
#endif
#if WATCH_CHAMBER
// Make sure temperature is increasing
if (watch_chamber.elapsed(ms)) { // Time to check the chamber?
if (degChamber() < watch_chamber.target) // Failed to increase enough?
- _temp_error(H_CHAMBER, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
+ _temp_error(H_CHAMBER, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
else
start_watching_chamber(); // Start again if the target is still far off
}
@@ -1249,8 +1221,8 @@ void Temperature::manage_heater() {
UNUSED(ms);
}
-#define TEMP_AD595(RAW) ((RAW) * 5.0 * 100.0 / 1024.0 / (OVERSAMPLENR) * (TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET)
-#define TEMP_AD8495(RAW) ((RAW) * 6.6 * 100.0 / 1024.0 / (OVERSAMPLENR) * (TEMP_SENSOR_AD8495_GAIN) + TEMP_SENSOR_AD8495_OFFSET)
+#define TEMP_AD595(RAW) ((RAW) * 5.0 * 100.0 / float(HAL_ADC_RANGE) / (OVERSAMPLENR) * (TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET)
+#define TEMP_AD8495(RAW) ((RAW) * 6.6 * 100.0 / float(HAL_ADC_RANGE) / (OVERSAMPLENR) * (TEMP_SENSOR_AD8495_GAIN) + TEMP_SENSOR_AD8495_OFFSET)
/**
* Bisect search for the range of the 'raw' value, then interpolate
@@ -1326,7 +1298,7 @@ void Temperature::manage_heater() {
const user_thermistor_t &t = user_thermistor[t_index];
SERIAL_ECHOPAIR_F(" R", t.series_res, 1);
- SERIAL_ECHOPAIR_F(" T", t.res_25, 1);
+ SERIAL_ECHOPAIR_F_P(SP_T_STR, t.res_25, 1);
SERIAL_ECHOPAIR_F(" B", t.beta, 1);
SERIAL_ECHOPAIR_F(" C", t.sh_c_coeff, 9);
SERIAL_ECHOPGM(" ; ");
@@ -1424,7 +1396,7 @@ void Temperature::manage_heater() {
{
SERIAL_ERROR_START();
SERIAL_ECHO((int)e);
- SERIAL_ECHOLNPGM(MSG_INVALID_EXTRUDER_NUM);
+ SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER_NUM);
kill();
return 0;
}
@@ -1625,7 +1597,7 @@ void Temperature::updateTemperaturesFromRawValues() {
// Reset the watchdog on good temperature measurement
watchdog_refresh();
- temp_meas_ready = false;
+ raw_temps_ready = false;
}
#if MAX6675_SEPARATE_SPI
@@ -1677,10 +1649,9 @@ void Temperature::init() {
#endif
#if MB(RUMBA)
+ // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
#define _AD(N) ANY(HEATER_##N##_USES_AD595, HEATER_##N##_USES_AD8495)
- #if _AD(0) || _AD(1) || _AD(2) /* RUMBA has 3 E plugs // || _AD(3) || _AD(4) || _AD(5) || _AD(6) || _AD(7) */ \
- || _AD(BED) || _AD(CHAMBER)
- // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
+ #if _AD(0) || _AD(1) || _AD(2) || _AD(BED) || _AD(CHAMBER)
MCUCR = _BV(JTD);
MCUCR = _BV(JTD);
#endif
@@ -1974,12 +1945,7 @@ void Temperature::init() {
*/
void Temperature::start_watching_hotend(const uint8_t E_NAME) {
const uint8_t ee = HOTEND_INDEX;
- if (degTargetHotend(ee) && degHotend(ee) < degTargetHotend(ee) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) {
- watch_hotend[ee].target = degHotend(ee) + WATCH_TEMP_INCREASE;
- watch_hotend[ee].next_ms = millis() + (WATCH_TEMP_PERIOD) * 1000UL;
- }
- else
- watch_hotend[ee].next_ms = 0;
+ watch_hotend[ee].restart(degHotend(ee), degTargetHotend(ee));
}
#endif
@@ -1990,12 +1956,7 @@ void Temperature::init() {
* This is called when the temperature is set. (M140, M190)
*/
void Temperature::start_watching_bed() {
- if (degTargetBed() && degBed() < degTargetBed() - (WATCH_BED_TEMP_INCREASE + TEMP_BED_HYSTERESIS + 1)) {
- watch_bed.target = degBed() + WATCH_BED_TEMP_INCREASE;
- watch_bed.next_ms = millis() + (WATCH_BED_TEMP_PERIOD) * 1000UL;
- }
- else
- watch_bed.next_ms = 0;
+ watch_bed.restart(degBed(), degTargetBed());
}
#endif
@@ -2006,12 +1967,7 @@ void Temperature::init() {
* This is called when the temperature is set. (M141, M191)
*/
void Temperature::start_watching_chamber() {
- if (degChamber() < degTargetChamber() - (WATCH_CHAMBER_TEMP_INCREASE + TEMP_CHAMBER_HYSTERESIS + 1)) {
- watch_chamber.target = degChamber() + WATCH_CHAMBER_TEMP_INCREASE;
- watch_chamber.next_ms = millis() + (WATCH_CHAMBER_TEMP_PERIOD) * 1000UL;
- }
- else
- watch_chamber.next_ms = 0;
+ watch_chamber.restart(degChamber(), degTargetChamber());
}
#endif
@@ -2033,7 +1989,7 @@ void Temperature::init() {
/**
SERIAL_ECHO_START();
- SERIAL_ECHOPGM("Thermal Thermal Runaway Running. Heater ID: ");
+ SERIAL_ECHOPGM("Thermal Runaway Running. Heater ID: ");
if (heater_id == H_CHAMBER) SERIAL_ECHOPGM("chamber");
if (heater_id < 0) SERIAL_ECHOPGM("bed"); else SERIAL_ECHO(heater_id);
SERIAL_ECHOPAIR(" ; State:", sm.state, " ; Timer:", sm.timer, " ; Temperature:", current, " ; Target Temp:", target);
@@ -2102,7 +2058,7 @@ void Temperature::init() {
sm.state = TRRunaway;
case TRRunaway:
- _temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+ _temp_error(heater_id, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
}
}
@@ -2131,10 +2087,10 @@ void Temperature::disable_all_heaters() {
pause(false);
#endif
- #define DISABLE_HEATER(NR) { \
- setTargetHotend(0, NR); \
- temp_hotend[NR].soft_pwm_amount = 0; \
- WRITE_HEATER_ ##NR (LOW); \
+ #define DISABLE_HEATER(N) { \
+ setTargetHotend(0, N); \
+ temp_hotend[N].soft_pwm_amount = 0; \
+ WRITE_HEATER_##N(LOW); \
}
#if HAS_TEMP_HOTEND
@@ -2154,6 +2110,34 @@ void Temperature::disable_all_heaters() {
#endif
}
+#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
+
+ bool Temperature::over_autostart_threshold() {
+ #if HOTENDS
+ HOTEND_LOOP() if (degTargetHotend(e) > (EXTRUDE_MINTEMP) / 2) return true;
+ #endif
+ #if HAS_HEATED_BED
+ if (degTargetBed() > BED_MINTEMP) return true;
+ #endif
+ #if HAS_HEATED_CHAMBER
+ if (degTargetChamber() > CHAMBER_MINTEMP) return true;
+ #endif
+ return false;
+ }
+
+ void Temperature::check_timer_autostart(const bool can_start, const bool can_stop) {
+ if (over_autostart_threshold()) {
+ if (can_start) startOrResumeJob();
+ }
+ else if (can_stop) {
+ print_job_timer.stop();
+ ui.reset_status();
+ }
+ }
+
+#endif
+
+
#if ENABLED(PROBING_HEATERS_OFF)
void Temperature::pause(const bool p) {
@@ -2166,7 +2150,7 @@ void Temperature::disable_all_heaters() {
#endif
}
else {
- HOTEND_LOOP() reset_heater_idle_timer(e);
+ HOTEND_LOOP() reset_hotend_idle_timer(e);
#if HAS_HEATED_BED
reset_bed_idle_timer();
#endif
@@ -2304,9 +2288,9 @@ void Temperature::disable_all_heaters() {
#endif // HAS_MAX6675
/**
- * Get raw temperatures
+ * Update raw temperatures
*/
-void Temperature::set_current_temp_raw() {
+void Temperature::update_raw_temperatures() {
#if HAS_TEMP_ADC_0 && DISABLED(HEATER_0_USES_MAX6675)
temp_hotend[0].update();
@@ -2318,25 +2302,26 @@ void Temperature::set_current_temp_raw() {
#elif DISABLED(HEATER_1_USES_MAX6675)
temp_hotend[1].update();
#endif
- #if HAS_TEMP_ADC_2
- temp_hotend[2].update();
- #if HAS_TEMP_ADC_3
- temp_hotend[3].update();
- #if HAS_TEMP_ADC_4
- temp_hotend[4].update();
- #if HAS_TEMP_ADC_5
- temp_hotend[5].update();
- #if HAS_TEMP_ADC_6
- temp_hotend[6].update();
- #if HAS_TEMP_ADC_7
- temp_hotend[7].update();
- #endif // HAS_TEMP_ADC_7
- #endif // HAS_TEMP_ADC_6
- #endif // HAS_TEMP_ADC_5
- #endif // HAS_TEMP_ADC_4
- #endif // HAS_TEMP_ADC_3
- #endif // HAS_TEMP_ADC_2
- #endif // HAS_TEMP_ADC_1
+ #endif
+
+ #if HAS_TEMP_ADC_2
+ temp_hotend[2].update();
+ #endif
+ #if HAS_TEMP_ADC_3
+ temp_hotend[3].update();
+ #endif
+ #if HAS_TEMP_ADC_4
+ temp_hotend[4].update();
+ #endif
+ #if HAS_TEMP_ADC_5
+ temp_hotend[5].update();
+ #endif
+ #if HAS_TEMP_ADC_6
+ temp_hotend[6].update();
+ #endif
+ #if HAS_TEMP_ADC_7
+ temp_hotend[7].update();
+ #endif
#if HAS_HEATED_BED
temp_bed.update();
@@ -2360,13 +2345,13 @@ void Temperature::set_current_temp_raw() {
joystick.z.update();
#endif
- temp_meas_ready = true;
+ raw_temps_ready = true;
}
void Temperature::readings_ready() {
// Update the raw values if they've been read. Else we could be updating them during reading.
- if (!temp_meas_ready) set_current_temp_raw();
+ if (!raw_temps_ready) update_raw_temperatures();
// Filament Sensor - can be read any time since IIR filtering is used
#if ENABLED(FILAMENT_WIDTH_SENSOR)
@@ -2423,7 +2408,7 @@ void Temperature::readings_ready() {
#endif // HOTENDS > 1
};
- for (uint8_t e = 0; e < COUNT(temp_dir); e++) {
+ LOOP_L_N(e, COUNT(temp_dir)) {
const int8_t tdir = temp_dir[e];
if (tdir) {
const int16_t rawtemp = temp_hotend[e].raw * tdir; // normal direction, +rawtemp, else -rawtemp
@@ -2594,10 +2579,10 @@ void Temperature::tick() {
#endif
#if ENABLED(FAN_SOFT_PWM)
- #define _FAN_PWM(N) do{ \
- uint8_t &spcf = soft_pwm_count_fan[N]; \
+ #define _FAN_PWM(N) do{ \
+ uint8_t &spcf = soft_pwm_count_fan[N]; \
spcf = (spcf & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
- WRITE_FAN(N, spcf > pwm_mask ? HIGH : LOW); \
+ WRITE_FAN(N, spcf > pwm_mask ? HIGH : LOW); \
}while(0)
#if HAS_FAN0
_FAN_PWM(0);
@@ -2962,7 +2947,7 @@ void Temperature::tick() {
// Additional ~1KHz Tasks
//
- #if ENABLED(BABYSTEPPING)
+ #if ENABLED(BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
babystep.task();
#endif
@@ -3363,6 +3348,15 @@ void Temperature::tick() {
return wait_for_heatup;
}
+ void Temperature::wait_for_bed_heating() {
+ if (isHeatingBed()) {
+ SERIAL_ECHOLNPGM("Wait for bed heating...");
+ LCD_MESSAGEPGM(MSG_BED_HEATING);
+ wait_for_bed();
+ ui.reset_status();
+ }
+ }
+
#endif // HAS_HEATED_BED
#if HAS_HEATED_CHAMBER
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 0bf67ed41b..24e0054496 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -74,8 +74,6 @@ hotend_pid_t;
typedef IF<(LPQ_MAX_LEN > 255), uint16_t, uint8_t>::type lpq_ptr_t;
#endif
-#define DUMMY_PID_VALUE 3000.0f
-
#if ENABLED(PIDTEMP)
#define _PID_Kp(H) Temperature::temp_hotend[H].pid.Kp
#define _PID_Ki(H) Temperature::temp_hotend[H].pid.Ki
@@ -92,9 +90,9 @@ hotend_pid_t;
#define _PID_Kf(H) 0
#endif
#else
- #define _PID_Kp(H) DUMMY_PID_VALUE
- #define _PID_Ki(H) DUMMY_PID_VALUE
- #define _PID_Kd(H) DUMMY_PID_VALUE
+ #define _PID_Kp(H) NAN
+ #define _PID_Ki(H) NAN
+ #define _PID_Kd(H) NAN
#define _PID_Kc(H) 1
#endif
@@ -228,15 +226,38 @@ typedef struct {
inline void start(const millis_t &ms) { timeout_ms = millis() + ms; timed_out = false; }
inline void reset() { timeout_ms = 0; timed_out = false; }
inline void expire() { start(0); }
-} heater_idle_t;
+} hotend_idle_t;
// Heater watch handling
-typedef struct {
+template
+struct HeaterWatch {
uint16_t target;
millis_t next_ms;
inline bool elapsed(const millis_t &ms) { return next_ms && ELAPSED(ms, next_ms); }
inline bool elapsed() { return elapsed(millis()); }
-} heater_watch_t;
+
+ inline void restart(const int16_t curr, const int16_t tgt) {
+ if (tgt) {
+ const int16_t newtarget = curr + INCREASE;
+ if (newtarget < tgt - HYSTERESIS - 1) {
+ target = newtarget;
+ next_ms = millis() + PERIOD * 1000UL;
+ return;
+ }
+ }
+ next_ms = 0;
+ }
+};
+
+#if WATCH_HOTENDS
+ typedef struct HeaterWatch hotend_watch_t;
+#endif
+#if WATCH_BED
+ typedef struct HeaterWatch bed_watch_t;
+#endif
+#if WATCH_CHAMBER
+ typedef struct HeaterWatch chamber_watch_t;
+#endif
// Temperature sensor read value ranges
typedef struct { int16_t raw_min, raw_max; } raw_range_t;
@@ -345,12 +366,12 @@ class Temperature {
FORCE_INLINE static bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); }
#if HEATER_IDLE_HANDLER
- static heater_idle_t hotend_idle[HOTENDS];
+ static hotend_idle_t hotend_idle[HOTENDS];
#if HAS_HEATED_BED
- static heater_idle_t bed_idle;
+ static hotend_idle_t bed_idle;
#endif
#if HAS_HEATED_CHAMBER
- static heater_idle_t chamber_idle;
+ static hotend_idle_t chamber_idle;
#endif
#endif
@@ -360,10 +381,10 @@ class Temperature {
static bool inited; // If temperature controller is running
#endif
- static volatile bool temp_meas_ready;
+ static volatile bool raw_temps_ready;
#if WATCH_HOTENDS
- static heater_watch_t watch_hotend[HOTENDS];
+ static hotend_watch_t watch_hotend[HOTENDS];
#endif
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
@@ -382,7 +403,7 @@ class Temperature {
#if HAS_HEATED_BED
#if WATCH_BED
- static heater_watch_t watch_bed;
+ static bed_watch_t watch_bed;
#endif
#if DISABLED(PIDTEMPBED)
static millis_t next_bed_check_ms;
@@ -397,7 +418,7 @@ class Temperature {
#if HAS_HEATED_CHAMBER
#if WATCH_CHAMBER
- static heater_watch_t watch_chamber;
+ static chamber_watch_t watch_chamber;
#endif
static millis_t next_chamber_check_ms;
#ifdef CHAMBER_MINTEMP
@@ -678,6 +699,8 @@ class Temperature {
#endif
);
+ static void wait_for_bed_heating();
+
#endif // HAS_HEATED_BED
#if HAS_TEMP_PROBE
@@ -736,6 +759,14 @@ class Temperature {
*/
static void disable_all_heaters();
+ #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
+ /**
+ * Methods to check if heaters are enabled, indicating an active job
+ */
+ static bool over_autostart_threshold();
+ static void check_timer_autostart(const bool can_start, const bool can_stop);
+ #endif
+
/**
* Perform auto-tuning for hotend or bed in response to M303
*/
@@ -768,7 +799,7 @@ class Temperature {
#if HEATER_IDLE_HANDLER
- static void reset_heater_idle_timer(const uint8_t E_NAME) {
+ static void reset_hotend_idle_timer(const uint8_t E_NAME) {
hotend_idle[HOTEND_INDEX].reset();
start_watching_hotend(HOTEND_INDEX);
}
@@ -805,7 +836,7 @@ class Temperature {
#endif
private:
- static void set_current_temp_raw();
+ static void update_raw_temperatures();
static void updateTemperaturesFromRawValues();
#define HAS_MAX6675 EITHER(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675)
diff --git a/Marlin/src/module/thermistor/thermistor_1.h b/Marlin/src/module/thermistor/thermistor_1.h
index f2eb078081..f3226da475 100644
--- a/Marlin/src/module/thermistor/thermistor_1.h
+++ b/Marlin/src/module/thermistor/thermistor_1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_10.h b/Marlin/src/module/thermistor/thermistor_10.h
index 0ef9d9d635..9e89eab84a 100644
--- a/Marlin/src/module/thermistor/thermistor_10.h
+++ b/Marlin/src/module/thermistor/thermistor_10.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_1010.h b/Marlin/src/module/thermistor/thermistor_1010.h
index ab2b1fb443..200d9aed56 100644
--- a/Marlin/src/module/thermistor/thermistor_1010.h
+++ b/Marlin/src/module/thermistor/thermistor_1010.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_1047.h b/Marlin/src/module/thermistor/thermistor_1047.h
index 8010d8ebc1..af41a20a10 100644
--- a/Marlin/src/module/thermistor/thermistor_1047.h
+++ b/Marlin/src/module/thermistor/thermistor_1047.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_11.h b/Marlin/src/module/thermistor/thermistor_11.h
index f9a9524a15..1b2da4a71a 100644
--- a/Marlin/src/module/thermistor/thermistor_11.h
+++ b/Marlin/src/module/thermistor/thermistor_11.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_110.h b/Marlin/src/module/thermistor/thermistor_110.h
index a55a193611..fe8f4fbb80 100644
--- a/Marlin/src/module/thermistor/thermistor_110.h
+++ b/Marlin/src/module/thermistor/thermistor_110.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_12.h b/Marlin/src/module/thermistor/thermistor_12.h
index 9210bf9131..f9e994a959 100644
--- a/Marlin/src/module/thermistor/thermistor_12.h
+++ b/Marlin/src/module/thermistor/thermistor_12.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_13.h b/Marlin/src/module/thermistor/thermistor_13.h
index 703ec74159..44c5243c1f 100644
--- a/Marlin/src/module/thermistor/thermistor_13.h
+++ b/Marlin/src/module/thermistor/thermistor_13.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_147.h b/Marlin/src/module/thermistor/thermistor_147.h
index b020103a38..8fead6c429 100644
--- a/Marlin/src/module/thermistor/thermistor_147.h
+++ b/Marlin/src/module/thermistor/thermistor_147.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_15.h b/Marlin/src/module/thermistor/thermistor_15.h
index aab32c05c0..85602abb3a 100644
--- a/Marlin/src/module/thermistor/thermistor_15.h
+++ b/Marlin/src/module/thermistor/thermistor_15.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_18.h b/Marlin/src/module/thermistor/thermistor_18.h
index 46f1be452a..f6a3edec49 100644
--- a/Marlin/src/module/thermistor/thermistor_18.h
+++ b/Marlin/src/module/thermistor/thermistor_18.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_2.h b/Marlin/src/module/thermistor/thermistor_2.h
index 4a59e8d818..f3fe470603 100644
--- a/Marlin/src/module/thermistor/thermistor_2.h
+++ b/Marlin/src/module/thermistor/thermistor_2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_20.h b/Marlin/src/module/thermistor/thermistor_20.h
index 44c6a946c9..49b212da50 100644
--- a/Marlin/src/module/thermistor/thermistor_20.h
+++ b/Marlin/src/module/thermistor/thermistor_20.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_201.h b/Marlin/src/module/thermistor/thermistor_201.h
index 21f0e92a41..d92f957561 100644
--- a/Marlin/src/module/thermistor/thermistor_201.h
+++ b/Marlin/src/module/thermistor/thermistor_201.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_202.h b/Marlin/src/module/thermistor/thermistor_202.h
new file mode 100644
index 0000000000..9da3d45f45
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_202.h
@@ -0,0 +1,69 @@
+//
+// Unknown 200K thermistor on a Copymaster 3D hotend
+// Temptable sent from dealer technologyoutlet.co.uk
+//
+
+const short temptable_202[][2] PROGMEM = {
+ { OV( 1), 864 },
+ { OV( 35), 300 },
+ { OV( 38), 295 },
+ { OV( 41), 290 },
+ { OV( 44), 285 },
+ { OV( 47), 280 },
+ { OV( 51), 275 },
+ { OV( 55), 270 },
+ { OV( 60), 265 },
+ { OV( 65), 260 },
+ { OV( 70), 255 },
+ { OV( 76), 250 },
+ { OV( 83), 245 },
+ { OV( 90), 240 },
+ { OV( 98), 235 },
+ { OV( 107), 230 },
+ { OV( 116), 225 },
+ { OV( 127), 220 },
+ { OV( 138), 215 },
+ { OV( 151), 210 },
+ { OV( 164), 205 },
+ { OV( 179), 200 },
+ { OV( 195), 195 },
+ { OV( 213), 190 },
+ { OV( 232), 185 },
+ { OV( 253), 180 },
+ { OV( 275), 175 },
+ { OV( 299), 170 },
+ { OV( 325), 165 },
+ { OV( 352), 160 },
+ { OV( 381), 155 },
+ { OV( 411), 150 },
+ { OV( 443), 145 },
+ { OV( 476), 140 },
+ { OV( 511), 135 },
+ { OV( 546), 130 },
+ { OV( 581), 125 },
+ { OV( 617), 120 },
+ { OV( 652), 115 },
+ { OV( 687), 110 },
+ { OV( 720), 105 },
+ { OV( 753), 100 },
+ { OV( 783), 95 },
+ { OV( 812), 90 },
+ { OV( 839), 85 },
+ { OV( 864), 80 },
+ { OV( 886), 75 },
+ { OV( 906), 70 },
+ { OV( 924), 65 },
+ { OV( 940), 60 },
+ { OV( 954), 55 },
+ { OV( 966), 50 },
+ { OV( 976), 45 },
+ { OV( 985), 40 },
+ { OV( 992), 35 },
+ { OV( 998), 30 },
+ { OV(1003), 25 },
+ { OV(1007), 20 },
+ { OV(1011), 15 },
+ { OV(1014), 10 },
+ { OV(1016), 5 },
+ { OV(1018), 0 }
+};
diff --git a/Marlin/src/module/thermistor/thermistor_21.h b/Marlin/src/module/thermistor/thermistor_21.h
new file mode 100644
index 0000000000..655f56685d
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_21.h
@@ -0,0 +1,77 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#define REVERSE_TEMP_SENSOR_RANGE
+
+#undef OV_SCALE
+#define OV_SCALE(N) (float((N) * 5) / 3.3f)
+
+// Pt100 with INA826 amp with 3.3v excitation based on "Pt100 with INA826 amp on Ultimaker v2.0 electronics"
+const short temptable_21[][2] PROGMEM = {
+ { OV( 0), 0 },
+ { OV(227), 1 },
+ { OV(236), 10 },
+ { OV(245), 20 },
+ { OV(253), 30 },
+ { OV(262), 40 },
+ { OV(270), 50 },
+ { OV(279), 60 },
+ { OV(287), 70 },
+ { OV(295), 80 },
+ { OV(304), 90 },
+ { OV(312), 100 },
+ { OV(320), 110 },
+ { OV(329), 120 },
+ { OV(337), 130 },
+ { OV(345), 140 },
+ { OV(353), 150 },
+ { OV(361), 160 },
+ { OV(369), 170 },
+ { OV(377), 180 },
+ { OV(385), 190 },
+ { OV(393), 200 },
+ { OV(401), 210 },
+ { OV(409), 220 },
+ { OV(417), 230 },
+ { OV(424), 240 },
+ { OV(432), 250 },
+ { OV(440), 260 },
+ { OV(447), 270 },
+ { OV(455), 280 },
+ { OV(463), 290 },
+ { OV(470), 300 },
+ { OV(478), 310 },
+ { OV(485), 320 },
+ { OV(493), 330 },
+ { OV(500), 340 },
+ { OV(507), 350 },
+ { OV(515), 360 },
+ { OV(522), 370 },
+ { OV(529), 380 },
+ { OV(537), 390 },
+ { OV(544), 400 },
+ { OV(614), 500 }
+};
+
+#undef OV_SCALE
+#define OV_SCALE(N) (N)
diff --git a/Marlin/src/module/thermistor/thermistor_3.h b/Marlin/src/module/thermistor/thermistor_3.h
index bccfcb04c1..e37c2ace7b 100644
--- a/Marlin/src/module/thermistor/thermistor_3.h
+++ b/Marlin/src/module/thermistor/thermistor_3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_331.h b/Marlin/src/module/thermistor/thermistor_331.h
index 8f98d07523..434492d7e7 100644
--- a/Marlin/src/module/thermistor/thermistor_331.h
+++ b/Marlin/src/module/thermistor/thermistor_331.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_332.h b/Marlin/src/module/thermistor/thermistor_332.h
index 85ca169a1e..3112751b95 100644
--- a/Marlin/src/module/thermistor/thermistor_332.h
+++ b/Marlin/src/module/thermistor/thermistor_332.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_4.h b/Marlin/src/module/thermistor/thermistor_4.h
index 46462ba566..00e0d9ed97 100644
--- a/Marlin/src/module/thermistor/thermistor_4.h
+++ b/Marlin/src/module/thermistor/thermistor_4.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_5.h b/Marlin/src/module/thermistor/thermistor_5.h
index 0d3905ac1c..8f414de15e 100644
--- a/Marlin/src/module/thermistor/thermistor_5.h
+++ b/Marlin/src/module/thermistor/thermistor_5.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_501.h b/Marlin/src/module/thermistor/thermistor_501.h
index cb178321aa..3db433644e 100644
--- a/Marlin/src/module/thermistor/thermistor_501.h
+++ b/Marlin/src/module/thermistor/thermistor_501.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_51.h b/Marlin/src/module/thermistor/thermistor_51.h
index 93306d0f81..f314777a52 100644
--- a/Marlin/src/module/thermistor/thermistor_51.h
+++ b/Marlin/src/module/thermistor/thermistor_51.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_512.h b/Marlin/src/module/thermistor/thermistor_512.h
index aa9e9e57f9..5528e56b97 100644
--- a/Marlin/src/module/thermistor/thermistor_512.h
+++ b/Marlin/src/module/thermistor/thermistor_512.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_52.h b/Marlin/src/module/thermistor/thermistor_52.h
index 0e2b028e45..9a54ef4b6f 100644
--- a/Marlin/src/module/thermistor/thermistor_52.h
+++ b/Marlin/src/module/thermistor/thermistor_52.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_55.h b/Marlin/src/module/thermistor/thermistor_55.h
index b9a462eab3..ead481e865 100644
--- a/Marlin/src/module/thermistor/thermistor_55.h
+++ b/Marlin/src/module/thermistor/thermistor_55.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_6.h b/Marlin/src/module/thermistor/thermistor_6.h
index a3e6e69f85..f84c64413c 100644
--- a/Marlin/src/module/thermistor/thermistor_6.h
+++ b/Marlin/src/module/thermistor/thermistor_6.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_60.h b/Marlin/src/module/thermistor/thermistor_60.h
index 78939bfb44..167e0edcf8 100644
--- a/Marlin/src/module/thermistor/thermistor_60.h
+++ b/Marlin/src/module/thermistor/thermistor_60.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_61.h b/Marlin/src/module/thermistor/thermistor_61.h
index 3619947117..5f8171a1d4 100644
--- a/Marlin/src/module/thermistor/thermistor_61.h
+++ b/Marlin/src/module/thermistor/thermistor_61.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_66.h b/Marlin/src/module/thermistor/thermistor_66.h
index c8669c49fc..97f0823486 100644
--- a/Marlin/src/module/thermistor/thermistor_66.h
+++ b/Marlin/src/module/thermistor/thermistor_66.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_666.h b/Marlin/src/module/thermistor/thermistor_666.h
index 3b8c68b88d..ab8b0380f1 100644
--- a/Marlin/src/module/thermistor/thermistor_666.h
+++ b/Marlin/src/module/thermistor/thermistor_666.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_67.h b/Marlin/src/module/thermistor/thermistor_67.h
index 9e86811123..5af203c8ab 100644
--- a/Marlin/src/module/thermistor/thermistor_67.h
+++ b/Marlin/src/module/thermistor/thermistor_67.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_7.h b/Marlin/src/module/thermistor/thermistor_7.h
index 609317d492..e791d0c333 100644
--- a/Marlin/src/module/thermistor/thermistor_7.h
+++ b/Marlin/src/module/thermistor/thermistor_7.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_70.h b/Marlin/src/module/thermistor/thermistor_70.h
index f05f066bea..b498041069 100644
--- a/Marlin/src/module/thermistor/thermistor_70.h
+++ b/Marlin/src/module/thermistor/thermistor_70.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_71.h b/Marlin/src/module/thermistor/thermistor_71.h
index 0198f326ed..c3a9193b79 100644
--- a/Marlin/src/module/thermistor/thermistor_71.h
+++ b/Marlin/src/module/thermistor/thermistor_71.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_75.h b/Marlin/src/module/thermistor/thermistor_75.h
index fcc4c60375..3a3cdc6364 100644
--- a/Marlin/src/module/thermistor/thermistor_75.h
+++ b/Marlin/src/module/thermistor/thermistor_75.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_8.h b/Marlin/src/module/thermistor/thermistor_8.h
index 8cb9f3aaaa..f6e407a730 100644
--- a/Marlin/src/module/thermistor/thermistor_8.h
+++ b/Marlin/src/module/thermistor/thermistor_8.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_9.h b/Marlin/src/module/thermistor/thermistor_9.h
index 44274106b0..5023fbe1d0 100644
--- a/Marlin/src/module/thermistor/thermistor_9.h
+++ b/Marlin/src/module/thermistor/thermistor_9.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_99.h b/Marlin/src/module/thermistor/thermistor_99.h
index b6183e54e4..045a42b738 100644
--- a/Marlin/src/module/thermistor/thermistor_99.h
+++ b/Marlin/src/module/thermistor/thermistor_99.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_998.h b/Marlin/src/module/thermistor/thermistor_998.h
index 74d0e6e38c..6f631d4b9a 100644
--- a/Marlin/src/module/thermistor/thermistor_998.h
+++ b/Marlin/src/module/thermistor/thermistor_998.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_999.h b/Marlin/src/module/thermistor/thermistor_999.h
index 9d5818bc76..d750d5597c 100644
--- a/Marlin/src/module/thermistor/thermistor_999.h
+++ b/Marlin/src/module/thermistor/thermistor_999.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 875f742ccb..8ac9f11a55 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,8 @@
#error "MAX_RAW_THERMISTOR_VALUE is too large for int16_t. Reduce OVERSAMPLENR or HAL_ADC_RESOLUTION."
#endif
-#define OV(N) int16_t((N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
+#define OV_SCALE(N) (N)
+#define OV(N) int16_t(OV_SCALE(N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
#define ANY_THERMISTOR_IS(n) (THERMISTOR_HEATER_0 == n || THERMISTOR_HEATER_1 == n || THERMISTOR_HEATER_2 == n || THERMISTOR_HEATER_3 == n || THERMISTOR_HEATER_4 == n || THERMISTOR_HEATER_5 == n || THERMISTOR_HEATER_6 == n || THERMISTOR_HEATER_7 == n || THERMISTORBED == n || THERMISTORCHAMBER == n || THERMISTORPROBE == n)
@@ -105,6 +106,9 @@
#if ANY_THERMISTOR_IS(20) // Pt100 with INA826 amp on Ultimaker v2.0 electronics
#include "thermistor_20.h"
#endif
+#if ANY_THERMISTOR_IS(21) // Pt100 with INA826 amp with 3.3v excitation based on "Pt100 with INA826 amp on Ultimaker v2.0 electronics"
+ #include "thermistor_21.h"
+#endif
#if ANY_THERMISTOR_IS(51) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 1 kOhm, "EPCOS"
#include "thermistor_51.h"
#endif
@@ -147,6 +151,9 @@
#if ANY_THERMISTOR_IS(201) // Pt100 with LMV324 Overlord
#include "thermistor_201.h"
#endif
+#if ANY_THERMISTOR_IS(202) // 200K thermistor in Copymaker3D hotend
+ #include "thermistor_202.h"
+#endif
#if ANY_THERMISTOR_IS(331) // Like table 1, but with 3V3 as input voltage for MEGA
#include "thermistor_331.h"
#endif
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 7acc27e7e7..498b2cdcd3 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -45,8 +45,8 @@
#endif
#endif
-#if ENABLED(MAGNETIC_PARKING_EXTRUDER) || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
- #include "../gcode/gcode.h" // for dwell()
+#if ENABLED(MAGNETIC_PARKING_EXTRUDER) || defined(EVENT_GCODE_AFTER_TOOLCHANGE) || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
+ #include "../gcode/gcode.h"
#endif
#if ANY(SWITCHING_EXTRUDER, SWITCHING_NOZZLE, SWITCHING_TOOLHEAD)
@@ -74,7 +74,7 @@
#endif
#if ENABLED(PRUSA_MMU2)
- #include "../feature/prusa_MMU2/mmu2.h"
+ #include "../feature/mmu2/mmu2.h"
#endif
#if HAS_LCD_MENU
@@ -251,7 +251,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
#elif ENABLED(PARKING_EXTRUDER)
void pe_solenoid_init() {
- for (uint8_t n = 0; n <= 1; ++n)
+ LOOP_LE_N(n, 1)
#if ENABLED(PARKING_EXTRUDER_SOLENOIDS_INVERT)
pe_activate_solenoid(n);
#else
@@ -368,11 +368,16 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
#if ENABLED(SWITCHING_TOOLHEAD)
+ inline void swt_lock(const bool locked=true) {
+ const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
+ MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, swt_angles[locked ? 0 : 1]);
+ }
+
+ void swt_init() { swt_lock(); }
+
inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
if (no_move) return;
- constexpr uint16_t angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
-
constexpr float toolheadposx[] = SWITCHING_TOOLHEAD_X_POS;
const float placexpos = toolheadposx[active_extruder],
grabxpos = toolheadposx[new_tool];
@@ -406,7 +411,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
planner.synchronize();
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("(2) Unlock and Place Toolhead");
- MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, angles[1]);
+ swt_lock(false);
safe_delay(500);
current_position.y = SWITCHING_TOOLHEAD_Y_POS;
@@ -451,7 +456,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
// Wait for move to finish, pause 0.2s, move servo, pause 0.5s
planner.synchronize();
safe_delay(200);
- MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, angles[0]);
+ swt_lock();
safe_delay(500);
current_position.y -= SWITCHING_TOOLHEAD_Y_CLEAR;
@@ -700,7 +705,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
inline void invalid_extruder_error(const uint8_t e) {
SERIAL_ECHO_START();
SERIAL_CHAR('T'); SERIAL_ECHO(int(e));
- SERIAL_CHAR(' '); SERIAL_ECHOLNPGM(MSG_INVALID_EXTRUDER);
+ SERIAL_CHAR(' '); SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER);
}
#endif
@@ -816,14 +821,13 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
if (new_tool >= EXTRUDERS)
return invalid_extruder_error(new_tool);
- if (!no_move && !all_axes_homed()) {
+ if (!no_move && homing_needed()) {
no_move = true;
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)");
}
#if HAS_LCD_MENU
- if(!no_move)
- ui.return_to_status();
+ if (!no_move) ui.return_to_status();
#endif
#if ENABLED(DUAL_X_CARRIAGE)
@@ -844,7 +848,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#endif
if (should_swap) {
if (too_cold) {
- SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
+ SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
#if ENABLED(SINGLENOZZLE)
active_extruder = new_tool;
return;
@@ -852,7 +856,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
}
else {
#if ENABLED(ADVANCED_PAUSE_FEATURE)
- do_pause_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
+ unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
#else
current_position.e -= toolchange_settings.swap_length / planner.e_factor[old_tool];
planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.retract_speed), old_tool);
@@ -862,7 +866,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
}
#endif // TOOLCHANGE_FILAMENT_SWAP
- #if HAS_LEVELING
+ #if HAS_LEVELING && DISABLED(SINGLENOZZLE)
// Set current position to the physical position
TEMPORARY_BED_LEVELING_STATE(false);
#endif
@@ -987,8 +991,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
if (should_swap && !too_cold) {
#if ENABLED(ADVANCED_PAUSE_FEATURE)
- do_pause_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed));
- do_pause_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE);
+ unscaled_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed));
+ unscaled_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE);
#else
current_position.e += toolchange_settings.swap_length / planner.e_factor[new_tool];
planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.prime_speed), new_tool);
@@ -1069,11 +1073,16 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#endif
#ifdef EVENT_GCODE_AFTER_TOOLCHANGE
- gcode.process_subcommands_now_P(EVENT_GCODE_AFTER_TOOLCHANGE);
+ if (!no_move
+ #if ENABLED(DUAL_X_CARRIAGE)
+ && dual_x_carriage_mode == DXC_AUTO_PARK_MODE
+ #endif
+ )
+ gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE));
#endif
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, int(active_extruder));
+ SERIAL_ECHOLNPAIR(STR_ACTIVE_EXTRUDER, int(active_extruder));
#endif // EXTRUDERS > 1
}
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index 613cb1612c..17c173d052 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -97,6 +97,10 @@
void est_init();
#endif
+#if ENABLED(SWITCHING_TOOLHEAD)
+ void swt_init();
+#endif
+
/**
* Perform a tool-change, which may result in moving the
* previous tool out of the way and the new tool into place.
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
new file mode 100644
index 0000000000..829c391c4d
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -0,0 +1,90 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * E4d@Box pin assignments
+ * E4d@Box is a small factor 3D printer control board based on the ESP32 microcontroller for Laser, CNC and 3d printers
+ * for more info check http://atbox.tech/ and join to Facebook page E4d@box.
+ */
+
+#ifndef ARDUINO_ARCH_ESP32
+ #error "Oops! Select an ESP32 board in 'Tools > Board.'"
+#elif EXTRUDERS > 1 || E_STEPPERS > 1
+ #error "E4d@box only supports one E Stepper. Comment out this line to continue."
+#elif HOTENDS > 2
+ #error "E4d@box currently supports only one hotend. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "E4D@BOX"
+#define BOARD_WEBSITE_URL "github.com/Exilaus/E4d@box"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN 34
+#define Y_MIN_PIN 35
+#define Z_MIN_PIN 16 // 15
+
+//
+// Steppers
+//
+#define X_STEP_PIN 12 // 34//27
+#define X_DIR_PIN 13 // 35//26
+#define X_ENABLE_PIN 17 // 0//17//25 // used free pin
+//#define X_CS_PIN 0
+
+#define Y_STEP_PIN 32 // 33
+#define Y_DIR_PIN 33 // 32
+#define Y_ENABLE_PIN X_ENABLE_PIN
+//#define Y_CS_PIN 13
+
+#define Z_STEP_PIN 25 // 14
+#define Z_DIR_PIN 26 // 12
+#define Z_ENABLE_PIN X_ENABLE_PIN
+//#define Z_CS_PIN 5 // SS_PIN
+
+#define E0_STEP_PIN 27 // 16
+#define E0_DIR_PIN 14 // 17
+#define E0_ENABLE_PIN X_ENABLE_PIN
+//#define E0_CS_PIN 21
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 36 // Analog Input
+#define TEMP_BED_PIN 39 // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN 2 // 4//2//(D8)
+#define FAN_PIN 0 // 2//15//13 (D9)
+#define HEATER_BED_PIN 15 // 15//0 //(D10)
+
+// SPI
+#define SDSS 5
+#define I2S_STEPPER_STREAM
+#define I2S_WS 23
+#define I2S_BCK 22
+#define I2S_DATA 21
diff --git a/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin/src/pins/esp32/pins_ESP32.h
index 0831746f0d..e4da400528 100644
--- a/Marlin/src/pins/esp32/pins_ESP32.h
+++ b/Marlin/src/pins/esp32/pins_ESP32.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,52 +35,52 @@
// I2S (steppers & other output-only pins)
//
#define I2S_STEPPER_STREAM
-#define I2S_WS 25
-#define I2S_BCK 26
-#define I2S_DATA 27
+#define I2S_WS 25
+#define I2S_BCK 26
+#define I2S_DATA 27
//
// Limit Switches
//
-#define X_MIN_PIN 34
-#define Y_MIN_PIN 35
-#define Z_MIN_PIN 15
+#define X_MIN_PIN 34
+#define Y_MIN_PIN 35
+#define Z_MIN_PIN 15
//
// Steppers
//
-#define X_STEP_PIN 128
-#define X_DIR_PIN 129
-#define X_ENABLE_PIN 130
-//#define X_CS_PIN 0
+#define X_STEP_PIN 128
+#define X_DIR_PIN 129
+#define X_ENABLE_PIN 130
+//#define X_CS_PIN 0
-#define Y_STEP_PIN 131
-#define Y_DIR_PIN 132
-#define Y_ENABLE_PIN 133
-//#define Y_CS_PIN 13
+#define Y_STEP_PIN 131
+#define Y_DIR_PIN 132
+#define Y_ENABLE_PIN 133
+//#define Y_CS_PIN 13
-#define Z_STEP_PIN 134
-#define Z_DIR_PIN 135
-#define Z_ENABLE_PIN 136
-//#define Z_CS_PIN 5 // SS_PIN
+#define Z_STEP_PIN 134
+#define Z_DIR_PIN 135
+#define Z_ENABLE_PIN 136
+//#define Z_CS_PIN 5 // SS_PIN
-#define E0_STEP_PIN 137
-#define E0_DIR_PIN 138
-#define E0_ENABLE_PIN 139
-//#define E0_CS_PIN 21
+#define E0_STEP_PIN 137
+#define E0_DIR_PIN 138
+#define E0_ENABLE_PIN 139
+//#define E0_CS_PIN 21
//
// Temperature Sensors
//
-#define TEMP_0_PIN 36 // Analog Input
-#define TEMP_BED_PIN 39 // Analog Input
+#define TEMP_0_PIN 36 // Analog Input
+#define TEMP_BED_PIN 39 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define FAN_PIN 13
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+#define FAN_PIN 13
+#define HEATER_BED_PIN 4
// SPI
-#define SDSS 5
+#define SDSS 5
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index 1a7967d579..8a06f9a169 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -45,59 +45,66 @@
#ifdef I2S_STEPPER_STREAM
#undef I2S_STEPPER_STREAM
#endif
-#define I2S_WS -1
-#define I2S_BCK -1
-#define I2S_DATA -1
+#define I2S_WS -1
+#define I2S_BCK -1
+#define I2S_DATA -1
//
// Limit Switches
//
-#define X_STOP_PIN 34
-#define Y_STOP_PIN 35
-#define Z_STOP_PIN 15
+#define X_STOP_PIN 34
+#define Y_STOP_PIN 35
+#define Z_STOP_PIN 15
//
// Steppers
//
-#define X_STEP_PIN 27
-#define X_DIR_PIN 26
-#define X_ENABLE_PIN 25
-//#define X_CS_PIN 21
+#define X_STEP_PIN 27
+#define X_DIR_PIN 26
+#define X_ENABLE_PIN 25
+//#define X_CS_PIN 21
-#define Y_STEP_PIN 33
-#define Y_DIR_PIN 32
-#define Y_ENABLE_PIN X_ENABLE_PIN
-//#define Y_CS_PIN 22
+#define Y_STEP_PIN 33
+#define Y_DIR_PIN 32
+#define Y_ENABLE_PIN X_ENABLE_PIN
+//#define Y_CS_PIN 22
-#define Z_STEP_PIN 14
-#define Z_DIR_PIN 12
-#define Z_ENABLE_PIN X_ENABLE_PIN
-//#define Z_CS_PIN 5 // SS_PIN
+#define Z_STEP_PIN 14
+#define Z_DIR_PIN 12
+#define Z_ENABLE_PIN X_ENABLE_PIN
+//#define Z_CS_PIN 5 // SS_PIN
-#define E0_STEP_PIN 16
-#define E0_DIR_PIN 17
-#define E0_ENABLE_PIN X_ENABLE_PIN
-//#define E0_CS_PIN 21
+#define E0_STEP_PIN 16
+#define E0_DIR_PIN 17
+#define E0_ENABLE_PIN X_ENABLE_PIN
+//#define E0_CS_PIN 21
//
// Temperature Sensors
//
-#define TEMP_0_PIN 36 // Analog Input
-#define TEMP_BED_PIN 39 // Analog Input
+#define TEMP_0_PIN 36 // Analog Input
+#define TEMP_BED_PIN 39 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define FAN_PIN 13
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+#define FAN_PIN 13
+#define HEATER_BED_PIN 4
//
// MicroSD card
//
-#define MOSI_PIN 23
-#define MISO_PIN 19
-#define SCK_PIN 18
-#define SDSS 5
-#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN 23
+#define MISO_PIN 19
+#define SCK_PIN 18
+#define SDSS 5
+#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers
+// Hardware serial pins
+// Add the following to Configuration.h or Configuration_adv.h to assign
+// specific pins to hardware Serial1.
+// Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
+// MRR ESPA does not have enough spare pins for such reassignment.
+//#define HARDWARE_SERIAL1_RX 21
+//#define HARDWARE_SERIAL1_TX 22
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index cffdfa465d..3dd50489df 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -43,9 +43,9 @@
//
// Limit Switches
//
-#define X_STOP_PIN 35
-#define Y_STOP_PIN 32
-#define Z_STOP_PIN 33
+#define X_STOP_PIN 35
+#define Y_STOP_PIN 32
+#define Z_STOP_PIN 33
//
// Enable I2S stepper stream
@@ -53,72 +53,72 @@
#undef I2S_STEPPER_STREAM
#define I2S_STEPPER_STREAM
-#undef LIN_ADVANCE // Currently, I2S stream does not work with linear advance
+#undef LIN_ADVANCE // Currently, I2S stream does not work with linear advance
-#define I2S_WS 26
-#define I2S_BCK 25
-#define I2S_DATA 27
+#define I2S_WS 26
+#define I2S_BCK 25
+#define I2S_DATA 27
//
// Steppers
//
-#define X_STEP_PIN 129
-#define X_DIR_PIN 130
-#define X_ENABLE_PIN 128
-//#define X_CS_PIN 21
+#define X_STEP_PIN 129
+#define X_DIR_PIN 130
+#define X_ENABLE_PIN 128
+//#define X_CS_PIN 21
-#define Y_STEP_PIN 132
-#define Y_DIR_PIN 133
-#define Y_ENABLE_PIN 131
-//#define Y_CS_PIN 22
+#define Y_STEP_PIN 132
+#define Y_DIR_PIN 133
+#define Y_ENABLE_PIN 131
+//#define Y_CS_PIN 22
-#define Z_STEP_PIN 135
-#define Z_DIR_PIN 136
-#define Z_ENABLE_PIN 134
-//#define Z_CS_PIN 5 // SS_PIN
+#define Z_STEP_PIN 135
+#define Z_DIR_PIN 136
+#define Z_ENABLE_PIN 134
+//#define Z_CS_PIN 5 // SS_PIN
-#define E0_STEP_PIN 138
-#define E0_DIR_PIN 139
-#define E0_ENABLE_PIN 137
-//#define E0_CS_PIN 21
+#define E0_STEP_PIN 138
+#define E0_DIR_PIN 139
+#define E0_ENABLE_PIN 137
+//#define E0_CS_PIN 21
-#define E1_STEP_PIN 141
-#define E1_DIR_PIN 142
-#define E1_ENABLE_PIN 140
-//#define E1_CS_PIN 22
+#define E1_STEP_PIN 141
+#define E1_DIR_PIN 142
+#define E1_ENABLE_PIN 140
+//#define E1_CS_PIN 22
-#define Z2_STEP_PIN 141
-#define Z2_DIR_PIN 142
-#define Z2_ENABLE_PIN 140
-//#define Z2_CS_PIN 5
+#define Z2_STEP_PIN 141
+#define Z2_DIR_PIN 142
+#define Z2_ENABLE_PIN 140
+//#define Z2_CS_PIN 5
//
// Temperature Sensors
//
-#define TEMP_0_PIN 36 // Analog Input
-#define TEMP_1_PIN 34 // Analog Input
-#define TEMP_BED_PIN 39 // Analog Input
+#define TEMP_0_PIN 36 // Analog Input
+#define TEMP_1_PIN 34 // Analog Input
+#define TEMP_BED_PIN 39 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 145 // 2
-#define FAN_PIN 146 // 15
-#define HEATER_BED_PIN 144 // 4
+#define HEATER_0_PIN 145 // 2
+#define FAN_PIN 146 // 15
+#define HEATER_BED_PIN 144 // 4
-#define CONTROLLER_FAN_PIN 147
-//#define E0_AUTO_FAN_PIN 148 // need to update Configuration_adv.h @section extruder
-//#define E1_AUTO_FAN_PIN 149 // need to update Configuration_adv.h @section extruder
-#define FAN1_PIN 149
+#define CONTROLLER_FAN_PIN 147
+//#define E0_AUTO_FAN_PIN 148 // need to update Configuration_adv.h @section extruder
+//#define E1_AUTO_FAN_PIN 149 // need to update Configuration_adv.h @section extruder
+#define FAN1_PIN 149
//
// MicroSD card
//
-#define MOSI_PIN 23
-#define MISO_PIN 19
-#define SCK_PIN 18
-#define SDSS 5
-#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN 23
+#define MISO_PIN 19
+#define SCK_PIN 18
+#define SDSS 5
+#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers
//////////////////////////
// LCDs and Controllers //
@@ -126,21 +126,21 @@
#if HAS_GRAPHICAL_LCD
- #define LCD_PINS_RS 13
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 16
+ #define LCD_PINS_RS 13
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 16
#if ENABLED(CR10_STOCKDISPLAY)
- #define BEEPER_PIN 151
+ #define BEEPER_PIN 151
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define BEEPER_PIN 151
+ #define BEEPER_PIN 151
- //#define LCD_PINS_D5 150
- //#define LCD_PINS_D6 151
- //#define LCD_PINS_D7 153
+ //#define LCD_PINS_D5 150
+ //#define LCD_PINS_D6 152
+ //#define LCD_PINS_D7 153
#else
@@ -148,8 +148,18 @@
#endif
- #define BTN_EN1 0
- #define BTN_EN2 12
- #define BTN_ENC 14
+ #define BTN_EN1 0
+ #define BTN_EN2 12
+ #define BTN_ENC 14
#endif // HAS_GRAPHICAL_LCD
+
+// Hardware serial pins
+// Add the following to Configuration.h or Configuration_adv.h to assign
+// specific pins to hardware Serial1 and Serial2.
+// Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
+// MRR ESPA does not have enough spare pins for such reassignment.
+//#define HARDWARE_SERIAL1_RX 21
+//#define HARDWARE_SERIAL1_TX 22
+//#define HARDWARE_SERIAL2_RX 2
+//#define HARDWARE_SERIAL2_TX 4
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 2cb6fb597b..0bfbaabdcd 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -49,7 +49,7 @@
#define BOARD_INFO_NAME "RAMPS 1.4"
#endif
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF // 4KB
#define IS_RAMPS_EFB
@@ -57,85 +57,85 @@
// Servos
//
#ifdef IS_RAMPS_13
- #define SERVO0_PIN 7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
+ #define SERVO0_PIN 7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
#else
- #define SERVO0_PIN 11
+ #define SERVO0_PIN 11
#endif
-#define SERVO1_PIN 6
-#define SERVO2_PIN 5
+#define SERVO1_PIN 6
+#define SERVO2_PIN 5
#ifndef SERVO3_PIN
- #define SERVO3_PIN 4
+ #define SERVO3_PIN 4
#endif
//
// Limit Switches
//
-#define X_MIN_PIN 3
+#define X_MIN_PIN 3
#ifndef X_MAX_PIN
- #define X_MAX_PIN 2
+ #define X_MAX_PIN 2
#endif
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN 53
+ #define X_CS_PIN 53
#endif
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN
- #define Y_CS_PIN 49
+ #define Y_CS_PIN 49
#endif
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 62
#ifndef Z_CS_PIN
- #define Z_CS_PIN 40
+ #define Z_CS_PIN 40
#endif
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
#ifndef E0_CS_PIN
- #define E0_CS_PIN 42
+ #define E0_CS_PIN 42
#endif
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
#ifndef E1_CS_PIN
- #define E1_CS_PIN 44
+ #define E1_CS_PIN 44
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card
#else
- #define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
#endif
//
@@ -159,72 +159,72 @@
// Heaters / Fans
//
#ifndef MOSFET_D_PIN
- #define MOSFET_D_PIN -1
+ #define MOSFET_D_PIN -1
#endif
#ifndef RAMPS_D8_PIN
- #define RAMPS_D8_PIN 8
+ #define RAMPS_D8_PIN 8
#endif
#ifndef RAMPS_D9_PIN
- #define RAMPS_D9_PIN 9
+ #define RAMPS_D9_PIN 9
#endif
#ifndef RAMPS_D10_PIN
- #define RAMPS_D10_PIN 10
+ #define RAMPS_D10_PIN 10
#endif
-#define HEATER_0_PIN RAMPS_D10_PIN
+#define HEATER_0_PIN RAMPS_D10_PIN
-#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
- #define FAN_PIN RAMPS_D9_PIN
- #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
- #define HEATER_1_PIN RAMPS_D9_PIN
- #define FAN_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
- #define HEATER_1_PIN RAMPS_D9_PIN
- #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
- #define FAN_PIN RAMPS_D9_PIN
- #define FAN1_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_SF) // Spindle, Fan
- #define FAN_PIN RAMPS_D8_PIN
-#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
- #define FAN_PIN RAMPS_D9_PIN
- #define HEATER_BED_PIN RAMPS_D8_PIN
+#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
+ #define FAN_PIN RAMPS_D9_PIN
+ #define HEATER_BED_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
+ #define HEATER_1_PIN RAMPS_D9_PIN
+ #define FAN_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
+ #define HEATER_1_PIN RAMPS_D9_PIN
+ #define HEATER_BED_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
+ #define FAN_PIN RAMPS_D9_PIN
+ #define FAN1_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_SF) // Spindle, Fan
+ #define FAN_PIN RAMPS_D8_PIN
+#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+ #define FAN_PIN RAMPS_D9_PIN
+ #define HEATER_BED_PIN RAMPS_D8_PIN
#if HOTENDS == 1
- #define FAN1_PIN MOSFET_D_PIN
+ #define FAN1_PIN MOSFET_D_PIN
#else
- #define HEATER_1_PIN MOSFET_D_PIN
+ #define HEATER_1_PIN MOSFET_D_PIN
#endif
#endif
#ifndef FAN_PIN
- #define FAN_PIN 4 // IO pin. Buffer needed
+ #define FAN_PIN 4 // IO pin. Buffer needed
#endif
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
+#define SDSS 53
+#define LED_PIN 13
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 5 // Analog Input on AUX2
+ #define FILWIDTH_PIN 5 // Analog Input on AUX2
#endif
// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 4
+ #define FIL_RUNOUT_PIN 4
#endif
#ifndef PS_ON_PIN
- #define PS_ON_PIN 12
+ #define PS_ON_PIN 12
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
- #if NUM_SERVOS <= 1 // Prefer the servo connector
- #define CASE_LIGHT_PIN 6 // Hardware PWM
- #elif HAS_FREE_AUX2_PINS // try to use AUX 2
- #define CASE_LIGHT_PIN 44 // Hardware PWM
+ #if NUM_SERVOS <= 1 // Prefer the servo connector
+ #define CASE_LIGHT_PIN 6 // Hardware PWM
+ #elif HAS_FREE_AUX2_PINS // try to use AUX 2
+ #define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
@@ -232,14 +232,14 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
- #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
- #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
- #define SPINDLE_DIR_PIN 5
- #elif HAS_FREE_AUX2_PINS // try to use AUX 2
- #define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
- #define SPINDLE_DIR_PIN 65
+ #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
+ #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
+ #define SPINDLE_DIR_PIN 5
+ #elif HAS_FREE_AUX2_PINS // try to use AUX 2
+ #define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+ #define SPINDLE_DIR_PIN 65
#endif
#endif
@@ -247,13 +247,13 @@
// Průša i3 MK2 Multiplexer Support
//
#ifndef E_MUX0_PIN
- #define E_MUX0_PIN 40 // Z_CS_PIN
+ #define E_MUX0_PIN 40 // Z_CS_PIN
#endif
#ifndef E_MUX1_PIN
- #define E_MUX1_PIN 42 // E0_CS_PIN
+ #define E_MUX1_PIN 42 // E0_CS_PIN
#endif
#ifndef E_MUX2_PIN
- #define E_MUX2_PIN 44 // E1_CS_PIN
+ #define E_MUX2_PIN 44 // E1_CS_PIN
#endif
/**
@@ -261,17 +261,17 @@
*/
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI 66
+ #define TMC_SW_MOSI 66
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO 44
+ #define TMC_SW_MISO 44
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK 64
+ #define TMC_SW_SCK 64
#endif
#endif
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -295,73 +295,91 @@
*/
#ifndef X_SERIAL_TX_PIN
- #define X_SERIAL_TX_PIN 40
+ #define X_SERIAL_TX_PIN 40
#endif
#ifndef X_SERIAL_RX_PIN
- #define X_SERIAL_RX_PIN 63
+ #define X_SERIAL_RX_PIN 63
#endif
#ifndef X2_SERIAL_TX_PIN
- #define X2_SERIAL_TX_PIN -1
+ #define X2_SERIAL_TX_PIN -1
#endif
#ifndef X2_SERIAL_RX_PIN
- #define X2_SERIAL_RX_PIN -1
+ #define X2_SERIAL_RX_PIN -1
#endif
#ifndef Y_SERIAL_TX_PIN
- #define Y_SERIAL_TX_PIN 59
+ #define Y_SERIAL_TX_PIN 59
#endif
#ifndef Y_SERIAL_RX_PIN
- #define Y_SERIAL_RX_PIN 64
+ #define Y_SERIAL_RX_PIN 64
#endif
#ifndef Y2_SERIAL_TX_PIN
- #define Y2_SERIAL_TX_PIN -1
+ #define Y2_SERIAL_TX_PIN -1
#endif
#ifndef Y2_SERIAL_RX_PIN
- #define Y2_SERIAL_RX_PIN -1
+ #define Y2_SERIAL_RX_PIN -1
#endif
#ifndef Z_SERIAL_TX_PIN
- #define Z_SERIAL_TX_PIN 42
+ #define Z_SERIAL_TX_PIN 42
#endif
#ifndef Z_SERIAL_RX_PIN
- #define Z_SERIAL_RX_PIN 65
+ #define Z_SERIAL_RX_PIN 65
#endif
#ifndef Z2_SERIAL_TX_PIN
- #define Z2_SERIAL_TX_PIN -1
+ #define Z2_SERIAL_TX_PIN -1
#endif
#ifndef Z2_SERIAL_RX_PIN
- #define Z2_SERIAL_RX_PIN -1
+ #define Z2_SERIAL_RX_PIN -1
#endif
#ifndef E0_SERIAL_TX_PIN
- #define E0_SERIAL_TX_PIN 44
+ #define E0_SERIAL_TX_PIN 44
#endif
#ifndef E0_SERIAL_RX_PIN
- #define E0_SERIAL_RX_PIN 66
+ #define E0_SERIAL_RX_PIN 66
#endif
#ifndef E1_SERIAL_TX_PIN
- #define E1_SERIAL_TX_PIN -1
+ #define E1_SERIAL_TX_PIN -1
#endif
#ifndef E1_SERIAL_RX_PIN
- #define E1_SERIAL_RX_PIN -1
+ #define E1_SERIAL_RX_PIN -1
#endif
#ifndef E2_SERIAL_TX_PIN
- #define E2_SERIAL_TX_PIN -1
+ #define E2_SERIAL_TX_PIN -1
#endif
#ifndef E2_SERIAL_RX_PIN
- #define E2_SERIAL_RX_PIN -1
+ #define E2_SERIAL_RX_PIN -1
#endif
#ifndef E3_SERIAL_TX_PIN
- #define E3_SERIAL_TX_PIN -1
+ #define E3_SERIAL_TX_PIN -1
#endif
#ifndef E3_SERIAL_RX_PIN
- #define E3_SERIAL_RX_PIN -1
+ #define E3_SERIAL_RX_PIN -1
#endif
#ifndef E4_SERIAL_TX_PIN
- #define E4_SERIAL_TX_PIN -1
+ #define E4_SERIAL_TX_PIN -1
#endif
#ifndef E4_SERIAL_RX_PIN
- #define E4_SERIAL_RX_PIN -1
+ #define E4_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_TX_PIN
+ #define E5_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_RX_PIN
+ #define E5_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_TX_PIN
+ #define E6_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_RX_PIN
+ #define E6_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_TX_PIN
+ #define E7_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_RX_PIN
+ #define E7_SERIAL_RX_PIN -1
#endif
#endif
@@ -376,62 +394,62 @@
//
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS 40
- #define LCD_PINS_ENABLE 42
- #define LCD_PINS_D4 65
- #define LCD_PINS_D5 66
- #define LCD_PINS_D6 44
- #define LCD_PINS_D7 64
+ #define LCD_PINS_RS 40
+ #define LCD_PINS_ENABLE 42
+ #define LCD_PINS_D4 65
+ #define LCD_PINS_D5 66
+ #define LCD_PINS_D6 44
+ #define LCD_PINS_D7 64
#else
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS 27
- #define LCD_PINS_ENABLE 29
- #define LCD_PINS_D4 25
+ #define LCD_PINS_RS 27
+ #define LCD_PINS_ENABLE 29
+ #define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#endif
#elif ENABLED(ZONESTAR_LCD)
- #define LCD_PINS_RS 64
- #define LCD_PINS_ENABLE 44
- #define LCD_PINS_D4 63
- #define LCD_PINS_D5 40
- #define LCD_PINS_D6 42
- #define LCD_PINS_D7 65
+ #define LCD_PINS_RS 64
+ #define LCD_PINS_ENABLE 44
+ #define LCD_PINS_D4 63
+ #define LCD_PINS_D5 40
+ #define LCD_PINS_D6 42
+ #define LCD_PINS_D7 65
#else
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC 25 // Set as output on init
- #define LCD_PINS_RS 27 // Pull low for 1s to init
+ #define LCD_PINS_DC 25 // Set as output on init
+ #define LCD_PINS_RS 27 // Pull low for 1s to init
// DOGM SPI LCD Support
- #define DOGLCD_CS 16
- #define DOGLCD_MOSI 17
- #define DOGLCD_SCK 23
- #define DOGLCD_A0 LCD_PINS_DC
+ #define DOGLCD_CS 16
+ #define DOGLCD_MOSI 17
+ #define DOGLCD_SCK 23
+ #define DOGLCD_A0 LCD_PINS_DC
#else
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
#endif
- #define LCD_PINS_D7 29
+ #define LCD_PINS_D7 29
#if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
#endif
#endif
@@ -439,10 +457,10 @@
#if DISABLED(NEWPANEL)
// Buttons attached to a shift register
// Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
#endif
#endif
@@ -454,85 +472,85 @@
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#if ENABLED(CR10_STOCKDISPLAY)
- #define BTN_EN1 17
- #define BTN_EN2 23
+ #define BTN_EN1 17
+ #define BTN_EN2 23
#else
- #define BTN_EN1 31
- #define BTN_EN2 33
+ #define BTN_EN1 31
+ #define BTN_EN2 33
#endif
- #define BTN_ENC 35
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
+ #define BTN_ENC 35
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 39
+ #define LCD_BACKLIGHT_PIN 39
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SD_DETECT_PIN 42
#elif ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS SDSS
- #define KILL_PIN 41
+ #define BTN_EN1 47
+ #define BTN_EN2 43
+ #define BTN_ENC 32
+ #define LCD_SDSS SDSS
+ #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI)
- #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
- #define BTN_ENC -1
+ #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+ #define BTN_ENC -1
- #define LCD_SDSS SDSS
- #define SD_DETECT_PIN 49
+ #define LCD_SDSS SDSS
+ #define SD_DETECT_PIN 49
#elif ANY(VIKI2, miniVIKI)
- #define DOGLCD_CS 45
- #define DOGLCD_A0 44
+ #define DOGLCD_CS 45
+ #define DOGLCD_A0 44
#define LCD_SCREEN_ROT_180
- #define BEEPER_PIN 33
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
+ #define BEEPER_PIN 33
+ #define STAT_LED_RED_PIN 32
+ #define STAT_LED_BLUE_PIN 35
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
+ #define BTN_EN1 22
+ #define BTN_EN2 7
+ #define BTN_ENC 39
- #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
- #define KILL_PIN 31
+ #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
+ #define KILL_PIN 31
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
+ #define DOGLCD_CS 29
+ #define DOGLCD_A0 27
- #define BEEPER_PIN 23
- #define LCD_BACKLIGHT_PIN 33
+ #define BEEPER_PIN 23
+ #define LCD_BACKLIGHT_PIN 33
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
+ #define BTN_EN1 35
+ #define BTN_EN2 37
+ #define BTN_ENC 31
- #define LCD_SDSS SDSS
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
+ #define LCD_SDSS SDSS
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
#elif ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 27
- #define DOGLCD_CS 25
+ #define DOGLCD_A0 27
+ #define DOGLCD_CS 25
// GLCD features
// Uncomment screen orientation
@@ -540,25 +558,25 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
// not connected to a pin
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
- #define SD_DETECT_PIN 49
- #define KILL_PIN 64
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 64
#elif ENABLED(MINIPANEL)
- #define BEEPER_PIN 42
+ #define BEEPER_PIN 42
// not connected to a pin
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 66
// GLCD features
// Uncomment screen orientation
@@ -566,16 +584,16 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
+ #define BTN_EN1 40
+ #define BTN_EN2 63
+ #define BTN_ENC 59
- #define SD_DETECT_PIN 49
- #define KILL_PIN 64
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 64
#elif ENABLED(ZONESTAR_LCD)
- #define ADC_KEYPAD_PIN 12
+ #define ADC_KEYPAD_PIN 12
#elif ENABLED(AZSMZ_12864)
@@ -584,29 +602,29 @@
#else
// Beeper on AUX-4
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
// Buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
#elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
+ #define BTN_EN1 59 // AUX2 PIN 3
+ #define BTN_EN2 63 // AUX2 PIN 4
+ #define BTN_ENC 49 // AUX3 PIN 7
#else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
+ #define BTN_EN1 37
+ #define BTN_EN2 35
+ #define BTN_ENC 31
#endif
#if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
#endif
#endif
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 65d3fe73ee..1417fb7d99 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,87 +31,93 @@
#define BOARD_INFO_NAME "AZSMZ MINI"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P1_23
+#define SERVO0_PIN P1_23
//
// Limit Switches
//
-#define X_MIN_PIN P1_24
-#define Y_MIN_PIN P1_26
-#define Z_MIN_PIN P1_28
-#define Z_MAX_PIN P1_29
+#define X_MIN_PIN P1_24
+#define Y_MIN_PIN P1_26
+#define Z_MIN_PIN P1_28
+#define Z_MAX_PIN P1_29
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P0_04
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P0_04
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
-#define E1_STEP_PIN P2_08
-#define E1_DIR_PIN P2_13
-#define E1_ENABLE_PIN P4_29
+#define E1_STEP_PIN P2_08
+#define E1_DIR_PIN P2_13
+#define E1_ENABLE_PIN P4_29
//
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_23_A0 // A0 (TH1)
-#define TEMP_BED_PIN P0_24_A1 // A1 (TH2)
-#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
+#define TEMP_0_PIN P0_23_A0 // A0 (TH1)
+#define TEMP_BED_PIN P0_24_A1 // A1 (TH2)
+#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
//
// Heaters / Fans
//
// EFB
-#define HEATER_0_PIN P2_04
-#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_04
+#define HEATER_BED_PIN P2_05
#ifndef FAN_PIN
- #define FAN_PIN P2_07
+ #define FAN_PIN P2_07
#endif
-#define FAN1_PIN P0_26
+#define FAN1_PIN P0_26
-#define LCD_SDSS P0_16 // LCD SD chip select
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define LCD_SDSS P0_16 // LCD SD chip select
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if ENABLED(AZSMZ_12864)
- #define BEEPER_PIN P1_30
- #define DOGLCD_A0 P2_06
- #define DOGLCD_CS P1_22
- #define BTN_EN1 P4_28
- #define BTN_EN2 P1_27
- #define BTN_ENC P3_26
+ #define BEEPER_PIN P1_30
+ #define DOGLCD_A0 P2_06
+ #define DOGLCD_CS P1_22
+ #define BTN_EN1 P4_28
+ #define BTN_EN2 P1_27
+ #define BTN_ENC P3_26
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION LCD
+ #define SDCARD_CONNECTION LCD
#endif
#endif
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_15
- #define MISO_PIN P0_17
- #define MOSI_PIN P0_18
- #define SS_PIN LCD_SDSS
- #define SD_DETECT_PIN P3_25
+ #define SCK_PIN P0_15
+ #define MISO_PIN P0_17
+ #define MOSI_PIN P0_18
+ #define SS_PIN LCD_SDSS
+ #define SD_DETECT_PIN P3_25
#elif SD_CONNECTION_IS(ONBOARD)
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
@@ -119,16 +125,16 @@
//
// Ethernet pins
//
-#define ENET_MDIO P1_17
-#define ENET_RX_ER P1_14
-#define ENET_RXD1 P1_10
-#define ENET_MOC P1_16
-#define REF_CLK P1_15
-#define ENET_RXD0 P1_09
-#define ENET_CRS P1_08
-#define ENET_TX_EN P1_04
-#define ENET_TXD0 P1_00
-#define ENET_TXD1 P1_01
+#define ENET_MDIO P1_17
+#define ENET_RX_ER P1_14
+#define ENET_RXD1 P1_10
+#define ENET_MOC P1_16
+#define REF_CLK P1_15
+#define ENET_RXD0 P1_09
+#define ENET_CRS P1_08
+#define ENET_TX_EN P1_04
+#define ENET_TXD0 P1_00
+#define ENET_TXD1 P1_01
/**
* PWMs
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
index 823bdba0d3..d710138b95 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,45 +38,51 @@
#define BOARD_INFO_NAME "BIQU Thunder B300 V1.0"
#endif
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Limit Switches
//
-#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P0_04
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P0_04
#ifndef X_CS_PIN
- #define X_CS_PIN P1_15 // ETH
+ #define X_CS_PIN P1_15 // ETH
#endif
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
#ifndef Y_CS_PIN
- #define Y_CS_PIN P1_14 // ETH
+ #define Y_CS_PIN P1_14 // ETH
#endif
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
#ifndef Z_CS_PIN
- #define Z_CS_PIN P1_16 // ETH
+ #define Z_CS_PIN P1_16 // ETH
#endif
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
#ifndef E0_CS_PIN
- #define E0_CS_PIN P1_17 // ETH
+ #define E0_CS_PIN P1_17 // ETH
#endif
//
@@ -84,13 +90,13 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P0_18 // ETH
+ #define TMC_SW_MOSI P0_18 // ETH
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P0_17 // ETH
+ #define TMC_SW_MISO P0_17 // ETH
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P0_15 // ETH
+ #define TMC_SW_SCK P0_15 // ETH
#endif
#endif
@@ -98,23 +104,23 @@
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_24_A1 // A0 (T0)
-#define TEMP_BED_PIN P0_23_A0 // A1 (T1)
+#define TEMP_0_PIN P0_24_A1 // A0 (T0)
+#define TEMP_BED_PIN P0_23_A0 // A1 (T1)
//
// Heaters / Fans
//
-#define HEATER_0_PIN P2_07
-#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_07
+#define HEATER_BED_PIN P2_05
#ifndef FAN_PIN
- #define FAN_PIN P2_04
+ #define FAN_PIN P2_04
#endif
//
// Unused
//
-//#define PIN_P2_10 P2_10 // IBOOT-1
-//#define PIN_P0_27 P0_27 // Onboard SD Detect
+//#define PIN_P2_10 P2_10 // IBOOT-1
+//#define PIN_P0_27 P0_27 // Onboard SD Detect
/**
* LCD / Controller
@@ -128,16 +134,16 @@
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN P1_31 // EXP1-1
+ #define BEEPER_PIN P1_31 // EXP1-1
- #define BTN_EN1 P3_26 // EXP2-3
- #define BTN_EN2 P3_25 // EXP2-5
- #define BTN_ENC P1_30 // EXP1-2
+ #define BTN_EN1 P3_26 // EXP2-3
+ #define BTN_EN2 P3_25 // EXP2-5
+ #define BTN_ENC P1_30 // EXP1-2
- #define SD_DETECT_PIN P0_27 // EXP2-7
- #define LCD_PINS_RS P0_16 // EXP1-4
- #define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
- #define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
+ #define SD_DETECT_PIN P0_27 // EXP2-7
+ #define LCD_PINS_RS P0_16 // EXP1-4
+ #define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
+ #define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
@@ -156,11 +162,11 @@
* Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board.
*/
#if ENABLED(SDSUPPORT)
- #define SCK_PIN P0_15 // EXP1-5
- #define MISO_PIN P0_16 // EXP1-4
- #define MOSI_PIN P0_18 // EXP1-3
- #define SS_PIN P1_30 // EXP1-2
- #define SDSS SS_PIN
+ #define SCK_PIN P0_15 // EXP1-5
+ #define MISO_PIN P0_16 // EXP1-4
+ #define MOSI_PIN P0_18 // EXP1-3
+ #define SS_PIN P1_30 // EXP1-2
+ #define SDSS SS_PIN
#endif
/**
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
index a20659f0f5..041235d493 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,59 +36,62 @@
#define BOARD_INFO_NAME "BIQU BQ111-A4"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Limit Switches
//
-#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
-
+#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
//
// Steppers
//
-#define X_STEP_PIN P2_0
-#define X_DIR_PIN P0_5
-#define X_ENABLE_PIN P0_4
+#define X_STEP_PIN P2_0
+#define X_DIR_PIN P0_5
+#define X_ENABLE_PIN P0_4
-#define Y_STEP_PIN P2_1
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
+#define Y_STEP_PIN P2_1
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
-#define Z_STEP_PIN P2_2
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
-
-#define E0_STEP_PIN P2_3
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
+#define Z_STEP_PIN P2_2
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
+#define E0_STEP_PIN P2_3
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
//
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_23_A0 // A0 (T0)
-#define TEMP_BED_PIN P0_24_A1 // A1 (T1)
-
+#define TEMP_0_PIN P0_23_A0 // A0 (T0)
+#define TEMP_BED_PIN P0_24_A1 // A1 (T1)
//
// Heaters / Fans
//
-#define HEATER_0_PIN P2_7
-#define HEATER_BED_PIN P2_5
+#define HEATER_0_PIN P2_7
+#define HEATER_BED_PIN P2_5
#ifndef FAN_PIN
- #define FAN_PIN P2_4
+ #define FAN_PIN P2_4
#endif
//
// Unused
//
-//#define PIN_P2_10 P2_10 // IBOOT-1
-//#define PIN_P0_27 P0_27 // Onboard SD Detect
+//#define PIN_P2_10 P2_10 // IBOOT-1
+//#define PIN_P0_27 P0_27 // Onboard SD Detect
/**
* LCD / Controller
@@ -102,16 +105,16 @@
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN P1_31 // EXP1-1
+ #define BEEPER_PIN P1_31 // EXP1-1
- #define BTN_EN1 P3_26 // EXP2-3
- #define BTN_EN2 P3_25 // EXP2-5
- #define BTN_ENC P1_30 // EXP1-2
+ #define BTN_EN1 P3_26 // EXP2-3
+ #define BTN_EN2 P3_25 // EXP2-5
+ #define BTN_ENC P1_30 // EXP1-2
- #define SD_DETECT_PIN P0_27 // EXP2-7
- #define LCD_PINS_RS P0_16 // EXP1-4
- #define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
- #define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
+ #define SD_DETECT_PIN P0_27 // EXP2-7
+ #define LCD_PINS_RS P0_16 // EXP1-4
+ #define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
+ #define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
@@ -123,7 +126,6 @@
#endif // HAS_SPI_LCD
-
/**
* SD Card Reader
*
@@ -132,15 +134,14 @@
*/
#if ENABLED(SDSUPPORT)
- #define SCK_PIN P0_15 // EXP1-5
- #define MISO_PIN P0_16 // EXP1-4
- #define MOSI_PIN P0_18 // EXP1-3
- #define SS_PIN P1_30 // EXP1-2
- #define SDSS SS_PIN
+ #define SCK_PIN P0_15 // EXP1-5
+ #define MISO_PIN P0_16 // EXP1-4
+ #define MOSI_PIN P0_18 // EXP1-3
+ #define SS_PIN P1_30 // EXP1-2
+ #define SDSS SS_PIN
#endif // SDSUPPORT
-
/**
* PWMS
*
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index abf5e821ca..4dae2dc5d6 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,35 +23,41 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.1"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Limit Switches
//
-#define X_MIN_PIN P1_29
-#define X_MAX_PIN P1_28
-#define Y_MIN_PIN P1_27
-#define Y_MAX_PIN P1_26
-#define Z_MIN_PIN P1_25
-#define Z_MAX_PIN P1_24
+#define X_MIN_PIN P1_29
+#define X_MAX_PIN P1_28
+#define Y_MIN_PIN P1_27
+#define Y_MAX_PIN P1_26
+#define Z_MIN_PIN P1_25
+#define Z_MAX_PIN P1_24
//
// Steppers
//
-#define X_STEP_PIN P0_04
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P4_28
+#define X_STEP_PIN P0_04
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P4_28
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P2_02
-#define Y_ENABLE_PIN P2_00
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P2_02
+#define Y_ENABLE_PIN P2_00
-#define Z_STEP_PIN P0_20
-#define Z_DIR_PIN P0_21
-#define Z_ENABLE_PIN P0_19
+#define Z_STEP_PIN P0_20
+#define Z_DIR_PIN P0_21
+#define Z_ENABLE_PIN P0_19
-#define E0_STEP_PIN P0_11
-#define E0_DIR_PIN P2_13
-#define E0_ENABLE_PIN P2_12
+#define E0_STEP_PIN P0_11
+#define E0_DIR_PIN P2_13
+#define E0_ENABLE_PIN P2_12
/**
* LCD / Controller
@@ -67,19 +73,19 @@
*/
#if HAS_SPI_LCD
- #define BTN_EN1 P3_26
- #define BTN_EN2 P3_25
- #define BTN_ENC P2_11
+ #define BTN_EN1 P3_26
+ #define BTN_EN2 P3_25
+ #define BTN_ENC P2_11
- #define SD_DETECT_PIN P1_31
- #define LCD_SDSS P1_23
- #define LCD_PINS_RS P0_16
- #define LCD_PINS_ENABLE P0_18
- #define LCD_PINS_D4 P0_15
+ #define SD_DETECT_PIN P1_31
+ #define LCD_SDSS P1_23
+ #define LCD_PINS_RS P0_16
+ #define LCD_PINS_ENABLE P0_18
+ #define LCD_PINS_D4 P0_15
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS P2_06
- #define DOGLCD_A0 P0_16
+ #define DOGLCD_CS P2_06
+ #define DOGLCD_A0 P0_16
#endif
#endif
@@ -91,19 +97,19 @@
// https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
#ifndef SDCARD_CONNECTION
#if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
- #define SDCARD_CONNECTION LCD
+ #define SDCARD_CONNECTION LCD
#else
- #define SDCARD_CONNECTION ONBOARD
+ #define SDCARD_CONNECTION ONBOARD
#endif
#endif
#if SD_CONNECTION_IS(LCD)
- #define SS_PIN P1_23
+ #define SS_PIN P1_23
#endif
// Trinamic driver support
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
// Using TMC devices in intelligent mode requires extra connections to each device. Unfortunately
// the SKR does not have many free pins (especially if a display is in use). The SPI-based devices
// will require 3 connections (clock, mosi, miso), plus a chip select line (CS) for each driver.
@@ -131,49 +137,48 @@
// When using any TMC SPI-based drivers, software SPI is used
// because pins may be shared with the display or SD card.
#define TMC_USE_SW_SPI
- #define TMC_SW_MOSI P0_18
- #define TMC_SW_MISO P0_17
+ #define TMC_SW_MOSI P0_18
+ #define TMC_SW_MISO P0_17
// To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
- #define TMC_SW_SCK P0_15
+ #define TMC_SW_SCK P0_15
// If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
- //#define TMC_SW_SCK P2_06
+ //#define TMC_SW_SCK P2_06
#if ENABLED(SOFTWARE_DRIVER_ENABLE)
// Software enable allows the enable pins to be repurposed as chip-select pins.
// Note: Requires the driver modules to be modified to always be enabled with the enable pin removed.
#if AXIS_DRIVER_TYPE_X(TMC2130)
- #define X_CS_PIN P4_28
- #undef X_ENABLE_PIN
- #define X_ENABLE_PIN -1
+ #define X_CS_PIN P4_28
+ #undef X_ENABLE_PIN
+ #define X_ENABLE_PIN -1
#endif
#if AXIS_DRIVER_TYPE_Y(TMC2130)
- #define Y_CS_PIN P2_00
- #undef Y_ENABLE_PIN
- #define Y_ENABLE_PIN -1
+ #define Y_CS_PIN P2_00
+ #undef Y_ENABLE_PIN
+ #define Y_ENABLE_PIN -1
#endif
#if AXIS_DRIVER_TYPE_Z(TMC2130)
- #define Z_CS_PIN P0_19
- #undef Z_ENABLE_PIN
- #define Z_ENABLE_PIN -1
+ #define Z_CS_PIN P0_19
+ #undef Z_ENABLE_PIN
+ #define Z_ENABLE_PIN -1
#endif
#if AXIS_DRIVER_TYPE_E0(TMC2130)
- #define E0_CS_PIN P2_12
- #undef E0_ENABLE_PIN
- #define E0_ENABLE_PIN -1
+ #define E0_CS_PIN P2_12
+ #undef E0_ENABLE_PIN
+ #define E0_ENABLE_PIN -1
#endif
-
#if AXIS_DRIVER_TYPE_E1(TMC2130)
- #define E1_CS_PIN P0_10
- #undef E1_ENABLE_PIN
- #define E1_ENABLE_PIN -1
+ #define E1_CS_PIN P0_10
+ #undef E1_ENABLE_PIN
+ #define E1_ENABLE_PIN -1
#endif
- #else // !SOFTWARE_DRIVER_ENABLE
+ #else // !SOFTWARE_DRIVER_ENABLE
// A chip-select pin is needed for each driver.
@@ -186,11 +191,11 @@
#if SD_CONNECTION_IS(LCD)
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
#endif
- #define X_CS_PIN P1_23
- #define Y_CS_PIN P3_26
- #define Z_CS_PIN P2_11
- #define E0_CS_PIN P3_25
- #define E1_CS_PIN P1_31
+ #define X_CS_PIN P1_23
+ #define Y_CS_PIN P3_26
+ #define Z_CS_PIN P2_11
+ #define E0_CS_PIN P3_25
+ #define E1_CS_PIN P1_31
#endif
// Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -201,16 +206,16 @@
#if SD_CONNECTION_IS(LCD)
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
#endif
- #define X_CS_PIN P0_02
- #define Y_CS_PIN P0_03
- #define Z_CS_PIN P2_06
+ #define X_CS_PIN P0_02
+ #define Y_CS_PIN P0_03
+ #define Z_CS_PIN P2_06
// We use SD_DETECT_PIN for E0
#undef SD_DETECT_PIN
- #define E0_CS_PIN P1_31
+ #define E0_CS_PIN P1_31
// We use LCD_SDSS pin for E1
- #undef LCD_SDSS
- #define LCD_SDSS -1
- #define E1_CS_PIN P1_23
+ #undef LCD_SDSS
+ #define LCD_SDSS -1
+ #define E1_CS_PIN P1_23
#endif
// Example 3: Use the driver enable pins for chip-select.
@@ -218,11 +223,11 @@
// advanced features (like driver monitoring) will not be available.
//#define SKR_USE_ENABLE_CS
#if ENABLED(SKR_USE_ENABLE_FOR_CS)
- #define X_CS_PIN X_ENABLE_PIN
- #define Y_CS_PIN Y_ENABLE_PIN
- #define Z_CS_PIN Z_ENABLE_PIN
- #define E0_CS_PIN E0_ENABLE_PIN
- #define E1_CS_PIN E1_ENABLE_PIN
+ #define X_CS_PIN X_ENABLE_PIN
+ #define Y_CS_PIN Y_ENABLE_PIN
+ #define Z_CS_PIN Z_ENABLE_PIN
+ #define E0_CS_PIN E0_ENABLE_PIN
+ #define E1_CS_PIN E1_ENABLE_PIN
#endif
#endif // SOFTWARE_DRIVER_ENABLE
@@ -230,4 +235,4 @@
#endif
// Include common SKR pins
-#include "pins_BTT_SKR.h"
+#include "pins_BTT_SKR_common.h"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 7f74456a48..1d1ad60f24 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,91 +23,116 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.3"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
+/**
+ * Trinamic Stallguard pins
+ */
+#define X_DIAG_PIN P1_29 // X-
+#define Y_DIAG_PIN P1_27 // Y-
+#define Z_DIAG_PIN P1_25 // Z-
+#define E0_DIAG_PIN P1_28 // X+
+#define E1_DIAG_PIN P1_26 // Y+
+
/**
* Limit Switches
*/
-#if X_HOME_DIR > 0 && X_STALL_SENSITIVITY && !defined(USE_XMAX_PLUG)
- // For StallGuard homing to MAX swap the MIN / MAX pins
- // so the MAX physical connectors may be used for other things.
- #define X_MIN_PIN P1_28 // X_MAX (free)
- #define X_MAX_PIN P1_29 // X_MIN
-#else // else, non-endstop is free and appears in M43 output
- #define X_MIN_PIN P1_29 // X_MIN
- #define X_MAX_PIN P1_28 // X_MAX
-#endif
-
-#if Y_HOME_DIR > 0 && Y_STALL_SENSITIVITY && !defined(USE_YMAX_PLUG)
- #define Y_MIN_PIN P1_26 // Y_MAX (free)
- #define Y_MAX_PIN P1_27 // Y_MIN
+#if X_STALL_SENSITIVITY
+ #define X_STOP_PIN X_DIAG_PIN
+ #if X_HOME_DIR < 0
+ #define X_MAX_PIN P1_28 // X+
+ #else
+ #define X_MIN_PIN P1_28 // X+
+ #endif
#else
- #define Y_MIN_PIN P1_27 // Y_MIN
- #define Y_MAX_PIN P1_26 // Y_MAX
+ #define X_MIN_PIN P1_29 // X-
+ #define X_MAX_PIN P1_28 // X+
#endif
-#if Z_HOME_DIR > 0 && Z_STALL_SENSITIVITY && !defined(USE_ZMAX_PLUG)
- #define Z_MIN_PIN P1_24 // Z_MAX (free)
- #define Z_MAX_PIN P1_25 // Z_MIN
+#if Y_STALL_SENSITIVITY
+ #define Y_STOP_PIN Y_DIAG_PIN
+ #if Y_HOME_DIR < 0
+ #define Y_MAX_PIN P1_26 // Y+
+ #else
+ #define Y_MIN_PIN P1_26 // Y+
+ #endif
#else
- #define Z_MIN_PIN P1_25 // Z_MIN
- #define Z_MAX_PIN P1_24 // Z_MAX
+ #define Y_MIN_PIN P1_27 // Y-
+ #define Y_MAX_PIN P1_26 // Y+
#endif
-#define ONBOARD_ENDSTOPPULLUPS // Board has built-in pullups
+#if Z_STALL_SENSITIVITY
+ #define Z_STOP_PIN Z_DIAG_PIN
+ #if Z_HOME_DIR < 0
+ #define Z_MAX_PIN P1_24 // Z+
+ #else
+ #define Z_MIN_PIN P1_24 // Z+
+ #endif
+#else
+ #define Z_MIN_PIN P1_25 // Z-
+ #define Z_MAX_PIN P1_24 // Z+
+#endif
+
+#define ONBOARD_ENDSTOPPULLUPS // Board has built-in pullups
//
// Servos
//
#ifndef SERVO0_PIN
- #define SERVO0_PIN P2_00
+ #define SERVO0_PIN P2_00
#endif
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN P1_24
+ #define Z_MIN_PROBE_PIN P1_24
#endif
//
// Filament Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN P1_28
+ #define FIL_RUNOUT_PIN P1_28
#endif
//
// Steppers
//
-#define X_STEP_PIN P2_02
-#define X_DIR_PIN P2_06
-#define X_ENABLE_PIN P2_01
+#define X_STEP_PIN P2_02
+#define X_DIR_PIN P2_06
+#define X_ENABLE_PIN P2_01
#ifndef X_CS_PIN
- #define X_CS_PIN P1_17
+ #define X_CS_PIN P1_17
#endif
-#define Y_STEP_PIN P0_19
-#define Y_DIR_PIN P0_20
-#define Y_ENABLE_PIN P2_08
+#define Y_STEP_PIN P0_19
+#define Y_DIR_PIN P0_20
+#define Y_ENABLE_PIN P2_08
#ifndef Y_CS_PIN
- #define Y_CS_PIN P1_15
+ #define Y_CS_PIN P1_15
#endif
-#define Z_STEP_PIN P0_22
-#define Z_DIR_PIN P2_11
-#define Z_ENABLE_PIN P0_21
+#define Z_STEP_PIN P0_22
+#define Z_DIR_PIN P2_11
+#define Z_ENABLE_PIN P0_21
#ifndef Z_CS_PIN
- #define Z_CS_PIN P1_10
+ #define Z_CS_PIN P1_10
#endif
-#define E0_STEP_PIN P2_13
-#define E0_DIR_PIN P0_11
-#define E0_ENABLE_PIN P2_12
+#define E0_STEP_PIN P2_13
+#define E0_DIR_PIN P0_11
+#define E0_ENABLE_PIN P2_12
#ifndef E0_CS_PIN
- #define E0_CS_PIN P1_08
+ #define E0_CS_PIN P1_08
#endif
#ifndef E1_CS_PIN
- #define E1_CS_PIN P1_01
+ #define E1_CS_PIN P1_01
#endif
//
@@ -115,17 +140,17 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P4_28
+ #define TMC_SW_MOSI P4_28
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P0_05
+ #define TMC_SW_MISO P0_05
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P0_04
+ #define TMC_SW_SCK P0_04
#endif
#endif
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -147,23 +172,20 @@
//
// Software serial
//
- #define X_SERIAL_TX_PIN P4_29
- #define X_SERIAL_RX_PIN P1_17
+ #define X_SERIAL_TX_PIN P4_29
+ #define X_SERIAL_RX_PIN P1_17
- #define Y_SERIAL_TX_PIN P1_16
- #define Y_SERIAL_RX_PIN P1_15
+ #define Y_SERIAL_TX_PIN P1_16
+ #define Y_SERIAL_RX_PIN P1_15
- #define Z_SERIAL_TX_PIN P1_14
- #define Z_SERIAL_RX_PIN P1_10
+ #define Z_SERIAL_TX_PIN P1_14
+ #define Z_SERIAL_RX_PIN P1_10
- #define E0_SERIAL_TX_PIN P1_09
- #define E0_SERIAL_RX_PIN P1_08
+ #define E0_SERIAL_TX_PIN P1_09
+ #define E0_SERIAL_RX_PIN P1_08
- #define E1_SERIAL_TX_PIN P1_04
- #define E1_SERIAL_RX_PIN P1_01
-
- #define Z2_SERIAL_TX_PIN P1_04
- #define Z2_SERIAL_RX_PIN P1_01
+ #define E1_SERIAL_TX_PIN P1_04
+ #define E1_SERIAL_RX_PIN P1_01
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
@@ -171,14 +193,33 @@
/**
* _____ _____
- * NC | · · | GND 5V | · · | GND
- * RESET | · · | 1.31 (SD_DETECT) (LCD_D7) 1.23 | · · | 1.22 (LCD_D6)
- * (MOSI) 0.18 | · · | 3.25 (BTN_EN2) (LCD_D5) 1.21 | · · | 1.20 (LCD_D4)
- * (SD_SS) 0.16 | · · | 3.26 (BTN_EN1) (LCD_RS) 1.19 | · · | 1.18 (LCD_EN)
- * (SCK) 0.15 | · · | 0.17 (MISO) (BTN_ENC) 0.28 | · · | 1.30 (BEEPER)
+ * NC | 1 2 | GND 5V | 1 2 | GND
+ * RESET | 3 4 | 1.31 (SD_DETECT) (LCD_D7) 1.23 | 3 4 | 1.22 (LCD_D6)
+ * (MOSI) 0.18 | 5 6 3.25 (BTN_EN2) (LCD_D5) 1.21 | 5 6 1.20 (LCD_D4)
+ * (SD_SS) 0.16 | 7 8 | 3.26 (BTN_EN1) (LCD_RS) 1.19 | 7 8 | 1.18 (LCD_EN)
+ * (SCK) 0.15 | 9 10| 0.17 (MISO) (BTN_ENC) 0.28 | 9 10| 1.30 (BEEPER)
* ----- -----
* EXP2 EXP1
*/
+
+#define EXPA1_03_PIN P1_23
+#define EXPA1_04_PIN P1_22
+#define EXPA1_05_PIN P1_21
+#define EXPA1_06_PIN P1_20
+#define EXPA1_07_PIN P1_19
+#define EXPA1_08_PIN P1_18
+#define EXPA1_09_PIN P0_28
+#define EXPA1_10_PIN P1_30
+
+#define EXPA2_03_PIN -1
+#define EXPA2_04_PIN P1_31
+#define EXPA2_05_PIN P0_18
+#define EXPA2_06_PIN P3_25
+#define EXPA2_07_PIN P0_16
+#define EXPA2_08_PIN P3_26
+#define EXPA2_09_PIN P0_15
+#define EXPA2_10_PIN P0_17
+
#if HAS_SPI_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
@@ -197,114 +238,114 @@
*
* BEFORE AFTER
* _____ _____
- * GND 1 | · · | 2 5V 5V 1 | · · | 2 GND
- * CS 3 | · · | 4 BTN_EN2 CS 3 | · · | 4 BTN_EN2
- * SID 5 | · · | 6 BTN_EN1 SID 5 | · · | 6 BTN_EN1
- * open 7 | · · | 8 BTN_ENC CLK 7 | · · | 8 BTN_ENC
- * CLK 9 | · · | 10 Beeper open 9 | · · | 10 Beeper
+ * GND 1 | 1 2 | 2 5V 5V 1 | 1 2 | 2 GND
+ * CS 3 | 3 4 | 4 BTN_EN2 CS 3 | 3 4 | 4 BTN_EN2
+ * SID 5 | 5 6 6 BTN_EN1 SID 5 | 5 6 6 BTN_EN1
+ * open 7 | 7 8 | 8 BTN_ENC CLK 7 | 7 8 | 8 BTN_ENC
+ * CLK 9 | 9 10| 10 Beeper open 9 | 9 10| 10 Beeper
* ----- -----
* LCD LCD
*/
- #define LCD_PINS_RS P1_23
+ #define LCD_PINS_RS EXPA1_03_PIN
- #define BTN_EN1 P1_20
- #define BTN_EN2 P1_22
- #define BTN_ENC P1_18
+ #define BTN_EN1 EXPA1_06_PIN
+ #define BTN_EN2 EXPA1_04_PIN
+ #define BTN_ENC EXPA1_08_PIN
- #define LCD_PINS_ENABLE P1_21
- #define LCD_PINS_D4 P1_19
+ #define LCD_PINS_ENABLE EXPA1_05_PIN
+ #define LCD_PINS_D4 EXPA1_07_PIN
#elif ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS P1_22
+ #define LCD_PINS_RS EXPA1_04_PIN
- #define BTN_EN1 P1_18
- #define BTN_EN2 P1_20
- #define BTN_ENC P0_28 // (58) open-drain
+ #define BTN_EN1 EXPA1_08_PIN
+ #define BTN_EN2 EXPA1_06_PIN
+ #define BTN_ENC EXPA1_09_PIN // (58) open-drain
- #define LCD_PINS_ENABLE P1_23
- #define LCD_PINS_D4 P1_21
+ #define LCD_PINS_ENABLE EXPA1_03_PIN
+ #define LCD_PINS_D4 EXPA1_05_PIN
- #else // !CR10_STOCKDISPLAY
+ #else // !CR10_STOCKDISPLAY
- #define LCD_PINS_RS P1_19
+ #define LCD_PINS_RS EXPA1_07_PIN
- #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
- #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
- #define BTN_ENC P0_28 // (58) open-drain
+ #define BTN_EN1 EXPA2_08_PIN // (31) J3-2 & AUX-4
+ #define BTN_EN2 EXPA2_06_PIN // (33) J3-4 & AUX-4
+ #define BTN_ENC EXPA1_09_PIN // (58) open-drain
- #define LCD_PINS_ENABLE P1_18
- #define LCD_PINS_D4 P1_20
+ #define LCD_PINS_ENABLE EXPA1_08_PIN
+ #define LCD_PINS_D4 EXPA1_06_PIN
- #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
- #define SD_DETECT_PIN P1_31 // (49) (NOT 5V tolerant)
+ #define LCD_SDSS EXPA2_07_PIN // (16) J3-7 & AUX-4
+ #define SD_DETECT_PIN EXPA2_04_PIN // (49) (NOT 5V tolerant)
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS P1_18
- #define DOGLCD_A0 P1_19
- #define DOGLCD_SCK P0_15
- #define DOGLCD_MOSI P0_18
+ #define DOGLCD_CS EXPA1_08_PIN
+ #define DOGLCD_A0 EXPA1_07_PIN
+ #define DOGLCD_SCK EXPA2_09_PIN
+ #define DOGLCD_MOSI EXPA2_05_PIN
- #define LCD_BACKLIGHT_PIN -1
+ #define LCD_BACKLIGHT_PIN -1
- #define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ #define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN P1_20 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXPA1_06_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN P1_21
+ #define RGB_LED_R_PIN EXPA1_05_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN P1_22
+ #define RGB_LED_G_PIN EXPA1_04_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN P1_23
+ #define RGB_LED_B_PIN EXPA1_03_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN P1_21
+ #define NEOPIXEL_PIN EXPA1_05_PIN
#endif
- #else // !FYSETC_MINI_12864
+ #else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS P1_21
- #define DOGLCD_A0 P1_22
- #define DOGLCD_SCK P0_15
- #define DOGLCD_MOSI P0_18
+ #define DOGLCD_CS EXPA1_05_PIN
+ #define DOGLCD_A0 EXPA1_04_PIN
+ #define DOGLCD_SCK EXPA2_09_PIN
+ #define DOGLCD_MOSI EXPA2_05_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY)
/**
* Creality Ender-2 display pinout
* _____
- * 5V | · · | GND
- * (MOSI) P1_23 | · · | P1_22 (LCD_CS)
- * (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
- * RESET P1.19 | · · | P1_18 (BTN_EN1)
- * (BTN_ENC) P0_28 | · · | P1_30 (SCK)
+ * 5V | 1 2 | GND
+ * (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
+ * (LCD_A0) P1_21 | 5 6 P1_20 (BTN_EN2)
+ * RESET P1_19 | 7 8 | P1_18 (BTN_EN1)
+ * (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
* -----
* EXP1
*/
- #define BTN_EN1 P1_18
- #define BTN_EN2 P1_20
- #define BTN_ENC P0_28
- #define DOGLCD_CS P1_22
- #define DOGLCD_A0 P1_21
- #define DOGLCD_SCK P1_30
- #define DOGLCD_MOSI P1_23
+ #define BTN_EN1 EXPA1_08_PIN
+ #define BTN_EN2 EXPA1_06_PIN
+ #define BTN_ENC EXPA1_09_PIN
+ #define DOGLCD_CS EXPA1_04_PIN
+ #define DOGLCD_A0 EXPA1_05_PIN
+ #define DOGLCD_SCK EXPA1_10_PIN
+ #define DOGLCD_MOSI EXPA1_03_PIN
#define FORCE_SOFT_SPI
- #define LCD_BACKLIGHT_PIN -1
+ #define LCD_BACKLIGHT_PIN -1
#endif
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 P1_21
- #define LCD_PINS_D6 P1_22
- #define LCD_PINS_D7 P1_23
+ #define LCD_PINS_D5 EXPA1_05_PIN
+ #define LCD_PINS_D6 EXPA1_04_PIN
+ #define LCD_PINS_D7 EXPA1_03_PIN
#endif
#endif // !FYSETC_MINI_12864
@@ -318,11 +359,11 @@
//
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION LCD
+ #define SDCARD_CONNECTION LCD
#endif
#if SD_CONNECTION_IS(LCD)
- #define SS_PIN P0_16
+ #define SS_PIN EXPA2_07_PIN
#endif
/**
@@ -334,4 +375,4 @@
*/
// Include common SKR pins
-#include "pins_BTT_SKR.h"
+#include "pins_BTT_SKR_common.h"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 8e2a0cec23..7e722ea45f 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,114 +25,157 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.4"
#endif
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+ #define FLASH_EEPROM_EMULATION
+ //#define SDCARD_EEPROM_EMULATION
+#endif
+
//
// SD Connection
//
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION LCD
+ #define SDCARD_CONNECTION LCD
#endif
//
// Servos
//
-#define SERVO0_PIN P2_00
+#define SERVO0_PIN P2_00
+
+//
+// TMC StallGuard DIAG pins
+//
+#define X_DIAG_PIN P1_29 // X-STOP
+#define Y_DIAG_PIN P1_28 // Y-STOP
+#define Z_DIAG_PIN P1_27 // Z-STOP
+#define E0_DIAG_PIN P1_26 // E0DET
+#define E1_DIAG_PIN P1_25 // E1DET
//
// Limit Switches
//
-#define X_STOP_PIN P1_29
-#define Y_STOP_PIN P1_28
-#define Z_STOP_PIN P1_27
+#if X_STALL_SENSITIVITY
+ #define X_STOP_PIN X_DIAG_PIN
+ #if X_HOME_DIR < 0
+ #define X_MAX_PIN P1_26 // E0DET
+ #else
+ #define X_MIN_PIN P1_26 // E0DET
+ #endif
+#else
+ #define X_STOP_PIN P1_29 // X-STOP
+#endif
+
+#if Y_STALL_SENSITIVITY
+ #define Y_STOP_PIN Y_DIAG_PIN
+ #if Y_HOME_DIR < 0
+ #define Y_MAX_PIN P1_25 // E1DET
+ #else
+ #define Y_MIN_PIN P1_25 // E1DET
+ #endif
+#else
+ #define Y_STOP_PIN P1_28 // Y-STOP
+#endif
+
+#if Z_STALL_SENSITIVITY
+ #define Z_STOP_PIN Z_DIAG_PIN
+ #if Z_HOME_DIR < 0
+ #define Z_MAX_PIN P1_00 // PWRDET
+ #else
+ #define Z_MIN_PIN P1_00 // PWRDET
+ #endif
+#else
+ #ifndef Z_STOP_PIN
+ #define Z_STOP_PIN P1_27 // Z-STOP
+ #endif
+#endif
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN P0_10
+ #define Z_MIN_PROBE_PIN P0_10
#endif
//
// Filament Runout Sensor
//
-#define FIL_RUNOUT_PIN P1_26
-#define FIL_RUNOUT2_PIN P1_25
+#define FIL_RUNOUT_PIN P1_26 // E0DET
+#define FIL_RUNOUT2_PIN P1_25 // E1DET
//
// Power Supply Control
//
#ifndef PS_ON_PIN
- #define PS_ON_PIN P1_00
+ #define PS_ON_PIN P1_00 // PWRDET
#endif
//
// Power Loss Detection
//
#ifndef POWER_LOSS_PIN
- #define POWER_LOSS_PIN P1_00
+ #define POWER_LOSS_PIN P1_00 // PWRDET
#endif
//
// Steppers
//
-#define X_STEP_PIN P2_02
-#define X_DIR_PIN P2_06
-#define X_ENABLE_PIN P2_01
+#define X_STEP_PIN P2_02
+#define X_DIR_PIN P2_06
+#define X_ENABLE_PIN P2_01
#ifndef X_CS_PIN
- #define X_CS_PIN P1_10
+ #define X_CS_PIN P1_10
#endif
-#define Y_STEP_PIN P0_19
-#define Y_DIR_PIN P0_20
-#define Y_ENABLE_PIN P2_08
+#define Y_STEP_PIN P0_19
+#define Y_DIR_PIN P0_20
+#define Y_ENABLE_PIN P2_08
#ifndef Y_CS_PIN
- #define Y_CS_PIN P1_09
+ #define Y_CS_PIN P1_09
#endif
-#define Z_STEP_PIN P0_22
-#define Z_DIR_PIN P2_11
-#define Z_ENABLE_PIN P0_21
+#define Z_STEP_PIN P0_22
+#define Z_DIR_PIN P2_11
+#define Z_ENABLE_PIN P0_21
#ifndef Z_CS_PIN
- #define Z_CS_PIN P1_08
+ #define Z_CS_PIN P1_08
#endif
-#define E0_STEP_PIN P2_13
-#define E0_DIR_PIN P0_11
-#define E0_ENABLE_PIN P2_12
+#define E0_STEP_PIN P2_13
+#define E0_DIR_PIN P0_11
+#define E0_ENABLE_PIN P2_12
#ifndef E0_CS_PIN
- #define E0_CS_PIN P1_04
+ #define E0_CS_PIN P1_04
#endif
-#define E1_STEP_PIN P1_15
-#define E1_DIR_PIN P1_14
-#define E1_ENABLE_PIN P1_16
+#define E1_STEP_PIN P1_15
+#define E1_DIR_PIN P1_14
+#define E1_ENABLE_PIN P1_16
#ifndef E1_CS_PIN
- #define E1_CS_PIN P1_01
+ #define E1_CS_PIN P1_01
#endif
-#define TEMP_1_PIN P0_23_A0 // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_BED_PIN P0_25_A2 // A0 (T0) - (67) - TEMP_BED_PIN
-
-//
-// Include common SKR pins
-//
-#include "pins_BTT_SKR.h"
+#define TEMP_1_PIN P0_23_A0 // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_BED_PIN P0_25_A2 // A0 (T0) - (67) - TEMP_BED_PIN
//
// Software SPI pins for TMC2130 stepper drivers
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P1_17
+ #define TMC_SW_MOSI P1_17
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P0_05
+ #define TMC_SW_MISO P0_05
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P0_04
+ #define TMC_SW_SCK P0_04
#endif
#endif
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -154,23 +197,23 @@
//
// Software serial
//
- #define X_SERIAL_TX_PIN P1_10
- #define X_SERIAL_RX_PIN P1_10
+ #define X_SERIAL_TX_PIN P1_10
+ #define X_SERIAL_RX_PIN P1_10
- #define Y_SERIAL_TX_PIN P1_09
- #define Y_SERIAL_RX_PIN P1_09
+ #define Y_SERIAL_TX_PIN P1_09
+ #define Y_SERIAL_RX_PIN P1_09
- #define Z_SERIAL_TX_PIN P1_08
- #define Z_SERIAL_RX_PIN P1_08
+ #define Z_SERIAL_TX_PIN P1_08
+ #define Z_SERIAL_RX_PIN P1_08
- #define E0_SERIAL_TX_PIN P1_04
- #define E0_SERIAL_RX_PIN P1_04
+ #define E0_SERIAL_TX_PIN P1_04
+ #define E0_SERIAL_RX_PIN P1_04
- #define E1_SERIAL_TX_PIN P1_01
- #define E1_SERIAL_RX_PIN P1_01
+ #define E1_SERIAL_TX_PIN P1_01
+ #define E1_SERIAL_RX_PIN P1_01
- #define Z2_SERIAL_TX_PIN P1_01
- #define Z2_SERIAL_RX_PIN P1_01
+ #define Z2_SERIAL_TX_PIN P1_01
+ #define Z2_SERIAL_RX_PIN P1_01
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
@@ -180,7 +223,7 @@
// SD Connection
//
#if SD_CONNECTION_IS(LCD)
- #define SS_PIN P0_16
+ #define SS_PIN P0_16
#endif
/**
@@ -194,70 +237,84 @@
* EXP2 EXP1
*/
#if HAS_SPI_LCD
- #define BTN_ENC P0_28 // (58) open-drain
+ #if ENABLED(ANET_FULL_GRAPHICS_LCD)
- #if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS P1_22
+ #define LCD_PINS_RS P1_23
- #define BTN_EN1 P1_18
- #define BTN_EN2 P1_20
+ #define BTN_EN1 P1_20
+ #define BTN_EN2 P1_22
+ #define BTN_ENC P1_18
- #define LCD_PINS_ENABLE P1_23
- #define LCD_PINS_D4 P1_21
+ #define LCD_PINS_ENABLE P1_21
+ #define LCD_PINS_D4 P1_19
+
+ #elif ENABLED(CR10_STOCKDISPLAY)
+ #define BTN_ENC P0_28 // (58) open-drain
+ #define LCD_PINS_RS P1_22
+
+ #define BTN_EN1 P1_18
+ #define BTN_EN2 P1_20
+
+ #define LCD_PINS_ENABLE P1_23
+ #define LCD_PINS_D4 P1_21
#else
- #define LCD_PINS_RS P1_19
+ #define BTN_ENC P0_28 // (58) open-drain
+ #define LCD_PINS_RS P1_19
- #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
- #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
+ #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
+ #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
- #define LCD_PINS_ENABLE P1_18
- #define LCD_PINS_D4 P1_20
+ #define LCD_PINS_ENABLE P1_18
+ #define LCD_PINS_D4 P1_20
- #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
- #define SD_DETECT_PIN P1_31 // (49) (NOT 5V tolerant)
+ #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
+
+ #if SD_CONNECTION_IS(LCD)
+ #define SD_DETECT_PIN P1_31 // (49) (NOT 5V tolerant)
+ #endif
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS P1_18
- #define DOGLCD_A0 P1_19
- #define DOGLCD_SCK P0_15
- #define DOGLCD_MOSI P0_18
+ #define DOGLCD_CS P1_18
+ #define DOGLCD_A0 P1_19
+ #define DOGLCD_SCK P0_15
+ #define DOGLCD_MOSI P0_18
- #define LCD_BACKLIGHT_PIN -1
+ #define LCD_BACKLIGHT_PIN -1
- #define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ #define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN P1_20 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN P1_20 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN P1_21
+ #define RGB_LED_R_PIN P1_21
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN P1_22
+ #define RGB_LED_G_PIN P1_22
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN P1_23
+ #define RGB_LED_B_PIN P1_23
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN P1_21
+ #define NEOPIXEL_PIN P1_21
#endif
- #else // !FYSETC_MINI_12864
+ #else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS P1_21
- #define DOGLCD_A0 P1_22
- #define DOGLCD_SCK P0_15
- #define DOGLCD_MOSI P0_18
+ #define DOGLCD_CS P1_21
+ #define DOGLCD_A0 P1_22
+ #define DOGLCD_SCK P0_15
+ #define DOGLCD_MOSI P0_18
#define FORCE_SOFT_SPI
#endif
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 P1_21
- #define LCD_PINS_D6 P1_22
- #define LCD_PINS_D7 P1_23
+ #define LCD_PINS_D5 P1_21
+ #define LCD_PINS_D6 P1_22
+ #define LCD_PINS_D7 P1_23
#endif
#endif // !FYSETC_MINI_12864
@@ -270,7 +327,7 @@
// Neopixel LED
//
#ifndef NEOPIXEL_PIN
- #define NEOPIXEL_PIN P1_24
+ #define NEOPIXEL_PIN P1_24
#endif
/**
@@ -280,3 +337,8 @@
* P0_27 (57) (Open collector)
* P0_28 (58) (Open collector)
*/
+
+//
+// Include common SKR pins
+//
+#include "pins_BTT_SKR_common.h"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
similarity index 58%
rename from Marlin/src/pins/lpc1768/pins_BTT_SKR.h
rename to Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 516913c2d4..63e160d8a0 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,17 +32,21 @@
// Ignore temp readings during development.
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+#if DISABLED(SDCARD_EEPROM_EMULATION)
+ #define FLASH_EEPROM_EMULATION
+#endif
+
//
// Steppers
//
#ifndef E1_STEP_PIN
- #define E1_STEP_PIN P0_01
+ #define E1_STEP_PIN P0_01
#endif
#ifndef E1_DIR_PIN
- #define E1_DIR_PIN P0_00
+ #define E1_DIR_PIN P0_00
#endif
#ifndef E1_ENABLE_PIN
- #define E1_ENABLE_PIN P0_10
+ #define E1_ENABLE_PIN P0_10
#endif
//
@@ -50,63 +54,64 @@
// 3.3V max when defined as an analog input
//
#ifndef TEMP_0_PIN
- #define TEMP_0_PIN P0_24_A1 // A1 (T1) - (68) - TEMP_0_PIN
+ #define TEMP_0_PIN P0_24_A1 // A1 (T1) - (68) - TEMP_0_PIN
#endif
#ifndef TEMP_1_PIN
- #define TEMP_1_PIN P0_25_A2 // A2 (T2) - (69) - TEMP_1_PIN
+ #define TEMP_1_PIN P0_25_A2 // A2 (T2) - (69) - TEMP_1_PIN
#endif
#ifndef TEMP_BED_PIN
- #define TEMP_BED_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_BED_PIN
+ #define TEMP_BED_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_BED_PIN
#endif
+
#if HOTENDS == 1 && TEMP_SENSOR_PROBE
- #define TEMP_PROBE_PIN P0_25_A2 // TEMP_1_PIN
+ #define TEMP_PROBE_PIN TEMP_1_PIN
#endif
//
// Heaters / Fans
//
#ifndef HEATER_0_PIN
- #define HEATER_0_PIN P2_07
+ #define HEATER_0_PIN P2_07
#endif
#if HOTENDS == 1
#ifndef FAN1_PIN
- #define FAN1_PIN P2_04
+ #define FAN1_PIN P2_04
#endif
#else
#ifndef HEATER_1_PIN
- #define HEATER_1_PIN P2_04
+ #define HEATER_1_PIN P2_04
#endif
#endif
#ifndef FAN_PIN
- #define FAN_PIN P2_03
+ #define FAN_PIN P2_03
#endif
#ifndef HEATER_BED_PIN
- #define HEATER_BED_PIN P2_05
+ #define HEATER_BED_PIN P2_05
#endif
//
// LCD / Controller
//
#if HAS_SPI_LCD
- #define BEEPER_PIN P1_30 // (37) not 5V tolerant
+ #define BEEPER_PIN P1_30 // (37) not 5V tolerant
#endif
//
// SD Support
//
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_15
- #define MISO_PIN P0_17
- #define MOSI_PIN P0_18
+ #define SCK_PIN P0_15
+ #define MISO_PIN P0_17
+ #define MOSI_PIN P0_18
#elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN
- #define SD_DETECT_PIN P0_27
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SD_DETECT_PIN P0_27
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 6e45a49a9e..32de7bb740 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,6 +30,12 @@
// Ignore temp readings during develpment.
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Enable 12MHz clock output on P1.27 pin to sync TMC2208 chip clocks
//
@@ -38,63 +44,63 @@
//
// Servos
//
-#define SERVO0_PIN P1_26 // PWM1[6]
-#define SERVO1_PIN P1_18 // PWM1[1]
+#define SERVO0_PIN P1_26 // PWM1[6]
+#define SERVO1_PIN P1_18 // PWM1[1]
//
// Limit Switches
//
-#define X_MIN_PIN P0_00
-#define X_MAX_PIN P0_01
-#define Y_MIN_PIN P0_10
-#define Y_MAX_PIN P0_21
-#define Z_MIN_PIN P2_13
-#define Z_MAX_PIN P2_22
+#define X_MIN_PIN P0_00
+#define X_MAX_PIN P0_01
+#define Y_MIN_PIN P0_10
+#define Y_MAX_PIN P0_21
+#define Z_MIN_PIN P2_13
+#define Z_MAX_PIN P2_22
//
// Steppers
//
-#define X_STEP_PIN P1_01
-#define X_DIR_PIN P1_04
-#define X_ENABLE_PIN P0_26
+#define X_STEP_PIN P1_01
+#define X_DIR_PIN P1_04
+#define X_ENABLE_PIN P0_26
-#define Y_STEP_PIN P1_10
-#define Y_DIR_PIN P1_14
-#define Y_ENABLE_PIN P1_08
+#define Y_STEP_PIN P1_10
+#define Y_DIR_PIN P1_14
+#define Y_ENABLE_PIN P1_08
-#define Z_STEP_PIN P1_17
-#define Z_DIR_PIN P4_29
-#define Z_ENABLE_PIN P1_15
+#define Z_STEP_PIN P1_17
+#define Z_DIR_PIN P4_29
+#define Z_ENABLE_PIN P1_15
-#define E0_STEP_PIN P0_05
-#define E0_DIR_PIN P2_00
-#define E0_ENABLE_PIN P4_28
+#define E0_STEP_PIN P0_05
+#define E0_DIR_PIN P2_00
+#define E0_ENABLE_PIN P4_28
-#define E1_STEP_PIN P2_03
-#define E1_DIR_PIN P2_04
-#define E1_ENABLE_PIN P2_01
+#define E1_STEP_PIN P2_03
+#define E1_DIR_PIN P2_04
+#define E1_ENABLE_PIN P2_01
-#define E2_STEP_PIN P2_07
-#define E2_DIR_PIN P2_08
-#define E2_ENABLE_PIN P2_05
+#define E2_STEP_PIN P2_07
+#define E2_DIR_PIN P2_08
+#define E2_ENABLE_PIN P2_05
//
// TMC2208 UART pins
//
-#if HAS_DRIVER(TMC2208)
- #define X_SERIAL_TX_PIN P1_00
- #define X_SERIAL_RX_PIN P1_00
- #define Y_SERIAL_TX_PIN P1_09
- #define Y_SERIAL_RX_PIN P1_09
- #define Z_SERIAL_TX_PIN P1_16
- #define Z_SERIAL_RX_PIN P1_16
- #define E0_SERIAL_TX_PIN P0_04
- #define E0_SERIAL_RX_PIN P0_04
- #define E1_SERIAL_TX_PIN P2_02
- #define E1_SERIAL_RX_PIN P2_02
- #define E2_SERIAL_TX_PIN P2_06
- #define E2_SERIAL_RX_PIN P2_06
+#if HAS_TMC_UART
+ #define X_SERIAL_TX_PIN P1_00
+ #define X_SERIAL_RX_PIN P1_00
+ #define Y_SERIAL_TX_PIN P1_09
+ #define Y_SERIAL_RX_PIN P1_09
+ #define Z_SERIAL_TX_PIN P1_16
+ #define Z_SERIAL_RX_PIN P1_16
+ #define E0_SERIAL_TX_PIN P0_04
+ #define E0_SERIAL_RX_PIN P0_04
+ #define E1_SERIAL_TX_PIN P2_02
+ #define E1_SERIAL_RX_PIN P2_02
+ #define E2_SERIAL_TX_PIN P2_06
+ #define E2_SERIAL_RX_PIN P2_06
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
@@ -106,36 +112,36 @@
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_24_A1 // AD0[0] on P0_23
-#define TEMP_BED_PIN P0_23_A0 // AD0[1] on P0_24
+#define TEMP_0_PIN P0_24_A1 // AD0[0] on P0_23
+#define TEMP_BED_PIN P0_23_A0 // AD0[1] on P0_24
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P1_19 // Not a PWM pin, software PWM required
-#define HEATER_0_PIN P3_26 // PWM1[3]
-#define FAN_PIN P3_25 // Part cooling fan - connected to PWM1[2]
-#define E0_AUTO_FAN_PIN P0_27 // Extruder cooling fan
+#define HEATER_BED_PIN P1_19 // Not a PWM pin, software PWM required
+#define HEATER_0_PIN P3_26 // PWM1[3]
+#define FAN_PIN P3_25 // Part cooling fan - connected to PWM1[2]
+#define E0_AUTO_FAN_PIN P0_27 // Extruder cooling fan
//
// Misc. Functions
//
-#define LED_PIN P1_31
+#define LED_PIN P1_31
//
// LCD
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define BEEPER_PIN P0_19
- #define BTN_EN1 P1_23
- #define BTN_EN2 P1_24
- #define BTN_ENC P1_25
- #define LCD_PINS_RS P0_20
- #define LCD_PINS_ENABLE P0_21
- #define LCD_PINS_D4 P2_11
- #define LCD_PINS_D5 P0_22
- #define LCD_PINS_D6 P1_29
- #define LCD_PINS_D7 P1_28
+ #define BEEPER_PIN P0_19
+ #define BTN_EN1 P1_23
+ #define BTN_EN2 P1_24
+ #define BTN_ENC P1_25
+ #define LCD_PINS_RS P0_20
+ #define LCD_PINS_ENABLE P0_21
+ #define LCD_PINS_D4 P2_11
+ #define LCD_PINS_D5 P0_22
+ #define LCD_PINS_D6 P1_29
+ #define LCD_PINS_D7 P1_28
#endif
//
@@ -143,21 +149,21 @@
//
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION LCD
+ #define SDCARD_CONNECTION LCD
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_15
- #define MISO_PIN P0_17
- #define MOSI_PIN P0_18
- #define SS_PIN P0_16
+ #define SCK_PIN P0_15
+ #define MISO_PIN P0_17
+ #define MOSI_PIN P0_18
+ #define SS_PIN P0_16
#elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN
- #define SD_DETECT_PIN P0_27
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SD_DETECT_PIN P0_27
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
#endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index b830f3dcb8..0cd10ebc05 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,73 +38,81 @@
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SBASE"
#endif
-#define LED_PIN P1_18 // Used as a status indicator
-#define LED2_PIN P1_19
-#define LED3_PIN P1_20
-#define LED4_PIN P1_21
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+ #define FLASH_EEPROM_EMULATION
+ //#define SDCARD_EEPROM_EMULATION
+#endif
+
+#define LED_PIN P1_18 // Used as a status indicator
+#define LED2_PIN P1_19
+#define LED3_PIN P1_20
+#define LED4_PIN P1_21
//
// Servos
//
-#define SERVO0_PIN P1_23 // J8-3 (low jitter)
-#define SERVO1_PIN P2_12 // J8-4
-#define SERVO2_PIN P2_11 // J8-5
-#define SERVO3_PIN P4_28 // J8-6
+#define SERVO0_PIN P1_23 // J8-3 (low jitter)
+#define SERVO1_PIN P2_12 // J8-4
+#define SERVO2_PIN P2_11 // J8-5
+#define SERVO3_PIN P4_28 // J8-6
//
// Limit Switches - Not Interrupt Capable
//
-#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN P1_28 // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
-#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN P1_28 // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
+#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN P4_28 // Connector J8
+ #define Z_MIN_PROBE_PIN P4_28 // Connector J8
#endif
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P0_04
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P0_04
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
-#define E1_STEP_PIN P2_08
-#define E1_DIR_PIN P2_13
-#define E1_ENABLE_PIN P4_29
+#define E1_STEP_PIN P2_08
+#define E1_DIR_PIN P2_13
+#define E1_ENABLE_PIN P4_29
//
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
-#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
-#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
-#define TEMP_2_PIN P0_26_A3 // A3 (TH4)
+#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
+#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
+#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
+#define TEMP_2_PIN P0_26_A3 // A3 (TH4)
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_05
-#define HEATER_0_PIN P2_07
-#define HEATER_1_PIN P2_06
+#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_07
+#define HEATER_1_PIN P2_06
#ifndef FAN_PIN
- #define FAN_PIN P2_04
+ #define FAN_PIN P2_04
#endif
//
@@ -116,56 +124,56 @@
// 5V
// NC
// GND
-#define PIN_P0_17 P0_17
-#define PIN_P0_16 P0_16
-#define PIN_P0_15 P0_15
+#define PIN_P0_17 P0_17
+#define PIN_P0_16 P0_16
+#define PIN_P0_15 P0_15
//
// Connector J8
//
// GND
-#define PIN_P1_22 P1_22
-#define PIN_P1_23 P1_23 // PWM Capable
-#define PIN_P2_12 P2_12 // Interrupt Capable
-#define PIN_P2_11 P2_11 // Interrupt Capable
+#define PIN_P1_22 P1_22
+#define PIN_P1_23 P1_23 // PWM Capable
+#define PIN_P2_12 P2_12 // Interrupt Capable
+#define PIN_P2_11 P2_11 // Interrupt Capable
//
// Průša i3 MK2 Multi Material Multiplexer Support
//
#if ENABLED(MK2_MULTIPLEXER)
- #define E_MUX0_PIN P1_23 // J8-3
- #define E_MUX1_PIN P2_12 // J8-4
- #define E_MUX2_PIN P2_11 // J8-5
+ #define E_MUX0_PIN P1_23 // J8-3
+ #define E_MUX1_PIN P2_12 // J8-4
+ #define E_MUX2_PIN P2_11 // J8-5
#endif
//
// Misc. Functions
//
-#define PS_ON_PIN P0_25 // TH3 Connector
+#define PS_ON_PIN P0_25 // TH3 Connector
//
// Ethernet pins
//
#ifndef ULTIPANEL
- #define ENET_MDIO P1_17 // J12-4
- #define ENET_RX_ER P1_14 // J12-6
- #define ENET_RXD1 P1_10 // J12-8
+ #define ENET_MDIO P1_17 // J12-4
+ #define ENET_RX_ER P1_14 // J12-6
+ #define ENET_RXD1 P1_10 // J12-8
#endif
-#define ENET_MOC P1_16 // J12-3
-#define REF_CLK P1_15 // J12-5
-#define ENET_RXD0 P1_09 // J12-7
-#define ENET_CRS P1_08 // J12-9
-#define ENET_TX_EN P1_04 // J12-10
-#define ENET_TXD0 P1_00 // J12-11
-#define ENET_TXD1 P1_01 // J12-12
+#define ENET_MOC P1_16 // J12-3
+#define REF_CLK P1_15 // J12-5
+#define ENET_RXD0 P1_09 // J12-7
+#define ENET_CRS P1_08 // J12-9
+#define ENET_TX_EN P1_04 // J12-10
+#define ENET_TXD0 P1_00 // J12-11
+#define ENET_TXD1 P1_01 // J12-12
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
+ #define SDCARD_CONNECTION ONBOARD
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(CUSTOM_CABLE)
@@ -181,27 +189,27 @@
* If you can't find a pin to use for the LCD's SD_DETECT then comment out
* SD_DETECT_PIN entirely and remove that wire from the the custom cable.
*/
- #define SD_DETECT_PIN P2_11 // J8-5 (moved from EXP2 P0.27)
- #define SCK_PIN P1_22 // J8-2 (moved from EXP2 P0.7)
- #define MISO_PIN P1_23 // J8-3 (moved from EXP2 P0.8)
- #define MOSI_PIN P2_12 // J8-4 (moved from EXP2 P0.9)
- #define SS_PIN P0_28
- #define LPC_SOFTWARE_SPI // With a custom cable we need software SPI because the
- // selected pins are not on a hardware SPI controller
+ #define SD_DETECT_PIN P2_11 // J8-5 (moved from EXP2 P0.27)
+ #define SCK_PIN P1_22 // J8-2 (moved from EXP2 P0.7)
+ #define MISO_PIN P1_23 // J8-3 (moved from EXP2 P0.8)
+ #define MOSI_PIN P2_12 // J8-4 (moved from EXP2 P0.9)
+ #define SS_PIN P0_28
+ #define LPC_SOFTWARE_SPI // With a custom cable we need software SPI because the
+ // selected pins are not on a hardware SPI controller
#elif SD_CONNECTION_IS(LCD)
// use standard cable and header, SPI and SD detect sre shared with on-board SD card
// hardware SPI is used for both SD cards. The detect pin is shred between the
// LCD and onboard SD readers so we disable it.
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN P0_28
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN P0_28
#elif SD_CONNECTION_IS(ONBOARD)
- #define SD_DETECT_PIN P0_27
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SD_DETECT_PIN P0_27
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
#endif
/**
@@ -218,17 +226,17 @@
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN P1_31 // EXP1.1
- #define BTN_ENC P1_30 // EXP1.2
- #define BTN_EN1 P3_26 // EXP2.5
- #define BTN_EN2 P3_25 // EXP2.3
- #define LCD_PINS_RS P0_16 // EXP1.4
- #define LCD_SDSS P0_28 // EXP2.4
- #define LCD_PINS_ENABLE P0_18 // EXP1.3
- #define LCD_PINS_D4 P0_15 // EXP1.5
+ #define BEEPER_PIN P1_31 // EXP1.1
+ #define BTN_ENC P1_30 // EXP1.2
+ #define BTN_EN1 P3_26 // EXP2.5
+ #define BTN_EN2 P3_25 // EXP2.3
+ #define LCD_PINS_RS P0_16 // EXP1.4
+ #define LCD_SDSS P0_28 // EXP2.4
+ #define LCD_PINS_ENABLE P0_18 // EXP1.3
+ #define LCD_PINS_D4 P0_15 // EXP1.5
#if ANY(VIKI2, miniVIKI)
- #define DOGLCD_SCK SCK_PIN
- #define DOGLCD_MOSI MOSI_PIN
+ #define DOGLCD_SCK SCK_PIN
+ #define DOGLCD_MOSI MOSI_PIN
#endif
#if ENABLED(FYSETC_MINI_12864)
@@ -243,26 +251,26 @@
* Pins 6, 7 & 8 on EXP2 are no connects. That means a second special
* cable will be needed if the RGB LEDs are to be active.
*/
- #define DOGLCD_CS LCD_PINS_ENABLE // EXP1.3 (LCD_EN on FYSETC schematic)
- #define DOGLCD_A0 LCD_PINS_RS // EXP1.4 (LCD_A0 on FYSETC schematic)
- #define DOGLCD_SCK P2_11 // J8-5 (SCK on FYSETC schematic)
- #define DOGLCD_MOSI P4_28 // J8-6 (MOSI on FYSETC schematic)
+ #define DOGLCD_CS LCD_PINS_ENABLE // EXP1.3 (LCD_EN on FYSETC schematic)
+ #define DOGLCD_A0 LCD_PINS_RS // EXP1.4 (LCD_A0 on FYSETC schematic)
+ #define DOGLCD_SCK P2_11 // J8-5 (SCK on FYSETC schematic)
+ #define DOGLCD_MOSI P4_28 // J8-6 (MOSI on FYSETC schematic)
- //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN P2_12 // J8-4 (LCD_D6 on FYSETC schematic)
+ #define RGB_LED_R_PIN P2_12 // J8-4 (LCD_D6 on FYSETC schematic)
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN P1_23 // J8-3 (LCD_D5 on FYSETC schematic)
+ #define RGB_LED_G_PIN P1_23 // J8-3 (LCD_D5 on FYSETC schematic)
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN P1_22 // J8-2 (LCD_D7 on FYSETC schematic)
+ #define RGB_LED_B_PIN P1_22 // J8-2 (LCD_D7 on FYSETC schematic)
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN P2_12
+ #define NEOPIXEL_PIN P2_12
#endif
#elif ENABLED(MINIPANEL)
@@ -283,29 +291,29 @@
#if HAS_DRIVER(TMC2130)
// J8
- #define X_CS_PIN P1_22
- #define Y_CS_PIN P1_23
- #define Z_CS_PIN P2_12
- #define E0_CS_PIN P2_11
- #define E1_CS_PIN P4_28
+ #define X_CS_PIN P1_22
+ #define Y_CS_PIN P1_23
+ #define Z_CS_PIN P2_12
+ #define E0_CS_PIN P2_11
+ #define E1_CS_PIN P4_28
// Hardware SPI is on EXP2. See if you can make it work:
// https://github.com/makerbase-mks/MKS-SBASE/issues/25
#define TMC_USE_SW_SPI
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P0_03 // AUX1
+ #define TMC_SW_MOSI P0_03 // AUX1
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P0_02 // AUX1
+ #define TMC_SW_MISO P0_02 // AUX1
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P0_26 // TH4
+ #define TMC_SW_SCK P0_26 // TH4
#endif
#endif
#endif
-#if MB(MKS_SBASE) && HAS_TMC220x
+#if MB(MKS_SBASE) && HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
@@ -314,24 +322,24 @@
* Worst case you may have to give up the LCD
* RX pins need to be interrupt capable
*/
- #define X_SERIAL_TX_PIN P1_22 // J8-2
- #define X_SERIAL_RX_PIN P2_12 // J8-4 Interrupt Capable
- #define Y_SERIAL_TX_PIN P1_23 // J8-3
- #define Y_SERIAL_RX_PIN P2_11 // J8-5 Interrupt Capable
- #define Z_SERIAL_TX_PIN P2_12 // J8-4
- #define Z_SERIAL_RX_PIN P0_25 // TH3
- #define E0_SERIAL_TX_PIN P4_28 // J8-6
- #define E0_SERIAL_RX_PIN P0_26 // TH4
+ #define X_SERIAL_TX_PIN P1_22 // J8-2
+ #define X_SERIAL_RX_PIN P2_12 // J8-4 Interrupt Capable
+ #define Y_SERIAL_TX_PIN P1_23 // J8-3
+ #define Y_SERIAL_RX_PIN P2_11 // J8-5 Interrupt Capable
+ #define Z_SERIAL_TX_PIN P2_12 // J8-4
+ #define Z_SERIAL_RX_PIN P0_25 // TH3
+ #define E0_SERIAL_TX_PIN P4_28 // J8-6
+ #define E0_SERIAL_RX_PIN P0_26 // TH4
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
// UNUSED
-#define PIN_P0_27 P0_27 // EXP2/Onboard SD
-#define PIN_P0_28 P0_28 // EXP2
-#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_27 P0_27 // EXP2/Onboard SD
+#define PIN_P0_28 P0_28 // EXP2
+#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
/**
* PWMs
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index a47e9e0383..afbe6d5564 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,65 +32,109 @@
#define BOARD_INFO_NAME "MKS SGen-L"
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P1_23 // SERVO P1.23
-#define SERVO1_PIN P2_00 // SERVO P2.0
+#define SERVO0_PIN P1_23 // SERVO P1.23
+#define SERVO1_PIN P2_00 // SERVO P2.0
+
+//
+// Trinamic Stallguard pins
+//
+#define X_DIAG_PIN P1_29 // X-
+#define Y_DIAG_PIN P1_27 // Y-
+#define Z_DIAG_PIN P1_25 // Z-
+#define E0_DIAG_PIN P1_28 // X+
+#define E1_DIAG_PIN P1_26 // Y+
//
// Limit Switches
//
-#define X_MIN_PIN P1_29
-#define X_MAX_PIN P1_28
-#define Y_MIN_PIN P1_27
-#define Y_MAX_PIN P1_26
-#define Z_MIN_PIN P1_25
-#define Z_MAX_PIN P1_24
+#if X_STALL_SENSITIVITY
+ #define X_STOP_PIN X_DIAG_PIN
+ #if X_HOME_DIR < 0
+ #define X_MAX_PIN P1_28 // X+
+ #else
+ #define X_MIN_PIN P1_28 // X+
+ #endif
+#else
+ #define X_MIN_PIN P1_29 // X-
+ #define X_MAX_PIN P1_28 // X+
+#endif
+
+#if Y_STALL_SENSITIVITY
+ #define Y_STOP_PIN Y_DIAG_PIN
+ #if Y_HOME_DIR < 0
+ #define Y_MAX_PIN P1_26 // Y+
+ #else
+ #define Y_MIN_PIN P1_26 // Y+
+ #endif
+#else
+ #define Y_MIN_PIN P1_27 // Y-
+ #define Y_MAX_PIN P1_26 // Y+
+#endif
+
+#if Z_STALL_SENSITIVITY
+ #define Z_STOP_PIN Z_DIAG_PIN
+ #if Z_HOME_DIR < 0
+ #define Z_MAX_PIN P1_24 // Z+
+ #else
+ #define Z_MIN_PIN P1_24 // Z+
+ #endif
+#else
+ #define Z_MIN_PIN P1_25 // Z-
+ #define Z_MAX_PIN P1_24 // Z+
+#endif
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN P1_24
+ #define Z_MIN_PROBE_PIN P1_24
#endif
//
// Steppers
//
-#define X_STEP_PIN P2_02
-#define X_DIR_PIN P2_03
-#define X_ENABLE_PIN P2_01
+#define X_STEP_PIN P2_02
+#define X_DIR_PIN P2_03
+#define X_ENABLE_PIN P2_01
#ifndef X_CS_PIN
- #define X_CS_PIN P1_01
+ #define X_CS_PIN P1_01
#endif
-#define Y_STEP_PIN P0_19
-#define Y_DIR_PIN P0_20
-#define Y_ENABLE_PIN P2_08
+#define Y_STEP_PIN P0_19
+#define Y_DIR_PIN P0_20
+#define Y_ENABLE_PIN P2_08
#ifndef Y_CS_PIN
- #define Y_CS_PIN P1_08
+ #define Y_CS_PIN P1_08
#endif
-#define Z_STEP_PIN P0_22
-#define Z_DIR_PIN P2_11
-#define Z_ENABLE_PIN P0_21
+#define Z_STEP_PIN P0_22
+#define Z_DIR_PIN P2_11
+#define Z_ENABLE_PIN P0_21
#ifndef Z_CS_PIN
- #define Z_CS_PIN P1_10
+ #define Z_CS_PIN P1_10
#endif
-#define E0_STEP_PIN P2_13
-#define E0_DIR_PIN P0_11
-#define E0_ENABLE_PIN P2_12
+#define E0_STEP_PIN P2_13
+#define E0_DIR_PIN P0_11
+#define E0_ENABLE_PIN P2_12
#ifndef E0_CS_PIN
- #define E0_CS_PIN P1_15
+ #define E0_CS_PIN P1_15
#endif
-#define E1_STEP_PIN P0_01
-#define E1_DIR_PIN P0_00
-#define E1_ENABLE_PIN P0_10
+#define E1_STEP_PIN P0_01
+#define E1_DIR_PIN P0_00
+#define E1_ENABLE_PIN P0_10
#ifndef E1_CS_PIN
- #define E1_CS_PIN P1_17
+ #define E1_CS_PIN P1_17
#endif
//
@@ -98,17 +142,17 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P4_28
+ #define TMC_SW_MOSI P4_28
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P0_05
+ #define TMC_SW_MISO P0_05
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P0_04
+ #define TMC_SW_SCK P0_04
#endif
#endif
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -131,23 +175,23 @@
// Software serial
//
- #define X_SERIAL_TX_PIN P1_04
- #define X_SERIAL_RX_PIN P1_01
+ #define X_SERIAL_TX_PIN P1_04
+ #define X_SERIAL_RX_PIN P1_01
- #define Y_SERIAL_TX_PIN P1_09
- #define Y_SERIAL_RX_PIN P1_08
+ #define Y_SERIAL_TX_PIN P1_09
+ #define Y_SERIAL_RX_PIN P1_08
- #define Z_SERIAL_TX_PIN P1_14
- #define Z_SERIAL_RX_PIN P1_10
+ #define Z_SERIAL_TX_PIN P1_14
+ #define Z_SERIAL_RX_PIN P1_10
- #define E0_SERIAL_TX_PIN P1_16
- #define E0_SERIAL_RX_PIN P1_15
+ #define E0_SERIAL_TX_PIN P1_16
+ #define E0_SERIAL_RX_PIN P1_15
- #define E1_SERIAL_TX_PIN P4_29
- #define E1_SERIAL_RX_PIN P1_17
+ #define E1_SERIAL_TX_PIN P4_29
+ #define E1_SERIAL_RX_PIN P1_17
- #define Z2_SERIAL_TX_PIN P4_29
- #define Z2_SERIAL_RX_PIN P1_17
+ #define Z2_SERIAL_TX_PIN P4_29
+ #define Z2_SERIAL_RX_PIN P1_17
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
@@ -157,35 +201,35 @@
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_23_A0 // Analog Input A0 (TH1)
-#define TEMP_BED_PIN P0_24_A1 // Analog Input A1 (TB)
-#define TEMP_1_PIN P0_25_A2 // Analog Input A2 (TH2)
+#define TEMP_0_PIN P0_23_A0 // Analog Input A0 (TH1)
+#define TEMP_BED_PIN P0_24_A1 // Analog Input A1 (TB)
+#define TEMP_1_PIN P0_25_A2 // Analog Input A2 (TH2)
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_05
-#define HEATER_0_PIN P2_07
+#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_07
#if HOTENDS == 1
#ifndef FAN1_PIN
- #define FAN1_PIN P2_06
+ #define FAN1_PIN P2_06
#endif
#else
#ifndef HEATER_1_PIN
- #define HEATER_1_PIN P2_06
+ #define HEATER_1_PIN P2_06
#endif
#endif
#ifndef FAN_PIN
- #define FAN_PIN P2_04
+ #define FAN_PIN P2_04
#endif
//
// Misc. Functions
//
-#define LED_PIN P1_18 // Used as a status indicator
-#define LED2_PIN P1_19
-#define LED3_PIN P1_20
-#define LED4_PIN P1_21
+#define LED_PIN P1_18 // Used as a status indicator
+#define LED2_PIN P1_19
+#define LED3_PIN P1_20
+#define LED4_PIN P1_21
/**
* _____ _____
@@ -198,83 +242,83 @@
* EXP1 EXP2
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN P1_31
- #define BTN_ENC P1_30
+ #define BEEPER_PIN P1_31
+ #define BTN_ENC P1_30
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS P1_00
+ #define LCD_PINS_RS P1_00
- #define BTN_EN1 P0_18
- #define BTN_EN2 P0_15
+ #define BTN_EN1 P0_18
+ #define BTN_EN2 P0_15
- #define LCD_PINS_ENABLE P1_22
- #define LCD_PINS_D4 P0_17
+ #define LCD_PINS_ENABLE P1_22
+ #define LCD_PINS_D4 P0_17
#else
- #define BTN_EN1 P3_25
- #define BTN_EN2 P3_26
+ #define BTN_EN1 P3_25
+ #define BTN_EN2 P3_26
- #define LCD_SDSS P0_28
+ #define LCD_SDSS P0_28
#if ENABLED(MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC P0_17
- #define DOGLCD_CS P0_16
- #define DOGLCD_A0 LCD_PINS_DC
- #define DOGLCD_SCK P0_15
- #define DOGLCD_MOSI P0_18
+ #define LCD_PINS_DC P0_17
+ #define DOGLCD_CS P0_16
+ #define DOGLCD_A0 LCD_PINS_DC
+ #define DOGLCD_SCK P0_15
+ #define DOGLCD_MOSI P0_18
- #define LCD_PINS_RS P1_00
- #define LCD_PINS_D7 P1_22
- #define KILL_PIN -1 // NC
+ #define LCD_PINS_RS P1_00
+ #define LCD_PINS_D7 P1_22
+ #define KILL_PIN -1 // NC
- #else // !MKS_12864OLED_SSD1306
+ #else // !MKS_12864OLED_SSD1306
- #define LCD_PINS_RS P0_16
+ #define LCD_PINS_RS P0_16
- #define LCD_PINS_ENABLE P0_18
- #define LCD_PINS_D4 P0_15
+ #define LCD_PINS_ENABLE P0_18
+ #define LCD_PINS_D4 P0_15
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS P0_18
- #define DOGLCD_A0 P0_16
- #define DOGLCD_SCK P0_07
- #define DOGLCD_MOSI P1_20
+ #define DOGLCD_CS P0_18
+ #define DOGLCD_A0 P0_16
+ #define DOGLCD_SCK P0_07
+ #define DOGLCD_MOSI P1_20
- #define LCD_BACKLIGHT_PIN -1
+ #define LCD_BACKLIGHT_PIN -1
- #define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ #define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN P0_15 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN P0_15 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN P0_17
+ #define RGB_LED_R_PIN P0_17
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN P1_00
+ #define RGB_LED_G_PIN P1_00
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN P1_22
+ #define RGB_LED_B_PIN P1_22
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN P0_17
+ #define NEOPIXEL_PIN P0_17
#endif
- #else // !FYSETC_MINI_12864
+ #else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS P0_17
- #define DOGLCD_A0 P1_00
+ #define DOGLCD_CS P0_17
+ #define DOGLCD_A0 P1_00
#endif
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 P0_17
- #define LCD_PINS_D6 P1_00
- #define LCD_PINS_D7 P1_22
+ #define LCD_PINS_D5 P0_17
+ #define LCD_PINS_D6 P1_00
+ #define LCD_PINS_D7 P1_22
#endif
#endif // !FYSETC_MINI_12864
@@ -286,20 +330,20 @@
#endif // HAS_SPI_LCD
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
+ #define SDCARD_CONNECTION ONBOARD
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
- #define SD_DETECT_PIN P0_27
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
+ #define SD_DETECT_PIN P0_27
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
#if SD_CONNECTION_IS(ONBOARD)
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SS_PIN ONBOARD_SD_CS_PIN
#else
- #define SS_PIN P0_28
+ #define SS_PIN P0_28
#endif
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
@@ -308,6 +352,6 @@
//
// Other Pins
//
-//#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PS_ON_PIN P1_23 // SERVO P1.23
+//#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PS_ON_PIN P1_23 // SERVO P1.23
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index af08e0a588..b8b04a348c 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,61 +42,67 @@
#define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P1_20 // (11)
-#define SERVO1_PIN P1_21 // ( 6) also on J5-1
-#define SERVO2_PIN P1_19 // ( 5)
-#define SERVO3_PIN P1_18 // ( 4) 5V output
+#define SERVO0_PIN P1_20 // (11)
+#define SERVO1_PIN P1_21 // ( 6) also on J5-1
+#define SERVO2_PIN P1_19 // ( 5)
+#define SERVO3_PIN P1_18 // ( 4) 5V output
//
// Limit Switches
//
-#define X_MIN_PIN P1_24 // ( 3) 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN P1_25 // ( 2) 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN P1_26 // (14) 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN P1_27 // (15) 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN P1_29 // (18) 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN P1_28 // (19) 10k pullup to 3.3V, 1K series
-#define ONBOARD_ENDSTOPPULLUPS // Board has built-in pullups
+#define X_MIN_PIN P1_24 // ( 3) 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN P1_25 // ( 2) 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN P1_26 // (14) 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN P1_27 // (15) 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN P1_29 // (18) 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN P1_28 // (19) 10k pullup to 3.3V, 1K series
+#define ONBOARD_ENDSTOPPULLUPS // Board has built-in pullups
//
// Steppers
//
-#define X_STEP_PIN P2_01 // (54)
-#define X_DIR_PIN P0_11 // (55)
-#define X_ENABLE_PIN P0_10 // (38)
+#define X_STEP_PIN P2_01 // (54)
+#define X_DIR_PIN P0_11 // (55)
+#define X_ENABLE_PIN P0_10 // (38)
#ifndef X_CS_PIN
- #define X_CS_PIN P1_01 // ETH
+ #define X_CS_PIN P1_01 // ETH
#endif
-#define Y_STEP_PIN P2_02 // (60)
-#define Y_DIR_PIN P0_20 // (61)
-#define Y_ENABLE_PIN P0_19 // (56)
+#define Y_STEP_PIN P2_02 // (60)
+#define Y_DIR_PIN P0_20 // (61)
+#define Y_ENABLE_PIN P0_19 // (56)
#ifndef Y_CS_PIN
- #define Y_CS_PIN P1_04 // ETH
+ #define Y_CS_PIN P1_04 // ETH
#endif
-#define Z_STEP_PIN P2_03 // (46)
-#define Z_DIR_PIN P0_22 // (48)
-#define Z_ENABLE_PIN P0_21 // (62)
+#define Z_STEP_PIN P2_03 // (46)
+#define Z_DIR_PIN P0_22 // (48)
+#define Z_ENABLE_PIN P0_21 // (62)
#ifndef Z_CS_PIN
- #define Z_CS_PIN P1_10 // ETH
+ #define Z_CS_PIN P1_10 // ETH
#endif
-#define E0_STEP_PIN P2_00 // (26)
-#define E0_DIR_PIN P0_05 // (28)
-#define E0_ENABLE_PIN P0_04 // (24)
+#define E0_STEP_PIN P2_00 // (26)
+#define E0_DIR_PIN P0_05 // (28)
+#define E0_ENABLE_PIN P0_04 // (24)
#ifndef E0_CS_PIN
- #define E0_CS_PIN P1_14 // ETH
+ #define E0_CS_PIN P1_14 // ETH
#endif
-#define E1_STEP_PIN P2_08 // (36)
-#define E1_DIR_PIN P2_13 // (34)
-#define E1_ENABLE_PIN P4_29 // (30)
+#define E1_STEP_PIN P2_08 // (36)
+#define E1_DIR_PIN P2_13 // (34)
+#define E1_ENABLE_PIN P4_29 // (30)
#ifndef E1_CS_PIN
- #define E1_CS_PIN -1
+ #define E1_CS_PIN -1
#endif
//
@@ -104,17 +110,17 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P1_00 // ETH
+ #define TMC_SW_MOSI P1_00 // ETH
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P1_08 // ETH
+ #define TMC_SW_MISO P1_08 // ETH
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P1_09 // ETH
+ #define TMC_SW_SCK P1_09 // ETH
#endif
#endif
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -130,31 +136,31 @@
// P2_13 E1-Dir
#ifndef X_SERIAL_TX_PIN
- #define X_SERIAL_TX_PIN P0_01
+ #define X_SERIAL_TX_PIN P0_01
#endif
#ifndef X_SERIAL_RX_PIN
- #define X_SERIAL_RX_PIN P0_01
+ #define X_SERIAL_RX_PIN P0_01
#endif
#ifndef Y_SERIAL_TX_PIN
- #define Y_SERIAL_TX_PIN P0_00
+ #define Y_SERIAL_TX_PIN P0_00
#endif
#ifndef Y_SERIAL_RX_PIN
- #define Y_SERIAL_RX_PIN P0_00
+ #define Y_SERIAL_RX_PIN P0_00
#endif
#ifndef Z_SERIAL_TX_PIN
- #define Z_SERIAL_TX_PIN P2_13
+ #define Z_SERIAL_TX_PIN P2_13
#endif
#ifndef Z_SERIAL_RX_PIN
- #define Z_SERIAL_RX_PIN P2_13
+ #define Z_SERIAL_RX_PIN P2_13
#endif
#ifndef E0_SERIAL_TX_PIN
- #define E0_SERIAL_TX_PIN P2_08
+ #define E0_SERIAL_TX_PIN P2_08
#endif
#ifndef E0_SERIAL_RX_PIN
- #define E0_SERIAL_RX_PIN P2_08
+ #define E0_SERIAL_RX_PIN P2_08
#endif
// Reduce baud rate to improve software serial reliability
@@ -165,14 +171,14 @@
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_0_PIN
-#define TEMP_BED_PIN P0_24_A1 // A1 (T1) - (68) - TEMP_BED_PIN
-#define TEMP_1_PIN P0_25_A2 // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_2_PIN P0_26_A3 // A3 - (63) - J5-3 & AUX-2
-#define TEMP_3_PIN P1_30_A4 // A4 - (37) - BUZZER_PIN
-//#define TEMP_4_PIN P1_31_A5 // A5 - (49) - SD_DETECT_PIN
+#define TEMP_0_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_0_PIN
+#define TEMP_BED_PIN P0_24_A1 // A1 (T1) - (68) - TEMP_BED_PIN
+#define TEMP_1_PIN P0_25_A2 // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_2_PIN P0_26_A3 // A3 - (63) - J5-3 & AUX-2
+#define TEMP_3_PIN P1_30_A4 // A4 - (37) - BUZZER_PIN
+//#define TEMP_4_PIN P1_31_A5 // A5 - (49) - SD_DETECT_PIN
//#define ?? P0_03_A6 // A6 - ( 0) - RXD0 - J4-4 & AUX-1
-#define FILWIDTH_PIN P0_02_A7 // A7 - ( 1) - TXD0 - J4-5 & AUX-1
+#define FILWIDTH_PIN P0_02_A7 // A7 - ( 1) - TXD0 - J4-5 & AUX-1
//
// Augmentation for auto-assigning RAMPS plugs
@@ -195,69 +201,69 @@
// Heaters / Fans
//
#ifndef MOSFET_D_PIN
- #define MOSFET_D_PIN -1
+ #define MOSFET_D_PIN -1
#endif
#ifndef RAMPS_D8_PIN
- #define RAMPS_D8_PIN P2_07 // (8)
+ #define RAMPS_D8_PIN P2_07 // (8)
#endif
#ifndef RAMPS_D9_PIN
- #define RAMPS_D9_PIN P2_04 // (9)
+ #define RAMPS_D9_PIN P2_04 // (9)
#endif
#ifndef RAMPS_D10_PIN
- #define RAMPS_D10_PIN P2_05 // (10)
+ #define RAMPS_D10_PIN P2_05 // (10)
#endif
-#define HEATER_0_PIN RAMPS_D10_PIN
+#define HEATER_0_PIN RAMPS_D10_PIN
-#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
- #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
- #define HEATER_1_PIN RAMPS_D9_PIN
-#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
- #define HEATER_1_PIN RAMPS_D9_PIN
- #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
- #define FAN1_PIN RAMPS_D8_PIN
-#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
- #define HEATER_BED_PIN RAMPS_D8_PIN
+#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
+ #define HEATER_BED_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
+ #define HEATER_1_PIN RAMPS_D9_PIN
+#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
+ #define HEATER_1_PIN RAMPS_D9_PIN
+ #define HEATER_BED_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
+ #define FAN1_PIN RAMPS_D8_PIN
+#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+ #define HEATER_BED_PIN RAMPS_D8_PIN
#if HOTENDS == 1
- #define FAN1_PIN MOSFET_D_PIN
+ #define FAN1_PIN MOSFET_D_PIN
#else
- #define HEATER_1_PIN MOSFET_D_PIN
+ #define HEATER_1_PIN MOSFET_D_PIN
#endif
#endif
#ifndef FAN_PIN
#if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
- #define FAN_PIN RAMPS_D9_PIN
+ #define FAN_PIN RAMPS_D9_PIN
#elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF) // Hotend, Hotend, Fan or Spindle, Fan
- #define FAN_PIN RAMPS_D8_PIN
- #elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
- #define FAN_PIN P1_18 // (4) IO pin. Buffer needed
- #else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
- #define FAN_PIN RAMPS_D9_PIN
+ #define FAN_PIN RAMPS_D8_PIN
+ #elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
+ #define FAN_PIN P1_18 // (4) IO pin. Buffer needed
+ #else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+ #define FAN_PIN RAMPS_D9_PIN
#endif
#endif
//
// Misc. Functions
//
-#define LED_PIN P4_28 // (13)
+#define LED_PIN P4_28 // (13)
// define digital pin 5 for the filament runout sensor. Use the RAMPS 1.4 digital input 5 on the servos connector
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN P1_19 // (5)
+ #define FIL_RUNOUT_PIN P1_19 // (5)
#endif
-#define PS_ON_PIN P2_12 // (12)
+#define PS_ON_PIN P2_12 // (12)
#if !defined(MAX6675_SS_PIN) && DISABLED(USE_ZMAX_PLUG)
- #define MAX6675_SS_PIN P1_28
+ #define MAX6675_SS_PIN P1_28
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
- #if !defined(NUM_SERVOS) || NUM_SERVOS < 4 // Try to use servo connector
- #define CASE_LIGHT_PIN P1_18 // (4) MUST BE HARDWARE PWM
+ #if !defined(NUM_SERVOS) || NUM_SERVOS < 4 // Try to use servo connector
+ #define CASE_LIGHT_PIN P1_18 // (4) MUST BE HARDWARE PWM
#endif
#endif
@@ -273,19 +279,19 @@
#error "LASER_FEATURE requires 3 free servo pins."
#endif
#endif
- #define SPINDLE_LASER_ENA_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown!
- #define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM
- #define SPINDLE_DIR_PIN SERVO2_PIN // (5)
+ #define SPINDLE_LASER_ENA_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown!
+ #define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM
+ #define SPINDLE_DIR_PIN SERVO2_PIN // (5)
#endif
//
// Průša i3 MK2 Multiplexer Support
//
#if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
- #define E_MUX0_PIN P0_03 // ( 0) Z_CS_PIN
- #define E_MUX1_PIN P0_02 // ( 1) E0_CS_PIN
+ #define E_MUX0_PIN P0_03 // ( 0) Z_CS_PIN
+ #define E_MUX1_PIN P0_02 // ( 1) E0_CS_PIN
#endif
-#define E_MUX2_PIN P0_26 // (63) E1_CS_PIN
+#define E_MUX2_PIN P0_26 // (63) E1_CS_PIN
/**
* LCD / Controller
@@ -316,101 +322,101 @@
// 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
// Requires REVERSE_ENCODER_DIRECTION in Configuration.h
- #define BEEPER_PIN P2_11 // J3-3 & AUX-4
+ #define BEEPER_PIN P2_11 // J3-3 & AUX-4
- #define BTN_EN1 P0_16 // J3-7 & AUX-4
- #define BTN_EN2 P1_23 // J3-5 & AUX-4
- #define BTN_ENC P3_25 // J3-4 & AUX-4
+ #define BTN_EN1 P0_16 // J3-7 & AUX-4
+ #define BTN_EN2 P1_23 // J3-5 & AUX-4
+ #define BTN_ENC P3_25 // J3-4 & AUX-4
- #define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS)
- #define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
- #define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
+ #define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS)
+ #define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
+ #define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
#elif HAS_SPI_LCD
- //#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
- //#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
- //#define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
- //#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS)
+ //#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
+ //#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
+ //#define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
+ //#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS)
#if ENABLED(FYSETC_MINI_12864)
- #define BEEPER_PIN P1_01
- #define BTN_ENC P1_04
+ #define BEEPER_PIN P1_01
+ #define BTN_ENC P1_04
#else
- #define BEEPER_PIN P1_30 // (37) not 5V tolerant
- #define BTN_ENC P2_11 // (35) J3-3 & AUX-4
+ #define BEEPER_PIN P1_30 // (37) not 5V tolerant
+ #define BTN_ENC P2_11 // (35) J3-3 & AUX-4
#endif
- #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
- #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
+ #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
+ #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
- #define SD_DETECT_PIN P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
- #define KILL_PIN P1_22 // (41) J5-4 & AUX-4
- #define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
- #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
+ #define SD_DETECT_PIN P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
+ #define KILL_PIN P1_22 // (41) J5-4 & AUX-4
+ #define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
+ #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
#if ENABLED(NEWPANEL)
#if ENABLED(REPRAPWORLD_KEYPAD)
- #define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
- #define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
- #define SHIFT_LD P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
+ #define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
+ #define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
+ #define SHIFT_LD P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
#endif
#else
- //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
- //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4
- //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4
- //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4
+ //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
+ //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4
+ //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4
+ //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4
#endif
#if ANY(VIKI2, miniVIKI)
// #define LCD_SCREEN_ROT_180
- #define DOGLCD_CS P0_16 // (16)
- #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
- #define DOGLCD_SCK SCK_PIN
- #define DOGLCD_MOSI MOSI_PIN
+ #define DOGLCD_CS P0_16 // (16)
+ #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
+ #define DOGLCD_SCK SCK_PIN
+ #define DOGLCD_MOSI MOSI_PIN
- #define STAT_LED_BLUE_PIN P0_26 //(63) may change if cable changes
- #define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
+ #define STAT_LED_BLUE_PIN P0_26 //(63) may change if cable changes
+ #define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
#else
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_SCK P0_15
- #define DOGLCD_MOSI P0_18
+ #define DOGLCD_SCK P0_15
+ #define DOGLCD_MOSI P0_18
// EXP1 on LCD adapter is not usable - using Ethernet connector instead
- #define DOGLCD_CS P1_09
- #define DOGLCD_A0 P1_14
- //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ #define DOGLCD_CS P1_09
+ #define DOGLCD_A0 P1_14
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN P0_16 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN P0_16 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN P1_00
+ #define RGB_LED_R_PIN P1_00
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN P1_01
+ #define RGB_LED_G_PIN P1_01
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN P1_08
+ #define RGB_LED_B_PIN P1_08
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN P1_00
+ #define NEOPIXEL_PIN P1_00
#endif
#else
- #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
- #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
+ #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
+ #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#endif
- #define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
- #define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
- #define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
+ #define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
+ #define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
+ #define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
- #define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
- #define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
+ #define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
+ #define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
+ #define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
#endif
#endif
@@ -428,38 +434,38 @@
// Ethernet pins
//
#if DISABLED(ULTIPANEL)
- #define ENET_MDIO P1_17 // (71) J12-4
- #define ENET_RX_ER P1_14 // (73) J12-6
- #define ENET_RXD1 P1_10 // (75) J12-8
+ #define ENET_MDIO P1_17 // (71) J12-4
+ #define ENET_RX_ER P1_14 // (73) J12-6
+ #define ENET_RXD1 P1_10 // (75) J12-8
#endif
-#define ENET_MOC P1_16 // (70) J12-3
-#define REF_CLK P1_15 // (72) J12-5
-#define ENET_RXD0 P1_09 // (74) J12-7
-#define ENET_CRS P1_08 // (76) J12-9
-#define ENET_TX_EN P1_04 // (77) J12-10
-#define ENET_TXD0 P1_00 // (78) J12-11
-#define ENET_TXD1 P1_01 // (79) J12-12
+#define ENET_MOC P1_16 // (70) J12-3
+#define REF_CLK P1_15 // (72) J12-5
+#define ENET_RXD0 P1_09 // (74) J12-7
+#define ENET_CRS P1_08 // (76) J12-9
+#define ENET_TX_EN P1_04 // (77) J12-10
+#define ENET_TXD0 P1_00 // (78) J12-11
+#define ENET_TXD1 P1_01 // (79) J12-12
//
// SD Support
//
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
+ #define SDCARD_CONNECTION ONBOARD
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
- #define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
- #define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
- #define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+ #define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
+ #define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
+ #define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
+ #define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
#elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 4bc3c86882..6f84f87bba 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,83 +32,88 @@
#define BOARD_INFO_NAME "Selena Compact"
#define BOARD_WEBSITE_URL "github.com/Ales2-k/Selena"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P1_23
+#define SERVO0_PIN P1_23
//
// Limit Switches
//
-#define X_MIN_PIN P1_28
-#define X_MAX_PIN P1_25
-#define Y_MIN_PIN P2_11
-#define Y_MAX_PIN -1
-#define Z_MIN_PIN P1_27
-#define Z_MAX_PIN -1
-#define Z_PROBE P1_22
+#define X_MIN_PIN P1_28
+#define X_MAX_PIN P1_25
+#define Y_MIN_PIN P2_11
+#define Y_MAX_PIN -1
+#define Z_MIN_PIN P1_27
+#define Z_MAX_PIN -1
+#define Z_PROBE P1_22
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P0_04
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P0_04
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
-#define E1_STEP_PIN P2_08
-#define E1_DIR_PIN P2_13
-#define E1_ENABLE_PIN P4_29
+#define E1_STEP_PIN P2_08
+#define E1_DIR_PIN P2_13
+#define E1_ENABLE_PIN P4_29
//
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
-#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
-#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
-
+#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
+#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
+#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_05
-#define HEATER_BED2_PIN P2_04
-#define HEATER_0_PIN P2_07
-#define HEATER_1_PIN P2_06
+#define HEATER_BED_PIN P2_05
+#define HEATER_BED2_PIN P2_04
+#define HEATER_0_PIN P2_07
+#define HEATER_1_PIN P2_06
#ifndef FAN_PIN
- #define FAN_PIN P1_24
+ #define FAN_PIN P1_24
#endif
-#define FAN1_PIN P1_26
+#define FAN1_PIN P1_26
//
// Display
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define LCD_PINS_RS P0_16
- #define LCD_PINS_ENABLE P0_18
- #define LCD_PINS_D4 P0_15
- #define LCD_PINS_D5 P1_00
- #define LCD_PINS_D6 P1_01
- #define LCD_PINS_D7 P1_04
- #define BEEPER_PIN P1_31
+ #define LCD_PINS_RS P0_16
+ #define LCD_PINS_ENABLE P0_18
+ #define LCD_PINS_D4 P0_15
+ #define LCD_PINS_D5 P1_00
+ #define LCD_PINS_D6 P1_01
+ #define LCD_PINS_D7 P1_04
+ #define BEEPER_PIN P1_31
- #define BTN_EN1 P3_25
- #define BTN_EN2 P3_26
- #define BTN_ENC P1_30
+ #define BTN_EN1 P3_25
+ #define BTN_EN2 P3_26
+ #define BTN_ENC P1_30
- #define SD_DETECT_PIN -1
+ #define SD_DETECT_PIN -1
#endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
index 0ae4393cac..95cbd2163e 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,97 +32,101 @@
#define BOARD_INFO_NAME "Azteeg X5 GT"
#define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P1_23
+#define SERVO0_PIN P1_23
//
// Limit Switches
//
-#define X_MIN_PIN P1_24
-#define X_MAX_PIN P1_27
-#define Y_MIN_PIN P1_25
-#define Y_MAX_PIN P1_28
-#define Z_MIN_PIN P1_26
-#define Z_MAX_PIN P1_29
-
+#define X_MIN_PIN P1_24
+#define X_MAX_PIN P1_27
+#define Y_MIN_PIN P1_25
+#define Y_MAX_PIN P1_28
+#define Z_MIN_PIN P1_26
+#define Z_MAX_PIN P1_29
//
// Steppers
//
-#define X_STEP_PIN P2_01
-#define X_DIR_PIN P0_11
-#define X_ENABLE_PIN P0_10
+#define X_STEP_PIN P2_01
+#define X_DIR_PIN P0_11
+#define X_ENABLE_PIN P0_10
#ifndef X_CS_PIN
- #define X_CS_PIN P0_10 // BSD2660 default
+ #define X_CS_PIN P0_10 // BSD2660 default
#endif
-#define Y_STEP_PIN P2_02
-#define Y_DIR_PIN P0_20
-#define Y_ENABLE_PIN P0_19
+#define Y_STEP_PIN P2_02
+#define Y_DIR_PIN P0_20
+#define Y_ENABLE_PIN P0_19
#ifndef Y_CS_PIN
- #define Y_CS_PIN P0_19 // BSD2660 default
+ #define Y_CS_PIN P0_19 // BSD2660 default
#endif
-#define Z_STEP_PIN P2_03
-#define Z_DIR_PIN P0_22
-#define Z_ENABLE_PIN P0_21
+#define Z_STEP_PIN P2_03
+#define Z_DIR_PIN P0_22
+#define Z_ENABLE_PIN P0_21
#ifndef Z_CS_PIN
- #define Z_CS_PIN P0_21 // BSD2660 default
+ #define Z_CS_PIN P0_21 // BSD2660 default
#endif
-#define E0_STEP_PIN P2_00
-#define E0_DIR_PIN P0_05
-#define E0_ENABLE_PIN P0_04
+#define E0_STEP_PIN P2_00
+#define E0_DIR_PIN P0_05
+#define E0_ENABLE_PIN P0_04
#ifndef E0_CS_PIN
- #define E0_CS_PIN P0_04 // BSD2660 default
+ #define E0_CS_PIN P0_04 // BSD2660 default
#endif
-#define E1_STEP_PIN P2_08
-#define E1_DIR_PIN P2_13
-#define E1_ENABLE_PIN P4_29
+#define E1_STEP_PIN P2_08
+#define E1_DIR_PIN P2_13
+#define E1_ENABLE_PIN P4_29
#ifndef E1_CS_PIN
- #define E1_CS_PIN P4_29 // BSD2660 default
+ #define E1_CS_PIN P4_29 // BSD2660 default
#endif
//
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
-#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
-#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
-
+#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
+#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
+#define TEMP_1_PIN P0_25_A2 // A2 (TH3)
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_07
-#define HEATER_0_PIN P2_04
-#define HEATER_1_PIN P2_05
+#define HEATER_BED_PIN P2_07
+#define HEATER_0_PIN P2_04
+#define HEATER_1_PIN P2_05
#ifndef FAN_PIN
- #define FAN_PIN P0_26
+ #define FAN_PIN P0_26
#endif
-#define FAN1_PIN P1_22
+#define FAN1_PIN P1_22
//
// Display
//
#if ANY(VIKI2, miniVIKI)
- #define BEEPER_PIN P1_31
- #define DOGLCD_A0 P2_06
- #define DOGLCD_CS P0_16
+ #define BEEPER_PIN P1_31
+ #define DOGLCD_A0 P2_06
+ #define DOGLCD_CS P0_16
- #define BTN_EN1 P3_25
- #define BTN_EN2 P3_26
- #define BTN_ENC P2_11
+ #define BTN_EN1 P3_25
+ #define BTN_EN2 P3_26
+ #define BTN_ENC P2_11
- #define SD_DETECT_PIN P1_18
- #define SDSS P1_21
+ #define SD_DETECT_PIN P1_18
+ #define SDSS P1_21
- #define STAT_LED_RED_PIN P1_19
- #define STAT_LED_BLUE_PIN P1_20
+ #define STAT_LED_RED_PIN P1_19
+ #define STAT_LED_BLUE_PIN P1_20
#endif
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index 5cc4d52d30..ba1351e6f4 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,74 +37,74 @@
//
// LED
//
-#define LED_PIN P1_18
+#define LED_PIN P1_18
//
// Servos
//
-#define SERVO0_PIN P1_29
+#define SERVO0_PIN P1_29
//
// Limit Switches
//
-#define X_STOP_PIN P1_24
-#define Y_STOP_PIN P1_26
-#define Z_STOP_PIN P1_28
+#define X_STOP_PIN P1_24
+#define Y_STOP_PIN P1_26
+#define Z_STOP_PIN P1_28
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN P2_04
+ #define FIL_RUNOUT_PIN P2_04
#endif
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN P0_25_A2 // Analog Input (P0_25)
+ #define FILWIDTH_PIN P0_25_A2 // Analog Input (P0_25)
#endif
//
// Steppers
//
-#define X_STEP_PIN P2_01
-#define X_DIR_PIN P0_11
-#define X_ENABLE_PIN P0_10
+#define X_STEP_PIN P2_01
+#define X_DIR_PIN P0_11
+#define X_ENABLE_PIN P0_10
-#define Y_STEP_PIN P2_02
-#define Y_DIR_PIN P0_20
-#define Y_ENABLE_PIN P0_19
+#define Y_STEP_PIN P2_02
+#define Y_DIR_PIN P0_20
+#define Y_ENABLE_PIN P0_19
-#define Z_STEP_PIN P2_03
-#define Z_DIR_PIN P0_22
-#define Z_ENABLE_PIN P0_21
+#define Z_STEP_PIN P2_03
+#define Z_DIR_PIN P0_22
+#define Z_ENABLE_PIN P0_21
-#define E0_STEP_PIN P2_00
-#define E0_DIR_PIN P0_05
-#define E0_ENABLE_PIN P0_04
+#define E0_STEP_PIN P2_00
+#define E0_DIR_PIN P0_05
+#define E0_ENABLE_PIN P0_04
//
// DIGIPOT slave addresses
//
#ifndef DIGIPOT_I2C_ADDRESS_A
- #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT
+ #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT
#endif
#ifndef DIGIPOT_I2C_ADDRESS_B
- #define DIGIPOT_I2C_ADDRESS_B 0x2E // unshifted slave address for second DIGIPOT
+ #define DIGIPOT_I2C_ADDRESS_B 0x2E // unshifted slave address for second DIGIPOT
#endif
//
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
-#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
+#define TEMP_BED_PIN P0_23_A0 // A0 (TH1)
+#define TEMP_0_PIN P0_24_A1 // A1 (TH2)
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_07
-#define HEATER_0_PIN P2_05
+#define HEATER_BED_PIN P2_07
+#define HEATER_0_PIN P2_05
#ifndef FAN_PIN
- #define FAN_PIN P0_26
+ #define FAN_PIN P0_26
#endif
-#define FAN1_PIN P1_25
+#define FAN1_PIN P1_25
//
// Display
@@ -118,61 +118,61 @@
// 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
// Requires REVERSE_ENCODER_DIRECTION in Configuration.h
- #define BEEPER_PIN P2_11 // J3-3 & AUX-4
+ #define BEEPER_PIN P2_11 // J3-3 & AUX-4
- #define BTN_EN1 P0_16 // J3-7 & AUX-4
- #define BTN_EN2 P1_23 // J3-5 & AUX-4
- #define BTN_ENC P3_25 // J3-4 & AUX-4
+ #define BTN_EN1 P0_16 // J3-7 & AUX-4
+ #define BTN_EN2 P1_23 // J3-5 & AUX-4
+ #define BTN_ENC P3_25 // J3-4 & AUX-4
- #define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS)
- #define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
- #define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
+ #define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS)
+ #define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
+ #define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
#else
- #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
- #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
- #define BTN_ENC P2_11 // (35) J3-3 & AUX-4
+ #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
+ #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
+ #define BTN_ENC P2_11 // (35) J3-3 & AUX-4
- #define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3
- #define KILL_PIN P1_22 // (41) J5-4 & AUX-4
- #define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
- #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
- #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
- #define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
- #define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
+ #define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3
+ #define KILL_PIN P1_22 // (41) J5-4 & AUX-4
+ #define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
+ #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
+ #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
+ #define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
+ #define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
- #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
+ #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
- #define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
- #define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
- #define SHIFT_LD P1_31 // (49) not 5V tolerant J3-1 & AUX-3
+ #define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
+ #define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
+ #define SHIFT_LD P1_31 // (49) not 5V tolerant J3-1 & AUX-3
#elif DISABLED(NEWPANEL)
- //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4
- //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
- //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4
- //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4
+ //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4
+ //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
+ //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4
+ //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4
#endif
#if ANY(VIKI2, miniVIKI)
//#define LCD_SCREEN_ROT_180
- #define BEEPER_PIN P1_30 // (37) may change if cable changes
- #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
- #define DOGLCD_SCK SCK_PIN
- #define DOGLCD_MOSI MOSI_PIN
+ #define BEEPER_PIN P1_30 // (37) may change if cable changes
+ #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
+ #define DOGLCD_SCK SCK_PIN
+ #define DOGLCD_MOSI MOSI_PIN
- #define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
- #define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
+ #define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
+ #define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
#else
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
- #define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
- #define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
+ #define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
+ #define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
+ #define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
#endif
- #define BEEPER_PIN P1_30 // (37) not 5V tolerant
- #define DOGLCD_CS P0_16 // (16)
+ #define BEEPER_PIN P1_30 // (37) not 5V tolerant
+ #define DOGLCD_CS P0_16 // (16)
#endif
#if ENABLED(MINIPANEL)
@@ -187,26 +187,34 @@
#endif // HAS_SPI_LCD
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+ #define FLASH_EEPROM_EMULATION
+ //#define SDCARD_EEPROM_EMULATION
+#endif
+
//
// SD Support
//
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
+ #define SDCARD_CONNECTION ONBOARD
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_15
- #define MISO_PIN P0_17
- #define MOSI_PIN P0_18
- #define SS_PIN P1_23
+ #define SCK_PIN P0_15
+ #define MISO_PIN P0_17
+ #define MOSI_PIN P0_18
+ #define SS_PIN P1_23
#elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
index 3c2a40b403..1e5d2f3a2c 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,6 +31,12 @@
#define BOARD_INFO_NAME "Azteeg X5 MINI WIFI"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// DIGIPOT slave addresses
//
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
index 846f38556e..a8649b6f8d 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,6 +24,12 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.4 TURBO"
#define SKR_HAS_LPC1769
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Include SKR 1.4 pins
//
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
index 7ab8b5bb4a..87d3cb459c 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,56 +31,62 @@
#define BOARD_INFO_NAME "Cohesion3D Mini"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P1_23
+#define SERVO0_PIN P1_23
//
// Limit Switches
//
-#define X_MIN_PIN P1_24 // 10k pullup to 3.3V
-#define X_MAX_PIN P1_25 // 10k pullup to 3.3V
-#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V
-#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V
-#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V
-#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V
+#define X_MIN_PIN P1_24 // 10k pullup to 3.3V
+#define X_MAX_PIN P1_25 // 10k pullup to 3.3V
+#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V
+#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V
+#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V
+#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P0_04
-#define X_CS_PIN P1_10 // Ethernet Expansion - Pin 9
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P0_04
+#define X_CS_PIN P1_10 // Ethernet Expansion - Pin 9
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
-#define Y_CS_PIN P1_09 // Ethernet Expansion - Pin 10
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
+#define Y_CS_PIN P1_09 // Ethernet Expansion - Pin 10
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
-#define Z_CS_PIN P1_00 // Ethernet Expansion - Pin 11
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
+#define Z_CS_PIN P1_00 // Ethernet Expansion - Pin 11
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
-#define E0_CS_PIN P1_04 // Ethernet Expansion - Pin 12
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
+#define E0_CS_PIN P1_04 // Ethernet Expansion - Pin 12
//
// Default pins for TMC software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P1_16 // Ethernet Expansion - Pin 5
+ #define TMC_SW_MOSI P1_16 // Ethernet Expansion - Pin 5
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P1_17 // Ethernet Expansion - Pin 6
+ #define TMC_SW_MISO P1_17 // Ethernet Expansion - Pin 6
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P1_08 // Ethernet Expansion - Pin 7
+ #define TMC_SW_SCK P1_08 // Ethernet Expansion - Pin 7
#endif
#endif
@@ -88,42 +94,42 @@
// Analog Inputs
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_23_A0 // P0_23
-#define TEMP_BED_PIN P0_24_A1 // P0_24
+#define TEMP_0_PIN P0_23_A0 // P0_23
+#define TEMP_BED_PIN P0_24_A1 // P0_24
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_05
-#define HEATER_0_PIN P2_07 // FET 1
+#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_07 // FET 1
#ifndef FAN_PIN
- #define FAN_PIN P2_06 // FET 3
+ #define FAN_PIN P2_06 // FET 3
#endif
//
// Auto fans
//
-#define AUTO_FAN_PIN P2_04 // FET 4
+#define AUTO_FAN_PIN P2_04 // FET 4
-#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
//
// Misc. Functions
//
-#define LED_PIN P4_28 // Play LED
+#define LED_PIN P4_28 // Play LED
//
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
#undef HEATER_0_PIN
- #define SPINDLE_LASER_ENA_PIN P2_07 // FET 1
+ #define SPINDLE_LASER_ENA_PIN P2_07 // FET 1
#undef HEATER_BED_PIN
- #define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET
+ #define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET
#undef FAN_PIN
- #define SPINDLE_DIR_PIN P2_06 // FET 3
+ #define SPINDLE_DIR_PIN P2_06 // FET 3
#endif
//
@@ -138,18 +144,18 @@
//
#if HAS_SPI_LCD
- #define BEEPER_PIN P0_27 // EXP2-7 - open drain
+ #define BEEPER_PIN P0_27 // EXP2-7 - open drain
- #define BTN_EN1 P3_26 // EXP2-5
- #define BTN_EN2 P3_25 // EXP2-3
- #define BTN_ENC P1_30 // EXP1-2
+ #define BTN_EN1 P3_26 // EXP2-5
+ #define BTN_EN2 P3_25 // EXP2-3
+ #define BTN_ENC P1_30 // EXP1-2
- #define LCD_PINS_RS P0_16 // EXP1-4
- #define LCD_SDSS P0_28 // EXP2-4
- #define LCD_PINS_ENABLE P0_18 // EXP1-3
- #define LCD_PINS_D4 P0_15 // EXP1-5
+ #define LCD_PINS_RS P0_16 // EXP1-4
+ #define LCD_SDSS P0_28 // EXP2-4
+ #define LCD_PINS_ENABLE P0_18 // EXP1-3
+ #define LCD_PINS_D4 P0_15 // EXP1-5
- #define KILL_PIN P2_11 // EXP2-10
+ #define KILL_PIN P2_11 // EXP2-10
#if ENABLED(SDSUPPORT)
#error "SDSUPPORT is not currently supported by the Cohesion3D boards"
@@ -160,13 +166,13 @@
//
// Ethernet pins
//
-#define ENET_MDIO P1_17
-#define ENET_RX_ER P1_14
-#define ENET_RXD1 P1_10
-#define ENET_MOC P1_16
-#define REF_CLK P1_15
-#define ENET_RXD0 P1_09
-#define ENET_CRS P1_08
-#define ENET_TX_EN P1_04
-#define ENET_TXD0 P1_00
-#define ENET_TXD1 P1_01
+#define ENET_MDIO P1_17
+#define ENET_RX_ER P1_14
+#define ENET_RXD1 P1_10
+#define ENET_MOC P1_16
+#define REF_CLK P1_15
+#define ENET_RXD0 P1_09
+#define ENET_CRS P1_08
+#define ENET_TX_EN P1_04
+#define ENET_TXD0 P1_00
+#define ENET_TXD1 P1_01
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index 77cbb19780..fa55a8adae 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,66 +31,79 @@
#define BOARD_INFO_NAME "Cohesion3D ReMix"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P2_04
+#define SERVO0_PIN P2_04
//
// Limit Switches
//
-#define X_MIN_PIN P1_24 // 10k pullup to 3.3V
-#define X_MAX_PIN P1_25 // 10k pullup to 3.3V
-#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V
-#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V
-#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V
-#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V
+#define X_MIN_PIN P1_24 // 10k pullup to 3.3V
+#define X_MAX_PIN P1_25 // 10k pullup to 3.3V
+#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V
+#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V
+#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V
+#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN P1_29
+#endif
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P0_04
-#define X_CS_PIN P1_10 // Ethernet Expansion - Pin 9
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P0_04
+#define X_CS_PIN P1_10 // Ethernet Expansion - Pin 9
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
-#define Y_CS_PIN P1_09 // Ethernet Expansion - Pin 10
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
+#define Y_CS_PIN P1_09 // Ethernet Expansion - Pin 10
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
-#define Z_CS_PIN P1_00 // Ethernet Expansion - Pin 11
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
+#define Z_CS_PIN P1_00 // Ethernet Expansion - Pin 11
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
-#define E0_CS_PIN P1_04 // Ethernet Expansion - Pin 12
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
+#define E0_CS_PIN P1_04 // Ethernet Expansion - Pin 12
-#define E1_STEP_PIN P2_08
-#define E1_DIR_PIN P2_13
-#define E1_ENABLE_PIN P4_29
-#define E1_CS_PIN P1_01 // Ethernet Expansion - Pin 14
+#define E1_STEP_PIN P2_08
+#define E1_DIR_PIN P2_13
+#define E1_ENABLE_PIN P4_29
+#define E1_CS_PIN P1_01 // Ethernet Expansion - Pin 14
-#define E2_STEP_PIN P1_20
-#define E2_DIR_PIN P1_19
-#define E2_ENABLE_PIN P1_21
-#define E2_CS_PIN P1_18 // FET 6
+#define E2_STEP_PIN P1_20
+#define E2_DIR_PIN P1_19
+#define E2_ENABLE_PIN P1_21
+#define E2_CS_PIN P1_18 // FET 6
//
// Default pins for TMC software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI P1_16 // Ethernet Expansion - Pin 5
+ #define TMC_SW_MOSI P1_16 // Ethernet Expansion - Pin 5
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO P1_17 // Ethernet Expansion - Pin 6
+ #define TMC_SW_MISO P1_17 // Ethernet Expansion - Pin 6
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK P1_08 // Ethernet Expansion - Pin 7
+ #define TMC_SW_SCK P1_08 // Ethernet Expansion - Pin 7
#endif
#endif
@@ -98,42 +111,42 @@
// Analog Inputs
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_23_A0
-#define TEMP_BED_PIN P0_24_A1
-#define TEMP_1_PIN P0_25_A2
+#define TEMP_0_PIN P0_23_A0
+#define TEMP_BED_PIN P0_24_A1
+#define TEMP_1_PIN P0_25_A2
#if ENABLED(FILAMENT_WIDTH_SENSOR)
- #define FILWIDTH_PIN P0_26_A3
+ #define FILWIDTH_PIN P0_26_A3
#else
- #define TEMP_2_PIN P0_26_A3
+ #define TEMP_2_PIN P0_26_A3
#endif
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_05
-#define HEATER_0_PIN P2_07 // FET 1
-#define HEATER_1_PIN P1_23 // FET 2
-#define HEATER_2_PIN P1_22 // FET 3
+#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_07 // FET 1
+#define HEATER_1_PIN P1_23 // FET 2
+#define HEATER_2_PIN P1_22 // FET 3
#ifndef FAN_PIN
- #define FAN_PIN P2_06 // FET 4
+ #define FAN_PIN P2_06 // FET 4
#endif
//
// Auto fans
//
#if HOTENDS == 3
- #define AUTO_FAN_PIN P1_18 // FET 6
+ #define AUTO_FAN_PIN P1_18 // FET 6
#else
- #define AUTO_FAN_PIN P1_22 // FET 3
+ #define AUTO_FAN_PIN P1_22 // FET 3
#endif
-#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
//
// Misc. Functions
//
-#define LED_PIN P4_28 // Play LED
+#define LED_PIN P4_28 // Play LED
//
// M3/M4/M5 - Spindle/Laser Control
@@ -142,9 +155,9 @@
#undef HEATER_0_PIN
#undef HEATER_BED_PIN
#undef FAN_PIN
- #define SPINDLE_LASER_ENA_PIN P2_07 // FET 1
- #define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET
- #define SPINDLE_DIR_PIN P2_06 // FET 4
+ #define SPINDLE_LASER_ENA_PIN P2_07 // FET 1
+ #define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET
+ #define SPINDLE_DIR_PIN P2_06 // FET 4
#endif
//
@@ -160,54 +173,54 @@
#if ENABLED(FYSETC_MINI_12864)
- #define FORCE_SOFT_SPI // REQUIRED - results in LCD soft SPI mode 3
+ #define FORCE_SOFT_SPI // REQUIRED - results in LCD soft SPI mode 3
- #define BEEPER_PIN P1_31 // EXP1-1
- #define BTN_ENC P1_30 // EXP1-2
- #define DOGLCD_CS P0_18 // EXP1-3
- #define DOGLCD_A0 P0_16 // EXP1-4
- #define LCD_RESET_PIN P0_15 // EXP1-5
+ #define BEEPER_PIN P1_31 // EXP1-1
+ #define BTN_ENC P1_30 // EXP1-2
+ #define DOGLCD_CS P0_18 // EXP1-3
+ #define DOGLCD_A0 P0_16 // EXP1-4
+ #define LCD_RESET_PIN P0_15 // EXP1-5
// A custom cable is REQUIRED for EXP2 cable because the SCK & MOSI on the card's EXP2 are dedicated
// to the onboard SD card. All required EXP2 signals come from the Ethernet connector. Pin 1 of this
// connector is the one nearest the motor power connector.
- #define DOGLCD_SCK P1_17 // EXP2-2 => Ethernet pin 5 (bottom, 3 from left)
- #define BTN_EN2 P1_09 // EXP2-3 => Ethernet pin 9 (bottom, 5 from left)
- #define BTN_EN1 P1_04 // EXP2-5 => Ethernet pin 11 (bottom, 6 from left)
- #define DOGLCD_MOSI P1_01 // EXP2-6 => Ethernet pin 13 (bottom, 7 from left)
+ #define DOGLCD_SCK P1_17 // EXP2-2 => Ethernet pin 5 (bottom, 3 from left)
+ #define BTN_EN2 P1_09 // EXP2-3 => Ethernet pin 9 (bottom, 5 from left)
+ #define BTN_EN1 P1_04 // EXP2-5 => Ethernet pin 11 (bottom, 6 from left)
+ #define DOGLCD_MOSI P1_01 // EXP2-6 => Ethernet pin 13 (bottom, 7 from left)
// A custom EXP1 cable is required colored LEDs. Pins 1-5, 9, 10 of the cable go to pins 1-5, 9, 10
// on the board's EXP1 connector. Pins 6, 7, and 8 of the EXP1 cable go to the Ethernet connector.
// Rev 1.2 displays do NOT require the RGB LEDs. 2.0 and 2.1 displays do require RGB.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
+ #define RGB_LED_R_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN P1_10 // EXP1-7 => Ethernet pin 10 (top row, 5 from left)
+ #define RGB_LED_G_PIN P1_10 // EXP1-7 => Ethernet pin 10 (top row, 5 from left)
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN P1_00 // EXP1-8 => Ethernet pin 12 (top row, 6 from left)
+ #define RGB_LED_B_PIN P1_00 // EXP1-8 => Ethernet pin 12 (top row, 6 from left)
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
+ #define NEOPIXEL_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
#endif
#elif HAS_SPI_LCD
- #define BEEPER_PIN P1_31 // EXP1-1
- //#define SD_DETECT_PIN P0_27 // EXP2-7
+ #define BEEPER_PIN P1_31 // EXP1-1
+ //#define SD_DETECT_PIN P0_27 // EXP2-7
- #define BTN_EN1 P3_26 // EXP2-5
- #define BTN_EN2 P3_25 // EXP2-3
- #define BTN_ENC P1_30 // EXP1-2
+ #define BTN_EN1 P3_26 // EXP2-5
+ #define BTN_EN2 P3_25 // EXP2-3
+ #define BTN_ENC P1_30 // EXP1-2
- #define LCD_PINS_RS P0_16 // EXP1-4
- #define LCD_SDSS P0_28 // EXP2-4
- #define LCD_PINS_ENABLE P0_18 // EXP1-3
- #define LCD_PINS_D4 P0_15 // EXP1-5
+ #define LCD_PINS_RS P0_16 // EXP1-4
+ #define LCD_SDSS P0_28 // EXP2-4
+ #define LCD_PINS_ENABLE P0_18 // EXP1-3
+ #define LCD_PINS_D4 P0_15 // EXP1-5
- #define KILL_PIN P2_11 // EXP2-10
+ #define KILL_PIN P2_11 // EXP2-10
#endif // HAS_SPI_LCD
@@ -215,22 +228,22 @@
// SD Support
//
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
+ #define SDCARD_CONNECTION ONBOARD
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_07 // (52) system defined J3-9 & AUX-3
- #define MISO_PIN P0_08 // (50) system defined J3-10 & AUX-3
- #define MOSI_PIN P0_09 // (51) system defined J3-10 & AUX-3
- #define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+ #define SCK_PIN P0_07 // (52) system defined J3-9 & AUX-3
+ #define MISO_PIN P0_08 // (50) system defined J3-10 & AUX-3
+ #define MOSI_PIN P0_09 // (51) system defined J3-10 & AUX-3
+ #define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
#elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
@@ -238,16 +251,16 @@
//
// Ethernet pins
//
-//#define ENET_MDIO P1_17 // Ethernet pin 5 (bottom, 3 from left)
-//#define ENET_RX_ER P1_14
-//#define ENET_RXD1 P1_10 // Ethernet pin 10 (top row, 5 from left)
-//#define ENET_MOC P1_16 // Ethernet pin 6 (top row, 3 from left)
-//#define REF_CLK P1_15
-//#define ENET_RXD0 P1_09 // Ethernet pin 9 (bottom, 5 from left)
-//#define ENET_CRS P1_08 // Ethernet pin 8 (top row, 4 from left) - INPUT ONLY
-//#define ENET_TX_EN P1_04 // Ethernet pin 11 (bottom, 6 from left)
-//#define ENET_TXD0 P1_00 // Ethernet pin 12 (top row, 6 from left)
-//#define ENET_TXD1 P1_01 // Ethernet pin 13 (bottom, 7 from left)
+//#define ENET_MDIO P1_17 // Ethernet pin 5 (bottom, 3 from left)
+//#define ENET_RX_ER P1_14
+//#define ENET_RXD1 P1_10 // Ethernet pin 10 (top row, 5 from left)
+//#define ENET_MOC P1_16 // Ethernet pin 6 (top row, 3 from left)
+//#define REF_CLK P1_15
+//#define ENET_RXD0 P1_09 // Ethernet pin 9 (bottom, 5 from left)
+//#define ENET_CRS P1_08 // Ethernet pin 8 (top row, 4 from left) - INPUT ONLY
+//#define ENET_TX_EN P1_04 // Ethernet pin 11 (bottom, 6 from left)
+//#define ENET_TXD0 P1_00 // Ethernet pin 12 (top row, 6 from left)
+//#define ENET_TXD1 P1_01 // Ethernet pin 13 (bottom, 7 from left)
/**
* EXP1 pins
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index 7586415b43..fd98b5ef13 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,8 +31,14 @@
#define BOARD_INFO_NAME "MKS SGen"
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN"
-#define MKS_HAS_LPC1769
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
+#define MKS_HAS_LPC1769
#include "../lpc1768/pins_MKS_SBASE.h"
#undef E1_STEP_PIN
@@ -41,10 +47,10 @@
//#undef BTN_EN1
//#undef BTN_EN2
-//#define BTN_EN1 P1_23 // EXP2.5
-//#define BTN_EN2 P1_22 // EXP2.3
+//#define BTN_EN1 P1_23 // EXP2.5
+//#define BTN_EN2 P1_22 // EXP2.3
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -52,16 +58,16 @@
* In the worst case you may have to give up the LCD.
* RX pins must be interrupt-capable.
*/
- #define X_SERIAL_TX_PIN P4_29 // J8-2
- #define X_SERIAL_RX_PIN P4_29 // J8-2
+ #define X_SERIAL_TX_PIN P4_29 // J8-2
+ #define X_SERIAL_RX_PIN P4_29 // J8-2
- #define Y_SERIAL_TX_PIN P2_08 // J8-3
- #define Y_SERIAL_RX_PIN P2_08 // J8-3
+ #define Y_SERIAL_TX_PIN P2_08 // J8-3
+ #define Y_SERIAL_RX_PIN P2_08 // J8-3
- #define Z_SERIAL_TX_PIN P2_11 // J8-4
- #define Z_SERIAL_RX_PIN P2_11 // J8-4
- #define E0_SERIAL_TX_PIN P2_13 // J8-5
- #define E0_SERIAL_RX_PIN P2_13 // J8-5
+ #define Z_SERIAL_TX_PIN P2_11 // J8-4
+ #define Z_SERIAL_RX_PIN P2_11 // J8-4
+ #define E0_SERIAL_TX_PIN P2_13 // J8-5
+ #define E0_SERIAL_RX_PIN P2_13 // J8-5
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index 1096ddc629..43db07ea5e 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,82 +32,88 @@
#define BOARD_INFO_NAME "Smoothieboard"
#define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P1_23
+#define SERVO0_PIN P1_23
//
// Limit Switches
//
-#define X_MIN_PIN P1_24
-#define X_MAX_PIN P1_25
-#define Y_MIN_PIN P1_26
-#define Y_MAX_PIN P1_27
-#define Z_MIN_PIN P1_28
-#define Z_MAX_PIN P1_29
+#define X_MIN_PIN P1_24
+#define X_MAX_PIN P1_25
+#define Y_MIN_PIN P1_26
+#define Y_MAX_PIN P1_27
+#define Z_MIN_PIN P1_28
+#define Z_MAX_PIN P1_29
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P0_05
-#define X_ENABLE_PIN P0_04
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P0_05
+#define X_ENABLE_PIN P0_04
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P0_11
-#define Y_ENABLE_PIN P0_10
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P0_11
+#define Y_ENABLE_PIN P0_10
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P0_20
-#define Z_ENABLE_PIN P0_19
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P0_20
+#define Z_ENABLE_PIN P0_19
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P0_22
-#define E0_ENABLE_PIN P0_21
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P0_22
+#define E0_ENABLE_PIN P0_21
-#define E1_STEP_PIN P2_08
-#define E1_DIR_PIN P2_13
-#define E1_ENABLE_PIN P4_29
+#define E1_STEP_PIN P2_08
+#define E1_DIR_PIN P2_13
+#define E1_ENABLE_PIN P4_29
//
// Temperature Sensors
// 3.3V max when defined as an analog input
//
-#define TEMP_0_PIN P0_23_A0 // (T1)
-#define TEMP_BED_PIN P0_24_A1 // (T2)
-#define TEMP_1_PIN P0_25_A2 // (T3)
-#define TEMP_2_PIN P0_26_A3 // (T4)
+#define TEMP_0_PIN P0_23_A0 // (T1)
+#define TEMP_BED_PIN P0_24_A1 // (T2)
+#define TEMP_1_PIN P0_25_A2 // (T3)
+#define TEMP_2_PIN P0_26_A3 // (T4)
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_05
-#define HEATER_0_PIN P2_07
-#define HEATER_1_PIN P1_23
+#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_07
+#define HEATER_1_PIN P1_23
#ifndef FAN_PIN
- #define FAN_PIN P2_06
+ #define FAN_PIN P2_06
#endif
-#define FAN1_PIN P2_04
+#define FAN1_PIN P2_04
//
// LCD / Controller
//
#if ANY(VIKI2, miniVIKI)
- #define BEEPER_PIN P1_31
- #define DOGLCD_A0 P2_11
- #define DOGLCD_CS P0_16
+ #define BEEPER_PIN P1_31
+ #define DOGLCD_A0 P2_11
+ #define DOGLCD_CS P0_16
- #define BTN_EN1 P3_25
- #define BTN_EN2 P3_26
- #define BTN_ENC P1_30
+ #define BTN_EN1 P3_25
+ #define BTN_EN2 P3_26
+ #define BTN_ENC P1_30
- #define SD_DETECT_PIN P1_18
- #define SDSS P1_21
+ #define SD_DETECT_PIN P1_18
+ #define SDSS P1_21
- #define STAT_LED_RED_PIN P1_19
- #define STAT_LED_BLUE_PIN P1_20
+ #define STAT_LED_RED_PIN P1_19
+ #define STAT_LED_BLUE_PIN P1_20
#elif HAS_SPI_LCD
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index c2d7d478f1..d4030ed790 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,61 +32,67 @@
#define BOARD_INFO_NAME "TH3D EZBoard"
#define BOARD_WEBSITE_URL "th3dstudio.com"
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
//
// Servos
//
-#define SERVO0_PIN P2_04
+#define SERVO0_PIN P2_04
//
// Limit Switches
//
-#define X_STOP_PIN P1_24
-#define Y_STOP_PIN P1_25
-#define Z_STOP_PIN P1_26
+#define X_STOP_PIN P1_24
+#define Y_STOP_PIN P1_25
+#define Z_STOP_PIN P1_26
//
// Filament Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN P1_27
+ #define FIL_RUNOUT_PIN P1_27
#endif
//
// Steppers
//
-#define X_STEP_PIN P2_00
-#define X_DIR_PIN P1_16
-#define X_ENABLE_PIN P1_17
+#define X_STEP_PIN P2_00
+#define X_DIR_PIN P1_16
+#define X_ENABLE_PIN P1_17
-#define Y_STEP_PIN P2_01
-#define Y_DIR_PIN P1_10
-#define Y_ENABLE_PIN P1_09
+#define Y_STEP_PIN P2_01
+#define Y_DIR_PIN P1_10
+#define Y_ENABLE_PIN P1_09
-#define Z_STEP_PIN P2_02
-#define Z_DIR_PIN P1_15
-#define Z_ENABLE_PIN P1_14
+#define Z_STEP_PIN P2_02
+#define Z_DIR_PIN P1_15
+#define Z_ENABLE_PIN P1_14
-#define E0_STEP_PIN P2_03
-#define E0_DIR_PIN P1_04
-#define E0_ENABLE_PIN P1_08
+#define E0_STEP_PIN P2_03
+#define E0_DIR_PIN P1_04
+#define E0_ENABLE_PIN P1_08
-#define E1_STEP_PIN P2_08
-#define E1_DIR_PIN P2_13
-#define E1_ENABLE_PIN P4_29
+#define E1_STEP_PIN P2_08
+#define E1_DIR_PIN P2_13
+#define E1_ENABLE_PIN P4_29
-#if HAS_DRIVER(TMC2208)
+#if HAS_TMC_UART
//
- // TMC2208 stepper drivers
+ // TMC220x stepper drivers
// Software serial
//
- #define X_SERIAL_TX_PIN P0_04
- #define X_SERIAL_RX_PIN P0_05
- #define Y_SERIAL_TX_PIN P0_10
- #define Y_SERIAL_RX_PIN P0_11
- #define Z_SERIAL_TX_PIN P0_19
- #define Z_SERIAL_RX_PIN P0_20
- #define E0_SERIAL_TX_PIN P0_22
- #define E0_SERIAL_RX_PIN P0_21
+ #define X_SERIAL_TX_PIN P0_04
+ #define X_SERIAL_RX_PIN P0_05
+ #define Y_SERIAL_TX_PIN P0_10
+ #define Y_SERIAL_RX_PIN P0_11
+ #define Z_SERIAL_TX_PIN P0_19
+ #define Z_SERIAL_RX_PIN P0_20
+ #define E0_SERIAL_TX_PIN P0_22
+ #define E0_SERIAL_RX_PIN P0_21
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
@@ -96,50 +102,50 @@
// Temp Sensors
// 3.3V max when defined as an Analog Input!
//
-#if TEMP_SENSOR_0 == 20 // PT100 Adapter
- #define TEMP_0_PIN P0_02_A7 // Analog Input
+#if TEMP_SENSOR_0 == 20 // PT100 Adapter
+ #define TEMP_0_PIN P0_02_A7 // Analog Input
#else
- #define TEMP_0_PIN P0_23_A0 // Analog Input P0_23
+ #define TEMP_0_PIN P0_23_A0 // Analog Input P0_23
#endif
-#define TEMP_BED_PIN P0_24_A1 // Analog Input P0_24
-#define TEMP_1_PIN P0_25_A2 // Analog Input P0_25
+#define TEMP_BED_PIN P0_24_A1 // Analog Input P0_24
+#define TEMP_1_PIN P0_25_A2 // Analog Input P0_25
#if ENABLED(FILAMENT_WIDTH_SENSOR)
- #define FILWIDTH_PIN P0_26_A3 // Analog Input P0_26
+ #define FILWIDTH_PIN P0_26_A3 // Analog Input P0_26
#else
- #define TEMP_2_PIN P0_26_A3 // Analog Input P0_26
+ #define TEMP_2_PIN P0_26_A3 // Analog Input P0_26
#endif
//
// Heaters / Fans
//
-#define HEATER_BED_PIN P2_05
-#define HEATER_0_PIN P2_07
+#define HEATER_BED_PIN P2_05
+#define HEATER_0_PIN P2_07
#ifndef FAN_PIN
- #define FAN_PIN P2_06
+ #define FAN_PIN P2_06
#endif
-#define FAN1_PIN P1_22
+#define FAN1_PIN P1_22
//
// Auto fans
//
-#define AUTO_FAN_PIN P1_22 // FET 3
-#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
+#define AUTO_FAN_PIN P1_22 // FET 3
+#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
//
// SD Card
//
-#define SDCARD_CONNECTION ONBOARD
+#define SDCARD_CONNECTION ONBOARD
-#define SCK_PIN P0_07
-#define MISO_PIN P0_08
-#define MOSI_PIN P0_09
-#define ONBOARD_SD_CS_PIN P0_06
-#define SS_PIN ONBOARD_SD_CS_PIN
+#define SCK_PIN P0_07
+#define MISO_PIN P0_08
+#define MOSI_PIN P0_09
+#define ONBOARD_SD_CS_PIN P0_06
+#define SS_PIN ONBOARD_SD_CS_PIN
//
// LCD / Controller
@@ -164,14 +170,14 @@
*/
#if ENABLED(CR10_STOCKDISPLAY)
- #define BEEPER_PIN P1_31
- #define BTN_EN1 P3_26
- #define BTN_EN2 P3_25
- #define BTN_ENC P1_30
- #define LCD_PINS_RS P0_16
- #define LCD_PINS_ENABLE P0_18
- #define LCD_PINS_D4 P0_15
- #define KILL_PIN P2_11
+ #define BEEPER_PIN P1_31
+ #define BTN_EN1 P3_26
+ #define BTN_EN2 P3_25
+ #define BTN_ENC P1_30
+ #define LCD_PINS_RS P0_16
+ #define LCD_PINS_ENABLE P0_18
+ #define LCD_PINS_D4 P0_15
+ #define KILL_PIN P2_11
#elif HAS_SPI_LCD
#error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
#endif
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
index e49207a42a..7b0c0010a3 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,46 +33,46 @@
//
// Limit Switches
//
-#define X_STOP_PIN 3
-#define Y_STOP_PIN 2
-#define Z_STOP_PIN 5
+#define X_STOP_PIN 3
+#define Y_STOP_PIN 2
+#define Z_STOP_PIN 5
//
// Steppers
//
-#define X_STEP_PIN 14
-#define X_DIR_PIN 15
-#define X_ENABLE_PIN 24
+#define X_STEP_PIN 14
+#define X_DIR_PIN 15
+#define X_ENABLE_PIN 24
-#define Y_STEP_PIN 35
-#define Y_DIR_PIN 36
-#define Y_ENABLE_PIN 31
+#define Y_STEP_PIN 35
+#define Y_DIR_PIN 36
+#define Y_ENABLE_PIN 31
-#define Z_STEP_PIN 40
-#define Z_DIR_PIN 41
-#define Z_ENABLE_PIN 37
+#define Z_STEP_PIN 40
+#define Z_DIR_PIN 41
+#define Z_ENABLE_PIN 37
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 25
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 25
-#define E1_STEP_PIN 33
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 33
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
//
// Temperature sensors
//
-#define TEMP_0_PIN 15 // Analog Input
-#define TEMP_1_PIN 14 // Analog Input
-#define TEMP_BED_PIN 13 // Analog Input
+#define TEMP_0_PIN 15 // Analog Input
+#define TEMP_1_PIN 14 // Analog Input
+#define TEMP_BED_PIN 13 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 19 // EXTRUDER 1
-#define HEATER_1_PIN 23 // EXTRUDER 2
-#define HEATER_BED_PIN 22
+#define HEATER_0_PIN 19 // EXTRUDER 1
+#define HEATER_1_PIN 23 // EXTRUDER 2
+#define HEATER_BED_PIN 22
//
// LCD / Controller
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
index f2df6e1ecb..d56d08c9e0 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,101 +36,101 @@
//
// Limit Switches
//
-#define X_MIN_PIN 30
-#define X_MAX_PIN 31
-#define Y_MIN_PIN 32
-#define Y_MAX_PIN 33
-#define Z_MIN_PIN 34
-#define Z_MAX_PIN 35
+#define X_MIN_PIN 30
+#define X_MAX_PIN 31
+#define Y_MIN_PIN 32
+#define Y_MAX_PIN 33
+#define Z_MIN_PIN 34
+#define Z_MAX_PIN 35
//
// Steppers
//
-#define X_STEP_PIN 17
-#define X_DIR_PIN 16
-#define X_ENABLE_PIN 48
+#define X_STEP_PIN 17
+#define X_DIR_PIN 16
+#define X_ENABLE_PIN 48
-#define Y_STEP_PIN 54
-#define Y_DIR_PIN 47
-#define Y_ENABLE_PIN 55
+#define Y_STEP_PIN 54
+#define Y_DIR_PIN 47
+#define Y_ENABLE_PIN 55
-#define Z_STEP_PIN 57
-#define Z_DIR_PIN 56
-#define Z_ENABLE_PIN 62
+#define Z_STEP_PIN 57
+#define Z_DIR_PIN 56
+#define Z_ENABLE_PIN 62
-#define E0_STEP_PIN 23
-#define E0_DIR_PIN 22
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 23
+#define E0_DIR_PIN 22
+#define E0_ENABLE_PIN 24
-#define E1_STEP_PIN 26
-#define E1_DIR_PIN 25
-#define E1_ENABLE_PIN 27
+#define E1_STEP_PIN 26
+#define E1_DIR_PIN 25
+#define E1_ENABLE_PIN 27
-#define E2_STEP_PIN 29
-#define E2_DIR_PIN 28
-#define E2_ENABLE_PIN 39
+#define E2_STEP_PIN 29
+#define E2_DIR_PIN 28
+#define E2_ENABLE_PIN 39
//
// Temperature sensors
//
-#define TEMP_0_PIN 15
-#define TEMP_1_PIN 13
-#define TEMP_2_PIN 14
-#define TEMP_3_PIN 11 // should be used for chamber temperature control
-#define TEMP_BED_PIN 12
+#define TEMP_0_PIN 15
+#define TEMP_1_PIN 13
+#define TEMP_2_PIN 14
+#define TEMP_3_PIN 11 // should be used for chamber temperature control
+#define TEMP_BED_PIN 12
//
// Heaters / Fans
//
-#define HEATER_0_PIN 6
-#define HEATER_1_PIN 7
-#define HEATER_2_PIN 8
-#define HEATER_BED_PIN 9
+#define HEATER_0_PIN 6
+#define HEATER_1_PIN 7
+#define HEATER_2_PIN 8
+#define HEATER_BED_PIN 9
#ifndef FAN_PIN
- #define FAN_PIN 3
+ #define FAN_PIN 3
#endif
-#define FAN2_PIN 58 // additional fan or light control output
+#define FAN2_PIN 58 // additional fan or light control output
//
// Other board specific pins
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 37 // board input labeled as F-DET
+ #define FIL_RUNOUT_PIN 37 // board input labeled as F-DET
#endif
-#define Z_MIN_PROBE_PIN 36 // additional external board input labeled as E-SENS (should be used for Z-probe)
-#define LED_PIN 13
-#define SPINDLE_ENABLE_PIN 4 // additional PWM pin 1 at JP1 connector - should be used for laser control too
-#define EXT_2 5 // additional PWM pin 2 at JP1 connector
-#define EXT_3 2 // additional PWM pin 3 at JP1 connector
-#define PS_ON_PIN 45
-#define KILL_PIN 46
+#define Z_MIN_PROBE_PIN 36 // additional external board input labeled as E-SENS (should be used for Z-probe)
+#define LED_PIN 13
+#define SPINDLE_ENABLE_PIN 4 // additional PWM pin 1 at JP1 connector - should be used for laser control too
+#define EXT_2 5 // additional PWM pin 2 at JP1 connector
+#define EXT_3 2 // additional PWM pin 3 at JP1 connector
+#define PS_ON_PIN 45
+#define KILL_PIN 46
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 11 // shared with TEMP_3 analog input
+ #define FILWIDTH_PIN 11 // shared with TEMP_3 analog input
#endif
//
// LCD / Controller
//
-#define LCD_PINS_RS 19
-#define LCD_PINS_ENABLE 42
-#define LCD_PINS_D4 18
-#define LCD_PINS_D5 38
-#define LCD_PINS_D6 41
-#define LCD_PINS_D7 40
+#define LCD_PINS_RS 19
+#define LCD_PINS_ENABLE 42
+#define LCD_PINS_D4 18
+#define LCD_PINS_D5 38
+#define LCD_PINS_D6 41
+#define LCD_PINS_D7 40
//
// Beeper, SD Card, Encoder
//
-#define BEEPER_PIN 44
+#define BEEPER_PIN 44
#if ENABLED(SDSUPPORT)
- #define SDSS 53
- #define SD_DETECT_PIN 49
+ #define SDSS 53
+ #define SD_DETECT_PIN 49
#endif
#if ENABLED(NEWPANEL)
- #define BTN_EN1 11
- #define BTN_EN2 12
- #define BTN_ENC 43
+ #define BTN_EN1 11
+ #define BTN_EN2 12
+ #define BTN_ENC 43
#endif
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
index d54fbb13b3..833499fe0f 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,115 +34,115 @@
//
// Limit Switches
//
-#define X_STOP_PIN 43
-#define Y_STOP_PIN 45
-#define Z_STOP_PIN 42
+#define X_STOP_PIN 43
+#define Y_STOP_PIN 45
+#define Z_STOP_PIN 42
//
// Steppers
//
-#define X_STEP_PIN 34
-#define X_DIR_PIN 36
-#define X_ENABLE_PIN 35
+#define X_STEP_PIN 34
+#define X_DIR_PIN 36
+#define X_ENABLE_PIN 35
-#define Y_STEP_PIN 37
-#define Y_DIR_PIN 39
-#define Y_ENABLE_PIN 38
+#define Y_STEP_PIN 37
+#define Y_DIR_PIN 39
+#define Y_ENABLE_PIN 38
-#define Z_STEP_PIN 40
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 41
+#define Z_STEP_PIN 40
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 41
-#define E0_STEP_PIN 29
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 3
+#define E0_STEP_PIN 29
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 3
-#define E1_STEP_PIN 61
-#define E1_DIR_PIN 62
-#define E1_ENABLE_PIN 60
+#define E1_STEP_PIN 61
+#define E1_DIR_PIN 62
+#define E1_ENABLE_PIN 60
-#define E2_STEP_PIN 15
-#define E2_DIR_PIN 14
-#define E2_ENABLE_PIN 16
+#define E2_STEP_PIN 15
+#define E2_DIR_PIN 14
+#define E2_ENABLE_PIN 16
-#define E3_STEP_PIN 44
-#define E3_DIR_PIN 49
-#define E3_ENABLE_PIN 47
+#define E3_STEP_PIN 44
+#define E3_DIR_PIN 49
+#define E3_ENABLE_PIN 47
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 3 // Analog Input. 3 for tool2 -> 2 for chambertemp
-#define TEMP_2_PIN 2 // Analog Input. 9 for tool3 -> 2 for chambertemp
-#define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 2 for chambertemp
-#define TEMP_BED_PIN 1 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 3 // Analog Input. 3 for tool2 -> 2 for chambertemp
+#define TEMP_2_PIN 2 // Analog Input. 9 for tool3 -> 2 for chambertemp
+#define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 2 for chambertemp
+#define TEMP_BED_PIN 1 // Analog Input
#ifndef TEMP_CHAMBER_PIN
- //#define TEMP_CHAMBER_PIN 2 // Analog Input
+ //#define TEMP_CHAMBER_PIN 2 // Analog Input
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 5
-#define HEATER_1_PIN 58
-#define HEATER_2_PIN 64
-#define HEATER_3_PIN 46
-#define HEATER_BED_PIN 2
+#define HEATER_0_PIN 5
+#define HEATER_1_PIN 58
+#define HEATER_2_PIN 64
+#define HEATER_3_PIN 46
+#define HEATER_BED_PIN 2
#ifndef FAN_PIN
- //#define FAN_PIN 7 // common PWM pin for all tools
+ //#define FAN_PIN 7 // common PWM pin for all tools
#endif
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E1_AUTO_FAN_PIN 7
+#define ORIG_E2_AUTO_FAN_PIN 7
+#define ORIG_E3_AUTO_FAN_PIN 7
//
// Misc. Functions
//
-#define SDSS 53
-#define SD_DETECT_PIN 13
+#define SDSS 53
+#define SD_DETECT_PIN 13
// Tools
-//#define TOOL_0_PIN 4
-//#define TOOL_1_PIN 59
-//#define TOOL_2_PIN 8
-//#define TOOL_3_PIN 30
-//#define TOOL_PWM_PIN 7 // common PWM pin for all tools
+//#define TOOL_0_PIN 4
+//#define TOOL_1_PIN 59
+//#define TOOL_2_PIN 8
+//#define TOOL_3_PIN 30
+//#define TOOL_PWM_PIN 7 // common PWM pin for all tools
// Common I/O
-//#define FIL_RUNOUT_PIN -1
-//#define PWM_1_PIN 11
-//#define PWM_2_PIN 10
-//#define SPARE_IO 12
+//#define FIL_RUNOUT_PIN -1
+//#define PWM_1_PIN 11
+//#define PWM_2_PIN 10
+//#define SPARE_IO 12
//
// LCD / Controller
//
-#define BEEPER_PIN 6
+#define BEEPER_PIN 6
// Pins for DOGM SPI LCD Support
-#define DOGLCD_A0 26
-#define DOGLCD_CS 24
-#define DOGLCD_MOSI -1
-#define DOGLCD_SCK -1
+#define DOGLCD_A0 26
+#define DOGLCD_CS 24
+#define DOGLCD_MOSI -1
+#define DOGLCD_SCK -1
-#define BTN_EN1 23
-#define BTN_EN2 25
-#define BTN_ENC 27
+#define BTN_EN1 23
+#define BTN_EN2 25
+#define BTN_ENC 27
// Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT 19
-#define SHIFT_LD 18
-#define SHIFT_CLK 17
+#define SHIFT_OUT 19
+#define SHIFT_LD 18
+#define SHIFT_CLK 17
-//#define UI1 31
-//#define UI2 22
+//#define UI1 31
+//#define UI2 22
-#define STAT_LED_BLUE_PIN -1
-#define STAT_LED_RED_PIN 31
+#define STAT_LED_BLUE_PIN -1
+#define STAT_LED_RED_PIN 31
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
index 5628df7f10..680a5c9a99 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,122 +34,122 @@
//
// Limit Switches
//
-#define X_STOP_PIN 19
-#define Y_STOP_PIN 22
-#define Z_STOP_PIN 23
+#define X_STOP_PIN 19
+#define Y_STOP_PIN 22
+#define Z_STOP_PIN 23
//
// Steppers
//
-#define X_STEP_PIN 25
-#define X_DIR_PIN 27
-#define X_ENABLE_PIN 26
+#define X_STEP_PIN 25
+#define X_DIR_PIN 27
+#define X_ENABLE_PIN 26
-#define Y_STEP_PIN 28
-#define Y_DIR_PIN 30
-#define Y_ENABLE_PIN 29
+#define Y_STEP_PIN 28
+#define Y_DIR_PIN 30
+#define Y_ENABLE_PIN 29
-#define Z_STEP_PIN 31
-#define Z_DIR_PIN 33
-#define Z_ENABLE_PIN 32
+#define Z_STEP_PIN 31
+#define Z_DIR_PIN 33
+#define Z_ENABLE_PIN 32
-#define E0_STEP_PIN 57
-#define E0_DIR_PIN 55
-#define E0_ENABLE_PIN 58
+#define E0_STEP_PIN 57
+#define E0_DIR_PIN 55
+#define E0_ENABLE_PIN 58
-#define E1_STEP_PIN 61
-#define E1_DIR_PIN 62
-#define E1_ENABLE_PIN 60
+#define E1_STEP_PIN 61
+#define E1_DIR_PIN 62
+#define E1_ENABLE_PIN 60
-#define E2_STEP_PIN 46
-#define E2_DIR_PIN 66
-#define E2_ENABLE_PIN 44
+#define E2_STEP_PIN 46
+#define E2_DIR_PIN 66
+#define E2_ENABLE_PIN 44
-#define E3_STEP_PIN 45
-#define E3_DIR_PIN 69
-#define E3_ENABLE_PIN 47
+#define E3_STEP_PIN 45
+#define E3_DIR_PIN 69
+#define E3_ENABLE_PIN 47
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 9 // Analog Input. 9 for tool2 -> 13 for chambertemp
-#define TEMP_2_PIN 13 // Analog Input. 10 for tool3 -> 13 for chambertemp
-#define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 13 for chambertemp
-#define TEMP_BED_PIN 14 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input. 9 for tool2 -> 13 for chambertemp
+#define TEMP_2_PIN 13 // Analog Input. 10 for tool3 -> 13 for chambertemp
+#define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 13 for chambertemp
+#define TEMP_BED_PIN 14 // Analog Input
#ifndef TEMP_CHAMBER_PIN
- //#define TEMP_CHAMBER_PIN 13 // Analog Input
+ //#define TEMP_CHAMBER_PIN 13 // Analog Input
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 11
-#define HEATER_1_PIN 9
-#define HEATER_2_PIN 6
-#define HEATER_3_PIN 3
-#define HEATER_BED_PIN 24
+#define HEATER_0_PIN 11
+#define HEATER_1_PIN 9
+#define HEATER_2_PIN 6
+#define HEATER_3_PIN 3
+#define HEATER_BED_PIN 24
#ifndef FAN_PIN
- #define FAN_PIN 5 // 5 is PWMtool3 -> 7 is common PWM pin for all tools
+ #define FAN_PIN 5 // 5 is PWMtool3 -> 7 is common PWM pin for all tools
#endif
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E1_AUTO_FAN_PIN 7
+#define ORIG_E2_AUTO_FAN_PIN 7
+#define ORIG_E3_AUTO_FAN_PIN 7
//
// Misc. Functions
//
-#define SDSS 53
-#define SD_DETECT_PIN 15
+#define SDSS 53
+#define SD_DETECT_PIN 15
// Tools
-//#define TOOL_0_PIN 56
-//#define TOOL_0_PWM_PIN 10 // red warning led at dual extruder
-//#define TOOL_1_PIN 59
-//#define TOOL_1_PWM_PIN 8 // lights at dual extruder
-//#define TOOL_2_PIN 4
-//#define TOOL_2_PWM_PIN 5
-//#define TOOL_3_PIN 14
-//#define TOOL_3_PWM_PIN 2
+//#define TOOL_0_PIN 56
+//#define TOOL_0_PWM_PIN 10 // red warning led at dual extruder
+//#define TOOL_1_PIN 59
+//#define TOOL_1_PWM_PIN 8 // lights at dual extruder
+//#define TOOL_2_PIN 4
+//#define TOOL_2_PWM_PIN 5
+//#define TOOL_3_PIN 14
+//#define TOOL_3_PWM_PIN 2
// Common I/O
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 18
+ #define FIL_RUNOUT_PIN 18
#endif
-//#define PWM_1_PIN 12
-//#define PWM_2_PIN 13
-//#define SPARE_IO 17
+//#define PWM_1_PIN 12
+//#define PWM_2_PIN 13
+//#define SPARE_IO 17
//
// LCD / Controller
//
-#define BEEPER_PIN 16
+#define BEEPER_PIN 16
// Pins for DOGM SPI LCD Support
-#define DOGLCD_A0 39
-#define DOGLCD_CS 35
-#define DOGLCD_MOSI 48
-#define DOGLCD_SCK 49
+#define DOGLCD_A0 39
+#define DOGLCD_CS 35
+#define DOGLCD_MOSI 48
+#define DOGLCD_SCK 49
#define LCD_SCREEN_ROT_180
// The encoder and click button
-#define BTN_EN1 36
-#define BTN_EN2 34
-#define BTN_ENC 38
+#define BTN_EN1 36
+#define BTN_EN2 34
+#define BTN_ENC 38
// Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT 42
-#define SHIFT_LD 41
-#define SHIFT_CLK 40
+#define SHIFT_OUT 42
+#define SHIFT_LD 41
+#define SHIFT_CLK 40
-//#define UI1 43
-//#define UI2 37
+//#define UI1 43
+//#define UI2 37
-#define STAT_LED_BLUE_PIN -1
-#define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN
+#define STAT_LED_BLUE_PIN -1
+#define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
index c62be6befc..b4aa8ab815 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,79 +34,79 @@
//
// Servos
//
-#define SERVO0_PIN 6
+#define SERVO0_PIN 6
//
// Limit Switches
//
-#define X_STOP_PIN 34
-#define Y_STOP_PIN 39
-#define Z_STOP_PIN 62
+#define X_STOP_PIN 34
+#define Y_STOP_PIN 39
+#define Z_STOP_PIN 62
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 49
+ #define Z_MIN_PROBE_PIN 49
#endif
//
// Steppers
//
-#define X_STEP_PIN 14
-#define X_DIR_PIN 25
-#define X_ENABLE_PIN 26
+#define X_STEP_PIN 14
+#define X_DIR_PIN 25
+#define X_ENABLE_PIN 26
-#define Y_STEP_PIN 11
-#define Y_DIR_PIN 12
-#define Y_ENABLE_PIN 15
+#define Y_STEP_PIN 11
+#define Y_DIR_PIN 12
+#define Y_ENABLE_PIN 15
-#define Z_STEP_PIN 24
-#define Z_DIR_PIN 27
-#define Z_ENABLE_PIN 28
+#define Z_STEP_PIN 24
+#define Z_DIR_PIN 27
+#define Z_ENABLE_PIN 28
-#define E0_STEP_PIN 64
-#define E0_DIR_PIN 65
-#define E0_ENABLE_PIN 63
+#define E0_STEP_PIN 64
+#define E0_DIR_PIN 65
+#define E0_ENABLE_PIN 63
//
// Temperature Sensors
// Analog Inputs
//
-#define TEMP_0_PIN 2 // Analog Input
-#define TEMP_BED_PIN 4 // Analog Input
+#define TEMP_0_PIN 2 // Analog Input
+#define TEMP_BED_PIN 4 // Analog Input
#ifndef TEMP_CHAMBER_PIN
- #define TEMP_CHAMBER_PIN 5 // Analog Input
+ #define TEMP_CHAMBER_PIN 5 // Analog Input
#endif
//
// Heaters
//
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 32
-#define HEATER_CHAMBER_PIN 33
+#define HEATER_0_PIN 4
+#define HEATER_BED_PIN 32
+#define HEATER_CHAMBER_PIN 33
//
// Fans
//
-#define FAN_PIN 8
-#define ORIG_E0_AUTO_FAN_PIN 30
-#define ORIG_E1_AUTO_FAN_PIN 30
-#define ORIG_E2_AUTO_FAN_PIN 30
-#define ORIG_E3_AUTO_FAN_PIN 30
-//#define ORIG_CHAMBER_AUTO_FAN_PIN 10
+#define FAN_PIN 8
+#define ORIG_E0_AUTO_FAN_PIN 30
+#define ORIG_E1_AUTO_FAN_PIN 30
+#define ORIG_E2_AUTO_FAN_PIN 30
+#define ORIG_E3_AUTO_FAN_PIN 30
+//#define ORIG_CHAMBER_AUTO_FAN_PIN 10
//
// Misc. Functions
//
-#define SDSS 53
-#define SD_DETECT_PIN 40
+#define SDSS 53
+#define SD_DETECT_PIN 40
// Common I/O
-#define FIL_RUNOUT_PIN 9
-//#define FIL_RUNOUT_PIN 29 // encoder sensor
-//#define PWM_1_PIN 12
-//#define PWM_2_PIN 13
-//#define SPARE_IO 17
-#define BEEPER_PIN 13
-#define STAT_LED_BLUE_PIN -1
-#define STAT_LED_RED_PIN 10 // 31
+#define FIL_RUNOUT_PIN 9
+//#define FIL_RUNOUT_PIN 29 // encoder sensor
+//#define PWM_1_PIN 12
+//#define PWM_2_PIN 13
+//#define SPARE_IO 17
+#define BEEPER_PIN 13
+#define STAT_LED_BLUE_PIN -1
+#define STAT_LED_RED_PIN 10 // 31
diff --git a/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin/src/pins/mega/pins_EINSTART-S.h
index fae1d2e94d..8bb8f081f5 100644
--- a/Marlin/src/pins/mega/pins_EINSTART-S.h
+++ b/Marlin/src/pins/mega/pins_EINSTART-S.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,48 +35,48 @@
//
// Limit Switches
//
-#define X_STOP_PIN 44
-#define Y_STOP_PIN 43
-#define Z_STOP_PIN 42
+#define X_STOP_PIN 44
+#define Y_STOP_PIN 43
+#define Z_STOP_PIN 42
//
// Steppers
//
-#define X_STEP_PIN 76
-#define X_DIR_PIN 75
-#define X_ENABLE_PIN 73
+#define X_STEP_PIN 76
+#define X_DIR_PIN 75
+#define X_ENABLE_PIN 73
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 32
-#define Y_ENABLE_PIN 72
+#define Y_STEP_PIN 31
+#define Y_DIR_PIN 32
+#define Y_ENABLE_PIN 72
-#define Z_STEP_PIN 34
-#define Z_DIR_PIN 35
-#define Z_ENABLE_PIN 33
+#define Z_STEP_PIN 34
+#define Z_DIR_PIN 35
+#define Z_ENABLE_PIN 33
-#define E0_STEP_PIN 36
-#define E0_DIR_PIN 37
-#define E0_ENABLE_PIN 30
+#define E0_STEP_PIN 36
+#define E0_DIR_PIN 37
+#define E0_ENABLE_PIN 30
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_BED_PIN 1 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_BED_PIN 1 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 83
-#define HEATER_BED_PIN 38
+#define HEATER_0_PIN 83
+#define HEATER_BED_PIN 38
-#define FAN_PIN 82
+#define FAN_PIN 82
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 4
+#define SDSS 53
+#define LED_PIN 4
//////////////////////////
// LCDs and Controllers //
@@ -90,24 +90,24 @@
// u8glib constructor
// U8GLIB_SH1106_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, LCD_PINS_DC, LCD_PINS_RS);
-#define LCD_PINS_DC 78
-#define LCD_PINS_RS 79
+#define LCD_PINS_DC 78
+#define LCD_PINS_RS 79
// DOGM SPI LCD Support
-#define DOGLCD_CS 3
-#define DOGLCD_MOSI 2
-#define DOGLCD_SCK 5
-#define DOGLCD_A0 2
+#define DOGLCD_CS 3
+#define DOGLCD_MOSI 2
+#define DOGLCD_SCK 5
+#define DOGLCD_A0 2
//
// LCD Display input pins
//
-#define BTN_UP 25
-#define BTN_DWN 26
-#define BTN_LFT 27
-#define BTN_RT 28
+#define BTN_UP 25
+#define BTN_DWN 26
+#define BTN_LFT 27
+#define BTN_RT 28
// 'OK' button
-#define BTN_ENC 29
+#define BTN_ENC 29
// Set Kill to right arrow, same as RIGID_PANEL
-#define KILL_PIN 28
+#define KILL_PIN 28
diff --git a/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin/src/pins/mega/pins_ELEFU_3.h
index 5b43acab10..3d35a72b19 100644
--- a/Marlin/src/pins/mega/pins_ELEFU_3.h
+++ b/Marlin/src/pins/mega/pins_ELEFU_3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,115 +34,115 @@
//
// Limit Switches
//
-#define X_MIN_PIN 35
-#define X_MAX_PIN 34
-#define Y_MIN_PIN 33
-#define Y_MAX_PIN 32
-#define Z_MIN_PIN 31
-#define Z_MAX_PIN 30
+#define X_MIN_PIN 35
+#define X_MAX_PIN 34
+#define Y_MIN_PIN 33
+#define Y_MAX_PIN 32
+#define Z_MIN_PIN 31
+#define Z_MAX_PIN 30
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 30
+ #define Z_MIN_PROBE_PIN 30
#endif
//
// Steppers
//
-#define X_STEP_PIN 49
-#define X_DIR_PIN 13
-#define X_ENABLE_PIN 48
+#define X_STEP_PIN 49
+#define X_DIR_PIN 13
+#define X_ENABLE_PIN 48
-#define Y_STEP_PIN 11
-#define Y_DIR_PIN 9
-#define Y_ENABLE_PIN 12
+#define Y_STEP_PIN 11
+#define Y_DIR_PIN 9
+#define Y_ENABLE_PIN 12
-#define Z_STEP_PIN 7
-#define Z_DIR_PIN 6
-#define Z_ENABLE_PIN 8
+#define Z_STEP_PIN 7
+#define Z_DIR_PIN 6
+#define Z_ENABLE_PIN 8
-#define E0_STEP_PIN 40
-#define E0_DIR_PIN 41
-#define E0_ENABLE_PIN 37
+#define E0_STEP_PIN 40
+#define E0_DIR_PIN 41
+#define E0_ENABLE_PIN 37
-#define E1_STEP_PIN 18
-#define E1_DIR_PIN 19
-#define E1_ENABLE_PIN 38
+#define E1_STEP_PIN 18
+#define E1_DIR_PIN 19
+#define E1_ENABLE_PIN 38
-#define E2_STEP_PIN 43
-#define E2_DIR_PIN 47
-#define E2_ENABLE_PIN 42
+#define E2_STEP_PIN 43
+#define E2_DIR_PIN 47
+#define E2_ENABLE_PIN 42
//
// Temperature Sensors
//
-#define TEMP_0_PIN 3 // Analog Input
-#define TEMP_1_PIN 2 // Analog Input
-#define TEMP_2_PIN 1 // Analog Input
-#define TEMP_BED_PIN 0 // Analog Input
+#define TEMP_0_PIN 3 // Analog Input
+#define TEMP_1_PIN 2 // Analog Input
+#define TEMP_2_PIN 1 // Analog Input
+#define TEMP_BED_PIN 0 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 45 // 12V PWM1
-#define HEATER_1_PIN 46 // 12V PWM2
-#define HEATER_2_PIN 17 // 12V PWM3
-#define HEATER_BED_PIN 44 // DOUBLE 12V PWM
+#define HEATER_0_PIN 45 // 12V PWM1
+#define HEATER_1_PIN 46 // 12V PWM2
+#define HEATER_2_PIN 17 // 12V PWM3
+#define HEATER_BED_PIN 44 // DOUBLE 12V PWM
#ifndef FAN_PIN
- #define FAN_PIN 16 // 5V PWM
+ #define FAN_PIN 16 // 5V PWM
#endif
//
// Misc. Functions
//
-#define PS_ON_PIN 10 // Set to -1 if using a manual switch on the PWRSW Connector
-#define SLEEP_WAKE_PIN 26 // This feature still needs work
-#define PHOTOGRAPH_PIN 29
+#define PS_ON_PIN 10 // Set to -1 if using a manual switch on the PWRSW Connector
+#define SLEEP_WAKE_PIN 26 // This feature still needs work
+#define PHOTOGRAPH_PIN 29
//
// LCD / Controller
//
-#define BEEPER_PIN 36
+#define BEEPER_PIN 36
#if ENABLED(RA_CONTROL_PANEL)
- #define SDSS 53
- #define SD_DETECT_PIN 28
+ #define SDSS 53
+ #define SD_DETECT_PIN 28
- #define BTN_EN1 14
- #define BTN_EN2 39
- #define BTN_ENC 15
+ #define BTN_EN1 14
+ #define BTN_EN2 39
+ #define BTN_ENC 15
#endif // RA_CONTROL_PANEL
#if ENABLED(RA_DISCO)
// variables for which pins the TLC5947 is using
- #define TLC_CLOCK_PIN 25
- #define TLC_BLANK_PIN 23
- #define TLC_XLAT_PIN 22
- #define TLC_DATA_PIN 24
+ #define TLC_CLOCK_PIN 25
+ #define TLC_BLANK_PIN 23
+ #define TLC_XLAT_PIN 22
+ #define TLC_DATA_PIN 24
// We also need to define pin to port number mapping for the 2560 to match the pins listed above.
// If you change the TLC pins, update this as well per the 2560 datasheet! This currently only works with the RA Board.
- #define TLC_CLOCK_BIT 3
+ #define TLC_CLOCK_BIT 3
#define TLC_CLOCK_PORT &PORTA
- #define TLC_BLANK_BIT 1
+ #define TLC_BLANK_BIT 1
#define TLC_BLANK_PORT &PORTA
- #define TLC_DATA_BIT 2
+ #define TLC_DATA_BIT 2
#define TLC_DATA_PORT &PORTA
- #define TLC_XLAT_BIT 0
+ #define TLC_XLAT_BIT 0
#define TLC_XLAT_PORT &PORTA
// Change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
// Leave it at at least 1 if you have enabled RA_LIGHTING
// The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
- #define NUM_TLCS 2
+ #define NUM_TLCS 2
// These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
// Modify them according to your specific situation.
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index 16bd5688df..e111f2ce44 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,102 +39,102 @@
//
// Limit Switches
//
-#define X_MIN_PIN 22
-#define X_MAX_PIN 24
-#define Y_MIN_PIN 26
-#define Y_MAX_PIN 28
-#define Z_MIN_PIN 30
-#define Z_MAX_PIN 32
+#define X_MIN_PIN 22
+#define X_MAX_PIN 24
+#define Y_MIN_PIN 26
+#define Y_MAX_PIN 28
+#define Z_MIN_PIN 30
+#define Z_MAX_PIN 32
//
// Steppers
//
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 27
+#define X_STEP_PIN 25
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 27
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 33
-#define Y_ENABLE_PIN 29
+#define Y_STEP_PIN 31
+#define Y_DIR_PIN 33
+#define Y_ENABLE_PIN 29
-#define Z_STEP_PIN 37
-#define Z_DIR_PIN 39
-#define Z_ENABLE_PIN 35
+#define Z_STEP_PIN 37
+#define Z_DIR_PIN 39
+#define Z_ENABLE_PIN 35
-#define E0_STEP_PIN 43
-#define E0_DIR_PIN 45
-#define E0_ENABLE_PIN 41
+#define E0_STEP_PIN 43
+#define E0_DIR_PIN 45
+#define E0_ENABLE_PIN 41
-#define E1_STEP_PIN 49
-#define E1_DIR_PIN 47
-#define E1_ENABLE_PIN 48
+#define E1_STEP_PIN 49
+#define E1_DIR_PIN 47
+#define E1_ENABLE_PIN 48
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8
-#define TEMP_1_PIN 9
-#define TEMP_BED_PIN 10
+#define TEMP_0_PIN 8
+#define TEMP_1_PIN 9
+#define TEMP_BED_PIN 10
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 3
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+#define HEATER_1_PIN 3
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 7
+ #define FAN_PIN 7
#endif
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 12
-#define SUICIDE_PIN 54 // Must be enabled at startup to keep power flowing
-#define KILL_PIN -1
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+#define SUICIDE_PIN 54 // Must be enabled at startup to keep power flowing
+#define KILL_PIN -1
#if HAS_SPI_LCD
- #define BEEPER_PIN 18
+ #define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 5
- #define DOGLCD_CS 21
- #define BTN_EN1 40
- #define BTN_EN2 42
+ #define DOGLCD_A0 5
+ #define DOGLCD_CS 21
+ #define BTN_EN1 40
+ #define BTN_EN2 42
#else
- #define LCD_PINS_RS 20
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 16
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 5
- #define LCD_PINS_D7 6
- #define BTN_EN1 42
- #define BTN_EN2 40
+ #define LCD_PINS_RS 20
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 16
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 5
+ #define LCD_PINS_D7 6
+ #define BTN_EN1 42
+ #define BTN_EN2 40
#endif
- #define BTN_ENC 19
- #define SD_DETECT_PIN 38
+ #define BTN_ENC 19
+ #define SD_DETECT_PIN 38
- #else // !NEWPANEL
+ #else // !NEWPANEL
- #define SHIFT_CLK 38
- #define SHIFT_LD 42
- #define SHIFT_OUT 40
- #define SHIFT_EN 17
+ #define SHIFT_CLK 38
+ #define SHIFT_LD 42
+ #define SHIFT_OUT 40
+ #define SHIFT_EN 17
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 5
- #define LCD_PINS_D4 6
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 20
- #define LCD_PINS_D7 19
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 5
+ #define LCD_PINS_D4 6
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 20
+ #define LCD_PINS_D7 19
- #define SD_DETECT_PIN -1
+ #define SD_DETECT_PIN -1
#endif // !NEWPANEL
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
index c5c894810b..3ce4627dce 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
index ce805ddb1f..08f9018a29 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
#pragma once
/**
- * GT2560 V3.0 pin assignment
+ * GT2560 RevB + GT2560 V3.0 + GT2560 V3.1 + GT2560 V4.0 pin assignment
*/
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
@@ -36,33 +36,33 @@
//
// Servos
//
-#define SERVO0_PIN 11 //13 untested 3Dtouch
+#define SERVO0_PIN 11 //13 untested 3Dtouch
//
// Limit Switches
//
#ifndef X_STOP_PIN
#ifndef X_MIN_PIN
- #define X_MIN_PIN 24
+ #define X_MIN_PIN 24
#endif
#ifndef X_MAX_PIN
- #define X_MAX_PIN 22
+ #define X_MAX_PIN 22
#endif
#endif
#ifndef Y_STOP_PIN
#ifndef Y_MIN_PIN
- #define Y_MIN_PIN 28
+ #define Y_MIN_PIN 28
#endif
#ifndef Y_MAX_PIN
- #define Y_MAX_PIN 26
+ #define Y_MAX_PIN 26
#endif
#endif
#ifndef Z_STOP_PIN
#ifndef Z_MIN_PIN
- #define Z_MIN_PIN 30
+ #define Z_MIN_PIN 30
#endif
#ifndef Z_MAX_PIN
- #define Z_MAX_PIN 32
+ #define Z_MAX_PIN 32
#endif
#endif
@@ -70,116 +70,116 @@
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 66
+ #define FIL_RUNOUT_PIN 66
#endif
#ifndef FIL_RUNOUT2_PIN
- #define FIL_RUNOUT2_PIN 67
+ #define FIL_RUNOUT2_PIN 67
#endif
//
// Power Recovery
//
-#define POWER_LOSS_PIN 69 // Pin to detect power loss
-#define POWER_LOSS_STATE LOW
+#define POWER_LOSS_PIN 69 // Pin to detect power loss
+#define POWER_LOSS_STATE LOW
//
// Steppers
//
-#define X_STEP_PIN 37
-#define X_DIR_PIN 39
-#define X_ENABLE_PIN 35
+#define X_STEP_PIN 37
+#define X_DIR_PIN 39
+#define X_ENABLE_PIN 35
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 33
-#define Y_ENABLE_PIN 29
+#define Y_STEP_PIN 31
+#define Y_DIR_PIN 33
+#define Y_ENABLE_PIN 29
-#define Z_STEP_PIN 25
-#define Z_DIR_PIN 23
-#define Z_ENABLE_PIN 27
+#define Z_STEP_PIN 25
+#define Z_DIR_PIN 23
+#define Z_ENABLE_PIN 27
-#define E0_STEP_PIN 46
-#define E0_DIR_PIN 44
-#define E0_ENABLE_PIN 12
+#define E0_STEP_PIN 46
+#define E0_DIR_PIN 44
+#define E0_ENABLE_PIN 12
-#define E1_STEP_PIN 49
-#define E1_DIR_PIN 47
-#define E1_ENABLE_PIN 48
+#define E1_STEP_PIN 49
+#define E1_DIR_PIN 47
+#define E1_ENABLE_PIN 48
-#define E2_STEP_PIN 43
-#define E2_DIR_PIN 45
-#define E2_ENABLE_PIN 41
+#define E2_STEP_PIN 43
+#define E2_DIR_PIN 45
+#define E2_ENABLE_PIN 41
//
// Temperature Sensors
//
-#define TEMP_0_PIN 11 // Analog Input
-#define TEMP_1_PIN 9 // Analog Input
-#define TEMP_2_PIN 1 // Analog Input
-#define TEMP_BED_PIN 10 // Analog Input
+#define TEMP_0_PIN 11 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input
+#define TEMP_2_PIN 1 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 10
-#define HEATER_1_PIN 3
-#define HEATER_2_PIN 1
-#define HEATER_BED_PIN 4
-#define FAN_PIN 9
-#define FAN1_PIN 8
-#define FAN2_PIN 7
+#define HEATER_0_PIN 10
+#define HEATER_1_PIN 3
+#define HEATER_2_PIN 1
+#define HEATER_BED_PIN 4
+#define FAN_PIN 9
+#define FAN1_PIN 8
+#define FAN2_PIN 7
//
// Misc. Functions
//
-#define SD_DETECT_PIN 38
-#define SDSS 53
-#define LED_PIN 6
-#define PS_ON_PIN 12
-#define SUICIDE_PIN 54 // This pin must be enabled at boot to keep power flowing
+#define SD_DETECT_PIN 38
+#define SDSS 53
+#define LED_PIN 6
+#define PS_ON_PIN 12
+#define SUICIDE_PIN 54 // This pin must be enabled at boot to keep power flowing
#ifndef CASE_LIGHT_PIN
- #define CASE_LIGHT_PIN 6 // 21
+ #define CASE_LIGHT_PIN 6 // 21
#endif
//
// LCD Controller
//
-#define BEEPER_PIN 18
+#define BEEPER_PIN 18
#ifndef LCD_PINS_RS
- #define LCD_PINS_RS 20
+ #define LCD_PINS_RS 20
#endif
#ifndef LCD_PINS_ENABLE
- #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_ENABLE 17
#endif
#ifndef LCD_PINS_D4
- #define LCD_PINS_D4 16
+ #define LCD_PINS_D4 16
#endif
#ifndef LCD_PINS_D5
- #define LCD_PINS_D5 21
+ #define LCD_PINS_D5 21
#endif
#ifndef LCD_PINS_D6
- #define LCD_PINS_D6 5
+ #define LCD_PINS_D6 5
#endif
#ifndef LCD_PINS_D7
- #define LCD_PINS_D7 36
+ #define LCD_PINS_D7 36
#endif
#if ENABLED(NEWPANEL)
#ifndef BTN_EN1
- #define BTN_EN1 42
+ #define BTN_EN1 42
#endif
#ifndef BTN_EN2
- #define BTN_EN2 40
+ #define BTN_EN2 40
#endif
#ifndef BTN_ENC
- #define BTN_ENC 19
+ #define BTN_ENC 19
#endif
#endif
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
index e3b6895af1..06ac9fd9df 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,15 +25,15 @@
* Geeetech A20M pin assignment
*/
-#define LCD_PINS_RS 5
-#define LCD_PINS_ENABLE 36
-#define LCD_PINS_D4 21
-#define LCD_PINS_D7 6
+#define LCD_PINS_RS 5
+#define LCD_PINS_ENABLE 36
+#define LCD_PINS_D4 21
+#define LCD_PINS_D7 6
#if ENABLED(NEWPANEL)
- #define BTN_EN1 16
- #define BTN_EN2 17
- #define BTN_ENC 19
+ #define BTN_EN1 16
+ #define BTN_EN2 17
+ #define BTN_ENC 19
#endif
#include "pins_GT2560_V3.h"
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
index afdcad3435..0f06aaf256 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,9 +27,9 @@
#define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
-#define X_MIN_PIN 22
-#define X_MAX_PIN 24
-#define Y_MIN_PIN 26
-#define Y_MAX_PIN 28
+#define X_MIN_PIN 22
+#define X_MAX_PIN 24
+#define Y_MIN_PIN 26
+#define Y_MAX_PIN 28
#include "pins_GT2560_V3.h"
diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index a39162dded..66adfb2fa7 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,79 +42,79 @@
//
// Limit Switches
//
-#define X_STOP_PIN 22
-#define Y_STOP_PIN 26
-#define Z_STOP_PIN 29
-//#define EXP_STOP_PIN 28
+#define X_STOP_PIN 22
+#define Y_STOP_PIN 26
+#define Z_STOP_PIN 29
+//#define EXP_STOP_PIN 28
//
// Steppers
//
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 27
+#define X_STEP_PIN 25
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 27
-#define Y_STEP_PIN 32
-#define Y_DIR_PIN 33
-#define Y_ENABLE_PIN 31
+#define Y_STEP_PIN 32
+#define Y_DIR_PIN 33
+#define Y_ENABLE_PIN 31
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 36
-#define Z_ENABLE_PIN 34
+#define Z_STEP_PIN 35
+#define Z_DIR_PIN 36
+#define Z_ENABLE_PIN 34
-#define E0_STEP_PIN 42
-#define E0_DIR_PIN 43
-#define E0_ENABLE_PIN 37
+#define E0_STEP_PIN 42
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 37
-#define E1_STEP_PIN 49
-#define E1_DIR_PIN 47
-#define E1_ENABLE_PIN 48
+#define E1_STEP_PIN 49
+#define E1_DIR_PIN 47
+#define E1_ENABLE_PIN 48
-#define MOTOR_CURRENT_PWM_XY_PIN 44
-#define MOTOR_CURRENT_PWM_Z_PIN 45
-#define MOTOR_CURRENT_PWM_E_PIN 46
+#define MOTOR_CURRENT_PWM_XY_PIN 44
+#define MOTOR_CURRENT_PWM_Z_PIN 45
+#define MOTOR_CURRENT_PWM_E_PIN 46
// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
#ifndef MOTOR_CURRENT_PWM_RANGE
- #define MOTOR_CURRENT_PWM_RANGE 2000
+ #define MOTOR_CURRENT_PWM_RANGE 2000
#endif
#define DEFAULT_PWM_MOTOR_CURRENT { 1300, 1300, 1250 }
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8 // Analog Input
-#define TEMP_1_PIN 9 // Analog Input
-#define TEMP_BED_PIN 10 // Analog Input
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 3
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+#define HEATER_1_PIN 3
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 7 //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
+ #define FAN_PIN 7 //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
#endif
//
// Misc. Functions
//
-#define SDSS 53
-#define SD_DETECT_PIN 39
-//#define LED_PIN 8
-#define CASE_LIGHT_PIN 8 // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
+#define SDSS 53
+#define SD_DETECT_PIN 39
+//#define LED_PIN 8
+#define CASE_LIGHT_PIN 8 // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
-//#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
-//#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+//#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
+//#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
//
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE)
- #define SPINDLE_DIR_PIN 16
- #define SPINDLE_LASER_ENABLE_PIN 17 // Pin should have a pullup!
- #define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
+ #define SPINDLE_DIR_PIN 16
+ #define SPINDLE_LASER_ENABLE_PIN 17 // Pin should have a pullup!
+ #define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
#endif
//
@@ -122,48 +122,48 @@
//
#if HAS_SPI_LCD
- #define BEEPER_PIN 18
+ #define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
- #define LCD_PINS_RS 20 // LCD_CS
- #define LCD_PINS_ENABLE 15 // LCD_SDA
- #define LCD_PINS_D4 14 // LCD_SCK
+ #define LCD_PINS_RS 20 // LCD_CS
+ #define LCD_PINS_ENABLE 15 // LCD_SDA
+ #define LCD_PINS_D4 14 // LCD_SCK
#if ENABLED(HJC_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 5 // LCD_Backlight
+ #define LCD_BACKLIGHT_PIN 5 // LCD_Backlight
//#ifndef LCD_CONTRAST_PIN
// #define LCD_CONTRAST_PIN 5 // LCD_Contrast
//#endif
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 24 // Filament runout
+ #define FIL_RUNOUT_PIN 24 // Filament runout
#endif
#else
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 5
- #define LCD_PINS_D7 6
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 5
+ #define LCD_PINS_D7 6
#endif
- #define BTN_EN1 41
- #define BTN_EN2 40
- #define BTN_ENC 19
+ #define BTN_EN1 41
+ #define BTN_EN2 40
+ #define BTN_ENC 19
- #define SD_DETECT_PIN 39
+ #define SD_DETECT_PIN 39
#else
// Buttons attached to a shift register
- #define SHIFT_CLK 38
- #define SHIFT_LD 42
- #define SHIFT_OUT 40
- #define SHIFT_EN 17
+ #define SHIFT_CLK 38
+ #define SHIFT_LD 42
+ #define SHIFT_OUT 40
+ #define SHIFT_EN 17
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 5
- #define LCD_PINS_D4 6
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 20
- #define LCD_PINS_D7 19
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 5
+ #define LCD_PINS_D4 6
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 20
+ #define LCD_PINS_D7 19
#endif // !NEWPANEL
diff --git a/Marlin/src/pins/mega/pins_INTAMSYS40.h b/Marlin/src/pins/mega/pins_INTAMSYS40.h
new file mode 100644
index 0000000000..c688823ddf
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_INTAMSYS40.h
@@ -0,0 +1,152 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * Intamsys Funmat HT V4.0 Mainboard
+ * 4988 Drivers Tested
+ * 2208 version exists and may or may not work
+ */
+
+#ifndef __AVR_ATmega2560__
+ #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
+#endif
+
+#define BOARD_INFO_NAME "Intamsys 4.0"
+
+//
+// Servos
+//
+#define SERVO0_PIN 12 // Uses High Temp Present Jumper Pin
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN 22
+#define Y_STOP_PIN 26
+#define Z_MIN_PIN 29
+#define Z_MAX_PIN 69
+
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN 69
+#endif
+
+#define FIL_RUNOUT_PIN 10
+
+//
+// Steppers
+//
+#define X_STEP_PIN 25
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 27 // 44
+
+#define Y_STEP_PIN 32 // 33
+#define Y_DIR_PIN 33 // 31, 32
+#define Y_ENABLE_PIN 31 // 32
+
+#define Z_STEP_PIN 35 // 35
+#define Z_DIR_PIN 36
+#define Z_ENABLE_PIN 34 // 34
+
+#define E0_STEP_PIN 42
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 37
+
+#define E1_STEP_PIN 49
+#define E1_DIR_PIN 47
+#define E1_ENABLE_PIN 48
+
+#define MOTOR_CURRENT_PWM_X_PIN 11
+#define MOTOR_CURRENT_PWM_Y_PIN 44
+#define MOTOR_CURRENT_PWM_Z_PIN 45
+#define MOTOR_CURRENT_PWM_E_PIN 46
+
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
+#ifndef MOTOR_CURRENT_PWM_RANGE
+ #define MOTOR_CURRENT_PWM_RANGE 2000
+#endif
+#define DEFAULT_PWM_MOTOR_CURRENT { 1300, 1300, 1250 }
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 8 // Analog Input D62
+#define TEMP_BED_PIN 10 // Analog Input D64
+
+#define TEMP_CHAMBER_PIN 9 // Analog Input D63
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN 2 // PWM
+#define HEATER_BED_PIN 4 // PWM
+#define HEATER_CHAMBER_PIN 3 // PWM
+#define FAN_PIN 7 // PWM
+
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define SD_DETECT_PIN 39
+
+#if ENABLED(CASE_LIGHT_ENABLE)
+ #define CASE_LIGHT_PIN 8
+#endif
+
+#if ENABLED(PSU_CONTROL)
+ #define PS_ON_PIN 38 // UPS Module
+#endif
+
+//
+// LCD Controller
+//
+
+#define BEEPER_PIN 18
+
+#if HAS_SPI_LCD
+ #define LCD_PINS_RS 20
+ #define LCD_PINS_ENABLE 30
+ #define LCD_PINS_D4 14
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 5
+ #define LCD_PINS_D7 6
+ #define BTN_EN1 40
+ #define BTN_EN2 41
+ #define BTN_ENC 19
+#endif
+
+///////////////////// SPARE HEADERS //////////////
+
+/**
+ *
+ * J25
+ * 1 D54
+ * 2 D55
+ * 3 D56
+ * 4 D57
+ * 5 D58
+ * 6 D59
+ * 7 D60
+ * 8 D61
+
+Hotend High Temp Connected : D12
+*/
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG.h b/Marlin/src/pins/mega/pins_LEAPFROG.h
index 56eec5e97e..188cbcad3d 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,59 +34,59 @@
//
// Limit Switches
//
-#define X_MIN_PIN 47
-#define X_MAX_PIN 2
-#define Y_MIN_PIN 48
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 49
-#define Z_MAX_PIN -1
+#define X_MIN_PIN 47
+#define X_MAX_PIN 2
+#define Y_MIN_PIN 48
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 49
+#define Z_MAX_PIN -1
//
// Steppers
//
-#define X_STEP_PIN 28
-#define X_DIR_PIN 63
-#define X_ENABLE_PIN 29
+#define X_STEP_PIN 28
+#define X_DIR_PIN 63
+#define X_ENABLE_PIN 29
-#define Y_STEP_PIN 14 // A6
-#define Y_DIR_PIN 15 // A0
-#define Y_ENABLE_PIN 39
+#define Y_STEP_PIN 14 // A6
+#define Y_DIR_PIN 15 // A0
+#define Y_ENABLE_PIN 39
-#define Z_STEP_PIN 31 // A2
-#define Z_DIR_PIN 32 // A6
-#define Z_ENABLE_PIN 30 // A1
+#define Z_STEP_PIN 31 // A2
+#define Z_DIR_PIN 32 // A6
+#define Z_ENABLE_PIN 30 // A1
-#define E0_STEP_PIN 34 // 34
-#define E0_DIR_PIN 35 // 35
-#define E0_ENABLE_PIN 33 // 33
+#define E0_STEP_PIN 34 // 34
+#define E0_DIR_PIN 35 // 35
+#define E0_ENABLE_PIN 33 // 33
-#define E1_STEP_PIN 37 // 37
-#define E1_DIR_PIN 40 // 40
-#define E1_ENABLE_PIN 36 // 36
+#define E1_STEP_PIN 37 // 37
+#define E1_DIR_PIN 40 // 40
+#define E1_ENABLE_PIN 36 // 36
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13 // Analog Input (D27)
-#define TEMP_1_PIN 15 // Analog Input (1)
-#define TEMP_BED_PIN 14 // Analog Input (1,2 or I2C)
+#define TEMP_0_PIN 13 // Analog Input (D27)
+#define TEMP_1_PIN 15 // Analog Input (1)
+#define TEMP_BED_PIN 14 // Analog Input (1,2 or I2C)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 9
-#define HEATER_1_PIN 8 // 12
-#define HEATER_2_PIN 11 // 13
-#define HEATER_BED_PIN 10 // 14/15
+#define HEATER_0_PIN 9
+#define HEATER_1_PIN 8 // 12
+#define HEATER_2_PIN 11 // 13
+#define HEATER_BED_PIN 10 // 14/15
-#define FAN_PIN 7
+#define FAN_PIN 7
//
// Misc. Functions
//
-#define SDSS 11
-#define LED_PIN 13
-#define SOL1_PIN 16
-#define SOL2_PIN 17
+#define SDSS 11
+#define LED_PIN 13
+#define SOL1_PIN 16
+#define SOL2_PIN 17
/* Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31) */
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
index dba2241c4a..36cb0e2c14 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,9 +38,9 @@
//
// Limit Switches
//
-#define X_STOP_PIN 47 // 'X Min'
-#define Y_STOP_PIN 48 // 'Y Min'
-#define Z_STOP_PIN 49 // 'Z Min'
+#define X_STOP_PIN 47 // 'X Min'
+#define Y_STOP_PIN 48 // 'Y Min'
+#define Z_STOP_PIN 49 // 'Z Min'
//
// Steppers
@@ -51,65 +51,65 @@
//
// X-axis signal-level connector
-#define X_STEP_PIN 65
-#define X_DIR_PIN 64
-#define X_ENABLE_PIN 66 // Not actually used on Xeed, could be repurposed
+#define X_STEP_PIN 65
+#define X_DIR_PIN 64
+#define X_ENABLE_PIN 66 // Not actually used on Xeed, could be repurposed
// Y-axis signal-level connector
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24 // Not actually used on Xeed, could be repurposed
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24 // Not actually used on Xeed, could be repurposed
// ZMOT connector (Front Right Z Motor)
-#define Z_STEP_PIN 31
-#define Z_DIR_PIN 32
-#define Z_ENABLE_PIN 30
+#define Z_STEP_PIN 31
+#define Z_DIR_PIN 32
+#define Z_ENABLE_PIN 30
// XMOT connector (Rear Z Motor)
-#define Z2_STEP_PIN 28
-#define Z2_DIR_PIN 63
-#define Z2_ENABLE_PIN 29
+#define Z2_STEP_PIN 28
+#define Z2_DIR_PIN 63
+#define Z2_ENABLE_PIN 29
// YMOT connector (Front Left Z Motor)
-#define Z3_STEP_PIN 14
-#define Z3_DIR_PIN 15
-#define Z3_ENABLE_PIN 39
+#define Z3_STEP_PIN 14
+#define Z3_DIR_PIN 15
+#define Z3_ENABLE_PIN 39
// EMOT2 connector
-#define E0_STEP_PIN 37
-#define E0_DIR_PIN 40
-#define E0_ENABLE_PIN 36
+#define E0_STEP_PIN 37
+#define E0_DIR_PIN 40
+#define E0_ENABLE_PIN 36
// EMOT connector
-#define E1_STEP_PIN 34
-#define E1_DIR_PIN 35
-#define E1_ENABLE_PIN 33
+#define E1_STEP_PIN 34
+#define E1_DIR_PIN 35
+#define E1_ENABLE_PIN 33
//
// Filament runout
//
-#define FIL_RUNOUT_PIN 42 // ROT2 Connector
-#define FIL_RUNOUT2_PIN 44 // ROT1 Connector
+#define FIL_RUNOUT_PIN 42 // ROT2 Connector
+#define FIL_RUNOUT2_PIN 44 // ROT1 Connector
//
// Temperature Sensors
//
-#define TEMP_0_PIN 15 // T3 Connector
-#define TEMP_1_PIN 13 // T1 Connector
-#define TEMP_BED_PIN 14 // BED Connector (Between T1 and T3)
+#define TEMP_0_PIN 15 // T3 Connector
+#define TEMP_1_PIN 13 // T1 Connector
+#define TEMP_BED_PIN 14 // BED Connector (Between T1 and T3)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 8 // Misc Connector, pins 3 and 4 (Out2)
-#define HEATER_1_PIN 9 // Misc Connector, pins 5 and 6 (Out3)
-#define HEATER_BED_PIN 6 // Misc Connector, pins 9(-) and 10(+) (OutA)
+#define HEATER_0_PIN 8 // Misc Connector, pins 3 and 4 (Out2)
+#define HEATER_1_PIN 9 // Misc Connector, pins 5 and 6 (Out3)
+#define HEATER_BED_PIN 6 // Misc Connector, pins 9(-) and 10(+) (OutA)
-#define FAN_PIN 10 // Misc Connector, pins 7(-) and 8 (+) (Out4)
+#define FAN_PIN 10 // Misc Connector, pins 7(-) and 8 (+) (Out4)
-#define LED_PIN 13
+#define LED_PIN 13
-#define SOL1_PIN 7 // Misc Connector, pins 1(-) and 2(+) (Out1)
+#define SOL1_PIN 7 // Misc Connector, pins 1(-) and 2(+) (Out1)
// Door Closed Sensor
-//#define DOOR_PIN 45 // HM1 Connector
+//#define DOOR_PIN 45 // HM1 Connector
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index 473e79b276..2d0db15825 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,89 +36,89 @@
//
// Servos
//
-#define SERVO0_PIN 30
-#define SERVO1_PIN 31
-#define SERVO2_PIN 32
-#define SERVO3_PIN 33
+#define SERVO0_PIN 30
+#define SERVO1_PIN 31
+#define SERVO2_PIN 32
+#define SERVO3_PIN 33
//
// Limit Switches
//
-#define X_MIN_PIN 43
-#define X_MAX_PIN 42
-#define Y_MIN_PIN 38
-#define Y_MAX_PIN 41
-#define Z_MIN_PIN 40
-#define Z_MAX_PIN 37
+#define X_MIN_PIN 43
+#define X_MAX_PIN 42
+#define Y_MIN_PIN 38
+#define Y_MAX_PIN 41
+#define Z_MIN_PIN 40
+#define Z_MAX_PIN 37
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 37
+ #define Z_MIN_PROBE_PIN 37
#endif
//
// Steppers
//
-#define X_STEP_PIN 62 // A8
-#define X_DIR_PIN 63 // A9
-#define X_ENABLE_PIN 61 // A7
+#define X_STEP_PIN 62 // A8
+#define X_DIR_PIN 63 // A9
+#define X_ENABLE_PIN 61 // A7
-#define Y_STEP_PIN 65 // A11
-#define Y_DIR_PIN 66 // A12
-#define Y_ENABLE_PIN 64 // A10
+#define Y_STEP_PIN 65 // A11
+#define Y_DIR_PIN 66 // A12
+#define Y_ENABLE_PIN 64 // A10
-#define Z_STEP_PIN 68 // A14
-#define Z_DIR_PIN 69 // A15
-#define Z_ENABLE_PIN 67 // A13
+#define Z_STEP_PIN 68 // A14
+#define Z_DIR_PIN 69 // A15
+#define Z_ENABLE_PIN 67 // A13
-#define E0_STEP_PIN 23
-#define E0_DIR_PIN 24
-#define E0_ENABLE_PIN 22
+#define E0_STEP_PIN 23
+#define E0_DIR_PIN 24
+#define E0_ENABLE_PIN 22
-#define E1_STEP_PIN 26
-#define E1_DIR_PIN 27
-#define E1_ENABLE_PIN 25
+#define E1_STEP_PIN 26
+#define E1_DIR_PIN 27
+#define E1_ENABLE_PIN 25
//
// Temperature Sensors
//
#if TEMP_SENSOR_0 == -1
- #define TEMP_0_PIN 4 // Analog Input
+ #define TEMP_0_PIN 4 // Analog Input
#else
- #define TEMP_0_PIN 0 // Analog Input
+ #define TEMP_0_PIN 0 // Analog Input
#endif
#if TEMP_SENSOR_1 == -1
- #define TEMP_1_PIN 5 // Analog Input
+ #define TEMP_1_PIN 5 // Analog Input
#else
- #define TEMP_1_PIN 2 // Analog Input
+ #define TEMP_1_PIN 2 // Analog Input
#endif
-#define TEMP_2_PIN 3 // Analog Input
+#define TEMP_2_PIN 3 // Analog Input
#if TEMP_SENSOR_BED == -1
- #define TEMP_BED_PIN 6 // Analog Input
+ #define TEMP_BED_PIN 6 // Analog Input
#else
- #define TEMP_BED_PIN 1 // Analog Input
+ #define TEMP_BED_PIN 1 // Analog Input
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 29
-#define HEATER_1_PIN 34
-#define HEATER_BED_PIN 28
+#define HEATER_0_PIN 29
+#define HEATER_1_PIN 34
+#define HEATER_BED_PIN 28
#ifndef FAN_PIN
- #define FAN_PIN 39
+ #define FAN_PIN 39
#endif
-#define FAN1_PIN 35
-#define FAN2_PIN 36
+#define FAN1_PIN 35
+#define FAN2_PIN 36
#ifndef CONTROLLER_FAN_PIN
- #define CONTROLLER_FAN_PIN FAN2_PIN
+ #define CONTROLLER_FAN_PIN FAN2_PIN
#endif
#define FAN_SOFT_PWM
@@ -126,39 +126,39 @@
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define CASE_LIGHT_PIN 2
+#define SDSS 53
+#define LED_PIN 13
+#define CASE_LIGHT_PIN 2
//
// LCD / Controller
//
#if ENABLED(MINIPANEL)
- #define BEEPER_PIN 46
+ #define BEEPER_PIN 46
// Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 47
- #define DOGLCD_CS 45
- #define LCD_BACKLIGHT_PIN 44 // backlight LED on PA3
+ #define DOGLCD_A0 47
+ #define DOGLCD_CS 45
+ #define LCD_BACKLIGHT_PIN 44 // backlight LED on PA3
- #define KILL_PIN 12
+ #define KILL_PIN 12
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- #define BTN_EN1 48
- #define BTN_EN2 11
- #define BTN_ENC 10
+ #define BTN_EN1 48
+ #define BTN_EN2 11
+ #define BTN_ENC 10
- #define SD_DETECT_PIN 49
+ #define SD_DETECT_PIN 49
#endif // MINIPANEL
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 7 // Pullup!
-#define SPINDLE_DIR_PIN 8
+#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 7 // Pullup!
+#define SPINDLE_DIR_PIN 8
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h
index 6433757867..4d7a980050 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,99 +33,99 @@
//
// Limit Switches
//
-#define X_MIN_PIN 41
-#define X_MAX_PIN 37
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define X_MIN_PIN 41
+#define X_MAX_PIN 37
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 19
+ #define Z_MIN_PROBE_PIN 19
#endif
//
// Steppers
//
-#define X_STEP_PIN 26
-#define X_DIR_PIN 28
-#define X_ENABLE_PIN 24
+#define X_STEP_PIN 26
+#define X_DIR_PIN 28
+#define X_ENABLE_PIN 24
-#define Y_STEP_PIN 60 // A6
-#define Y_DIR_PIN 61 // A7
-#define Y_ENABLE_PIN 22
+#define Y_STEP_PIN 60 // A6
+#define Y_DIR_PIN 61 // A7
+#define Y_ENABLE_PIN 22
-#define Z_STEP_PIN 54 // A0
-#define Z_DIR_PIN 55 // A1
-#define Z_ENABLE_PIN 56 // A2
+#define Z_STEP_PIN 54 // A0
+#define Z_DIR_PIN 55 // A1
+#define Z_ENABLE_PIN 56 // A2
-#define E0_STEP_PIN 31
-#define E0_DIR_PIN 32
-#define E0_ENABLE_PIN 38
+#define E0_STEP_PIN 31
+#define E0_DIR_PIN 32
+#define E0_ENABLE_PIN 38
-#define E1_STEP_PIN 34
-#define E1_DIR_PIN 36
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 34
+#define E1_DIR_PIN 36
+#define E1_ENABLE_PIN 30
//
// Temperature Sensors
//
#if TEMP_SENSOR_0 == -1
- #define TEMP_0_PIN 8 // Analog Input
+ #define TEMP_0_PIN 8 // Analog Input
#else
- #define TEMP_0_PIN 13 // Analog Input
+ #define TEMP_0_PIN 13 // Analog Input
#endif
-#define TEMP_1_PIN 15 // Analog Input
-#define TEMP_BED_PIN 14 // Analog Input
+#define TEMP_1_PIN 15 // Analog Input
+#define TEMP_BED_PIN 14 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 9
-#define HEATER_1_PIN 8
-#define HEATER_BED_PIN 10
+#define HEATER_0_PIN 9
+#define HEATER_1_PIN 8
+#define HEATER_BED_PIN 10
#ifndef FAN_PIN
- #define FAN_PIN 7 // IO pin. Buffer needed
+ #define FAN_PIN 7 // IO pin. Buffer needed
#endif
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 12
-#define CASE_LIGHT_PIN 2
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+#define CASE_LIGHT_PIN 2
//
// LCD / Controller
//
-#define BEEPER_PIN 33
+#define BEEPER_PIN 33
#if BOTH(ULTRA_LCD, NEWPANEL)
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #define LCD_PINS_D7 29
// Buttons directly attached to AUX-2
- #define BTN_EN1 59
- #define BTN_EN2 64
- #define BTN_ENC 43
+ #define BTN_EN1 59
+ #define BTN_EN2 64
+ #define BTN_ENC 43
- #define SD_DETECT_PIN -1 // RAMPS doesn't use this
+ #define SD_DETECT_PIN -1 // RAMPS doesn't use this
#endif // HAS_SPI_LCD && NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 4 // Pullup!
-#define SPINDLE_DIR_PIN 11
+#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 4 // Pullup!
+#define SPINDLE_DIR_PIN 11
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
index 4cd5999604..d976e09816 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,120 +33,120 @@
//
// Limit Switches
//
-#define X_MIN_PIN 37
-#define X_MAX_PIN 40
-#define Y_MIN_PIN 41
-#define Y_MAX_PIN 38
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define X_MIN_PIN 37
+#define X_MAX_PIN 40
+#define Y_MIN_PIN 41
+#define Y_MAX_PIN 38
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 19
+ #define Z_MIN_PROBE_PIN 19
#endif
//
// Steppers
//
-#define X_STEP_PIN 26
-#define X_DIR_PIN 27
-#define X_ENABLE_PIN 25
+#define X_STEP_PIN 26
+#define X_DIR_PIN 27
+#define X_ENABLE_PIN 25
-#define Y_STEP_PIN 4 // A6
-#define Y_DIR_PIN 54 // A0
-#define Y_ENABLE_PIN 5
+#define Y_STEP_PIN 4 // A6
+#define Y_DIR_PIN 54 // A0
+#define Y_ENABLE_PIN 5
-#define Z_STEP_PIN 56 // A2
-#define Z_DIR_PIN 60 // A6
-#define Z_ENABLE_PIN 55 // A1
+#define Z_STEP_PIN 56 // A2
+#define Z_DIR_PIN 60 // A6
+#define Z_ENABLE_PIN 55 // A1
-#define E0_STEP_PIN 35
-#define E0_DIR_PIN 36
-#define E0_ENABLE_PIN 34
+#define E0_STEP_PIN 35
+#define E0_DIR_PIN 36
+#define E0_ENABLE_PIN 34
-#define E1_STEP_PIN 29
-#define E1_DIR_PIN 39
-#define E1_ENABLE_PIN 28
+#define E1_STEP_PIN 29
+#define E1_DIR_PIN 39
+#define E1_ENABLE_PIN 28
-#define E2_STEP_PIN 23 // ? schematic says 24
-#define E2_DIR_PIN 24 // ? schematic says 23
-#define E2_ENABLE_PIN 22
+#define E2_STEP_PIN 23 // ? schematic says 24
+#define E2_DIR_PIN 24 // ? schematic says 23
+#define E2_ENABLE_PIN 22
//
// Temperature Sensors
//
#if TEMP_SENSOR_0 == -1
- #define TEMP_0_PIN 4 // Analog Input
+ #define TEMP_0_PIN 4 // Analog Input
#else
- #define TEMP_0_PIN 13 // Analog Input
+ #define TEMP_0_PIN 13 // Analog Input
#endif
#if TEMP_SENSOR_1 == -1
- #define TEMP_1_PIN 8 // Analog Input
+ #define TEMP_1_PIN 8 // Analog Input
#else
- #define TEMP_1_PIN 15 // Analog Input
+ #define TEMP_1_PIN 15 // Analog Input
#endif
#if TEMP_SENSOR_BED == -1
- #define TEMP_BED_PIN 8 // Analog Input
+ #define TEMP_BED_PIN 8 // Analog Input
#else
- #define TEMP_BED_PIN 14 // Analog Input
+ #define TEMP_BED_PIN 14 // Analog Input
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 9
-#define HEATER_1_PIN 8
-#define HEATER_BED_PIN 10
+#define HEATER_0_PIN 9
+#define HEATER_1_PIN 8
+#define HEATER_BED_PIN 10
#ifndef FAN_PIN
- #define FAN_PIN 7
+ #define FAN_PIN 7
#endif
-#define FAN1_PIN 6
+#define FAN1_PIN 6
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 12
-#define CASE_LIGHT_PIN 2
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+#define CASE_LIGHT_PIN 2
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 16 // Pullup!
-#define SPINDLE_DIR_PIN 11
+#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 16 // Pullup!
+#define SPINDLE_DIR_PIN 11
//
// LCD / Controller
//
-#define BEEPER_PIN 64
+#define BEEPER_PIN 64
#if HAS_SPI_LCD
- #define LCD_PINS_RS 14
- #define LCD_PINS_ENABLE 15
- #define LCD_PINS_D4 30
- #define LCD_PINS_D5 31
- #define LCD_PINS_D6 32
- #define LCD_PINS_D7 33
+ #define LCD_PINS_RS 14
+ #define LCD_PINS_ENABLE 15
+ #define LCD_PINS_D4 30
+ #define LCD_PINS_D5 31
+ #define LCD_PINS_D6 32
+ #define LCD_PINS_D7 33
#if ENABLED(NEWPANEL)
// Buttons are directly attached using keypad
- #define BTN_EN1 61
- #define BTN_EN2 59
- #define BTN_ENC 43
+ #define BTN_EN1 61
+ #define BTN_EN2 59
+ #define BTN_ENC 43
#else
// Buttons attached to shift register of reprapworld keypad v1.1
- #define SHIFT_CLK 63
- #define SHIFT_LD 42
- #define SHIFT_OUT 17
- #define SHIFT_EN 17
+ #define SHIFT_CLK 63
+ #define SHIFT_LD 42
+ #define SHIFT_OUT 17
+ #define SHIFT_EN 17
#endif
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
index a33b2ecfc5..78dd88809f 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,132 +40,132 @@
//
// Servos
//
-#define SERVO0_PIN 46 // AUX3-6
-#define SERVO1_PIN 47 // AUX3-5
-#define SERVO2_PIN 48 // AUX3-4
-#define SERVO3_PIN 49 // AUX3-3
+#define SERVO0_PIN 46 // AUX3-6
+#define SERVO1_PIN 47 // AUX3-5
+#define SERVO2_PIN 48 // AUX3-4
+#define SERVO3_PIN 49 // AUX3-3
//
// Limit Switches
//
-#define X_MIN_PIN 37 // No INT
-#define X_MAX_PIN 40 // No INT
-#define Y_MIN_PIN 41 // No INT
-#define Y_MAX_PIN 38 // No INT
-#define Z_MIN_PIN 18 // No INT
-#define Z_MAX_PIN 19 // No INT
+#define X_MIN_PIN 37 // No INT
+#define X_MAX_PIN 40 // No INT
+#define Y_MIN_PIN 41 // No INT
+#define Y_MAX_PIN 38 // No INT
+#define Z_MIN_PIN 18 // No INT
+#define Z_MAX_PIN 19 // No INT
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 19
+ #define Z_MIN_PROBE_PIN 19
#endif
//
// Steppers
//
-#define X_STEP_PIN 58
-#define X_DIR_PIN 57
-#define X_ENABLE_PIN 59
+#define X_STEP_PIN 58
+#define X_DIR_PIN 57
+#define X_ENABLE_PIN 59
-#define Y_STEP_PIN 5
-#define Y_DIR_PIN 17
-#define Y_ENABLE_PIN 4
+#define Y_STEP_PIN 5
+#define Y_DIR_PIN 17
+#define Y_ENABLE_PIN 4
-#define Z_STEP_PIN 16
-#define Z_DIR_PIN 11
-#define Z_ENABLE_PIN 3
+#define Z_STEP_PIN 16
+#define Z_DIR_PIN 11
+#define Z_ENABLE_PIN 3
-#define E0_STEP_PIN 28
-#define E0_DIR_PIN 27
-#define E0_ENABLE_PIN 29
+#define E0_STEP_PIN 28
+#define E0_DIR_PIN 27
+#define E0_ENABLE_PIN 29
-#define E1_STEP_PIN 25
-#define E1_DIR_PIN 24
-#define E1_ENABLE_PIN 26
+#define E1_STEP_PIN 25
+#define E1_DIR_PIN 24
+#define E1_ENABLE_PIN 26
-#define E2_STEP_PIN 22
-#define E2_DIR_PIN 60
-#define E2_ENABLE_PIN 23
+#define E2_STEP_PIN 22
+#define E2_DIR_PIN 60
+#define E2_ENABLE_PIN 23
//
// Temperature Sensors
//
#if TEMP_SENSOR_0 == -1
- #define TEMP_0_PIN 11 // Analog Input
+ #define TEMP_0_PIN 11 // Analog Input
#else
- #define TEMP_0_PIN 15 // Analog Input
+ #define TEMP_0_PIN 15 // Analog Input
#endif
#if TEMP_SENSOR_1 == -1
- #define TEMP_1_PIN 10 // Analog Input
+ #define TEMP_1_PIN 10 // Analog Input
#else
- #define TEMP_1_PIN 13 // Analog Input
+ #define TEMP_1_PIN 13 // Analog Input
#endif
#if TEMP_SENSOR_2 == -1
- #define TEMP_2_PIN 9 // Analog Input
+ #define TEMP_2_PIN 9 // Analog Input
#else
- #define TEMP_2_PIN 12 // Analog Input
+ #define TEMP_2_PIN 12 // Analog Input
#endif
#if TEMP_SENSOR_BED == -1
- #define TEMP_BED_PIN 8 // Analog Input
+ #define TEMP_BED_PIN 8 // Analog Input
#else
- #define TEMP_BED_PIN 14 // Analog Input
+ #define TEMP_BED_PIN 14 // Analog Input
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 9
-#define HEATER_2_PIN 8
-#define HEATER_BED_PIN 10
+#define HEATER_0_PIN 2
+#define HEATER_1_PIN 9
+#define HEATER_2_PIN 8
+#define HEATER_BED_PIN 10
#ifndef FAN_PIN
- #define FAN_PIN 6
+ #define FAN_PIN 6
#endif
-#define FAN1_PIN 7
+#define FAN1_PIN 7
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 12
-#define CASE_LIGHT_PIN 45 // Try the keypad connector
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+#define CASE_LIGHT_PIN 45 // Try the keypad connector
//
// LCD / Controller
//
-#define BEEPER_PIN 61
+#define BEEPER_PIN 61
-#define BTN_EN1 44
-#define BTN_EN2 45
-#define BTN_ENC 33
+#define BTN_EN1 44
+#define BTN_EN2 45
+#define BTN_ENC 33
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 56 // CS chip select / SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
- #define SD_DETECT_PIN 35
+ #define LCD_PINS_RS 56 // CS chip select / SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #define SD_DETECT_PIN 35
#else
- #define LCD_PINS_RS 32
- #define LCD_PINS_ENABLE 31
- #define LCD_PINS_D4 14
- #define LCD_PINS_D5 30
- #define LCD_PINS_D6 39
- #define LCD_PINS_D7 15
+ #define LCD_PINS_RS 32
+ #define LCD_PINS_ENABLE 31
+ #define LCD_PINS_D4 14
+ #define LCD_PINS_D5 30
+ #define LCD_PINS_D6 39
+ #define LCD_PINS_D7 15
- #define SHIFT_CLK 43
- #define SHIFT_LD 35
- #define SHIFT_OUT 34
- #define SHIFT_EN 44
+ #define SHIFT_CLK 43
+ #define SHIFT_LD 35
+ #define SHIFT_OUT 34
+ #define SHIFT_EN 44
#if MB(MEGATRONICS_31, MEGATRONICS_32)
- #define SD_DETECT_PIN 56
+ #define SD_DETECT_PIN 56
#endif
#endif
@@ -173,23 +173,23 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
-#if DISABLED(REPRAPWORLD_KEYPAD) // try to use the keypad connector first
- #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
- #define SPINDLE_LASER_ENA_PIN 43 // Pullup!
- #define SPINDLE_DIR_PIN 42
+#if DISABLED(REPRAPWORLD_KEYPAD) // try to use the keypad connector first
+ #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 43 // Pullup!
+ #define SPINDLE_DIR_PIN 42
#elif EXTRUDERS <= 2
// Hijack the last extruder so that we can get the PWM signal off the Y breakout
// Move Y to the E2 plug. This makes dual Y steppers harder
- #undef Y_ENABLE_PIN // 4
- #undef Y_STEP_PIN // 5
- #undef Y_DIR_PIN // 17
- #undef E2_ENABLE_PIN // 23
- #undef E2_STEP_PIN // 22
- #undef E2_DIR_PIN // 60
- #define Y_ENABLE_PIN 23
- #define Y_STEP_PIN 22
- #define Y_DIR_PIN 60
- #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
- #define SPINDLE_LASER_ENA_PIN 17 // Pullup!
- #define SPINDLE_DIR_PIN 5
+ #undef Y_ENABLE_PIN // 4
+ #undef Y_STEP_PIN // 5
+ #undef Y_DIR_PIN // 17
+ #undef E2_ENABLE_PIN // 23
+ #undef E2_STEP_PIN // 22
+ #undef E2_DIR_PIN // 60
+ #define Y_ENABLE_PIN 23
+ #define Y_STEP_PIN 22
+ #define Y_DIR_PIN 60
+ #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 17 // Pullup!
+ #define SPINDLE_DIR_PIN 5
#endif
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 703d5caae0..3282216819 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -47,60 +47,60 @@
//
// Servos
//
-#define SERVO0_PIN 36 // C1 (1280-EX1)
-#define SERVO1_PIN 37 // C0 (1280-EX2)
-#define SERVO2_PIN 40 // G1 (1280-EX3)
-#define SERVO3_PIN 41 // G0 (1280-EX4)
+#define SERVO0_PIN 36 // C1 (1280-EX1)
+#define SERVO1_PIN 37 // C0 (1280-EX2)
+#define SERVO2_PIN 40 // G1 (1280-EX3)
+#define SERVO3_PIN 41 // G0 (1280-EX4)
//
// Limit Switches
//
-#define X_MIN_PIN 49 // L0
-#define X_MAX_PIN 48 // L1
-#define Y_MIN_PIN 47 // L2
-#define Y_MAX_PIN 46 // L3
-#define Z_MIN_PIN 43 // L6
-#define Z_MAX_PIN 42 // L7
+#define X_MIN_PIN 49 // L0
+#define X_MAX_PIN 48 // L1
+#define Y_MIN_PIN 47 // L2
+#define Y_MAX_PIN 46 // L3
+#define Z_MIN_PIN 43 // L6
+#define Z_MAX_PIN 42 // L7
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 42
+ #define Z_MIN_PROBE_PIN 42
#endif
//
// Filament Runout Pins
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 49
+ #define FIL_RUNOUT_PIN 49
#endif
#ifndef FIL_RUNOUT2_PIN
- #define FIL_RUNOUT2_PIN 47
+ #define FIL_RUNOUT2_PIN 47
#endif
//
// Steppers
//
-#define X_STEP_PIN 55 // F1
-#define X_DIR_PIN 54 // F0
-#define X_ENABLE_PIN 56 // F2
+#define X_STEP_PIN 55 // F1
+#define X_DIR_PIN 54 // F0
+#define X_ENABLE_PIN 56 // F2
-#define Y_STEP_PIN 59 // F5
-#define Y_DIR_PIN 58 // F4
-#define Y_ENABLE_PIN 60 // F6
+#define Y_STEP_PIN 59 // F5
+#define Y_DIR_PIN 58 // F4
+#define Y_ENABLE_PIN 60 // F6
-#define Z_STEP_PIN 63 // K1
-#define Z_DIR_PIN 62 // K0
-#define Z_ENABLE_PIN 64 // K2
+#define Z_STEP_PIN 63 // K1
+#define Z_DIR_PIN 62 // K0
+#define Z_ENABLE_PIN 64 // K2
-#define E0_STEP_PIN 25 // A3
-#define E0_DIR_PIN 24 // A2
-#define E0_ENABLE_PIN 26 // A4
+#define E0_STEP_PIN 25 // A3
+#define E0_DIR_PIN 24 // A2
+#define E0_ENABLE_PIN 26 // A4
-#define E1_STEP_PIN 29 // A7
-#define E1_DIR_PIN 28 // A6
-#define E1_ENABLE_PIN 39 // G2
+#define E1_STEP_PIN 29 // A7
+#define E1_DIR_PIN 28 // A6
+#define E1_ENABLE_PIN 39 // G2
//
// I2C Digipots - MCP4018
@@ -108,22 +108,22 @@
// Set from 0 - 127 with stop bit.
// (Ex. 3F << 1 | 1)
//
-#define DIGIPOTS_I2C_SCL 76 // J5
-#define DIGIPOTS_I2C_SDA_X 57 // F3
-#define DIGIPOTS_I2C_SDA_Y 61 // F7
-#define DIGIPOTS_I2C_SDA_Z 65 // K3
-#define DIGIPOTS_I2C_SDA_E0 27 // A5
-#define DIGIPOTS_I2C_SDA_E1 77 // J6
+#define DIGIPOTS_I2C_SCL 76 // J5
+#define DIGIPOTS_I2C_SDA_X 57 // F3
+#define DIGIPOTS_I2C_SDA_Y 61 // F7
+#define DIGIPOTS_I2C_SDA_Z 65 // K3
+#define DIGIPOTS_I2C_SDA_E0 27 // A5
+#define DIGIPOTS_I2C_SDA_E1 77 // J6
#ifndef DIGIPOT_I2C_ADDRESS_A
- #define DIGIPOT_I2C_ADDRESS_A 0x2F // unshifted slave address (5E <- 2F << 1)
+ #define DIGIPOT_I2C_ADDRESS_A 0x2F // unshifted slave address (5E <- 2F << 1)
#endif
//
// Temperature Sensors
//
// K7 - 69 / ADC15 - 15
-#define TEMP_BED_PIN 15
+#define TEMP_BED_PIN 15
// SPI for Max6675 or Max31855 Thermocouple
// Uses a separate SPI bus
@@ -133,15 +133,15 @@
// 2 E4 CS2
// 78 E2 SCK
//
-#define THERMO_SCK_PIN 78 // E2
-#define THERMO_DO_PIN 3 // E5
-#define THERMO_CS1_PIN 5 // E3
-#define THERMO_CS2_PIN 2 // E4
+#define THERMO_SCK_PIN 78 // E2
+#define THERMO_DO_PIN 3 // E5
+#define THERMO_CS1_PIN 5 // E3
+#define THERMO_CS2_PIN 2 // E4
-#define MAX6675_SS_PIN THERMO_CS1_PIN
-#define MAX6675_SS2_PIN THERMO_CS2_PIN
-#define MAX6675_SCK_PIN THERMO_SCK_PIN
-#define MAX6675_DO_PIN THERMO_DO_PIN
+#define MAX6675_SS_PIN THERMO_CS1_PIN
+#define MAX6675_SS2_PIN THERMO_CS2_PIN
+#define MAX6675_SCK_PIN THERMO_SCK_PIN
+#define MAX6675_DO_PIN THERMO_DO_PIN
//
// Augmentation for auto-assigning plugs
@@ -152,12 +152,12 @@
//
// Labels from the schematic:
-#define EX1_HEAT_PIN 6 // H3
-#define EX1_FAN_PIN 7 // H4
-#define EX2_HEAT_PIN 11 // B5
-#define EX2_FAN_PIN 12 // B6
-#define HBP_PIN 45 // L4
-#define EXTRA_FET_PIN 44 // L5
+#define EX1_HEAT_PIN 6 // H3
+#define EX1_FAN_PIN 7 // H4
+#define EX2_HEAT_PIN 11 // B5
+#define EX2_FAN_PIN 12 // B6
+#define HBP_PIN 45 // L4
+#define EXTRA_FET_PIN 44 // L5
#if HOTENDS > 1
#if TEMP_SENSOR_BED
@@ -174,35 +174,35 @@
//
// Heaters / Fans (24V)
//
-#define HEATER_0_PIN EX1_HEAT_PIN
+#define HEATER_0_PIN EX1_HEAT_PIN
-#if ENABLED(IS_EFB) // Hotend, Fan, Bed
- #define HEATER_BED_PIN HBP_PIN
-#elif ENABLED(IS_EEF) // Hotend, Hotend, Fan
- #define HEATER_1_PIN EX2_HEAT_PIN
-#elif ENABLED(IS_EEB) // Hotend, Hotend, Bed
- #define HEATER_1_PIN EX2_HEAT_PIN
- #define HEATER_BED_PIN HBP_PIN
-#elif ENABLED(IS_EFF) // Hotend, Fan, Fan
- #define FAN1_PIN HBP_PIN
+#if ENABLED(IS_EFB) // Hotend, Fan, Bed
+ #define HEATER_BED_PIN HBP_PIN
+#elif ENABLED(IS_EEF) // Hotend, Hotend, Fan
+ #define HEATER_1_PIN EX2_HEAT_PIN
+#elif ENABLED(IS_EEB) // Hotend, Hotend, Bed
+ #define HEATER_1_PIN EX2_HEAT_PIN
+ #define HEATER_BED_PIN HBP_PIN
+#elif ENABLED(IS_EFF) // Hotend, Fan, Fan
+ #define FAN1_PIN HBP_PIN
#endif
#ifndef FAN_PIN
#if EITHER(IS_EFB, IS_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
- #define FAN_PIN EX2_HEAT_PIN
+ #define FAN_PIN EX2_HEAT_PIN
#elif EITHER(IS_EEF, IS_SF) // Hotend, Hotend, Fan or Spindle, Fan
- #define FAN_PIN HBP_PIN
+ #define FAN_PIN HBP_PIN
#else
- #define FAN_PIN EXTRA_FET_PIN
+ #define FAN_PIN EXTRA_FET_PIN
#endif
#endif
//
// Misc. Functions
//
-#define LED_PIN 13 // B7
-#define CUTOFF_RESET_PIN 16 // H1
-#define CUTOFF_TEST_PIN 17 // H0
+#define LED_PIN 13 // B7
+#define CUTOFF_RESET_PIN 16 // H1
+#define CUTOFF_TEST_PIN 17 // H0
//
// LCD / Controller
@@ -211,64 +211,64 @@
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define LCD_PINS_RS 33 // C4: LCD-STROBE
- #define LCD_PINS_ENABLE 72 // J2: LEFT
- #define LCD_PINS_D4 35 // C2: LCD-CLK
- #define LCD_PINS_D5 32 // C5: RLED
- #define LCD_PINS_D6 34 // C3: LCD-DATA
- #define LCD_PINS_D7 31 // C6: GLED
+ #define LCD_PINS_RS 33 // C4: LCD-STROBE
+ #define LCD_PINS_ENABLE 72 // J2: LEFT
+ #define LCD_PINS_D4 35 // C2: LCD-CLK
+ #define LCD_PINS_D5 32 // C5: RLED
+ #define LCD_PINS_D6 34 // C3: LCD-DATA
+ #define LCD_PINS_D7 31 // C6: GLED
- #define BTN_EN2 75 // J4, UP
- #define BTN_EN1 73 // J3, DOWN
+ #define BTN_EN2 75 // J4, UP
+ #define BTN_EN1 73 // J3, DOWN
//STOP button connected as KILL_PIN
- #define KILL_PIN 14 // J1, RIGHT
+ #define KILL_PIN 14 // J1, RIGHT
//KILL - not connected
- #define BEEPER_PIN 8 // H5, SD_WP
+ #define BEEPER_PIN 8 // H5, SD_WP
//on board leds
- #define STAT_LED_RED_LED SERVO0_PIN // C1 (1280-EX1, DEBUG2)
- #define STAT_LED_BLUE_PIN SERVO1_PIN // C0 (1280-EX2, DEBUG3)
+ #define STAT_LED_RED_LED SERVO0_PIN // C1 (1280-EX1, DEBUG2)
+ #define STAT_LED_BLUE_PIN SERVO1_PIN // C0 (1280-EX2, DEBUG3)
#else
// Replicator uses a 3-wire SR controller with HD44780
- #define SR_DATA_PIN 34 // C3
- #define SR_CLK_PIN 35 // C2
- #define SR_STROBE_PIN 33 // C4
+ #define SR_DATA_PIN 34 // C3
+ #define SR_CLK_PIN 35 // C2
+ #define SR_STROBE_PIN 33 // C4
- #define BTN_UP 75 // J4
- #define BTN_DWN 73 // J3
- #define BTN_LFT 72 // J2
- #define BTN_RT 14 // J1
+ #define BTN_UP 75 // J4
+ #define BTN_DWN 73 // J3
+ #define BTN_LFT 72 // J2
+ #define BTN_RT 14 // J1
// Disable encoder
#undef BTN_EN1
#undef BTN_EN2
- #define BEEPER_PIN 4 // G5
+ #define BEEPER_PIN 4 // G5
- #define STAT_LED_RED_PIN 32 // C5
- #define STAT_LED_BLUE_PIN 31 // C6 (Actually green)
+ #define STAT_LED_RED_PIN 32 // C5
+ #define STAT_LED_BLUE_PIN 31 // C6 (Actually green)
#endif
- #define BTN_CENTER 15 // J0
- #define BTN_ENC BTN_CENTER
+ #define BTN_CENTER 15 // J0
+ #define BTN_ENC BTN_CENTER
#endif // HAS_SPI_LCD
//
// SD Card
//
-#define SDSS 53 // B0
-#define SD_DETECT_PIN 9 // H6
+#define SDSS 53 // B0
+#define SD_DETECT_PIN 9 // H6
//
-//TMC 2208
+// TMC 220x
//
-#if HAS_DRIVER(TMC2208)
+#if HAS_TMC_UART
/**
- * TMC2208 stepper drivers
+ * TMC220x stepper drivers
*
* Hardware serial communication ports.
* If undefined software serial is used according to the pins below
@@ -280,19 +280,19 @@
* Software serial
*/
- #define X_SERIAL_TX_PIN 16
- #define X_SERIAL_RX_PIN 17
+ #define X_SERIAL_TX_PIN 16
+ #define X_SERIAL_RX_PIN 17
- #define Y_SERIAL_TX_PIN 18
- #define Y_SERIAL_RX_PIN 19
+ #define Y_SERIAL_TX_PIN 18
+ #define Y_SERIAL_RX_PIN 19
- #define Z_SERIAL_TX_PIN 41
- #define Z_SERIAL_RX_PIN 66
+ #define Z_SERIAL_TX_PIN 41
+ #define Z_SERIAL_RX_PIN 66
- #define E0_SERIAL_TX_PIN 40
- #define E0_SERIAL_RX_PIN 67
+ #define E0_SERIAL_TX_PIN 40
+ #define E0_SERIAL_RX_PIN 67
- #define E1_SERIAL_TX_PIN 37
- #define E1_SERIAL_RX_PIN 68
+ #define E1_SERIAL_TX_PIN 37
+ #define E1_SERIAL_RX_PIN 68
#endif
diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h
index 16fad0067f..35d1b59ecb 100644
--- a/Marlin/src/pins/mega/pins_MINITRONICS.h
+++ b/Marlin/src/pins/mega/pins_MINITRONICS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,102 +42,102 @@
//
// Limit Switches
//
-#define X_MIN_PIN 5
-#define X_MAX_PIN 2
-#define Y_MIN_PIN 2
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 6
-#define Z_MAX_PIN -1
+#define X_MIN_PIN 5
+#define X_MAX_PIN 2
+#define Y_MIN_PIN 2
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 6
+#define Z_MAX_PIN -1
//
// Steppers
//
-#define X_STEP_PIN 48
-#define X_DIR_PIN 47
-#define X_ENABLE_PIN 49
+#define X_STEP_PIN 48
+#define X_DIR_PIN 47
+#define X_ENABLE_PIN 49
-#define Y_STEP_PIN 39 // A6
-#define Y_DIR_PIN 40 // A0
-#define Y_ENABLE_PIN 38
+#define Y_STEP_PIN 39 // A6
+#define Y_DIR_PIN 40 // A0
+#define Y_ENABLE_PIN 38
-#define Z_STEP_PIN 42 // A2
-#define Z_DIR_PIN 43 // A6
-#define Z_ENABLE_PIN 41 // A1
+#define Z_STEP_PIN 42 // A2
+#define Z_DIR_PIN 43 // A6
+#define Z_ENABLE_PIN 41 // A1
-#define E0_STEP_PIN 45
-#define E0_DIR_PIN 44
-#define E0_ENABLE_PIN 27
+#define E0_STEP_PIN 45
+#define E0_DIR_PIN 44
+#define E0_ENABLE_PIN 27
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 35
-#define E1_ENABLE_PIN 37
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 35
+#define E1_ENABLE_PIN 37
//
// Temperature Sensors
//
-#define TEMP_0_PIN 7 // Analog Input
-#define TEMP_1_PIN 6 // Analog Input
-#define TEMP_BED_PIN 6 // Analog Input
+#define TEMP_0_PIN 7 // Analog Input
+#define TEMP_1_PIN 6 // Analog Input
+#define TEMP_BED_PIN 6 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 7 // EXTRUDER 1
-#define HEATER_1_PIN 8 // EXTRUDER 2
-#define HEATER_BED_PIN 3 // BED
+#define HEATER_0_PIN 7 // EXTRUDER 1
+#define HEATER_1_PIN 8 // EXTRUDER 2
+#define HEATER_BED_PIN 3 // BED
#ifndef FAN_PIN
- #define FAN_PIN 9
+ #define FAN_PIN 9
#endif
//
// Misc. Functions
//
-#define SDSS 16
-#define LED_PIN 46
+#define SDSS 16
+#define LED_PIN 46
//
// LCD / Controller
//
-#define BEEPER_PIN -1
+#define BEEPER_PIN -1
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 15 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 11 // SID (MOSI)
- #define LCD_PINS_D4 10 // SCK (CLK) clock
+ #define LCD_PINS_RS 15 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 11 // SID (MOSI)
+ #define LCD_PINS_D4 10 // SCK (CLK) clock
- #define BTN_EN1 18
- #define BTN_EN2 17
- #define BTN_ENC 25
+ #define BTN_EN1 18
+ #define BTN_EN2 17
+ #define BTN_ENC 25
- #define SD_DETECT_PIN 30
+ #define SD_DETECT_PIN 30
#else
- #define LCD_PINS_RS -1
- #define LCD_PINS_ENABLE -1
+ #define LCD_PINS_RS -1
+ #define LCD_PINS_ENABLE -1
// Buttons are directly attached using keypad
- #define BTN_EN1 -1
- #define BTN_EN2 -1
- #define BTN_ENC -1
+ #define BTN_EN1 -1
+ #define BTN_EN2 -1
+ #define BTN_ENC -1
- #define SD_DETECT_PIN -1 // Minitronics doesn't use this
+ #define SD_DETECT_PIN -1 // Minitronics doesn't use this
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
-#if HAS_CUTTER // assumes we're only doing CNC work (no 3D printing)
+#if HAS_CUTTER // assumes we're only doing CNC work (no 3D printing)
#undef HEATER_BED_PIN
- #undef TEMP_BED_PIN // need to free up some pins but also need to
- #undef TEMP_0_PIN // re-assign them (to unused pins) because Marlin
- #undef TEMP_1_PIN // requires the presence of certain pins or else it
- #define HEATER_BED_PIN 4 // won't compile
- #define TEMP_BED_PIN 50
- #define TEMP_0_PIN 51
- #define SPINDLE_LASER_ENA_PIN 52 // using A6 because it already has a pullup
- #define SPINDLE_LASER_PWM_PIN 3 // WARNING - LED & resistor pull up to +12/+24V stepper voltage
- #define SPINDLE_DIR_PIN 53
+ #undef TEMP_BED_PIN // need to free up some pins but also need to
+ #undef TEMP_0_PIN // re-assign them (to unused pins) because Marlin
+ #undef TEMP_1_PIN // requires the presence of certain pins or else it
+ #define HEATER_BED_PIN 4 // won't compile
+ #define TEMP_BED_PIN 50
+ #define TEMP_0_PIN 51
+ #define SPINDLE_LASER_ENA_PIN 52 // using A6 because it already has a pullup
+ #define SPINDLE_LASER_PWM_PIN 3 // WARNING - LED & resistor pull up to +12/+24V stepper voltage
+ #define SPINDLE_DIR_PIN 53
#endif
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index b6043c018c..4e02127c12 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,83 +37,83 @@
//
// Limit Switches
//
-#define X_STOP_PIN 24
-#define Y_STOP_PIN 28
-#define Z_MIN_PIN 46
-#define Z_MAX_PIN 32
+#define X_STOP_PIN 24
+#define Y_STOP_PIN 28
+#define Z_MIN_PIN 46
+#define Z_MAX_PIN 32
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 46 // JP4, Tfeed1
+ #define Z_MIN_PROBE_PIN 46 // JP4, Tfeed1
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
- #define FIL_RUNOUT_PIN 44 // JP3, Tfeed2
+ #define FIL_RUNOUT_PIN 44 // JP3, Tfeed2
#endif
//
// Steppers
//
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 27
+#define X_STEP_PIN 25
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 27
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 33
-#define Y_ENABLE_PIN 29
+#define Y_STEP_PIN 31
+#define Y_DIR_PIN 33
+#define Y_ENABLE_PIN 29
-#define Z_STEP_PIN 37
-#define Z_DIR_PIN 39
-#define Z_ENABLE_PIN 35
+#define Z_STEP_PIN 37
+#define Z_DIR_PIN 39
+#define Z_ENABLE_PIN 35
-#define E0_STEP_PIN 43
-#define E0_DIR_PIN 45
-#define E0_ENABLE_PIN 41
+#define E0_STEP_PIN 43
+#define E0_DIR_PIN 45
+#define E0_ENABLE_PIN 41
-#define E1_STEP_PIN 49
-#define E1_DIR_PIN 47
-#define E1_ENABLE_PIN 48
+#define E1_STEP_PIN 49
+#define E1_DIR_PIN 47
+#define E1_ENABLE_PIN 48
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8 // Analog Input
-#define TEMP_1_PIN 9 // Analog Input - Redundant temp sensor
-#define TEMP_2_PIN 12 // Analog Input
-#define TEMP_3_PIN 14 // Analog Input
-#define TEMP_BED_PIN 10 // Analog Input
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input - Redundant temp sensor
+#define TEMP_2_PIN 12 // Analog Input
+#define TEMP_3_PIN 14 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 3
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+#define HEATER_1_PIN 3
+#define HEATER_BED_PIN 4
-#define FAN_PIN 7 // material cooling fan
+#define FAN_PIN 7 // material cooling fan
//
// SD Card
//
-#define SDSS 53
-#define SD_DETECT_PIN 38
+#define SDSS 53
+#define SD_DETECT_PIN 38
//
// Misc. Functions
//
-#define LED_PIN 13 // On PCB status led
-#define PS_ON_PIN 12 // For stepper/heater/fan power. Active HIGH.
-#define POWER_LOSS_PIN 34 // Power check - whether hotends/steppers/fans have power
+#define LED_PIN 13 // On PCB status led
+#define PS_ON_PIN 12 // For stepper/heater/fan power. Active HIGH.
+#define POWER_LOSS_PIN 34 // Power check - whether hotends/steppers/fans have power
#if ENABLED(BATTERY_STATUS_AVAILABLE)
#undef BATTERY_STATUS_PIN
- #define BATTERY_STATUS_PIN 26 // Status of power loss battery, whether it is charged (low) or charging (high)
+ #define BATTERY_STATUS_PIN 26 // Status of power loss battery, whether it is charged (low) or charging (high)
#endif
#if ENABLED(INPUT_VOLTAGE_AVAILABLE)
#undef VOLTAGE_DETECTION_PIN
- #define VOLTAGE_DETECTION_PIN 11 // Analog Input - ADC Voltage level of main input
+ #define VOLTAGE_DETECTION_PIN 11 // Analog Input - ADC Voltage level of main input
#endif
//
@@ -121,24 +121,24 @@
//
#if HAS_GRAPHICAL_LCD
// OVERLORD OLED pins
- #define LCD_PINS_RS 20
- #define LCD_PINS_D5 21
- #define LCD_PINS_ENABLE 15
- #define LCD_PINS_D4 14
- #define LCD_PINS_D6 5
- #define LCD_PINS_D7 6
+ #define LCD_PINS_RS 20
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_ENABLE 15
+ #define LCD_PINS_D4 14
+ #define LCD_PINS_D6 5
+ #define LCD_PINS_D7 6
#ifndef LCD_RESET_PIN
- #define LCD_RESET_PIN 5 // LCD_PINS_D6
+ #define LCD_RESET_PIN 5 // LCD_PINS_D6
#endif
#endif
#if ENABLED(NEWPANEL)
- #define BTN_ENC 16 // Enter Pin
- #define BTN_UP 19 // Button UP Pin
- #define BTN_DWN 17 // Button DOWN Pin
+ #define BTN_ENC 16 // Enter Pin
+ #define BTN_UP 19 // Button UP Pin
+ #define BTN_DWN 17 // Button DOWN Pin
#endif
// Additional connectors/pins on the Overlord V1.X board
-#define PCB_VERSION_PIN 22
-#define APPROACH_PIN 11 // JP7, Tpd
-#define GATE_PIN 36 // Threshold, JP6, Tg
+#define PCB_VERSION_PIN 22
+#define APPROACH_PIN 11 // JP7, Tpd
+#define GATE_PIN 36 // Threshold, JP6, Tg
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
new file mode 100644
index 0000000000..f00d817d6e
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -0,0 +1,143 @@
+/**
+ * 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 .
+ *
+ */
+
+/**
+ * Arduino Mega with PICA pin assignments
+ *
+ * PICA is Power, Interface, and Control Adapter and is open source hardware.
+ * See https://github.com/mjrice/PICA for schematics etc.
+ *
+ * Applies to PICA, PICA_REVB
+ */
+
+#ifndef BOARD_NAME
+ #define BOARD_NAME "PICA"
+#endif
+
+/*
+// Note that these are the "pins" that correspond to the analog inputs on the arduino mega.
+// These are not the same as the physical pin numbers
+ AD0 = 54; AD1 = 55; AD2 = 56; AD3 = 57;
+ AD4 = 58; AD5 = 59; AD6 = 60; AD7 = 61;
+ AD8 = 62; AD9 = 63; AD10 = 64; AD11 = 65;
+ AD12 = 66; AD13 = 67; AD14 = 68; AD15 = 69;
+*/
+
+#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
+ #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
+#endif
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN 14
+#define X_MAX_PIN 15
+#define Y_MIN_PIN 16
+#define Y_MAX_PIN 17
+#define Z_MIN_PIN 23
+#define Z_MAX_PIN 22
+
+//
+// Steppers
+//
+#define X_STEP_PIN 55
+#define X_DIR_PIN 54
+#define X_ENABLE_PIN 60
+
+#define Y_STEP_PIN 57
+#define Y_DIR_PIN 56
+#define Y_ENABLE_PIN 61
+
+#define Z_STEP_PIN 59
+#define Z_DIR_PIN 58
+#define Z_ENABLE_PIN 62
+
+#define E0_STEP_PIN 67
+#define E0_DIR_PIN 24
+#define E0_ENABLE_PIN 26
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 9 // Analog Input
+#define TEMP_1_PIN 10
+#define TEMP_BED_PIN 10
+#define TEMP_2_PIN 11
+#define TEMP_3_PIN 12
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+ #define HEATER_0_PIN 10 // E0
+#endif
+#ifndef HEATER_1_PIN
+ #define HEATER_1_PIN 2 // E1
+#endif
+#define HEATER_BED_PIN 8 // HEAT-BED
+
+#ifndef FAN_PIN
+ #define FAN_PIN 9
+#endif
+#ifndef FAN_2_PIN
+ #define FAN_2_PIN 7
+#endif
+
+#define SDPOWER_PIN -1
+#define LED_PIN -1
+#define PS_ON_PIN -1
+#define KILL_PIN -1
+
+#define SSR_PIN 6
+
+// SPI for Max6675 or Max31855 Thermocouple
+#if DISABLED(SDSUPPORT)
+ #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card
+#else
+ #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
+#endif
+
+//
+// SD Support
+//
+#define SD_DETECT_PIN 49
+#define SDSS 53
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN 29
+
+#if HAS_SPI_LCD
+ #define LCD_PINS_RS 33
+ #define LCD_PINS_ENABLE 30
+ #define LCD_PINS_D4 35
+ #define LCD_PINS_D5 32
+ #define LCD_PINS_D6 37
+ #define LCD_PINS_D7 36
+
+ #define BTN_EN1 47
+ #define BTN_EN2 48
+ #define BTN_ENC 31
+
+ #define LCD_SDSS 53
+#endif
diff --git a/Marlin/src/pins/mega/pins_PICAOLD.h b/Marlin/src/pins/mega/pins_PICAOLD.h
new file mode 100644
index 0000000000..34861277a8
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_PICAOLD.h
@@ -0,0 +1,28 @@
+/**
+ * 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 .
+ *
+ */
+
+#define HEATER_0_PIN 9 // E0
+#define HEATER_1_PIN 10 // E1
+#define FAN_PIN 11
+#define FAN2_PIN 12
+
+#include "pins_PICA.h"
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index 2ea2b09f5a..4c79507eab 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,67 +27,67 @@
#define BOARD_INFO_NAME "Silver Gate"
-#define X_STEP_PIN 43
-#define X_DIR_PIN 44
-#define X_ENABLE_PIN 42
-#define X_MIN_PIN 31
-#define X_MAX_PIN 34
+#define X_STEP_PIN 43
+#define X_DIR_PIN 44
+#define X_ENABLE_PIN 42
+#define X_MIN_PIN 31
+#define X_MAX_PIN 34
-#define Y_STEP_PIN 40
-#define Y_DIR_PIN 41
-#define Y_ENABLE_PIN 39
-#define Y_MIN_PIN 32
-#define Y_MAX_PIN 35
+#define Y_STEP_PIN 40
+#define Y_DIR_PIN 41
+#define Y_ENABLE_PIN 39
+#define Y_MIN_PIN 32
+#define Y_MAX_PIN 35
-#define Z_STEP_PIN 13
-#define Z_DIR_PIN 38
-#define Z_ENABLE_PIN 14
-#define Z_MIN_PIN 33
-#define Z_MAX_PIN 36
+#define Z_STEP_PIN 13
+#define Z_DIR_PIN 38
+#define Z_ENABLE_PIN 14
+#define Z_MIN_PIN 33
+#define Z_MAX_PIN 36
-#define E0_STEP_PIN 27
-#define E0_DIR_PIN 37
-#define E0_ENABLE_PIN 45
+#define E0_STEP_PIN 27
+#define E0_DIR_PIN 37
+#define E0_ENABLE_PIN 45
-#define SDSS 16
+#define SDSS 16
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 34 // X_MAX unless overridden
+ #define FIL_RUNOUT_PIN 34 // X_MAX unless overridden
#endif
#ifndef FAN_PIN
- #define FAN_PIN 5
+ #define FAN_PIN 5
#endif
-#define HEATER_0_PIN 7
+#define HEATER_0_PIN 7
-#define ORIG_E0_AUTO_FAN_PIN 3 // Use this by NOT overriding E0_AUTO_FAN_PIN
-#define CONTROLLER_FAN_PIN 2
+#define ORIG_E0_AUTO_FAN_PIN 3 // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define CONTROLLER_FAN_PIN 2
-#define TEMP_0_PIN 7 // Analog Input
+#define TEMP_0_PIN 7 // Analog Input
-#define HEATER_BED_PIN 8
-#define TEMP_BED_PIN 6
+#define HEATER_BED_PIN 8
+#define TEMP_BED_PIN 6
#if HAS_GRAPHICAL_LCD
- #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920
- #define LCD_PINS_RS 30
- #define LCD_PINS_ENABLE 20
- #define LCD_PINS_D4 25
- #define BEEPER_PIN 29
- #define BTN_EN1 19
- #define BTN_EN2 22
- #define BTN_ENC 24
- #define LCD_BACKLIGHT_PIN 6
+ #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920
+ #define LCD_PINS_RS 30
+ #define LCD_PINS_ENABLE 20
+ #define LCD_PINS_D4 25
+ #define BEEPER_PIN 29
+ #define BTN_EN1 19
+ #define BTN_EN2 22
+ #define BTN_ENC 24
+ #define LCD_BACKLIGHT_PIN 6
#if ENABLED(SILVER_GATE_GLCD_CONTROLLER)
- #define KILL_PIN 21
- #define HOME_PIN 28
+ #define KILL_PIN 21
+ #define HOME_PIN 28
#endif
#endif
#endif
-#define SD_DETECT_PIN 15
+#define SD_DETECT_PIN 15
-#define STAT_LED_RED_PIN 23
-#define STAT_LED_BLUE_PIN 26
-#define CASE_LIGHT_PIN 51
+#define STAT_LED_RED_PIN 23
+#define STAT_LED_BLUE_PIN 26
+#define CASE_LIGHT_PIN 51
diff --git a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
index 1cceef8dab..6c53b7ea4e 100644
--- a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
+++ b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,76 +36,76 @@
//
// Limit Switches
//
-#define X_STOP_PIN 19
-#define Y_STOP_PIN 18
-#define Z_STOP_PIN 38
+#define X_STOP_PIN 19
+#define Y_STOP_PIN 18
+#define Z_STOP_PIN 38
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 38
+ #define Z_MIN_PROBE_PIN 38
#endif
//
// Steppers
//
-#define X_STEP_PIN 22
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 57
+#define X_STEP_PIN 22
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 57
-#define Y_STEP_PIN 25
-#define Y_DIR_PIN 26
-#define Y_ENABLE_PIN 24
+#define Y_STEP_PIN 25
+#define Y_DIR_PIN 26
+#define Y_ENABLE_PIN 24
-#define Z_STEP_PIN 29
-#define Z_DIR_PIN 39
-#define Z_ENABLE_PIN 28
+#define Z_STEP_PIN 29
+#define Z_DIR_PIN 39
+#define Z_ENABLE_PIN 28
-#define E0_STEP_PIN 55
-#define E0_DIR_PIN 56
-#define E0_ENABLE_PIN 54
+#define E0_STEP_PIN 55
+#define E0_DIR_PIN 56
+#define E0_ENABLE_PIN 54
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13
-#define TEMP_BED_PIN 14
+#define TEMP_0_PIN 13
+#define TEMP_BED_PIN 14
//
// Heaters / Fans
//
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 44
-#define FAN_PIN 12 // IO pin. Buffer needed
+#define HEATER_0_PIN 4
+#define HEATER_BED_PIN 44
+#define FAN_PIN 12 // IO pin. Buffer needed
//
// SD Card
//
-#define SD_DETECT_PIN -1
-#define SDSS 53
+#define SD_DETECT_PIN -1
+#define SDSS 53
//
// Misc. Functions
//
-#define BEEPER_PIN 37
-#define KILL_PIN 64
+#define BEEPER_PIN 37
+#define KILL_PIN 64
//
// LCD / Controller (Integrated MINIPANEL)
//
#if ENABLED(MINIPANEL)
- #define DOGLCD_A0 40
- #define DOGLCD_CS 41
- #define LCD_BACKLIGHT_PIN 65 // Backlight LED on A11/D65
- #define LCD_RESET_PIN 27
+ #define DOGLCD_A0 40
+ #define DOGLCD_CS 41
+ #define LCD_BACKLIGHT_PIN 65 // Backlight LED on A11/D65
+ #define LCD_RESET_PIN 27
- #define BTN_EN1 2
- #define BTN_EN2 3
- #define BTN_ENC 5
+ #define BTN_EN1 2
+ #define BTN_EN2 3
+ #define BTN_ENC 5
// This display has adjustable contrast
- #define LCD_CONTRAST_MIN 0
- #define LCD_CONTRAST_MAX 255
- #define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
+ #define LCD_CONTRAST_MIN 0
+ #define LCD_CONTRAST_MAX 255
+ #define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
#endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index bd799e5e91..5de75a1f0e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,7 +35,7 @@
* These numbers are the same in any pin mapping.
*/
-#define MAX_EXTRUDERS 6
+#define MAX_EXTRUDERS 8
#if MB(RAMPS_13_EFB, RAMPS_14_EFB, RAMPS_PLUS_EFB, RAMPS_14_RE_ARM_EFB, RAMPS_SMART_EFB, RAMPS_DUO_EFB, RAMPS4DUE_EFB)
#define IS_RAMPS_EFB
@@ -56,136 +56,140 @@
//
#if MB(RAMPS_OLD)
- #include "ramps/pins_RAMPS_OLD.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_OLD.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EFB)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EEB)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EFF)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_EEF)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_13_SF)
- #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EFB)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EEB)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EFF)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_EEF)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_14_SF)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EFB)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EEB)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EFF)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_EEF)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RAMPS_PLUS_SF)
- #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
//
// RAMPS Derivatives - ATmega1280, ATmega2560
//
#elif MB(3DRAG)
- #include "ramps/pins_3DRAG.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_3DRAG.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(K8200)
- #include "ramps/pins_K8200.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+ #include "ramps/pins_K8200.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (3DRAG)
#elif MB(K8400)
- #include "ramps/pins_K8400.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+ #include "ramps/pins_K8400.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (3DRAG)
#elif MB(K8800)
- #include "ramps/pins_K8800.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+ #include "ramps/pins_K8800.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (3DRAG)
#elif MB(BAM_DICE)
- #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RAMPS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(BAM_DICE_DUE)
- #include "ramps/pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MKS_BASE)
- #include "ramps/pins_MKS_BASE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_10.h" // ATmega2560 env:mega2560
#elif MB(MKS_BASE_14)
- #include "ramps/pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_14.h" // ATmega2560 env:mega2560
#elif MB(MKS_BASE_15)
- #include "ramps/pins_MKS_BASE_15.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_15.h" // ATmega2560 env:mega2560
+#elif MB(MKS_BASE_16)
+ #include "ramps/pins_MKS_BASE_16.h" // ATmega2560 env:mega2560
#elif MB(MKS_BASE_HEROIC)
- #include "ramps/pins_MKS_BASE_HEROIC.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_MKS_BASE_HEROIC.h" // ATmega2560 env:mega2560
#elif MB(MKS_GEN_13)
- #include "ramps/pins_MKS_GEN_13.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_MKS_GEN_13.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MKS_GEN_L)
- #include "ramps/pins_MKS_GEN_L.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_MKS_GEN_L.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(KFB_2)
- #include "ramps/pins_BIQU_KFB_2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_BIQU_KFB_2.h" // ATmega2560 env:mega2560
#elif MB(ZRIB_V20)
- #include "ramps/pins_ZRIB_V20.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 (MKS_GEN_13)
+ #include "ramps/pins_ZRIB_V20.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560 (MKS_GEN_13)
#elif MB(FELIX2)
- #include "ramps/pins_FELIX2.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_FELIX2.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RIGIDBOARD)
- #include "ramps/pins_RIGIDBOARD.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RIGIDBOARD.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(RIGIDBOARD_V2)
- #include "ramps/pins_RIGIDBOARD_V2.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_RIGIDBOARD_V2.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(SAINSMART_2IN1)
- #include "ramps/pins_SAINSMART_2IN1.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_SAINSMART_2IN1.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(ULTIMAKER)
- #include "ramps/pins_ULTIMAKER.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_ULTIMAKER.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(ULTIMAKER_OLD)
- #include "ramps/pins_ULTIMAKER_OLD.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "ramps/pins_ULTIMAKER_OLD.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(AZTEEG_X3)
- #include "ramps/pins_AZTEEG_X3.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_AZTEEG_X3.h" // ATmega2560 env:mega2560
#elif MB(AZTEEG_X3_PRO)
- #include "ramps/pins_AZTEEG_X3_PRO.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_AZTEEG_X3_PRO.h" // ATmega2560 env:mega2560
#elif MB(ULTIMAIN_2)
- #include "ramps/pins_ULTIMAIN_2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_ULTIMAIN_2.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_RAPTOR)
- #include "ramps/pins_FORMBOT_RAPTOR.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_RAPTOR.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_RAPTOR2)
- #include "ramps/pins_FORMBOT_RAPTOR2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_RAPTOR2.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_TREX2PLUS)
- #include "ramps/pins_FORMBOT_TREX2PLUS.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_TREX2PLUS.h" // ATmega2560 env:mega2560
#elif MB(FORMBOT_TREX3)
- #include "ramps/pins_FORMBOT_TREX3.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_FORMBOT_TREX3.h" // ATmega2560 env:mega2560
#elif MB(RUMBA)
- #include "ramps/pins_RUMBA.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RUMBA.h" // ATmega2560 env:mega2560
#elif MB(RUMBA_RAISE3D)
- #include "ramps/pins_RUMBA_RAISE3D.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RUMBA_RAISE3D.h" // ATmega2560 env:mega2560
#elif MB(RL200)
- #include "ramps/pins_RL200.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RL200.h" // ATmega2560 env:mega2560
#elif MB(BQ_ZUM_MEGA_3D)
- #include "ramps/pins_BQ_ZUM_MEGA_3D.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_BQ_ZUM_MEGA_3D.h" // ATmega2560 env:mega2560
#elif MB(MAKEBOARD_MINI)
- #include "ramps/pins_MAKEBOARD_MINI.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MAKEBOARD_MINI.h" // ATmega2560 env:mega2560
#elif MB(TRIGORILLA_13)
- #include "ramps/pins_TRIGORILLA_13.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRIGORILLA_13.h" // ATmega2560 env:mega2560
#elif MB(TRIGORILLA_14)
- #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:mega2560
#elif MB(TRIGORILLA_14_11)
- #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_ENDER_4)
- #include "ramps/pins_RAMPS_ENDER_4.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RAMPS_ENDER_4.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_CREALITY)
- #include "ramps/pins_RAMPS_CREALITY.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RAMPS_CREALITY.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_DAGOMA)
- #include "ramps/pins_RAMPS_DAGOMA.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_RAMPS_DAGOMA.h" // ATmega2560 env:mega2560
#elif MB(FYSETC_F6_13)
#include "ramps/pins_FYSETC_F6_13.h" // ATmega2560 env:FYSETC_F6_13
#elif MB(FYSETC_F6_14)
#include "ramps/pins_FYSETC_F6_14.h" // ATmega2560 env:FYSETC_F6_14
#elif MB(DUPLICATOR_I3_PLUS)
- #include "ramps/pins_DUPLICATOR_I3_PLUS.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_DUPLICATOR_I3_PLUS.h" // ATmega2560 env:mega2560
#elif MB(VORON)
- #include "ramps/pins_VORON.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_VORON.h" // ATmega2560 env:mega2560
#elif MB(TRONXY_V3_1_0)
- #include "ramps/pins_TRONXY_V3_1_0.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TRONXY_V3_1_0.h" // ATmega2560 env:mega2560
#elif MB(Z_BOLT_X_SERIES)
- #include "ramps/pins_Z_BOLT_X_SERIES.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_Z_BOLT_X_SERIES.h" // ATmega2560 env:mega2560
#elif MB(TT_OSCAR)
- #include "ramps/pins_TT_OSCAR.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TT_OSCAR.h" // ATmega2560 env:mega2560
#elif MB(TANGO)
- #include "ramps/pins_TANGO.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_TANGO.h" // ATmega2560 env:mega2560
#elif MB(MKS_GEN_L_V2)
- #include "ramps/pins_MKS_GEN_L_V2.h" // ATmega2560 env:megaatmega2560
+ #include "ramps/pins_MKS_GEN_L_V2.h" // ATmega2560 env:mega2560
+#elif MB(COPYMASTER_3D)
+ #include "ramps/pins_COPYMASTER_3D.h" // ATmega2560 env:mega2560
//
// RAMBo and derivatives
@@ -207,110 +211,116 @@
//
#elif MB(CNCONTROLS_11)
- #include "mega/pins_CNCONTROLS_11.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_CNCONTROLS_11.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(CNCONTROLS_12)
- #include "mega/pins_CNCONTROLS_12.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_CNCONTROLS_12.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(CNCONTROLS_15)
- #include "mega/pins_CNCONTROLS_15.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_CNCONTROLS_15.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MIGHTYBOARD_REVE)
- #include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(CHEAPTRONIC)
- #include "mega/pins_CHEAPTRONIC.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_CHEAPTRONIC.h" // ATmega2560 env:mega2560
#elif MB(CHEAPTRONIC_V2)
- #include "mega/pins_CHEAPTRONICv2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_CHEAPTRONICv2.h" // ATmega2560 env:mega2560
#elif MB(MEGATRONICS)
- #include "mega/pins_MEGATRONICS.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGATRONICS.h" // ATmega2560 env:mega2560
#elif MB(MEGATRONICS_2)
- #include "mega/pins_MEGATRONICS_2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGATRONICS_2.h" // ATmega2560 env:mega2560
#elif MB(MEGATRONICS_3, MEGATRONICS_31, MEGATRONICS_32)
- #include "mega/pins_MEGATRONICS_3.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGATRONICS_3.h" // ATmega2560 env:mega2560
#elif MB(ELEFU_3)
- #include "mega/pins_ELEFU_3.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_ELEFU_3.h" // ATmega2560 env:mega2560
#elif MB(LEAPFROG)
- #include "mega/pins_LEAPFROG.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_LEAPFROG.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(MEGACONTROLLER)
- #include "mega/pins_MEGACONTROLLER.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_MEGACONTROLLER.h" // ATmega2560 env:mega2560
#elif MB(GT2560_REV_A)
- #include "mega/pins_GT2560_REV_A.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_GT2560_REV_A.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(GT2560_REV_A_PLUS)
- #include "mega/pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(GT2560_V3)
- #include "mega/pins_GT2560_V3.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_GT2560_V3.h" // ATmega2560 env:mega2560
#elif MB(GT2560_V3_MC2)
- #include "mega/pins_GT2560_V3_MC2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_GT2560_V3_MC2.h" // ATmega2560 env:mega2560
#elif MB(GT2560_V3_A20)
- #include "mega/pins_GT2560_V3_A20.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_GT2560_V3_A20.h" // ATmega2560 env:mega2560
#elif MB(EINSTART_S)
- #include "mega/pins_EINSTART-S.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
+ #include "mega/pins_EINSTART-S.h" // ATmega1280, ATmega2560 env:mega1280 env:mega2560
#elif MB(WANHAO_ONEPLUS)
- #include "mega/pins_WANHAO_ONEPLUS.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_WANHAO_ONEPLUS.h" // ATmega2560 env:mega2560
#elif MB(OVERLORD)
- #include "mega/pins_OVERLORD.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_OVERLORD.h" // ATmega2560 env:mega2560
#elif MB(HJC2560C_REV2)
- #include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:mega2560
#elif MB(LEAPFROG_XEED2015)
- #include "mega/pins_LEAPFROG_XEED2015.h" // ATmega2560 env:megaatmega2560
+ #include "mega/pins_LEAPFROG_XEED2015.h" // ATmega2560 env:mega2560
+#elif MB(PICA)
+ #include "mega/pins_PICA.h" // ATmega2560 env:mega2560
+#elif MB(PICA_REVB)
+ #include "mega/pins_PICAOLD.h" // ATmega2560 env:mega2560
+#elif MB(INTAMSYS40)
+ #include "mega/pins_INTAMSYS40.h" // ATmega2560 env:mega2560
//
// ATmega1281, ATmega2561
//
#elif MB(MINITRONICS)
- #include "mega/pins_MINITRONICS.h" // ATmega1281 env:megaatmega1280
+ #include "mega/pins_MINITRONICS.h" // ATmega1281 env:mega1280
#elif MB(SILVER_GATE)
- #include "mega/pins_SILVER_GATE.h" // ATmega2561 env:megaatmega2560
+ #include "mega/pins_SILVER_GATE.h" // ATmega2561 env:mega2560
//
// Sanguinololu and Derivatives - ATmega644P, ATmega1284P
//
#elif MB(SANGUINOLOLU_11)
- #include "sanguino/pins_SANGUINOLOLU_11.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_SANGUINOLOLU_11.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(SANGUINOLOLU_12)
- #include "sanguino/pins_SANGUINOLOLU_12.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_SANGUINOLOLU_12.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI)
- #include "sanguino/pins_MELZI.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_MAKR3D)
- #include "sanguino/pins_MELZI_MAKR3D.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_MAKR3D.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_CREALITY)
- #include "sanguino/pins_MELZI_CREALITY.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_CREALITY.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_MALYAN)
- #include "sanguino/pins_MELZI_MALYAN.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_MALYAN.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(MELZI_TRONXY)
- #include "sanguino/pins_MELZI_TRONXY.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_MELZI_TRONXY.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(STB_11)
- #include "sanguino/pins_STB_11.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_STB_11.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(AZTEEG_X1)
- #include "sanguino/pins_AZTEEG_X1.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_AZTEEG_X1.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
//
// Other ATmega644P, ATmega644, ATmega1284P
//
#elif MB(GEN3_MONOLITHIC)
- #include "sanguino/pins_GEN3_MONOLITHIC.h" // ATmega644P env:sanguino_atmega644p
+ #include "sanguino/pins_GEN3_MONOLITHIC.h" // ATmega644P env:sanguino644p
#elif MB(GEN3_PLUS)
- #include "sanguino/pins_GEN3_PLUS.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN3_PLUS.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN6)
- #include "sanguino/pins_GEN6.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN6.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN6_DELUXE)
- #include "sanguino/pins_GEN6_DELUXE.h" // ATmega644P, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN6_DELUXE.h" // ATmega644P, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_CUSTOM)
- #include "sanguino/pins_GEN7_CUSTOM.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_CUSTOM.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_12)
- #include "sanguino/pins_GEN7_12.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_12.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_13)
- #include "sanguino/pins_GEN7_13.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_13.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(GEN7_14)
- #include "sanguino/pins_GEN7_14.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_GEN7_14.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
#elif MB(OMCA_A)
- #include "sanguino/pins_OMCA_A.h" // ATmega644 env:sanguino_atmega644p
+ #include "sanguino/pins_OMCA_A.h" // ATmega644 env:sanguino644p
#elif MB(OMCA)
- #include "sanguino/pins_OMCA.h" // ATmega644P, ATmega644 env:sanguino_atmega644p
+ #include "sanguino/pins_OMCA.h" // ATmega644P, ATmega644 env:sanguino644p
#elif MB(ANET_10)
- #include "sanguino/pins_ANET_10.h" // ATmega1284P env:sanguino_atmega1284p
+ #include "sanguino/pins_ANET_10.h" // ATmega1284P env:sanguino1284p
#elif MB(SETHI)
- #include "sanguino/pins_SETHI.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p
+ #include "sanguino/pins_SETHI.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino644p env:sanguino1284p
//
// Teensyduino - AT90USB1286, AT90USB1286P
@@ -361,11 +371,11 @@
#include "lpc1768/pins_BIQU_B300_V1.0.h" // LPC1768 env:LPC1768
#elif MB(GMARSH_X6_REV1)
#include "lpc1768/pins_GMARSH_X6_REV1.h" // LPC1768 env:LPC1768
-#elif MB(BIGTREE_SKR_V1_1)
+#elif MB(BTT_SKR_V1_1)
#include "lpc1768/pins_BTT_SKR_V1_1.h" // LPC1768 env:LPC1768
-#elif MB(BIGTREE_SKR_V1_3)
+#elif MB(BTT_SKR_V1_3)
#include "lpc1768/pins_BTT_SKR_V1_3.h" // LPC1768 env:LPC1768
-#elif MB(BIGTREE_SKR_V1_4)
+#elif MB(BTT_SKR_V1_4)
#include "lpc1768/pins_BTT_SKR_V1_4.h" // LPC1768 env:LPC1768
//
@@ -388,7 +398,7 @@
#include "lpc1769/pins_SMOOTHIEBOARD.h" // LPC1769 env:LPC1769
#elif MB(TH3D_EZBOARD)
#include "lpc1769/pins_TH3D_EZBOARD.h" // LPC1769 env:LPC1769
-#elif MB(BIGTREE_SKR_V1_4_TURBO)
+#elif MB(BTT_SKR_V1_4_TURBO)
#include "lpc1769/pins_BTT_SKR_V1_4_TURBO.h" // LPC1769 env:LPC1769
//
@@ -459,53 +469,53 @@
//
#elif MB(STM32F103RE)
- #include "stm32/pins_STM32F1R.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_STM32F1R.h" // STM32F1 env:STM32F103RE
#elif MB(MALYAN_M200)
- #include "stm32/pins_MALYAN_M200.h" // STM32F1 env:STM32F103CB_malyan
+ #include "stm32f1/pins_MALYAN_M200.h" // STM32F1 env:STM32F103CB_malyan
#elif MB(STM3R_MINI)
- #include "stm32/pins_STM3R_MINI.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_STM3R_MINI.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_PRO_VB)
- #include "stm32/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_MINI_A30)
- #include "stm32/pins_GTM32_MINI_A30.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_MINI)
- #include "stm32/pins_GTM32_MINI.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_GTM32_MINI.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_REV_B)
- #include "stm32/pins_GTM32_REV_B.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_GTM32_REV_B.h" // STM32F1 env:STM32F103RE
#elif MB(MORPHEUS)
- #include "stm32/pins_MORPHEUS.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_MORPHEUS.h" // STM32F1 env:STM32F103RE
#elif MB(CHITU3D)
- #include "stm32/pins_CHITU3D.h" // STM32F1 env:STM32F103RE
+ #include "stm32f1/pins_CHITU3D.h" // STM32F1 env:STM32F103RE
#elif MB(MKS_ROBIN)
- #include "stm32/pins_MKS_ROBIN.h" // STM32F1 env:mks_robin
+ #include "stm32f1/pins_MKS_ROBIN.h" // STM32F1 env:mks_robin
#elif MB(MKS_ROBIN_MINI)
- #include "stm32/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini
+ #include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini
#elif MB(MKS_ROBIN_NANO)
- #include "stm32/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano
+ #include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano
#elif MB(MKS_ROBIN_LITE)
- #include "stm32/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
-#elif MB(BIGTREE_SKR_MINI_V1_1)
- #include "stm32/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+ #include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
+#elif MB(BTT_SKR_MINI_V1_1)
+ #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(BTT_SKR_MINI_E3_V1_0)
- #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+ #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(BTT_SKR_MINI_E3_V1_2)
- #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
-#elif MB(BIGTREE_SKR_E3_DIP)
- #include "stm32/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_bigtree env:STM32F103RE_bigtree_USB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+ #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
+#elif MB(BTT_SKR_E3_DIP)
+ #include "stm32f1/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(JGAURORA_A5S_A1)
- #include "stm32/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1
+ #include "stm32f1/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1
#elif MB(FYSETC_AIO_II)
- #include "stm32/pins_FYSETC_AIO_II.h" // STM32F1 env:STM32F103RC_fysetc
+ #include "stm32f1/pins_FYSETC_AIO_II.h" // STM32F1 env:STM32F103RC_fysetc
#elif MB(FYSETC_CHEETAH)
- #include "stm32/pins_FYSETC_CHEETAH.h" // STM32F1 env:STM32F103RC_fysetc
+ #include "stm32f1/pins_FYSETC_CHEETAH.h" // STM32F1 env:STM32F103RC_fysetc
#elif MB(FYSETC_CHEETAH_V12)
- #include "stm32/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:STM32F103RC_fysetc
+ #include "stm32f1/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:STM32F103RC_fysetc
#elif MB(LONGER3D_LK)
- #include "stm32/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103VE_longer
+ #include "stm32f1/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103VE_longer
#elif MB(MKS_ROBIN_LITE3)
- #include "stm32/pins_MKS_ROBIN_LITE3.h" // STM32F1 env:mks_robin_lite3
+ #include "stm32f1/pins_MKS_ROBIN_LITE3.h" // STM32F1 env:mks_robin_lite3
#elif MB(MKS_ROBIN_PRO)
- #include "stm32/pins_MKS_ROBIN_PRO.h" // STM32F1 env:mks_robin_pro
+ #include "stm32f1/pins_MKS_ROBIN_PRO.h" // STM32F1 env:mks_robin_pro
//
// ARM Cortex-M4F
@@ -521,44 +531,46 @@
//
#elif MB(BEAST)
- #include "stm32/pins_BEAST.h" // STM32F4 env:STM32F4
+ #include "stm32f4/pins_BEAST.h" // STM32F4 env:STM32F4
#elif MB(GENERIC_STM32F4)
- #include "stm32/pins_GENERIC_STM32F4.h" // STM32F4 env:STM32F4
+ #include "stm32f4/pins_GENERIC_STM32F4.h" // STM32F4 env:STM32F4
#elif MB(ARMED)
- #include "stm32/pins_ARMED.h" // STM32F4 env:ARMED
-#elif MB(RUMBA32)
- #include "stm32/pins_RUMBA32.h" // STM32F4 env:RUMBA32
+ #include "stm32f4/pins_ARMED.h" // STM32F4 env:ARMED
+#elif MB(RUMBA32_AUS3D)
+ #include "stm32f4/pins_RUMBA32_AUS3D.h" // STM32F4 env:rumba32_f446ve
+#elif MB(RUMBA32_MKS)
+ #include "stm32f4/pins_RUMBA32_MKS.h" // STM32F4 env:rumba32_mks
#elif MB(BLACK_STM32F407VE)
- #include "stm32/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black
+ #include "stm32f4/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black
#elif MB(STEVAL_3DP001V1)
- #include "stm32/pins_STEVAL_3DP001V1.h" // STM32F4 env:STM32F401VE_STEVAL
-#elif MB(BIGTREE_SKR_PRO_V1_1)
- #include "stm32/pins_BTT_SKR_PRO_V1_1.h" // STM32F4 env:BIGTREE_SKR_PRO
-#elif MB(BIGTREE_GTR_V1_0)
- #include "stm32/pins_BTT_GTR_V1_0.h" // STM32F4 env:BIGTREE_GTR
-#elif MB(BIGTREE_BTT002_V1_0)
- #include "stm32/pins_BTT_BTT002_V1_0.h" // STM32F4 env:BIGTREE_BTT002
+ #include "stm32f4/pins_STEVAL_3DP001V1.h" // STM32F4 env:STM32F401VE_STEVAL
+#elif MB(BTT_SKR_PRO_V1_1)
+ #include "stm32f4/pins_BTT_SKR_PRO_V1_1.h" // STM32F4 env:BIGTREE_SKR_PRO
+#elif MB(BTT_GTR_V1_0)
+ #include "stm32f4/pins_BTT_GTR_V1_0.h" // STM32F4 env:BIGTREE_GTR_V1_0
+#elif MB(BTT_BTT002_V1_0)
+ #include "stm32f4/pins_BTT_BTT002_V1_0.h" // STM32F4 env:BIGTREE_BTT002
#elif MB(LERDGE_K)
- #include "stm32/pins_LERDGE_K.h" // STM32F4 env:STM32F4
+ #include "stm32f4/pins_LERDGE_K.h" // STM32F4 env:STM32F4
#elif MB(LERDGE_X)
- #include "stm32/pins_LERDGE_X.h" // STM32F4 env:STM32F4
+ #include "stm32f4/pins_LERDGE_X.h" // STM32F4 env:STM32F4
#elif MB(VAKE403D)
- #include "stm32/pins_VAKE403D.h" // STM32F4 env:STM32F4
+ #include "stm32f4/pins_VAKE403D.h" // STM32F4 env:STM32F4
#elif MB(FYSETC_S6)
- #include "stm32/pins_FYSETC_S6.h" // STM32F4 env:FYSETC_S6
+ #include "stm32f4/pins_FYSETC_S6.h" // STM32F4 env:FYSETC_S6
#elif MB(FLYF407ZG)
- #include "stm32/pins_FLYF407ZG.h" // STM32F4 env:FLYF407ZG
+ #include "stm32f4/pins_FLYF407ZG.h" // STM32F4 env:FLYF407ZG
#elif MB(MKS_ROBIN2)
- #include "pins_MKS_ROBIN2.h" // STM32F4 env:MKS_ROBIN2
+ #include "stm32f4/pins_MKS_ROBIN2.h" // STM32F4 env:MKS_ROBIN2
//
// ARM Cortex M7
//
#elif MB(THE_BORG)
- #include "stm32/pins_THE_BORG.h" // STM32F7 env:STM32F7
+ #include "stm32f7/pins_THE_BORG.h" // STM32F7 env:STM32F7
#elif MB(REMRAM_V1)
- #include "stm32/pins_REMRAM_V1.h" // STM32F7 env:STM32F7
+ #include "stm32f7/pins_REMRAM_V1.h" // STM32F7 env:STM32F7
//
// Espressif ESP32
@@ -571,6 +583,15 @@
#include "esp32/pins_MRR_ESPA.h" // ESP32 env:esp32
#elif MB(MRR_ESPE)
#include "esp32/pins_MRR_ESPE.h" // ESP32 env:esp32
+#elif MB(E4D_BOX)
+ #include "esp32/pins_E4D.h" // ESP32 env:esp32
+
+//
+// Adafruit Grand Central M4 (SAMD51 ARM Cortex-M4)
+//
+
+#elif MB(AGCM4_RAMPS_144)
+ #include "samd/pins_RAMPS_144.h" // SAMD51 env:SAMD51_grandcentral_m4
//
// Linux Native Debug board
@@ -585,16 +606,25 @@
// Obsolete or unknown board
//
- #define BOARD_MKS_13 -1000
- #define BOARD_TRIGORILLA -1001
- #define BOARD_RURAMPS4D -1002
- #define BOARD_FORMBOT_TREX2 -1003
- #define BOARD_BIQU_SKR_V1_1 -1004
- #define BOARD_STM32F1R -1005
- #define BOARD_STM32F103R -1006
- #define BOARD_ESP32 -1007
- #define BOARD_BIGTREE_SKR_MINI_E3 -1008
- #define BOARD_STEVAL -1009
+ #define BOARD_MKS_13 -1000
+ #define BOARD_TRIGORILLA -1001
+ #define BOARD_RURAMPS4D -1002
+ #define BOARD_FORMBOT_TREX2 -1003
+ #define BOARD_BIQU_SKR_V1_1 -1004
+ #define BOARD_STM32F1R -1005
+ #define BOARD_STM32F103R -1006
+ #define BOARD_ESP32 -1007
+ #define BOARD_STEVAL -1008
+ #define BOARD_BIGTREE_SKR_V1_1 -1009
+ #define BOARD_BIGTREE_SKR_V1_3 -1010
+ #define BOARD_BIGTREE_SKR_V1_4 -1011
+ #define BOARD_BIGTREE_SKR_V1_4_TURBO -1012
+ #define BOARD_BIGTREE_BTT002_V1_0 -1013
+ #define BOARD_BIGTREE_SKR_PRO_V1_1 -1014
+ #define BOARD_BIGTREE_SKR_MINI_V1_1 -1015
+ #define BOARD_BIGTREE_SKR_MINI_E3 -1016
+ #define BOARD_BIGTREE_SKR_E3_DIP -1017
+ #define BOARD_RUMBA32 -1018
#if MB(MKS_13)
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -605,17 +635,37 @@
#elif MB(FORMBOT_TREX2)
#error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration."
#elif MB(BIQU_SKR_V1_1)
- #error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BIGTREE_SKR_V1_1. Please update your configuration."
+ #error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration."
+ #elif MB(BIGTREE_SKR_V1_1)
+ #error "BOARD_BIGTREE_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration."
+ #elif MB(BIGTREE_SKR_V2_2)
+ #error "BOARD_BIGTREE_SKR_V1_2 has been renamed BOARD_BTT_SKR_V1_2. Please update your configuration."
+ #elif MB(BIGTREE_SKR_V1_3)
+ #error "BOARD_BIGTREE_SKR_V1_3 has been renamed BOARD_BTT_SKR_V1_3. Please update your configuration."
+ #elif MB(BIGTREE_SKR_V1_4)
+ #error "BOARD_BIGTREE_SKR_V1_4 has been renamed BOARD_BTT_SKR_V1_4. Please update your configuration."
+ #elif MB(BIGTREE_SKR_V1_4_TURBO)
+ #error "BOARD_BIGTREE_SKR_V1_4_TURBO has been renamed BOARD_BTT_SKR_V1_4_TURBO. Please update your configuration."
+ #elif MB(BIGTREE_BTT002_V1_0)
+ #error "BOARD_BIGTREE_BTT002_V1_0 has been renamed BOARD_BTT_BTT002_V1_0. Please update your configuration."
+ #elif MB(BIGTREE_SKR_PRO_V1_1)
+ #error "BOARD_BIGTREE_SKR_PRO_V1_1 has been renamed BOARD_BTT_SKR_PRO_V1_1. Please update your configuration."
+ #elif MB(BIGTREE_SKR_MINI_V1_1)
+ #error "BOARD_BIGTREE_SKR_MINI_V1_1 has been renamed BOARD_BTT_SKR_MINI_V1_1. Please update your configuration."
+ #elif MB(BIGTREE_SKR_MINI_E3)
+ #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
+ #elif MB(BIGTREE_SKR_E3_DIP)
+ #error "BOARD_BIGTREE_SKR_E3_DIP has been renamed BOARD_BTT_SKR_E3_DIP. Please update your configuration."
#elif MB(STM32F1R)
#error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration."
#elif MB(STM32F103R)
#error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
#elif MOTHERBOARD == BOARD_ESP32
#error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
- #elif MB(BIGTREE_SKR_MINI_E3)
- #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
#elif MB(STEVAL)
#error "BOARD_STEVAL has been renamed BOARD_STEVAL_3DP001V1. Please update your configuration."
+ #elif MB(RUMBA32)
+ #error "BOARD_RUMBA32 is now BOARD_RUMBA32_MKS or BOARD_RUMBA32_AUS3D. Please update your configuration."
#else
#error "Unknown MOTHERBOARD value set in Configuration.h"
#endif
@@ -628,8 +678,17 @@
#undef BOARD_STM32F1R
#undef BOARD_STM32F103R
#undef BOARD_ESP32
- #undef BOARD_BIGTREE_SKR_MINI_E3
#undef BOARD_STEVAL
+ #undef BOARD_BIGTREE_SKR_MINI_E3
+ #undef BOARD_BIGTREE_SKR_V1_1
+ #undef BOARD_BIGTREE_SKR_V1_3
+ #undef BOARD_BIGTREE_SKR_V1_4
+ #undef BOARD_BIGTREE_SKR_V1_4_TURBO
+ #undef BOARD_BIGTREE_BTT002_V1_0
+ #undef BOARD_BIGTREE_SKR_PRO_V1_1
+ #undef BOARD_BIGTREE_SKR_MINI_V1_1
+ #undef BOARD_BIGTREE_SKR_E3_DIP
+ #undef BOARD_RUMBA32
#endif
@@ -807,6 +866,43 @@
#define E7_ENABLE_PIN -1
#endif
+//
+// Destroy unused CS pins
+//
+#if !AXIS_HAS_SPI(X)
+ #undef X_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(Y)
+ #undef Y_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(Z)
+ #undef Z_CS_PIN
+#endif
+#if E_STEPPERS && !AXIS_HAS_SPI(E0)
+ #undef E0_CS_PIN
+#endif
+#if E_STEPPERS > 1 && !AXIS_HAS_SPI(E1)
+ #undef E1_CS_PIN
+#endif
+#if E_STEPPERS > 2 && !AXIS_HAS_SPI(E2)
+ #undef E2_CS_PIN
+#endif
+#if E_STEPPERS > 3 && !AXIS_HAS_SPI(E3)
+ #undef E3_CS_PIN
+#endif
+#if E_STEPPERS > 4 && !AXIS_HAS_SPI(E4)
+ #undef E4_CS_PIN
+#endif
+#if E_STEPPERS > 5 && !AXIS_HAS_SPI(E5)
+ #undef E5_CS_PIN
+#endif
+#if E_STEPPERS > 6 && !AXIS_HAS_SPI(E6)
+ #undef E6_CS_PIN
+#endif
+#if E_STEPPERS > 7 && !AXIS_HAS_SPI(E7)
+ #undef E7_CS_PIN
+#endif
+
#ifndef X_CS_PIN
#define X_CS_PIN -1
#endif
@@ -1024,10 +1120,14 @@
#ifdef X_STOP_PIN
#if X_HOME_DIR < 0
#define X_MIN_PIN X_STOP_PIN
- #define X_MAX_PIN -1
+ #ifndef X_MAX_PIN
+ #define X_MAX_PIN -1
+ #endif
#else
- #define X_MIN_PIN -1
#define X_MAX_PIN X_STOP_PIN
+ #ifndef X_MIN_PIN
+ #define X_MIN_PIN -1
+ #endif
#endif
#elif X_HOME_DIR < 0
#define X_STOP_PIN X_MIN_PIN
@@ -1038,10 +1138,14 @@
#ifdef Y_STOP_PIN
#if Y_HOME_DIR < 0
#define Y_MIN_PIN Y_STOP_PIN
- #define Y_MAX_PIN -1
+ #ifndef Y_MAX_PIN
+ #define Y_MAX_PIN -1
+ #endif
#else
- #define Y_MIN_PIN -1
#define Y_MAX_PIN Y_STOP_PIN
+ #ifndef Y_MIN_PIN
+ #define Y_MIN_PIN -1
+ #endif
#endif
#elif Y_HOME_DIR < 0
#define Y_STOP_PIN Y_MIN_PIN
@@ -1052,10 +1156,14 @@
#ifdef Z_STOP_PIN
#if Z_HOME_DIR < 0
#define Z_MIN_PIN Z_STOP_PIN
- #define Z_MAX_PIN -1
+ #ifndef Z_MAX_PIN
+ #define Z_MAX_PIN -1
+ #endif
#else
- #define Z_MIN_PIN -1
#define Z_MAX_PIN Z_STOP_PIN
+ #ifndef Z_MIN_PIN
+ #define Z_MIN_PIN -1
+ #endif
#endif
#elif Z_HOME_DIR < 0
#define Z_STOP_PIN Z_MIN_PIN
@@ -1101,6 +1209,13 @@
#define Z_MIN_PIN -1
#endif
+#if HAS_FILAMENT_SENSOR
+ #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN
+#else
+ #undef FIL_RUNOUT_PIN
+ #undef FIL_RUNOUT1_PIN
+#endif
+
#ifndef LCD_PINS_D4
#define LCD_PINS_D4 -1
#endif
@@ -1125,42 +1240,72 @@
* overridden in Configuration.h or Configuration_adv.h.
*/
+#define __PEXI(p,q) PIN_EXISTS(E##p##_##q)
+#define _PEXI(p,q) __PEXI(p,q)
#define __EPIN(p,q) E##p##_##q##_PIN
#define _EPIN(p,q) __EPIN(p,q)
+#define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
// The X2 axis, if any, should be the next open extruder port
+#define X2_E_INDEX E_STEPPERS
+
#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
#ifndef X2_STEP_PIN
- #define X2_STEP_PIN _EPIN(E_STEPPERS, STEP)
- #define X2_DIR_PIN _EPIN(E_STEPPERS, DIR)
- #define X2_ENABLE_PIN _EPIN(E_STEPPERS, ENABLE)
- #if E_STEPPERS >= MAX_EXTRUDERS || !PIN_EXISTS(X2_STEP)
+ #define X2_STEP_PIN _EPIN(X2_E_INDEX, STEP)
+ #define X2_DIR_PIN _EPIN(X2_E_INDEX, DIR)
+ #define X2_ENABLE_PIN _EPIN(X2_E_INDEX, ENABLE)
+ #if X2_E_INDEX >= MAX_EXTRUDERS || !PIN_EXISTS(X2_STEP)
#error "No E stepper plug left for X2!"
#endif
#endif
#ifndef X2_MS1_PIN
- #define X2_MS1_PIN _EPIN(E_STEPPERS, MS1)
+ #define X2_MS1_PIN _EPIN(X2_E_INDEX, MS1)
#endif
#ifndef X2_MS2_PIN
- #define X2_MS2_PIN _EPIN(E_STEPPERS, MS2)
+ #define X2_MS2_PIN _EPIN(X2_E_INDEX, MS2)
#endif
#ifndef X2_MS3_PIN
- #define X2_MS3_PIN _EPIN(E_STEPPERS, MS3)
+ #define X2_MS3_PIN _EPIN(X2_E_INDEX, MS3)
#endif
#if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
- #define X2_CS_PIN _EPIN(E_STEPPERS, CS)
+ #define X2_CS_PIN _EPIN(X2_E_INDEX, CS)
#endif
#if AXIS_HAS_UART(X2)
#ifndef X2_SERIAL_TX_PIN
- #define X2_SERIAL_TX_PIN _EPIN(E_STEPPERS, SERIAL_TX)
+ #define X2_SERIAL_TX_PIN _EPIN(X2_E_INDEX, SERIAL_TX)
#endif
#ifndef X2_SERIAL_RX_PIN
- #define X2_SERIAL_RX_PIN _EPIN(E_STEPPERS, SERIAL_RX)
+ #define X2_SERIAL_RX_PIN _EPIN(X2_E_INDEX, SERIAL_RX)
#endif
#endif
- #define Y2_E_INDEX INCREMENT(E_STEPPERS)
+
+ //
+ // Auto-assign pins for stallGuard sensorless homing
+ //
+ #if X2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _PEXI(X2_E_INDEX, DIAG)
+ #define X2_DIAG_PIN _EPIN(X2_E_INDEX, DIAG)
+ #if DIAG_REMAPPED(X2, X_MIN) // If already remapped in the pins file...
+ #define X2_USE_ENDSTOP _XMIN_
+ #elif DIAG_REMAPPED(X2, Y_MIN)
+ #define X2_USE_ENDSTOP _YMIN_
+ #elif DIAG_REMAPPED(X2, Z_MIN)
+ #define X2_USE_ENDSTOP _ZMIN_
+ #elif DIAG_REMAPPED(X2, X_MAX)
+ #define X2_USE_ENDSTOP _XMAX_
+ #elif DIAG_REMAPPED(X2, Y_MAX)
+ #define X2_USE_ENDSTOP _YMAX_
+ #elif DIAG_REMAPPED(X2, Z_MAX)
+ #define X2_USE_ENDSTOP _ZMAX_
+ #else // Otherwise use the driver DIAG_PIN directly
+ #define _X2_USE_ENDSTOP(P) _E##P##_DIAG_
+ #define X2_USE_ENDSTOP _X2_USE_ENDSTOP(X2_E_INDEX)
+ #endif
+ #undef X2_DIAG_PIN
+ #endif
+
+ #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
#else
- #define Y2_E_INDEX E_STEPPERS
+ #define Y2_E_INDEX X2_E_INDEX
#endif
#ifndef X2_CS_PIN
@@ -1206,6 +1351,26 @@
#define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
#endif
#endif
+ #if Y2_STALL_SENSITIVITY && ENABLED(Y_DUAL_ENDSTOPS) && _PEXI(Y2_E_INDEX, DIAG)
+ #define Y2_DIAG_PIN _EPIN(Y2_E_INDEX, DIAG)
+ #if DIAG_REMAPPED(Y2, X_MIN)
+ #define Y2_USE_ENDSTOP _XMIN_
+ #elif DIAG_REMAPPED(Y2, Y_MIN)
+ #define Y2_USE_ENDSTOP _YMIN_
+ #elif DIAG_REMAPPED(Y2, Z_MIN)
+ #define Y2_USE_ENDSTOP _ZMIN_
+ #elif DIAG_REMAPPED(Y2, X_MAX)
+ #define Y2_USE_ENDSTOP _XMAX_
+ #elif DIAG_REMAPPED(Y2, Y_MAX)
+ #define Y2_USE_ENDSTOP _YMAX_
+ #elif DIAG_REMAPPED(Y2, Z_MAX)
+ #define Y2_USE_ENDSTOP _ZMAX_
+ #else
+ #define _Y2_USE_ENDSTOP(P) _E##P##_DIAG_
+ #define Y2_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
+ #endif
+ #undef Y2_DIAG_PIN
+ #endif
#define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
#else
#define Z2_E_INDEX Y2_E_INDEX
@@ -1254,6 +1419,26 @@
#define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
#endif
#endif
+ #if Z2_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
+ #define Z2_DIAG_PIN _EPIN(Z2_E_INDEX, DIAG)
+ #if DIAG_REMAPPED(Z2, X_MIN)
+ #define Z2_USE_ENDSTOP _XMIN_
+ #elif DIAG_REMAPPED(Z2, Y_MIN)
+ #define Z2_USE_ENDSTOP _YMIN_
+ #elif DIAG_REMAPPED(Z2, Z_MIN)
+ #define Z2_USE_ENDSTOP _ZMIN_
+ #elif DIAG_REMAPPED(Z2, X_MAX)
+ #define Z2_USE_ENDSTOP _XMAX_
+ #elif DIAG_REMAPPED(Z2, Y_MAX)
+ #define Z2_USE_ENDSTOP _YMAX_
+ #elif DIAG_REMAPPED(Z2, Z_MAX)
+ #define Z2_USE_ENDSTOP _ZMAX_
+ #else
+ #define _Z2_USE_ENDSTOP(P) _E##P##_DIAG_
+ #define Z2_USE_ENDSTOP _Z2_USE_ENDSTOP(Z2_E_INDEX)
+ #endif
+ #undef Z2_DIAG_PIN
+ #endif
#define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
#else
#define Z3_E_INDEX Z2_E_INDEX
@@ -1283,7 +1468,7 @@
#endif
#if AXIS_HAS_SPI(Z3)
#ifndef Z3_CS_PIN
- #define Z3_CS_PIN _EPIN(Z3_E_INDEX, CS)
+ #define Z3_CS_PIN _EPIN(Z3_E_INDEX, CS)
#endif
#endif
#ifndef Z3_MS1_PIN
@@ -1303,6 +1488,26 @@
#define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
#endif
#endif
+ #if Z3_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
+ #define Z3_DIAG_PIN _EPIN(Z3_E_INDEX, DIAG)
+ #if DIAG_REMAPPED(Z3, X_MIN)
+ #define Z3_USE_ENDSTOP _XMIN_
+ #elif DIAG_REMAPPED(Z3, Y_MIN)
+ #define Z3_USE_ENDSTOP _YMIN_
+ #elif DIAG_REMAPPED(Z3, Z_MIN)
+ #define Z3_USE_ENDSTOP _ZMIN_
+ #elif DIAG_REMAPPED(Z3, X_MAX)
+ #define Z3_USE_ENDSTOP _XMAX_
+ #elif DIAG_REMAPPED(Z3, Y_MAX)
+ #define Z3_USE_ENDSTOP _YMAX_
+ #elif DIAG_REMAPPED(Z3, Z_MAX)
+ #define Z3_USE_ENDSTOP _ZMAX_
+ #else
+ #define _Z3_USE_ENDSTOP(P) _E##P##_DIAG_
+ #define Z3_USE_ENDSTOP _Z3_USE_ENDSTOP(Z3_E_INDEX)
+ #endif
+ #undef Z3_DIAG_PIN
+ #endif
#define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
#endif
@@ -1350,6 +1555,26 @@
#define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX)
#endif
#endif
+ #if Z4_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
+ #define Z4_DIAG_PIN _EPIN(Z4_E_INDEX, DIAG)
+ #if DIAG_REMAPPED(Z4, X_MIN)
+ #define Z4_USE_ENDSTOP _XMIN_
+ #elif DIAG_REMAPPED(Z4, Y_MIN)
+ #define Z4_USE_ENDSTOP _YMIN_
+ #elif DIAG_REMAPPED(Z4, Z_MIN)
+ #define Z4_USE_ENDSTOP _ZMIN_
+ #elif DIAG_REMAPPED(Z4, X_MAX)
+ #define Z4_USE_ENDSTOP _XMAX_
+ #elif DIAG_REMAPPED(Z4, Y_MAX)
+ #define Z4_USE_ENDSTOP _YMAX_
+ #elif DIAG_REMAPPED(Z4, Z_MAX)
+ #define Z4_USE_ENDSTOP _ZMAX_
+ #else
+ #define _Z4_USE_ENDSTOP(P) _E##P##_DIAG_
+ #define Z4_USE_ENDSTOP _Z4_USE_ENDSTOP(Z4_E_INDEX)
+ #endif
+ #undef Z4_DIAG_PIN
+ #endif
#endif
#ifndef Z4_CS_PIN
@@ -1382,3 +1607,4 @@
#endif
#undef HAS_FREE_AUX2_PINS
+#undef DIAG_REMAPPED
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index 1972c3ba94..c08acd3836 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -45,7 +45,7 @@
#line 46
// manually add pins that have names that are macros which don't play well with these macros
-#if (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM))
+#if (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM) || defined(TARGET_LPC1768))
#if SERIAL_PORT == 0
static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
@@ -116,6 +116,9 @@ const PinInfo pin_array[] PROGMEM = {
#elif AVR_ATmega1284_FAMILY
{ RXD_NAME_0, 8, true },
{ TXD_NAME_0, 9, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_0, 3, true },
+ { TXD_NAME_0, 2, true },
#endif
#elif SERIAL_PORT == 1
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
@@ -124,16 +127,25 @@ const PinInfo pin_array[] PROGMEM = {
#elif AVR_ATmega1284_FAMILY
{ RXD_NAME_1, 10, true },
{ TXD_NAME_1, 11, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_1, 16, true },
+ { TXD_NAME_1, 15, true },
#endif
#elif SERIAL_PORT == 2
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
{ RXD_NAME_2, 17, true },
{ TXD_NAME_2, 16, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_2, 11, true },
+ { TXD_NAME_2, 10, true },
#endif
#elif SERIAL_PORT == 3
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
{ RXD_NAME_3, 15, true },
{ TXD_NAME_3, 14, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_3, 1, true },
+ { TXD_NAME_3, 0, true },
#endif
#endif
@@ -145,6 +157,9 @@ const PinInfo pin_array[] PROGMEM = {
#elif AVR_ATmega1284_FAMILY
{ RXD_NAME_0, 8, true },
{ TXD_NAME_0, 9, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_0, 3, true },
+ { TXD_NAME_0, 2, true },
#endif
#elif SERIAL_PORT_2 == 1
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
@@ -153,22 +168,31 @@ const PinInfo pin_array[] PROGMEM = {
#elif AVR_ATmega1284_FAMILY
{ RXD_NAME_1, 10, true },
{ TXD_NAME_1, 11, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_1, 16, true },
+ { TXD_NAME_1, 15, true },
#endif
#elif SERIAL_PORT_2 == 2
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
{ RXD_NAME_2, 17, true },
{ TXD_NAME_2, 16, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_2, 11, true },
+ { TXD_NAME_2, 10, true },
#endif
#elif SERIAL_PORT_2 == 3
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
{ RXD_NAME_3, 15, true },
{ TXD_NAME_3, 14, true },
+ #elif defined(TARGET_LPC1768)
+ { RXD_NAME_3, 1, true },
+ { TXD_NAME_3, 0, true },
#endif
#endif
#endif
#include "pinsDebug_list.h"
- #line 98
+ #line 172
};
@@ -183,17 +207,32 @@ static void print_input_or_output(const bool isout) {
}
// pretty report with PWM info
-inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = false, const char *start_string = "") {
+inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool extended=false, PGM_P const start_string=nullptr) {
char buffer[MAX_NAME_LENGTH + 1]; // for the sprintf statements
bool found = false, multi_name_pin = false;
- for (uint8_t x = 0; x < COUNT(pin_array); x++) { // scan entire array and report all instances of this pin
+ auto alt_pin_echo = [](const pin_t &pin) {
+ #if AVR_AT90USB1286_FAMILY
+ // Use FastIO for pins Teensy doesn't expose
+ if (pin == 46) {
+ print_input_or_output(IS_OUTPUT(46));
+ SERIAL_CHAR('0' + READ(46));
+ return false;
+ }
+ else if (pin == 47) {
+ print_input_or_output(IS_OUTPUT(47));
+ SERIAL_CHAR('0' + READ(47));
+ return false;
+ }
+ #endif
+ return true;
+ };
+
+ LOOP_L_N(x, COUNT(pin_array)) { // scan entire array and report all instances of this pin
if (GET_ARRAY_PIN(x) == pin) {
- if (found) multi_name_pin = true;
- found = true;
- if (!multi_name_pin) { // report digital and analog pin number only on the first time through
- sprintf_P(buffer, PSTR("%sPIN: "), start_string); // digital pin number
- SERIAL_ECHO(buffer);
+ if (!found) { // report digital and analog pin number only on the first time through
+ if (start_string) serialprintPGM(start_string);
+ serialprintPGM(PSTR("PIN: "));
PRINT_PIN(pin);
PRINT_PORT(pin);
if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
@@ -204,27 +243,14 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
}
else {
SERIAL_CHAR('.');
- SERIAL_ECHO_SP(MULTI_NAME_PAD + strlen(start_string)); // add padding if not the first instance found
+ SERIAL_ECHO_SP(MULTI_NAME_PAD + (start_string ? strlen_P(start_string) : 0)); // add padding if not the first instance found
}
PRINT_ARRAY_NAME(x);
if (extended) {
if (pin_is_protected(pin) && !ignore)
SERIAL_ECHOPGM("protected ");
else {
- #if AVR_AT90USB1286_FAMILY //Teensy IDEs don't know about these pins so must use FASTIO
- if (pin == 46 || pin == 47) {
- if (pin == 46) {
- print_input_or_output(IS_OUTPUT(46));
- SERIAL_CHAR('0' + READ(46));
- }
- else if (pin == 47) {
- print_input_or_output(IS_OUTPUT(47));
- SERIAL_CHAR('0' + READ(47));
- }
- }
- else
- #endif
- {
+ if (alt_pin_echo(pin)) {
if (!GET_ARRAY_IS_DIGITAL(x)) {
sprintf_P(buffer, PSTR("Analog in = %5ld"), (long)analogRead(DIGITAL_PIN_TO_ANALOG_PIN(pin)));
SERIAL_ECHO(buffer);
@@ -250,12 +276,14 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
}
}
SERIAL_EOL();
+ multi_name_pin = found;
+ found = true;
} // end of IF
} // end of for loop
if (!found) {
- sprintf_P(buffer, PSTR("%sPIN: "), start_string);
- SERIAL_ECHO(buffer);
+ if (start_string) serialprintPGM(start_string);
+ serialprintPGM(PSTR("PIN: "));
PRINT_PIN(pin);
PRINT_PORT(pin);
if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
@@ -266,21 +294,8 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
SERIAL_ECHO_SP(8); // add padding if not an analog pin
SERIAL_ECHOPGM("");
if (extended) {
- #if AVR_AT90USB1286_FAMILY //Teensy IDEs don't know about these pins so must use FASTIO
- if (pin == 46 || pin == 47) {
- SERIAL_ECHO_SP(12);
- if (pin == 46) {
- print_input_or_output(IS_OUTPUT(46));
- SERIAL_CHAR('0' + READ(46));
- }
- else {
- print_input_or_output(IS_OUTPUT(47));
- SERIAL_CHAR('0' + READ(47));
- }
- }
- else
- #endif
- {
+
+ if (alt_pin_echo(pin)) {
if (pwm_status(pin)) {
// do nothing
}
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index ca8c3f9a99..28478973fb 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
@@ -26,425 +26,72 @@
#line 28 // set __LINE__ to a known value for both passes
-// Undefine pins to suppress warnings
-#if !PIN_EXISTS(X_MS1)
- #undef X_MS1_PIN
-#endif
-#if !PIN_EXISTS(X_MS2)
- #undef X_MS2_PIN
-#endif
-#if !PIN_EXISTS(X_MS3)
- #undef X_MS3_PIN
-#endif
-#if !PIN_EXISTS(X2_MS1)
- #undef X2_MS1_PIN
-#endif
-#if !PIN_EXISTS(X2_MS2)
- #undef X2_MS2_PIN
-#endif
-#if !PIN_EXISTS(X2_MS3)
- #undef X2_MS3_PIN
-#endif
-#if !PIN_EXISTS(Y_MS1)
- #undef Y_MS1_PIN
-#endif
-#if !PIN_EXISTS(Y_MS2)
- #undef Y_MS2_PIN
-#endif
-#if !PIN_EXISTS(Y_MS3)
- #undef Y_MS3_PIN
-#endif
-#if !PIN_EXISTS(Y2_MS1)
- #undef Y2_MS1_PIN
-#endif
-#if !PIN_EXISTS(Y2_MS2)
- #undef Y2_MS2_PIN
-#endif
-#if !PIN_EXISTS(Y2_MS3)
- #undef Y2_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z_MS1)
- #undef Z_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z_MS2)
- #undef Z_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z_MS3)
- #undef Z_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z2_MS1)
- #undef Z2_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z2_MS2)
- #undef Z2_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z2_MS3)
- #undef Z2_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z3_MS1)
- #undef Z3_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z3_MS2)
- #undef Z3_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z3_MS3)
- #undef Z3_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z4_MS1)
- #undef Z4_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z4_MS2)
- #undef Z4_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z4_MS3)
- #undef Z4_MS3_PIN
-#endif
-#if !PIN_EXISTS(E0_MS1)
- #undef E0_MS1_PIN
-#endif
-#if !PIN_EXISTS(E0_MS2)
- #undef E0_MS2_PIN
-#endif
-#if !PIN_EXISTS(E0_MS3)
- #undef E0_MS3_PIN
-#endif
-#if !PIN_EXISTS(E1_MS1)
- #undef E1_MS1_PIN
-#endif
-#if !PIN_EXISTS(E1_MS2)
- #undef E1_MS2_PIN
-#endif
-#if !PIN_EXISTS(E1_MS3)
- #undef E1_MS3_PIN
-#endif
-#if !PIN_EXISTS(E2_MS1)
- #undef E2_MS1_PIN
-#endif
-#if !PIN_EXISTS(E2_MS2)
- #undef E2_MS2_PIN
-#endif
-#if !PIN_EXISTS(E2_MS3)
- #undef E2_MS3_PIN
-#endif
-#if !PIN_EXISTS(E3_MS1)
- #undef E3_MS1_PIN
-#endif
-#if !PIN_EXISTS(E3_MS2)
- #undef E3_MS2_PIN
-#endif
-#if !PIN_EXISTS(E3_MS3)
- #undef E3_MS3_PIN
-#endif
-#if !PIN_EXISTS(E4_MS1)
- #undef E4_MS1_PIN
-#endif
-#if !PIN_EXISTS(E4_MS2)
- #undef E4_MS2_PIN
-#endif
-#if !PIN_EXISTS(E4_MS3)
- #undef E4_MS3_PIN
-#endif
-#if !PIN_EXISTS(E5_MS1)
- #undef E5_MS1_PIN
-#endif
-#if !PIN_EXISTS(E5_MS2)
- #undef E5_MS2_PIN
-#endif
-#if !PIN_EXISTS(E5_MS3)
- #undef E5_MS3_PIN
-#endif
-#if !PIN_EXISTS(E6_MS1)
- #undef E6_MS1_PIN
-#endif
-#if !PIN_EXISTS(E6_MS2)
- #undef E6_MS2_PIN
-#endif
-#if !PIN_EXISTS(E6_MS3)
- #undef E6_MS3_PIN
-#endif
-#if !PIN_EXISTS(E7_MS1)
- #undef E7_MS1_PIN
-#endif
-#if !PIN_EXISTS(E7_MS2)
- #undef E7_MS2_PIN
-#endif
-#if !PIN_EXISTS(E7_MS3)
- #undef E7_MS3_PIN
-#endif
-
-#if !PIN_EXISTS(E0_STEP)
- #undef E0_STEP_PIN
-#endif
-#if !PIN_EXISTS(E0_DIR)
- #undef E0_DIR_PIN
-#endif
-#if !PIN_EXISTS(E0_ENABLE)
- #undef E0_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E1_STEP)
- #undef E1_STEP_PIN
-#endif
-#if !PIN_EXISTS(E1_DIR)
- #undef E1_DIR_PIN
-#endif
-#if !PIN_EXISTS(E1_ENABLE)
- #undef E1_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E2_STEP)
- #undef E2_STEP_PIN
-#endif
-#if !PIN_EXISTS(E2_DIR)
- #undef E2_DIR_PIN
-#endif
-#if !PIN_EXISTS(E2_ENABLE)
- #undef E2_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E3_STEP)
- #undef E3_STEP_PIN
-#endif
-#if !PIN_EXISTS(E3_DIR)
- #undef E3_DIR_PIN
-#endif
-#if !PIN_EXISTS(E3_ENABLE)
- #undef E3_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E4_STEP)
- #undef E4_STEP_PIN
-#endif
-#if !PIN_EXISTS(E4_DIR)
- #undef E4_DIR_PIN
-#endif
-#if !PIN_EXISTS(E4_ENABLE)
- #undef E4_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E5_STEP)
- #undef E5_STEP_PIN
-#endif
-#if !PIN_EXISTS(E5_DIR)
- #undef E5_DIR_PIN
-#endif
-#if !PIN_EXISTS(E5_ENABLE)
- #undef E5_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E6_STEP)
- #undef E6_STEP_PIN
-#endif
-#if !PIN_EXISTS(E6_DIR)
- #undef E6_DIR_PIN
-#endif
-#if !PIN_EXISTS(E6_ENABLE)
- #undef E6_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E7_STEP)
- #undef E7_STEP_PIN
-#endif
-#if !PIN_EXISTS(E7_DIR)
- #undef E7_DIR_PIN
-#endif
-#if !PIN_EXISTS(E7_ENABLE)
- #undef E7_ENABLE_PIN
-#endif
-
-#if !PIN_EXISTS(X_CS)
- #undef X_CS_PIN
-#endif
-#if !PIN_EXISTS(Y_CS)
- #undef Y_CS_PIN
-#endif
-#if !PIN_EXISTS(Z_CS)
- #undef Z_CS_PIN
-#endif
-#if !PIN_EXISTS(E0_CS)
- #undef E0_CS_PIN
-#endif
-#if !PIN_EXISTS(E1_CS)
- #undef E1_CS_PIN
-#endif
-#if !PIN_EXISTS(E2_CS)
- #undef E2_CS_PIN
-#endif
-#if !PIN_EXISTS(E3_CS)
- #undef E3_CS_PIN
-#endif
-#if !PIN_EXISTS(E4_CS)
- #undef E4_CS_PIN
-#endif
-#if !PIN_EXISTS(E5_CS)
- #undef E5_CS_PIN
-#endif
-#if !PIN_EXISTS(E6_CS)
- #undef E6_CS_PIN
-#endif
-#if !PIN_EXISTS(E7_CS)
- #undef E7_CS_PIN
-#endif
-
-#if !PIN_EXISTS(FAN)
- #undef FAN_PIN
-#endif
-#define FAN0_PIN FAN_PIN
-#if !PIN_EXISTS(FAN1)
- #undef FAN1_PIN
-#endif
-#if !PIN_EXISTS(FAN2)
- #undef FAN2_PIN
-#endif
-#if !PIN_EXISTS(FAN3)
- #undef FAN3_PIN
-#endif
-#if !PIN_EXISTS(FAN4)
- #undef FAN4_PIN
-#endif
-#if !PIN_EXISTS(FAN5)
- #undef FAN5_PIN
-#endif
-#if !PIN_EXISTS(FAN6)
- #undef FAN6_PIN
-#endif
-#if !PIN_EXISTS(FAN7)
- #undef FAN7_PIN
-#endif
-#if !PIN_EXISTS(CONTROLLER_FAN)
- #undef CONTROLLER_FAN_PIN
-#endif
-
-#if !PIN_EXISTS(FANMUX0)
- #undef FANMUX0_PIN
-#endif
-#if !PIN_EXISTS(FANMUX1)
- #undef FANMUX1_PIN
-#endif
-#if !PIN_EXISTS(FANMUX2)
- #undef FANMUX2_PIN
-#endif
-
-#if !PIN_EXISTS(HEATER_0)
- #undef HEATER_0_PIN
-#endif
-#if !PIN_EXISTS(HEATER_1)
- #undef HEATER_1_PIN
-#endif
-#if !PIN_EXISTS(HEATER_2)
- #undef HEATER_2_PIN
-#endif
-#if !PIN_EXISTS(HEATER_3)
- #undef HEATER_3_PIN
-#endif
-#if !PIN_EXISTS(HEATER_4)
- #undef HEATER_4_PIN
-#endif
-#if !PIN_EXISTS(HEATER_5)
- #undef HEATER_5_PIN
-#endif
-#if !PIN_EXISTS(HEATER_6)
- #undef HEATER_6_PIN
-#endif
-#if !PIN_EXISTS(HEATER_7)
- #undef HEATER_7_PIN
-#endif
-#if !PIN_EXISTS(HEATER_BED)
- #undef HEATER_BED_PIN
-#endif
-
-#if !PIN_EXISTS(TEMP_0)
- #undef TEMP_0_PIN
-#endif
-#if !PIN_EXISTS(TEMP_1)
- #undef TEMP_1_PIN
-#endif
-#if !PIN_EXISTS(TEMP_2)
- #undef TEMP_2_PIN
-#endif
-#if !PIN_EXISTS(TEMP_3)
- #undef TEMP_3_PIN
-#endif
-#if !PIN_EXISTS(TEMP_4)
- #undef TEMP_4_PIN
-#endif
-#if !PIN_EXISTS(TEMP_5)
- #undef TEMP_5_PIN
-#endif
-#if !PIN_EXISTS(TEMP_6)
- #undef TEMP_6_PIN
-#endif
-#if !PIN_EXISTS(TEMP_7)
- #undef TEMP_7_PIN
-#endif
-#if !PIN_EXISTS(TEMP_BED)
- #undef TEMP_BED_PIN
-#endif
-
-#if !PIN_EXISTS(SD_DETECT)
- #undef SD_DETECT_PIN
-#endif
-#if !PIN_EXISTS(SDPOWER)
- #undef SDPOWER_PIN
-#endif
-
//
// Analog Pin Assignments
//
-#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
+#define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_PINS)
+
+#if defined(EXT_AUX_A0) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
#endif
-#if defined(EXT_AUX_A1) && EXT_AUX_A1 >= 0 && EXT_AUX_A1 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A1) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
#endif
-#if defined(EXT_AUX_A2) && EXT_AUX_A2 >= 0 && EXT_AUX_A2 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A2) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
#endif
-#if defined(EXT_AUX_A3) && EXT_AUX_A3 >= 0 && EXT_AUX_A3 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A3) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
#endif
-#if defined(EXT_AUX_A4) && EXT_AUX_A4 >= 0 && EXT_AUX_A4 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A4) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
#endif
-#if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(FILWIDTH) && ANALOG_OK(FILWIDTH_PIN)
REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
#endif
-#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && ANALOG_OK(MAIN_VOLTAGE_MEASURE_PIN)
REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
#endif
-#if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD) //TC1 & TC2 are macros in the SAM/SAMD tool chain
- #if defined(TC1) && TC1 >= 0 && TC1 < NUM_ANALOG_INPUTS
+#if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD) // TC1 & TC2 are macros in the SAM/SAMD tool chain
+ #if defined(TC1) && ANALOG_OK(TC1)
REPORT_NAME_ANALOG(__LINE__, TC1)
#endif
- #if defined(TC2) && TC2 >= 0 && TC2 < NUM_ANALOG_INPUTS
+ #if defined(TC2) && ANALOG_OK(TC1)
REPORT_NAME_ANALOG(__LINE__, TC2)
#endif
#endif
-#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_0) && ANALOG_OK(TEMP_0_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
#endif
-#if PIN_EXISTS(TEMP_1) && TEMP_1_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_1) && ANALOG_OK(TEMP_1_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
#endif
-#if PIN_EXISTS(TEMP_2) && TEMP_2_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_2) && ANALOG_OK(TEMP_2_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
#endif
-#if PIN_EXISTS(TEMP_3) && TEMP_3_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_3) && ANALOG_OK(TEMP_3_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
#endif
-#if PIN_EXISTS(TEMP_4) && TEMP_4_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_4) && ANALOG_OK(TEMP_4_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
#endif
-#if PIN_EXISTS(TEMP_5) && TEMP_5_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_5) && ANALOG_OK(TEMP_5_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_5_PIN)
#endif
-#if PIN_EXISTS(TEMP_6) && TEMP_6_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_6) && ANALOG_OK(TEMP_6_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_6_PIN)
#endif
-#if PIN_EXISTS(TEMP_7) && TEMP_7_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_7) && ANALOG_OK(TEMP_7_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_7_PIN)
#endif
-#if PIN_EXISTS(TEMP_BED) && TEMP_BED_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_BED) && ANALOG_OK(TEMP_BED_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
#endif
-#if PIN_EXISTS(TEMP_CHAMBER) && TEMP_CHAMBER_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_CHAMBER) && ANALOG_OK(TEMP_CHAMBER_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
#endif
-#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(ADC_KEYPAD) && ANALOG_OK(ADC_KEYPAD_PIN)
REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
#endif
@@ -521,6 +168,18 @@
#if defined(BTN_UP) && BTN_UP >= 0
REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
#endif
+#if PIN_EXISTS(JOY_X)
+ REPORT_NAME_DIGITAL(__LINE__, JOY_X_PIN)
+#endif
+#if PIN_EXISTS(JOY_Y)
+ REPORT_NAME_DIGITAL(__LINE__, JOY_Y_PIN)
+#endif
+#if PIN_EXISTS(JOY_Z)
+ REPORT_NAME_DIGITAL(__LINE__, JOY_Z_PIN)
+#endif
+#if PIN_EXISTS(JOY_EN)
+ REPORT_NAME_DIGITAL(__LINE__, JOY_EN_PIN)
+#endif
#if PIN_EXISTS(CASE_LIGHT)
REPORT_NAME_DIGITAL(__LINE__, CASE_LIGHT_PIN)
#endif
@@ -900,6 +559,18 @@
#if PIN_EXISTS(FAN7)
REPORT_NAME_DIGITAL(__LINE__, FAN7_PIN)
#endif
+#if PIN_EXISTS(FAN_MUX0)
+ REPORT_NAME_DIGITAL(__LINE__, FAN_MUX0_PIN)
+#endif
+#if PIN_EXISTS(FAN_MUX1)
+ REPORT_NAME_DIGITAL(__LINE__, FAN_MUX1_PIN)
+#endif
+#if PIN_EXISTS(FAN_MUX2)
+ REPORT_NAME_DIGITAL(__LINE__, FAN_MUX2_PIN)
+#endif
+#if PIN_EXISTS(POWER_LOSS)
+ REPORT_NAME_DIGITAL(__LINE__, POWER_LOSS_PIN)
+#endif
#if PIN_EXISTS(FIL_RUNOUT)
REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
#endif
@@ -918,6 +589,12 @@
#if PIN_EXISTS(FIL_RUNOUT6)
REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT6_PIN)
#endif
+#if PIN_EXISTS(FIL_RUNOUT7)
+ REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT7_PIN)
+#endif
+#if PIN_EXISTS(FIL_RUNOUT8)
+ REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT8_PIN)
+#endif
#if PIN_EXISTS(HEATER_0)
REPORT_NAME_DIGITAL(__LINE__, HEATER_0_PIN)
#endif
@@ -945,6 +622,9 @@
#if PIN_EXISTS(HEATER_BED)
REPORT_NAME_DIGITAL(__LINE__, HEATER_BED_PIN)
#endif
+#if PIN_EXISTS(HEATER_CHAMBER)
+ REPORT_NAME_DIGITAL(__LINE__, HEATER_CHAMBER_PIN)
+#endif
#if PIN_EXISTS(HOME)
REPORT_NAME_DIGITAL(__LINE__, HOME_PIN)
#endif
@@ -990,9 +670,6 @@
#if PIN_EXISTS(LED_RED)
REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
#endif
-#if PIN_EXISTS(MAX)
- REPORT_NAME_DIGITAL(__LINE__, MAX_PIN)
-#endif
#if PIN_EXISTS(MAX6675_DO)
REPORT_NAME_DIGITAL(__LINE__, MAX6675_DO_PIN)
#endif
@@ -1005,6 +682,16 @@
#if PIN_EXISTS(MAX6675_SS2)
REPORT_NAME_DIGITAL(__LINE__, MAX6675_SS2_PIN)
#endif
+#if PIN_EXISTS(MAX7219_CLK)
+ REPORT_NAME_DIGITAL(__LINE__, MAX7219_CLK_PIN)
+#endif
+#if PIN_EXISTS(MAX7219_DIN)
+ REPORT_NAME_DIGITAL(__LINE__, MAX7219_DIN_PIN)
+#endif
+#if PIN_EXISTS(MAX7219_LOAD)
+ REPORT_NAME_DIGITAL(__LINE__, MAX7219_LOAD_PIN)
+#endif
+
// #if defined(MISO) && MISO >= 0
// REPORT_NAME_DIGITAL(__LINE__, MISO)
// #endif
@@ -1053,33 +740,12 @@
#if PIN_EXISTS(MOTOR_FAULT)
REPORT_NAME_DIGITAL(__LINE__, MOTOR_FAULT_PIN)
#endif
-#if PIN_EXISTS(ORIG_E0_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E0_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E1_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E1_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E2_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E2_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E3_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E3_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E4_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E4_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E5_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E5_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E6_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E6_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E7_AUTO_FAN)
- REPORT_NAME_DIGITAL(__LINE__, ORIG_E7_AUTO_FAN_PIN)
-#endif
#if PIN_EXISTS(PHOTOGRAPH)
REPORT_NAME_DIGITAL(__LINE__, PHOTOGRAPH_PIN)
#endif
+#if PIN_EXISTS(CHDK)
+ REPORT_NAME_DIGITAL(__LINE__, CHDK_PIN)
+#endif
#if PIN_EXISTS(PS_ON)
REPORT_NAME_DIGITAL(__LINE__, PS_ON_PIN)
#endif
@@ -1101,6 +767,12 @@
#if PIN_EXISTS(RAMPS_D9)
REPORT_NAME_DIGITAL(__LINE__, RAMPS_D9_PIN)
#endif
+#if PIN_EXISTS(NEOPIXEL)
+ REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL_PIN)
+#endif
+#if PIN_EXISTS(NEOPIXEL2)
+ REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL2_PIN)
+#endif
#if PIN_EXISTS(RGB_LED_R)
REPORT_NAME_DIGITAL(__LINE__, RGB_LED_R_PIN)
#endif
@@ -1191,6 +863,12 @@
#if PIN_EXISTS(SOL5)
REPORT_NAME_DIGITAL(__LINE__, SOL5_PIN)
#endif
+#if PIN_EXISTS(SOL6)
+ REPORT_NAME_DIGITAL(__LINE__, SOL6_PIN)
+#endif
+#if PIN_EXISTS(SOL7)
+ REPORT_NAME_DIGITAL(__LINE__, SOL7_PIN)
+#endif
#if defined(SPARE_IO) && SPARE_IO >= 0
REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
#endif
@@ -1323,6 +1001,9 @@
#if PIN_EXISTS(X_MIN)
REPORT_NAME_DIGITAL(__LINE__, X_MIN_PIN)
#endif
+#if PIN_EXISTS(X_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, X_DIAG_PIN)
+#endif
#if PIN_EXISTS(X_MS1)
REPORT_NAME_DIGITAL(__LINE__, X_MS1_PIN)
#endif
@@ -1338,12 +1019,21 @@
#if PIN_EXISTS(X_STOP)
REPORT_NAME_DIGITAL(__LINE__, X_STOP_PIN)
#endif
+#if PIN_EXISTS(X2_CS)
+ REPORT_NAME_DIGITAL(__LINE__, X2_CS_PIN)
+#endif
#if PIN_EXISTS(X2_DIR)
REPORT_NAME_DIGITAL(__LINE__, X2_DIR_PIN)
#endif
#if PIN_EXISTS(X2_ENABLE)
REPORT_NAME_DIGITAL(__LINE__, X2_ENABLE_PIN)
#endif
+#if PIN_EXISTS(X2_MAX)
+ REPORT_NAME_DIGITAL(__LINE__, X2_MAX_PIN)
+#endif
+#if PIN_EXISTS(X2_MIN)
+ REPORT_NAME_DIGITAL(__LINE__, X2_MIN_PIN)
+#endif
#if PIN_EXISTS(X2_MS1)
REPORT_NAME_DIGITAL(__LINE__, X2_MS1_PIN)
#endif
@@ -1374,6 +1064,9 @@
#if PIN_EXISTS(Y_MIN)
REPORT_NAME_DIGITAL(__LINE__, Y_MIN_PIN)
#endif
+#if PIN_EXISTS(Y_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, Y_DIAG_PIN)
+#endif
#if PIN_EXISTS(Y_MS1)
REPORT_NAME_DIGITAL(__LINE__, Y_MS1_PIN)
#endif
@@ -1389,12 +1082,21 @@
#if PIN_EXISTS(Y_STOP)
REPORT_NAME_DIGITAL(__LINE__, Y_STOP_PIN)
#endif
+#if PIN_EXISTS(Y2_CS)
+ REPORT_NAME_DIGITAL(__LINE__, Y2_CS_PIN)
+#endif
#if PIN_EXISTS(Y2_DIR)
REPORT_NAME_DIGITAL(__LINE__, Y2_DIR_PIN)
#endif
#if PIN_EXISTS(Y2_ENABLE)
REPORT_NAME_DIGITAL(__LINE__, Y2_ENABLE_PIN)
#endif
+#if PIN_EXISTS(Y2_MAX)
+ REPORT_NAME_DIGITAL(__LINE__, Y2_MAX_PIN)
+#endif
+#if PIN_EXISTS(Y2_MIN)
+ REPORT_NAME_DIGITAL(__LINE__, Y2_MIN_PIN)
+#endif
#if PIN_EXISTS(Y2_MS1)
REPORT_NAME_DIGITAL(__LINE__, Y2_MS1_PIN)
#endif
@@ -1425,8 +1127,8 @@
#if PIN_EXISTS(Z_MIN)
REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PIN)
#endif
-#if PIN_EXISTS(Z_MIN_PROBE)
- REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
+#if PIN_EXISTS(Z_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, Z_DIAG_PIN)
#endif
#if PIN_EXISTS(Z_MS1)
REPORT_NAME_DIGITAL(__LINE__, Z_MS1_PIN)
@@ -1452,6 +1154,12 @@
#if PIN_EXISTS(Z2_ENABLE)
REPORT_NAME_DIGITAL(__LINE__, Z2_ENABLE_PIN)
#endif
+#if PIN_EXISTS(Z2_MAX)
+ REPORT_NAME_DIGITAL(__LINE__, Z2_MAX_PIN)
+#endif
+#if PIN_EXISTS(Z2_MIN)
+ REPORT_NAME_DIGITAL(__LINE__, Z2_MIN_PIN)
+#endif
#if PIN_EXISTS(Z2_MS1)
REPORT_NAME_DIGITAL(__LINE__, Z2_MS1_PIN)
#endif
@@ -1473,6 +1181,12 @@
#if PIN_EXISTS(Z3_ENABLE)
REPORT_NAME_DIGITAL(__LINE__, Z3_ENABLE_PIN)
#endif
+#if PIN_EXISTS(Z3_MAX)
+ REPORT_NAME_DIGITAL(__LINE__, Z3_MAX_PIN)
+#endif
+#if PIN_EXISTS(Z3_MIN)
+ REPORT_NAME_DIGITAL(__LINE__, Z3_MIN_PIN)
+#endif
#if PIN_EXISTS(Z3_MS1)
REPORT_NAME_DIGITAL(__LINE__, Z3_MS1_PIN)
#endif
@@ -1494,6 +1208,12 @@
#if PIN_EXISTS(Z4_ENABLE)
REPORT_NAME_DIGITAL(__LINE__, Z4_ENABLE_PIN)
#endif
+#if PIN_EXISTS(Z4_MAX)
+ REPORT_NAME_DIGITAL(__LINE__, Z4_MAX_PIN)
+#endif
+#if PIN_EXISTS(Z4_MIN)
+ REPORT_NAME_DIGITAL(__LINE__, Z4_MIN_PIN)
+#endif
#if PIN_EXISTS(Z4_MS1)
REPORT_NAME_DIGITAL(__LINE__, Z4_MS1_PIN)
#endif
@@ -1506,6 +1226,9 @@
#if PIN_EXISTS(Z4_STEP)
REPORT_NAME_DIGITAL(__LINE__, Z4_STEP_PIN)
#endif
+#if PIN_EXISTS(Z_MIN_PROBE)
+ REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
+#endif
#if PIN_EXISTS(ZRIB_V20_D6)
REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN)
#endif
@@ -1560,48 +1283,72 @@
#if PIN_EXISTS(Z4_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, Z4_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E0_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E0_DIAG_PIN)
+#endif
#if PIN_EXISTS(E0_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E0_SERIAL_TX_PIN)
#endif
#if PIN_EXISTS(E0_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, E0_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E1_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E1_DIAG_PIN)
+#endif
#if PIN_EXISTS(E1_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E1_SERIAL_TX_PIN)
#endif
#if PIN_EXISTS(E1_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, E1_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E2_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E2_DIAG_PIN)
+#endif
#if PIN_EXISTS(E2_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E2_SERIAL_TX_PIN)
#endif
#if PIN_EXISTS(E2_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, E2_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E3_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E3_DIAG_PIN)
+#endif
#if PIN_EXISTS(E3_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E3_SERIAL_TX_PIN)
#endif
#if PIN_EXISTS(E3_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, E3_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E4_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E4_DIAG_PIN)
+#endif
#if PIN_EXISTS(E4_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E4_SERIAL_TX_PIN)
#endif
#if PIN_EXISTS(E4_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, E4_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E5_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E5_DIAG_PIN)
+#endif
#if PIN_EXISTS(E5_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E5_SERIAL_TX_PIN)
#endif
#if PIN_EXISTS(E5_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, E5_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E6_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E6_DIAG_PIN)
+#endif
#if PIN_EXISTS(E6_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E6_SERIAL_TX_PIN)
#endif
#if PIN_EXISTS(E6_SERIAL_RX)
REPORT_NAME_DIGITAL(__LINE__, E6_SERIAL_RX_PIN)
#endif
+#if PIN_EXISTS(E7_DIAG)
+ REPORT_NAME_DIGITAL(__LINE__, E7_DIAG_PIN)
+#endif
#if PIN_EXISTS(E7_SERIAL_TX)
REPORT_NAME_DIGITAL(__LINE__, E7_SERIAL_TX_PIN)
#endif
@@ -1641,6 +1388,24 @@
#if PIN_EXISTS(TOUCH_INT)
REPORT_NAME_DIGITAL(__LINE__, TOUCH_INT_PIN)
#endif
+#if PIN_EXISTS(USB_CS)
+ REPORT_NAME_DIGITAL(__LINE__, USB_CS_PIN)
+#endif
+#if PIN_EXISTS(USB_INTR)
+ REPORT_NAME_DIGITAL(__LINE__, USB_INTR_PIN)
+#endif
+#if PIN_EXISTS(MMU2_RST)
+ REPORT_NAME_DIGITAL(__LINE__, MMU2_RST_PIN)
+#endif
+#if PIN_EXISTS(CALIBRATION)
+ REPORT_NAME_DIGITAL(__LINE__, CALIBRATION_PIN)
+#endif
#if PIN_EXISTS(SMART_EFFECTOR_MOD)
REPORT_NAME_DIGITAL(__LINE__, SMART_EFFECTOR_MOD_PIN)
#endif
+#if PIN_EXISTS(CLOSED_LOOP_ENABLE)
+ REPORT_NAME_DIGITAL(__LINE__, CLOSED_LOOP_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(CLOSED_LOOP_MOVE_COMPLETE)
+ REPORT_NAME_DIGITAL(__LINE__, CLOSED_LOOP_MOVE_COMPLETE_PIN)
+#endif
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index d667032c9c..430fa170e1 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,10 +39,10 @@
#endif
// TMC2130 Diag Pins (currently just for reference)
-#define X_DIAG_PIN 64
-#define Y_DIAG_PIN 69
-#define Z_DIAG_PIN 68
-#define E0_DIAG_PIN 65
+#define X_DIAG_PIN 64
+#define Y_DIAG_PIN 69
+#define Z_DIAG_PIN 68
+#define E0_DIAG_PIN 65
//
// Limit Switches
@@ -55,20 +55,20 @@
#if DISABLED(SENSORLESS_HOMING)
- #define X_STOP_PIN 12
- #define Y_STOP_PIN 11
- #define Z_STOP_PIN 10
+ #define X_STOP_PIN 12
+ #define Y_STOP_PIN 11
+ #define Z_STOP_PIN 10
#else
- #define X_STOP_PIN X_DIAG_PIN
- #define Y_STOP_PIN Y_DIAG_PIN
+ #define X_STOP_PIN X_DIAG_PIN
+ #define Y_STOP_PIN Y_DIAG_PIN
#if ENABLED(BLTOUCH)
- #define Z_STOP_PIN 11 // Y-MIN
- #define SERVO0_PIN 10 // Z-MIN
+ #define Z_STOP_PIN 11 // Y-MIN
+ #define SERVO0_PIN 10 // Z-MIN
#else
- #define Z_STOP_PIN 10
+ #define Z_STOP_PIN 10
#endif
#endif
@@ -77,104 +77,104 @@
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 10
+ #define Z_MIN_PROBE_PIN 10
#endif
//
// Steppers
//
-#define X_STEP_PIN 37
-#define X_DIR_PIN 49
-#define X_ENABLE_PIN 29
-#define X_CS_PIN 41
+#define X_STEP_PIN 37
+#define X_DIR_PIN 49
+#define X_ENABLE_PIN 29
+#define X_CS_PIN 41
-#define Y_STEP_PIN 36
-#define Y_DIR_PIN 48
-#define Y_ENABLE_PIN 28
-#define Y_CS_PIN 39
+#define Y_STEP_PIN 36
+#define Y_DIR_PIN 48
+#define Y_ENABLE_PIN 28
+#define Y_CS_PIN 39
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 47
-#define Z_ENABLE_PIN 27
-#define Z_CS_PIN 67
+#define Z_STEP_PIN 35
+#define Z_DIR_PIN 47
+#define Z_ENABLE_PIN 27
+#define Z_CS_PIN 67
-#define E0_STEP_PIN 34
-#define E0_DIR_PIN 43
-#define E0_ENABLE_PIN 26
-#define E0_CS_PIN 66
+#define E0_STEP_PIN 34
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 26
+#define E0_CS_PIN 66
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 3
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 3
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 8
+ #define FAN_PIN 8
#endif
#ifndef FAN1_PIN
- #define FAN1_PIN 6
+ #define FAN1_PIN 6
#endif
//
// Misc. Functions
//
-#define SDSS 77
-#define LED_PIN 13
-#define CASE_LIGHT_PIN 9
+#define SDSS 77
+#define LED_PIN 13
+#define CASE_LIGHT_PIN 9
//
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
-#define SPINDLE_DIR_PIN 19
+#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
+#define SPINDLE_DIR_PIN 19
//
// Průša i3 MK2 Multiplexer Support
//
-#define E_MUX0_PIN 17
-#define E_MUX1_PIN 16
-#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
+#define E_MUX0_PIN 17
+#define E_MUX1_PIN 16
+#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
//
// LCD / Controller
//
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
- #define KILL_PIN 32
+ #define KILL_PIN 32
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS 85
- #define LCD_PINS_ENABLE 71
- #define LCD_PINS_D4 70
- #define BTN_EN1 61
- #define BTN_EN2 59
+ #define LCD_PINS_RS 85
+ #define LCD_PINS_ENABLE 71
+ #define LCD_PINS_D4 70
+ #define BTN_EN1 61
+ #define BTN_EN2 59
#else
- #define LCD_PINS_RS 82
- #define LCD_PINS_ENABLE 61
- #define LCD_PINS_D4 59
- #define LCD_PINS_D5 70
- #define LCD_PINS_D6 85
- #define LCD_PINS_D7 71
- #define BTN_EN1 14
- #define BTN_EN2 72
+ #define LCD_PINS_RS 82
+ #define LCD_PINS_ENABLE 61
+ #define LCD_PINS_D4 59
+ #define LCD_PINS_D5 70
+ #define LCD_PINS_D6 85
+ #define LCD_PINS_D7 71
+ #define BTN_EN1 14
+ #define BTN_EN2 72
#endif
- #define BTN_ENC 9 // AUX-2
- #define BEEPER_PIN 84 // AUX-4
- #define SD_DETECT_PIN 15
+ #define BTN_ENC 9 // AUX-2
+ #define BEEPER_PIN 84 // AUX-4
+ #define SD_DETECT_PIN 15
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 9ca51ac86f..6e8463d0bd 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -38,11 +38,11 @@
#error "You must set ([XYZ]|E0)_DRIVER_TYPE to TMC2130 in Configuration.h for EinsyRetro."
#endif
-// TMC2130 Diag Pins (currently just for reference)
-#define X_DIAG_PIN 64
-#define Y_DIAG_PIN 69
-#define Z_DIAG_PIN 68
-#define E0_DIAG_PIN 65
+// TMC2130 Diag Pins
+#define X_DIAG_PIN 64
+#define Y_DIAG_PIN 69
+#define Z_DIAG_PIN 68
+#define E0_DIAG_PIN 65
//
// Limit Switches
@@ -55,141 +55,141 @@
#if DISABLED(SENSORLESS_HOMING)
- #define X_MIN_PIN 12
- #define Y_MIN_PIN 11
- #define Z_MIN_PIN 10
- #define X_MAX_PIN 81
- #define Y_MAX_PIN 57
+ #define X_MIN_PIN 12 // X-
+ #define Y_MIN_PIN 11 // Y-
+ #define Z_MIN_PIN 10 // Z-
+ #define X_MAX_PIN 81 // X+
+ #define Y_MAX_PIN 57 // Y+
#else
#if X_HOME_DIR < 0
- #define X_MIN_PIN X_DIAG_PIN
- #define X_MAX_PIN 81
+ #define X_MIN_PIN X_DIAG_PIN
+ #define X_MAX_PIN 81 // X+
#else
- #define X_MIN_PIN 12
- #define X_MAX_PIN X_DIAG_PIN
+ #define X_MIN_PIN 12 // X-
+ #define X_MAX_PIN X_DIAG_PIN
#endif
#if Y_HOME_DIR < 0
- #define Y_MIN_PIN Y_DIAG_PIN
- #define Y_MAX_PIN 57
+ #define Y_MIN_PIN Y_DIAG_PIN
+ #define Y_MAX_PIN 57 // Y+
#else
- #define Y_MIN_PIN 11
- #define Y_MAX_PIN Y_DIAG_PIN
+ #define Y_MIN_PIN 11 // Y-
+ #define Y_MAX_PIN Y_DIAG_PIN
#endif
#if ENABLED(BLTOUCH)
- #define Z_MIN_PIN 11 // Y-MIN
- #define SERVO0_PIN 10 // Z-MIN
+ #define Z_MIN_PIN 11 // Y-MIN
+ #define SERVO0_PIN 10 // Z-MIN
#else
- #define Z_MIN_PIN 10
+ #define Z_MIN_PIN 10
#endif
#endif
-#define Z_MAX_PIN 7
+#define Z_MAX_PIN 7
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 10
+ #define Z_MIN_PROBE_PIN 10
#endif
//
// Steppers
//
-#define X_STEP_PIN 37
-#define X_DIR_PIN 49
-#define X_ENABLE_PIN 29
-#define X_CS_PIN 41
+#define X_STEP_PIN 37
+#define X_DIR_PIN 49
+#define X_ENABLE_PIN 29
+#define X_CS_PIN 41
-#define Y_STEP_PIN 36
-#define Y_DIR_PIN 48
-#define Y_ENABLE_PIN 28
-#define Y_CS_PIN 39
+#define Y_STEP_PIN 36
+#define Y_DIR_PIN 48
+#define Y_ENABLE_PIN 28
+#define Y_CS_PIN 39
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 47
-#define Z_ENABLE_PIN 27
-#define Z_CS_PIN 67
+#define Z_STEP_PIN 35
+#define Z_DIR_PIN 47
+#define Z_ENABLE_PIN 27
+#define Z_CS_PIN 67
-#define E0_STEP_PIN 34
-#define E0_DIR_PIN 43
-#define E0_ENABLE_PIN 26
-#define E0_CS_PIN 66
+#define E0_STEP_PIN 34
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 26
+#define E0_CS_PIN 66
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 3
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 3
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 8
+ #define FAN_PIN 8
#endif
-#define FAN1_PIN 6
+#define FAN1_PIN 6
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define CASE_LIGHT_PIN 9
+#define SDSS 53
+#define LED_PIN 13
+#define CASE_LIGHT_PIN 9
//
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
-#define SPINDLE_DIR_PIN 19
+#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
+#define SPINDLE_DIR_PIN 19
//
// Průša i3 MK2 Multiplexer Support
//
-#define E_MUX0_PIN 17
-#define E_MUX1_PIN 16
-#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
+#define E_MUX0_PIN 17
+#define E_MUX1_PIN 16
+#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
//
// LCD / Controller
//
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
- #define KILL_PIN 32
+ #define KILL_PIN 32
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS 85
- #define LCD_PINS_ENABLE 71
- #define LCD_PINS_D4 70
- #define BTN_EN1 18
- #define BTN_EN2 19
+ #define LCD_PINS_RS 85
+ #define LCD_PINS_ENABLE 71
+ #define LCD_PINS_D4 70
+ #define BTN_EN1 18
+ #define BTN_EN2 19
#else
- #define LCD_PINS_RS 82
- #define LCD_PINS_ENABLE 18 // On 0.6b, use 61
- #define LCD_PINS_D4 19 // On 0.6b, use 59
- #define LCD_PINS_D5 70
- #define LCD_PINS_D6 85
- #define LCD_PINS_D7 71
- #define BTN_EN1 14
- #define BTN_EN2 72
+ #define LCD_PINS_RS 82
+ #define LCD_PINS_ENABLE 18 // On 0.6b, use 61
+ #define LCD_PINS_D4 19 // On 0.6b, use 59
+ #define LCD_PINS_D5 70
+ #define LCD_PINS_D6 85
+ #define LCD_PINS_D7 71
+ #define BTN_EN1 14
+ #define BTN_EN2 72
#endif
- #define BTN_ENC 9 // AUX-2
- #define BEEPER_PIN 84 // AUX-4
+ #define BTN_ENC 9 // AUX-2
+ #define BEEPER_PIN 84 // AUX-4
- #define SD_DETECT_PIN 15
+ #define SD_DETECT_PIN 15
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index 51c5fab892..18bc3ddd16 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,7 +26,7 @@
*/
#ifndef __AVR_ATmega2560__
- #error "Oops! Select 'RAMBo' in 'Tools > Board.'"
+ #error "Oops! Select 'RAMBo' in 'Tools > Board' or the Mega2560 environment in PlatformIO."
#endif
#if MB(MINIRAMBO_10A)
@@ -38,104 +38,104 @@
//
// Limit Switches
//
-#define X_MIN_PIN 12
-#define X_MAX_PIN 30
-#define Y_MIN_PIN 11
-#define Y_MAX_PIN 24
-#define Z_MIN_PIN 10
-#define Z_MAX_PIN 23
+#define X_MIN_PIN 12
+#define X_MAX_PIN 30
+#define Y_MIN_PIN 11
+#define Y_MAX_PIN 24
+#define Z_MIN_PIN 10
+#define Z_MAX_PIN 23
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 23
+ #define Z_MIN_PROBE_PIN 23
#endif
//
// Steppers
//
-#define X_STEP_PIN 37
-#define X_DIR_PIN 48
-#define X_ENABLE_PIN 29
+#define X_STEP_PIN 37
+#define X_DIR_PIN 48
+#define X_ENABLE_PIN 29
-#define Y_STEP_PIN 36
-#define Y_DIR_PIN 49
-#define Y_ENABLE_PIN 28
+#define Y_STEP_PIN 36
+#define Y_DIR_PIN 49
+#define Y_ENABLE_PIN 28
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 47
-#define Z_ENABLE_PIN 27
+#define Z_STEP_PIN 35
+#define Z_DIR_PIN 47
+#define Z_ENABLE_PIN 27
-#define E0_STEP_PIN 34
-#define E0_DIR_PIN 43
-#define E0_ENABLE_PIN 26
+#define E0_STEP_PIN 34
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 26
// Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN 40
-#define X_MS2_PIN 41
-#define Y_MS1_PIN 69
-#define Y_MS2_PIN 39
-#define Z_MS1_PIN 68
-#define Z_MS2_PIN 67
-#define E0_MS1_PIN 65
-#define E0_MS2_PIN 66
+#define X_MS1_PIN 40
+#define X_MS2_PIN 41
+#define Y_MS1_PIN 69
+#define Y_MS2_PIN 39
+#define Z_MS1_PIN 68
+#define Z_MS2_PIN 67
+#define E0_MS1_PIN 65
+#define E0_MS2_PIN 66
-#define MOTOR_CURRENT_PWM_XY_PIN 46
-#define MOTOR_CURRENT_PWM_Z_PIN 45
-#define MOTOR_CURRENT_PWM_E_PIN 44
+#define MOTOR_CURRENT_PWM_XY_PIN 46
+#define MOTOR_CURRENT_PWM_Z_PIN 45
+#define MOTOR_CURRENT_PWM_E_PIN 44
// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
#ifndef MOTOR_CURRENT_PWM_RANGE
- #define MOTOR_CURRENT_PWM_RANGE 2000
+ #define MOTOR_CURRENT_PWM_RANGE 2000
#endif
#define DEFAULT_PWM_MOTOR_CURRENT {1300, 1300, 1250}
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 3
-#define HEATER_1_PIN 7
+#define HEATER_0_PIN 3
+#define HEATER_1_PIN 7
#if !MB(MINIRAMBO_10A)
- #define HEATER_2_PIN 6
+ #define HEATER_2_PIN 6
#endif
-#define HEATER_BED_PIN 4
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 8
+ #define FAN_PIN 8
#endif
-#define FAN1_PIN 6
+#define FAN1_PIN 6
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
+#define SDSS 53
+#define LED_PIN 13
#if !MB(MINIRAMBO_10A)
- #define CASE_LIGHT_PIN 9
+ #define CASE_LIGHT_PIN 9
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
-#define SPINDLE_DIR_PIN 19
+#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
+#define SPINDLE_DIR_PIN 19
//
// Průša i3 MK2 Multiplexer Support
//
-#define E_MUX0_PIN 17
-#define E_MUX1_PIN 16
+#define E_MUX0_PIN 17
+#define E_MUX1_PIN 16
#if !MB(MINIRAMBO_10A)
- #define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
+ #define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
#endif
//
@@ -144,46 +144,46 @@
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#if !MB(MINIRAMBO_10A)
- #define KILL_PIN 32
+ #define KILL_PIN 32
#endif
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if MB(MINIRAMBO_10A)
- #define BEEPER_PIN 78
+ #define BEEPER_PIN 78
- #define BTN_EN1 80
- #define BTN_EN2 73
- #define BTN_ENC 21
+ #define BTN_EN1 80
+ #define BTN_EN2 73
+ #define BTN_ENC 21
- #define LCD_PINS_RS 38
- #define LCD_PINS_ENABLE 5
- #define LCD_PINS_D4 14
- #define LCD_PINS_D5 15
- #define LCD_PINS_D6 32
- #define LCD_PINS_D7 31
+ #define LCD_PINS_RS 38
+ #define LCD_PINS_ENABLE 5
+ #define LCD_PINS_D4 14
+ #define LCD_PINS_D5 15
+ #define LCD_PINS_D6 32
+ #define LCD_PINS_D7 31
- #define SD_DETECT_PIN 72
+ #define SD_DETECT_PIN 72
- #else // !MINIRAMBO_10A
+ #else // !MINIRAMBO_10A
// AUX-4
- #define BEEPER_PIN 84
+ #define BEEPER_PIN 84
// AUX-2
- #define BTN_EN1 14
- #define BTN_EN2 72
- #define BTN_ENC 9
+ #define BTN_EN1 14
+ #define BTN_EN2 72
+ #define BTN_ENC 9
- #define LCD_PINS_RS 82
- #define LCD_PINS_ENABLE 18
- #define LCD_PINS_D4 19
- #define LCD_PINS_D5 70
- #define LCD_PINS_D6 85
- #define LCD_PINS_D7 71
+ #define LCD_PINS_RS 82
+ #define LCD_PINS_ENABLE 18
+ #define LCD_PINS_D4 19
+ #define LCD_PINS_D5 70
+ #define LCD_PINS_D6 85
+ #define LCD_PINS_D7 71
- #define SD_DETECT_PIN 15
+ #define SD_DETECT_PIN 15
#endif // !MINIRAMBO_10A
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 1094e0687e..dec72b8ea7 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -50,64 +50,68 @@
//
// Servos
//
-#define SERVO0_PIN 22 // Motor header MX1
-#define SERVO1_PIN 23 // Motor header MX2
-#define SERVO2_PIN 24 // Motor header MX3
-#define SERVO3_PIN 5 // PWM header pin 5
+#define SERVO0_PIN 22 // Motor header MX1
+#define SERVO1_PIN 23 // Motor header MX2
+#define SERVO2_PIN 24 // Motor header MX3
+#define SERVO3_PIN 5 // PWM header pin 5
//
// Limit Switches
//
-#define X_MIN_PIN 12
-#define X_MAX_PIN 24
-#define Y_MIN_PIN 11
-#define Y_MAX_PIN 23
-#define Z_MIN_PIN 10
-#define Z_MAX_PIN 30
+#define X_MIN_PIN 12
+#define X_MAX_PIN 24
+#define Y_MIN_PIN 11
+#define Y_MAX_PIN 23
+#define Z_MIN_PIN 10
+#define Z_MAX_PIN 30
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 30
+ #define Z_MIN_PROBE_PIN 30
+#endif
+
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN 5
#endif
//
// Steppers
//
-#define X_STEP_PIN 37
-#define X_DIR_PIN 48
-#define X_ENABLE_PIN 29
+#define X_STEP_PIN 37
+#define X_DIR_PIN 48
+#define X_ENABLE_PIN 29
-#define Y_STEP_PIN 36
-#define Y_DIR_PIN 49
-#define Y_ENABLE_PIN 28
+#define Y_STEP_PIN 36
+#define Y_DIR_PIN 49
+#define Y_ENABLE_PIN 28
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 47
-#define Z_ENABLE_PIN 27
+#define Z_STEP_PIN 35
+#define Z_DIR_PIN 47
+#define Z_ENABLE_PIN 27
-#define E0_STEP_PIN 34
-#define E0_DIR_PIN 43
-#define E0_ENABLE_PIN 26
+#define E0_STEP_PIN 34
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 26
-#define E1_STEP_PIN 33
-#define E1_DIR_PIN 42
-#define E1_ENABLE_PIN 25
+#define E1_STEP_PIN 33
+#define E1_DIR_PIN 42
+#define E1_ENABLE_PIN 25
// Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN 40
-#define X_MS2_PIN 41
-#define Y_MS1_PIN 69
-#define Y_MS2_PIN 39
-#define Z_MS1_PIN 68
-#define Z_MS2_PIN 67
-#define E0_MS1_PIN 65
-#define E0_MS2_PIN 66
-#define E1_MS1_PIN 63
-#define E1_MS2_PIN 64
+#define X_MS1_PIN 40
+#define X_MS2_PIN 41
+#define Y_MS1_PIN 69
+#define Y_MS2_PIN 39
+#define Z_MS1_PIN 68
+#define Z_MS2_PIN 67
+#define E0_MS1_PIN 65
+#define E0_MS2_PIN 66
+#define E1_MS1_PIN 63
+#define E1_MS2_PIN 64
-#define DIGIPOTSS_PIN 38
+#define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS { 4,5,3,0,1 } // X Y Z E0 E1 digipot channels to stepper driver mapping
#ifndef DIGIPOT_MOTOR_CURRENT
#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
@@ -116,122 +120,129 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 9
-#define HEATER_1_PIN 7
-#define HEATER_2_PIN 6
-#define HEATER_BED_PIN 3
+#define HEATER_0_PIN 9
+#define HEATER_1_PIN 7
+#define HEATER_2_PIN 6
+#define HEATER_BED_PIN 3
#ifndef FAN_PIN
- #define FAN_PIN 8
+ #define FAN_PIN 8
#endif
-#define FAN1_PIN 6
-#define FAN2_PIN 2
+#define FAN1_PIN 6
+#define FAN2_PIN 2
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 4
-#define CASE_LIGHT_PIN 46
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 4
+#define CASE_LIGHT_PIN 46
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 3 // Analog Input
+ #define FILWIDTH_PIN 3 // Analog Input
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 31 // Pullup!
-#define SPINDLE_DIR_PIN 32
+#define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 31 // Pullup!
+#define SPINDLE_DIR_PIN 32
+
+//
+// SPI for Max6675 or Max31855 Thermocouple
+//
+#ifndef MAX6675_SS_PIN
+ #define MAX6675_SS_PIN 32 // SPINDLE_DIR_PIN / STAT_LED_BLUE_PIN
+#endif
//
// M7/M8/M9 - Coolant Control
//
-#define COOLANT_MIST_PIN 22
-#define COOLANT_FLOOD_PIN 44
+#define COOLANT_MIST_PIN 22
+#define COOLANT_FLOOD_PIN 44
//
// Průša i3 MK2 Multiplexer Support
//
-#define E_MUX0_PIN 17
-#define E_MUX1_PIN 16
-#define E_MUX2_PIN 84 // 84 in MK2 Firmware
+#define E_MUX0_PIN 17
+#define E_MUX1_PIN 16
+#define E_MUX2_PIN 84 // 84 in MK2 Firmware
//
// LCD / Controller
//
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
- #define KILL_PIN 80
+ #define KILL_PIN 80
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
- #define LCD_PINS_RS 70
- #define LCD_PINS_ENABLE 71
- #define LCD_PINS_D4 72
- #define LCD_PINS_D5 73
- #define LCD_PINS_D6 74
- #define LCD_PINS_D7 75
+ #define LCD_PINS_RS 70
+ #define LCD_PINS_ENABLE 71
+ #define LCD_PINS_D4 72
+ #define LCD_PINS_D5 73
+ #define LCD_PINS_D6 74
+ #define LCD_PINS_D7 75
#if ANY(VIKI2, miniVIKI)
- #define BEEPER_PIN 44
+ #define BEEPER_PIN 44
// NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
// beeper/buzzer is connected to pin 33; however, the pin used in the
// diagram is actually pin 44, so this is correct.
- #define DOGLCD_A0 70
- #define DOGLCD_CS 71
+ #define DOGLCD_A0 70
+ #define DOGLCD_CS 71
#define LCD_SCREEN_ROT_180
- #define BTN_EN1 85
- #define BTN_EN2 84
- #define BTN_ENC 83
+ #define BTN_EN1 85
+ #define BTN_EN2 84
+ #define BTN_ENC 83
- #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
+ #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
- #define STAT_LED_RED_PIN 22
- #define STAT_LED_BLUE_PIN 32
+ #define STAT_LED_RED_PIN 22
+ #define STAT_LED_BLUE_PIN 32
- #else // !VIKI2 && !miniVIKI
+ #else // !VIKI2 && !miniVIKI
- #define BEEPER_PIN 79 // AUX-4
+ #define BEEPER_PIN 79 // AUX-4
// AUX-2
- #define BTN_EN1 76
- #define BTN_EN2 77
- #define BTN_ENC 78
+ #define BTN_EN1 76
+ #define BTN_EN2 77
+ #define BTN_ENC 78
- #define SD_DETECT_PIN 81
+ #define SD_DETECT_PIN 81
#endif // !VIKI2 && !miniVIKI
- #else // !NEWPANEL - old style panel with shift register
+ #else // !NEWPANEL - old style panel with shift register
// No Beeper added
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
// Buttons attached to a shift register
// Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
- #define LCD_PINS_RS 75
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
+ #define LCD_PINS_RS 75
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #define LCD_PINS_D7 29
#endif // !NEWPANEL
diff --git a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
index e8c9b2ebc0..49237c7062 100644
--- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
+++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,126 +34,126 @@
//
// Servos
//
-#define SERVO0_PIN 22 // Motor header MX1
-#define SERVO1_PIN 23 // Motor header MX2
-#define SERVO2_PIN 24 // Motor header MX3
-#define SERVO3_PIN 5 // PWM header pin 5
+#define SERVO0_PIN 22 // Motor header MX1
+#define SERVO1_PIN 23 // Motor header MX2
+#define SERVO2_PIN 24 // Motor header MX3
+#define SERVO3_PIN 5 // PWM header pin 5
//
// Limit Switches
//
-#define X_MIN_PIN 12
-#define X_MAX_PIN 24
-#define Y_MIN_PIN 11
-#define Y_MAX_PIN 23
-#define Z_MIN_PIN 10
-#define Z_MAX_PIN 30
+#define X_MIN_PIN 12
+#define X_MAX_PIN 24
+#define Y_MIN_PIN 11
+#define Y_MAX_PIN 23
+#define Z_MIN_PIN 10
+#define Z_MAX_PIN 30
//
// Z Probe (when not Z_MIN_IN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 30
+ #define Z_MIN_PROBE_PIN 30
#endif
//
// Steppers
//
-#define X_STEP_PIN 37
-#define X_DIR_PIN 48
-#define X_ENABLE_PIN 29
+#define X_STEP_PIN 37
+#define X_DIR_PIN 48
+#define X_ENABLE_PIN 29
-#define Y_STEP_PIN 36
-#define Y_DIR_PIN 49
-#define Y_ENABLE_PIN 28
+#define Y_STEP_PIN 36
+#define Y_DIR_PIN 49
+#define Y_ENABLE_PIN 28
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 47
-#define Z_ENABLE_PIN 27
+#define Z_STEP_PIN 35
+#define Z_DIR_PIN 47
+#define Z_ENABLE_PIN 27
-#define E0_STEP_PIN 34
-#define E0_DIR_PIN 43
-#define E0_ENABLE_PIN 26
+#define E0_STEP_PIN 34
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 26
-#define E1_STEP_PIN 33
-#define E1_DIR_PIN 42
-#define E1_ENABLE_PIN 25
+#define E1_STEP_PIN 33
+#define E1_DIR_PIN 42
+#define E1_ENABLE_PIN 25
// Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN 40
-#define X_MS2_PIN 41
-#define Y_MS1_PIN 69
-#define Y_MS2_PIN 39
-#define Z_MS1_PIN 68
-#define Z_MS2_PIN 67
-#define E0_MS1_PIN 65
-#define E0_MS2_PIN 66
-#define E1_MS1_PIN 63
-#define E1_MS2_PIN 64
+#define X_MS1_PIN 40
+#define X_MS2_PIN 41
+#define Y_MS1_PIN 69
+#define Y_MS2_PIN 39
+#define Z_MS1_PIN 68
+#define Z_MS2_PIN 67
+#define E0_MS1_PIN 65
+#define E0_MS2_PIN 66
+#define E1_MS1_PIN 63
+#define E1_MS2_PIN 64
-#define DIGIPOTSS_PIN 38
+#define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_BED_PIN 7 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_BED_PIN 7 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 9
-#define HEATER_1_PIN 7
-#define HEATER_BED_PIN 3
+#define HEATER_0_PIN 9
+#define HEATER_1_PIN 7
+#define HEATER_BED_PIN 3
#ifndef FAN_PIN
- #define FAN_PIN 8
+ #define FAN_PIN 8
#endif
-#define FAN1_PIN 6
-#define FAN2_PIN 2
+#define FAN1_PIN 6
+#define FAN2_PIN 2
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 4
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 4
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 3 // Analog Input
+ #define FILWIDTH_PIN 3 // Analog Input
#endif
//
// LCD / Controller
//
-#define LCD_PINS_RS 70 // Ext2_5
-#define LCD_PINS_ENABLE 71 // Ext2_7
-#define LCD_PINS_D4 72 // Ext2_9 ?
-#define LCD_PINS_D5 73 // Ext2_11 ?
-#define LCD_PINS_D6 74 // Ext2_13
-#define LCD_PINS_D7 75 // Ext2_15 ?
-#define BEEPER_PIN -1
+#define LCD_PINS_RS 70 // Ext2_5
+#define LCD_PINS_ENABLE 71 // Ext2_7
+#define LCD_PINS_D4 72 // Ext2_9 ?
+#define LCD_PINS_D5 73 // Ext2_11 ?
+#define LCD_PINS_D6 74 // Ext2_13
+#define LCD_PINS_D7 75 // Ext2_15 ?
+#define BEEPER_PIN -1
-#define BTN_HOME 80 // Ext_16
-#define BTN_CENTER 81 // Ext_14
-#define BTN_ENC BTN_CENTER
-#define BTN_RIGHT 82 // Ext_12
-#define BTN_LEFT 83 // Ext_10
-#define BTN_UP 84 // Ext2_8
-#define BTN_DOWN 85 // Ext2_6
+#define BTN_HOME 80 // Ext_16
+#define BTN_CENTER 81 // Ext_14
+#define BTN_ENC BTN_CENTER
+#define BTN_RIGHT 82 // Ext_12
+#define BTN_LEFT 83 // Ext_10
+#define BTN_UP 84 // Ext2_8
+#define BTN_DOWN 85 // Ext2_6
-#define HOME_PIN BTN_HOME
+#define HOME_PIN BTN_HOME
#if ANY(VIKI2, miniVIKI)
- #define BEEPER_PIN 44
+ #define BEEPER_PIN 44
// Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 70
- #define DOGLCD_CS 71
+ #define DOGLCD_A0 70
+ #define DOGLCD_CS 71
#define LCD_SCREEN_ROT_180
- #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
+ #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
- #define STAT_LED_RED_PIN 22
- #define STAT_LED_BLUE_PIN 32
+ #define STAT_LED_RED_PIN 22
+ #define STAT_LED_BLUE_PIN 32
#endif // VIKI2/miniVIKI
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index e6c3bdc2ea..69d2ac2088 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,11 +40,11 @@
//
// Heaters / Fans
//
-#define RAMPS_D8_PIN 9
-#define RAMPS_D9_PIN 8
-#define MOSFET_D_PIN 12
+#define RAMPS_D8_PIN 9
+#define RAMPS_D9_PIN 8
+#define MOSFET_D_PIN 12
-#define CASE_LIGHT_PIN -1 // Hardware PWM but one is not available on expansion header
+#define CASE_LIGHT_PIN -1 // Hardware PWM but one is not available on expansion header
#include "pins_RAMPS.h"
@@ -57,21 +57,21 @@
// Steppers
//
#undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN 63
+#define Z_ENABLE_PIN 63
//
// Heaters / Fans
//
-#define HEATER_2_PIN 6
+#define HEATER_2_PIN 6
//
// Misc. Functions
//
#undef SDSS
-#define SDSS 25
+#define SDSS 25
#undef SD_DETECT_PIN
-#define SD_DETECT_PIN 53
+#define SD_DETECT_PIN 53
//
// LCD / Controller
@@ -85,24 +85,24 @@
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
- #define LCD_PINS_RS 27
- #define LCD_PINS_ENABLE 29
- #define LCD_PINS_D4 37
- #define LCD_PINS_D5 35
- #define LCD_PINS_D6 33
- #define LCD_PINS_D7 31
+ #define LCD_PINS_RS 27
+ #define LCD_PINS_ENABLE 29
+ #define LCD_PINS_D4 37
+ #define LCD_PINS_D5 35
+ #define LCD_PINS_D6 33
+ #define LCD_PINS_D7 31
// Buttons
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
- #define BTN_EN1 16
- #define BTN_EN2 17
- #define BTN_ENC 23
+ #define BTN_EN1 16
+ #define BTN_EN2 17
+ #define BTN_ENC 23
#else
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
#endif // HAS_SPI_LCD && NEWPANEL
@@ -137,7 +137,7 @@
*
* Note: Socket names vary from vendor to vendor
*/
-#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not good with 3DRAG
+#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not good with 3DRAG
#undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN
@@ -149,14 +149,14 @@
#undef Z_DIR_PIN
#undef Z_ENABLE_PIN
#undef Z_STEP_PIN
- #define Z_DIR_PIN 28
- #define Z_ENABLE_PIN 24
- #define Z_STEP_PIN 26
- #define SPINDLE_LASER_PWM_PIN 46 // Hardware PWM
- #define SPINDLE_LASER_ENA_PIN 62 // Pullup!
- #define SPINDLE_DIR_PIN 48
- #elif !BOTH(ULTRA_LCD, NEWPANEL) // use expansion header if no LCD in use
- #define SPINDLE_LASER_ENA_PIN 16 // Pullup or pulldown!
- #define SPINDLE_DIR_PIN 17
+ #define Z_DIR_PIN 28
+ #define Z_ENABLE_PIN 24
+ #define Z_STEP_PIN 26
+ #define SPINDLE_LASER_PWM_PIN 46 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 62 // Pullup!
+ #define SPINDLE_DIR_PIN 48
+ #elif !BOTH(ULTRA_LCD, NEWPANEL) // use expansion header if no LCD in use
+ #define SPINDLE_LASER_ENA_PIN 16 // Pullup or pulldown!
+ #define SPINDLE_DIR_PIN 17
#endif
#endif
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index 692d4f8a6e..a38e4e1b43 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,15 +32,15 @@
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
- #define CASE_LIGHT_PIN 6 // Define before RAMPS pins include
+ #define CASE_LIGHT_PIN 6 // Define before RAMPS pins include
#endif
#define BOARD_INFO_NAME "Azteeg X3"
//
// Servos
//
-#define SERVO0_PIN 44 // SERVO1 port
-#define SERVO1_PIN 55 // SERVO2 port
+#define SERVO0_PIN 44 // SERVO1 port
+#define SERVO1_PIN 55 // SERVO2 port
#include "pins_RAMPS_13.h"
@@ -55,17 +55,17 @@
#undef DOGLCD_A0
#undef DOGLCD_CS
#undef BTN_ENC
- #define DOGLCD_A0 31
- #define DOGLCD_CS 32
- #define BTN_ENC 12
+ #define DOGLCD_A0 31
+ #define DOGLCD_CS 32
+ #define BTN_ENC 12
- #define STAT_LED_RED_PIN 64
- #define STAT_LED_BLUE_PIN 63
+ #define STAT_LED_RED_PIN 64
+ #define STAT_LED_BLUE_PIN 63
#else
- #define STAT_LED_RED_PIN 6
- #define STAT_LED_BLUE_PIN 11
+ #define STAT_LED_RED_PIN 6
+ #define STAT_LED_BLUE_PIN 11
#endif
@@ -79,18 +79,18 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
-#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
+#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
#undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN
#if HAS_CUTTER
- #undef SDA // use EXP3 header
+ #undef SDA // use EXP3 header
#undef SCL
#if SERVO0_PIN == 7
#undef SERVO0_PIN
- #define SERVO0_PIN 11
+ #define SERVO0_PIN 11
#endif
- #define SPINDLE_LASER_PWM_PIN 7 // Hardware PWM
- #define SPINDLE_LASER_ENA_PIN 20 // Pullup!
- #define SPINDLE_DIR_PIN 21
+ #define SPINDLE_LASER_PWM_PIN 7 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 20 // Pullup!
+ #define SPINDLE_DIR_PIN 21
#endif
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index 62014217ff..c8e2a6683d 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,21 +43,21 @@
// Tested this pin with bed leveling on a Delta with 1 servo.
// Physical wire attachment on EXT1: GND, 5V, D47.
//
-#define SERVO0_PIN 47
+#define SERVO0_PIN 47
//
// Limit Switches
//
-#define X_STOP_PIN 3
-#define Y_STOP_PIN 14
-#define Z_STOP_PIN 18
+#define X_STOP_PIN 3
+#define Y_STOP_PIN 14
+#define Z_STOP_PIN 18
#ifndef FAN_PIN
- #define FAN_PIN 6
+ #define FAN_PIN 6
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
- #define CASE_LIGHT_PIN 44
+ #define CASE_LIGHT_PIN 44
#endif
//
@@ -67,100 +67,100 @@
// DIGIPOT slave addresses
#ifndef DIGIPOT_I2C_ADDRESS_A
- #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+ #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
#endif
#ifndef DIGIPOT_I2C_ADDRESS_B
- #define DIGIPOT_I2C_ADDRESS_B 0x2E // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
+ #define DIGIPOT_I2C_ADDRESS_B 0x2E // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
#endif
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 18
+ #define Z_MIN_PROBE_PIN 18
#endif
//
// Steppers
//
-#define E2_STEP_PIN 23
-#define E2_DIR_PIN 25
-#define E2_ENABLE_PIN 40
+#define E2_STEP_PIN 23
+#define E2_DIR_PIN 25
+#define E2_ENABLE_PIN 40
-#define E3_STEP_PIN 27
-#define E3_DIR_PIN 29
-#define E3_ENABLE_PIN 41
+#define E3_STEP_PIN 27
+#define E3_DIR_PIN 29
+#define E3_ENABLE_PIN 41
-#define E4_STEP_PIN 43
-#define E4_DIR_PIN 37
-#define E4_ENABLE_PIN 42
+#define E4_STEP_PIN 43
+#define E4_DIR_PIN 37
+#define E4_ENABLE_PIN 42
//
// Temperature Sensors
//
-#define TEMP_2_PIN 12 // Analog Input
-#define TEMP_3_PIN 11 // Analog Input
-#define TEMP_4_PIN 10 // Analog Input
-#define TC1 4 // Analog Input (Thermo couple on Azteeg X3Pro)
-#define TC2 5 // Analog Input (Thermo couple on Azteeg X3Pro)
+#define TEMP_2_PIN 12 // Analog Input
+#define TEMP_3_PIN 11 // Analog Input
+#define TEMP_4_PIN 10 // Analog Input
+#define TC1 4 // Analog Input (Thermo couple on Azteeg X3Pro)
+#define TC2 5 // Analog Input (Thermo couple on Azteeg X3Pro)
//
// Heaters / Fans
//
-#define HEATER_2_PIN 16
-#define HEATER_3_PIN 17
-#define HEATER_4_PIN 4
-#define HEATER_5_PIN 5
-#define HEATER_6_PIN 6
-#define HEATER_7_PIN 11
+#define HEATER_2_PIN 16
+#define HEATER_3_PIN 17
+#define HEATER_4_PIN 4
+#define HEATER_5_PIN 5
+#define HEATER_6_PIN 6
+#define HEATER_7_PIN 11
#ifndef CONTROLLER_FAN_PIN
- #define CONTROLLER_FAN_PIN 4 // Pin used for the fan to cool motherboard (-1 to disable)
+ #define CONTROLLER_FAN_PIN 4 // Pin used for the fan to cool motherboard (-1 to disable)
#endif
// Fans/Water Pump to cool the hotend cool side.
-#define ORIG_E0_AUTO_FAN_PIN 5
-#define ORIG_E1_AUTO_FAN_PIN 5
-#define ORIG_E2_AUTO_FAN_PIN 5
-#define ORIG_E3_AUTO_FAN_PIN 5
+#define ORIG_E0_AUTO_FAN_PIN 5
+#define ORIG_E1_AUTO_FAN_PIN 5
+#define ORIG_E2_AUTO_FAN_PIN 5
+#define ORIG_E3_AUTO_FAN_PIN 5
//
// LCD / Controller
//
#undef BEEPER_PIN
-#define BEEPER_PIN 33
+#define BEEPER_PIN 33
#if ANY(VIKI2, miniVIKI)
#undef SD_DETECT_PIN
- #define SD_DETECT_PIN 49 // For easy adapter board
+ #define SD_DETECT_PIN 49 // For easy adapter board
#undef BEEPER_PIN
- #define BEEPER_PIN 12 // 33 isn't physically available to the LCD display
+ #define BEEPER_PIN 12 // 33 isn't physically available to the LCD display
#else
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
+ #define STAT_LED_RED_PIN 32
+ #define STAT_LED_BLUE_PIN 35
#endif
//
// Misc. Functions
//
#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN
- #undef DOGLCD_A0 // Steal pin 44 for the case light; if you have a Viki2 and have connected it
- #define DOGLCD_A0 57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments
+ #undef DOGLCD_A0 // Steal pin 44 for the case light; if you have a Viki2 and have connected it
+ #define DOGLCD_A0 57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments
// as the wiring diagram uses pin 44 for DOGLCD_A0
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
-#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
+#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
#undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN
-#if HAS_CUTTER // EXP2 header
+#if HAS_CUTTER // EXP2 header
#if ANY(VIKI2, miniVIKI)
- #define BTN_EN2 31 // Pin 7 needed for Spindle PWM
+ #define BTN_EN2 31 // Pin 7 needed for Spindle PWM
#endif
- #define SPINDLE_LASER_PWM_PIN 7 // Hardware PWM
- #define SPINDLE_LASER_ENA_PIN 20 // Pullup!
- #define SPINDLE_DIR_PIN 21
+ #define SPINDLE_LASER_PWM_PIN 7 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 20 // Pullup!
+ #define SPINDLE_DIR_PIN 21
#endif
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index 4cadf481f3..1aa9b67f7c 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,9 +34,9 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 66 // Pullup or pulldown!
-#define SPINDLE_DIR_PIN 67
-#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 66 // Pullup or pulldown!
+#define SPINDLE_DIR_PIN 67
+#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#include "pins_RAMPS.h"
@@ -45,5 +45,5 @@
//
#undef TEMP_0_PIN
#undef TEMP_1_PIN
-#define TEMP_0_PIN 9 // Analog Input
-#define TEMP_1_PIN 11 // Analog Input
+#define TEMP_0_PIN 9 // Analog Input
+#define TEMP_1_PIN 11 // Analog Input
diff --git a/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h b/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
index 7f27df6eb4..738b522e66 100644
--- a/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
+++ b/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
index 14013d874c..44b6ff1e61 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,30 +34,30 @@
//
// Heaters / Fans
//
-#define RAMPS_D8_PIN 10
-#define RAMPS_D9_PIN 12
-#define RAMPS_D10_PIN 9
-#define MOSFET_D_PIN 7
+#define RAMPS_D8_PIN 10
+#define RAMPS_D9_PIN 12
+#define RAMPS_D10_PIN 9
+#define MOSFET_D_PIN 7
//
// Auto fans
//
-#define ORIG_E0_AUTO_FAN_PIN 11
-#define ORIG_E1_AUTO_FAN_PIN 6
-#define ORIG_E2_AUTO_FAN_PIN 6
-#define ORIG_E3_AUTO_FAN_PIN 6
+#define ORIG_E0_AUTO_FAN_PIN 11
+#define ORIG_E1_AUTO_FAN_PIN 6
+#define ORIG_E2_AUTO_FAN_PIN 6
+#define ORIG_E3_AUTO_FAN_PIN 6
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
-#define SPINDLE_DIR_PIN 42
+#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+#define SPINDLE_DIR_PIN 42
//
// Limit Switches
//
-#define X_MAX_PIN 79 // 2
+#define X_MAX_PIN 79 // 2
//
// Import RAMPS 1.3 pins
@@ -68,34 +68,33 @@
// Z Probe (when not Z_MIN_PIN)
//
#undef Z_MIN_PROBE_PIN
-#define Z_MIN_PROBE_PIN 19 // IND_S_5V
+#define Z_MIN_PROBE_PIN 19 // IND_S_5V
#undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN 77 // 62
+#define Z_ENABLE_PIN 77 // 62
//
// Steppers
//
-#define DIGIPOTSS_PIN 22
+#define DIGIPOTSS_PIN 22
#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
//
// Temperature Sensors
//
#undef TEMP_1_PIN
-#define TEMP_1_PIN 14 // Analog Input (15)
+#define TEMP_1_PIN 14 // Analog Input (15)
#undef TEMP_BED_PIN
-#define TEMP_BED_PIN 15 // Analog Input (14)
+#define TEMP_BED_PIN 15 // Analog Input (14)
//
// Misc. Functions
//
-#undef PS_ON_PIN // 12
-#define PS_ON_PIN 81 // External Power Supply
-
-#define CASE_LIGHT_PIN 44 // Hardware PWM
+#undef PS_ON_PIN // 12
+#define PS_ON_PIN 81 // External Power Supply
+#define CASE_LIGHT_PIN 44 // Hardware PWM
// This board has headers for Z-min, Z-max and IND_S_5V *but* as the bq team
// decided to ship the printer only with the probe and no additional Z-min
@@ -104,8 +103,8 @@
#ifdef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
#undef Z_MIN_PIN
#undef Z_MAX_PIN
- #define Z_MIN_PIN 19 // IND_S_5V
- #define Z_MAX_PIN 18 // Z-MIN Label
+ #define Z_MIN_PIN 19 // IND_S_5V
+ #define Z_MAX_PIN 18 // Z-MIN Label
#endif
//
@@ -113,5 +112,5 @@
//
#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
#undef HEATER_BED_PIN
- #define HEATER_BED_PIN 8
+ #define HEATER_BED_PIN 8
#endif
diff --git a/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
new file mode 100644
index 0000000000..8f61ef47dc
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
@@ -0,0 +1,34 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "Copymaster 3D RAMPS"
+
+#define Z_STEP_PIN 47
+#define Y_MAX_PIN 14
+#define FIL_RUNOUT_PIN 15
+#define SD_DETECT_PIN 66
+
+//
+// Import RAMPS 1.4 pins
+//
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
index 0ffc70aa73..9ff9d3be62 100644
--- a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,68 +34,68 @@
//
// Limit Switches
//
-#define X_STOP_PIN 54 // PF0 / A0
-#define Y_STOP_PIN 24 // PA2 / AD2
-#define Z_MIN_PIN 23 // PA1 / AD1
-#define Z_MAX_PIN 25 // PA3 / AD3
-#define SERVO0_PIN 40 // PG1 / !RD
+#define X_STOP_PIN 54 // PF0 / A0
+#define Y_STOP_PIN 24 // PA2 / AD2
+#define Z_MIN_PIN 23 // PA1 / AD1
+#define Z_MAX_PIN 25 // PA3 / AD3
+#define SERVO0_PIN 40 // PG1 / !RD
//
// Steppers
//
-#define X_STEP_PIN 61 // PF7 / A7
-#define X_DIR_PIN 62 // PK0 / A8
-#define X_ENABLE_PIN 60 // PF6 / A6
+#define X_STEP_PIN 61 // PF7 / A7
+#define X_DIR_PIN 62 // PK0 / A8
+#define X_ENABLE_PIN 60 // PF6 / A6
-#define Y_STEP_PIN 64 // PK2 / A10
-#define Y_DIR_PIN 65 // PK3 / A11
-#define Y_ENABLE_PIN 63 // PK1 / A9
+#define Y_STEP_PIN 64 // PK2 / A10
+#define Y_DIR_PIN 65 // PK3 / A11
+#define Y_ENABLE_PIN 63 // PK1 / A9
-#define Z_STEP_PIN 67 // PK5 / A13
-#define Z_DIR_PIN 69 // PK7 / A15
-#define Z_ENABLE_PIN 66 // PK4 / A12
-#define Z_MIN_PROBE_PIN 25 // PA3 / AD3
+#define Z_STEP_PIN 67 // PK5 / A13
+#define Z_DIR_PIN 69 // PK7 / A15
+#define Z_ENABLE_PIN 66 // PK4 / A12
+#define Z_MIN_PROBE_PIN 25 // PA3 / AD3
-#define E0_STEP_PIN 58 // PF4 / A4
-#define E0_DIR_PIN 59 // PF5 / A5
-#define E0_ENABLE_PIN 57 // PF3 / A3
+#define E0_STEP_PIN 58 // PF4 / A4
+#define E0_DIR_PIN 59 // PF5 / A5
+#define E0_ENABLE_PIN 57 // PF3 / A3
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // PF1 / A1 Analog
-#define TEMP_BED_PIN 14 // PK6 / A14 Analog
+#define TEMP_0_PIN 1 // PF1 / A1 Analog
+#define TEMP_BED_PIN 14 // PK6 / A14 Analog
//
// Heaters / Fans
//
-#define HEATER_0_PIN 4 // PG5 / PWM4
-#define HEATER_BED_PIN 3 // PE5 / PWM3
+#define HEATER_0_PIN 4 // PG5 / PWM4
+#define HEATER_BED_PIN 3 // PE5 / PWM3
-#define FAN_PIN 5 // PE3 / PWM5
+#define FAN_PIN 5 // PE3 / PWM5
//
// Misc. Functions
//
-#define SDSS 53 // PB0 / SS
-#define LED_PIN 13 // PB7 / PWM13
+#define SDSS 53 // PB0 / SS
+#define LED_PIN 13 // PB7 / PWM13
-#define MISO_PIN 50 // PB3
-#define MOSI_PIN 51 // PB2
-#define SCK_PIN 52 // PB1
+#define MISO_PIN 50 // PB3
+#define MOSI_PIN 51 // PB2
+#define SCK_PIN 52 // PB1
//
// LCDs and Controllers
//
#if HAS_SPI_LCD
#if ENABLED(ZONESTAR_LCD)
- #define LCD_PINS_RS 2
- #define LCD_PINS_ENABLE 36
- #define LCD_PINS_D4 37
- #define LCD_PINS_D5 34
- #define LCD_PINS_D6 35
- #define LCD_PINS_D7 32
- #define ADC_KEYPAD_PIN 12 // Analog
+ #define LCD_PINS_RS 2
+ #define LCD_PINS_ENABLE 36
+ #define LCD_PINS_D4 37
+ #define LCD_PINS_D5 34
+ #define LCD_PINS_D6 35
+ #define LCD_PINS_D7 32
+ #define ADC_KEYPAD_PIN 12 // Analog
#endif
#endif
diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h
index c2c2b4bbf4..bfd341db6d 100644
--- a/Marlin/src/pins/ramps/pins_FELIX2.h
+++ b/Marlin/src/pins/ramps/pins_FELIX2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,29 +35,29 @@
// Heaters / Fans
//
// Power outputs EFBF or EFBE
-#define MOSFET_D_PIN 7
+#define MOSFET_D_PIN 7
#include "pins_RAMPS.h"
//
// Misc. Functions
//
-#define SDPOWER_PIN 1
+#define SDPOWER_PIN 1
-#define PS_ON_PIN 12
+#define PS_ON_PIN 12
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
- #define SD_DETECT_PIN 6
+ #define SD_DETECT_PIN 6
#endif // NEWPANEL && ULTRA_LCD
//
// M3/M4/M5 - Spindle/Laser Control
//
-#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not valid with this board
+#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not valid with this board
#undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index 0ff0ec57ba..75d647fed5 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -41,83 +41,83 @@
//
// Servos
//
-#define SERVO0_PIN 11
-#define SERVO1_PIN 6
-#define SERVO2_PIN 5
+#define SERVO0_PIN 11
+#define SERVO1_PIN 6
+#define SERVO2_PIN 5
//
// Limit Switches
//
-#define X_MIN_PIN 3
+#define X_MIN_PIN 3
#ifndef X_MAX_PIN
- #define X_MAX_PIN 2
+ #define X_MAX_PIN 2
#endif
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN 53
+ #define X_CS_PIN 53
#endif
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN
- #define Y_CS_PIN 49
+ #define Y_CS_PIN 49
#endif
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 62
#ifndef Z_CS_PIN
- #define Z_CS_PIN 40
+ #define Z_CS_PIN 40
#endif
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
#ifndef E0_CS_PIN
- #define E0_CS_PIN 42
+ #define E0_CS_PIN 42
#endif
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
#ifndef E1_CS_PIN
- #define E1_CS_PIN 44
+ #define E1_CS_PIN 44
#endif
-#define E2_STEP_PIN 42
-#define E2_DIR_PIN 43
-#define E2_ENABLE_PIN 44
+#define E2_STEP_PIN 42
+#define E2_DIR_PIN 43
+#define E2_ENABLE_PIN 44
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13 // Analog Input
-#define TEMP_1_PIN 15 // Analog Input
-#define TEMP_BED_PIN 14 // Analog Input
+#define TEMP_0_PIN 13 // Analog Input
+#define TEMP_1_PIN 15 // Analog Input
+#define TEMP_BED_PIN 14 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card
#else
- #define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
#endif
//
@@ -140,39 +140,39 @@
//
// Heaters / Fans
//
-#define HEATER_0_PIN 10
-#define HEATER_1_PIN 7
-#define HEATER_BED_PIN 8
+#define HEATER_0_PIN 10
+#define HEATER_1_PIN 7
+#define HEATER_BED_PIN 8
#ifndef FAN_PIN
- #define FAN_PIN 9
+ #define FAN_PIN 9
#endif
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 57
+ #define FIL_RUNOUT_PIN 57
#endif
#if !HAS_FILAMENT_SENSOR
- #define FAN1_PIN 4
+ #define FAN1_PIN 4
#endif
//
// Misc. Functions
//
#ifndef SDSS
- #define SDSS 53
+ #define SDSS 53
#endif
-#define LED_PIN 13
-#define LED4_PIN 5
+#define LED_PIN 13
+#define LED4_PIN 5
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN 5 // Analog Input
+#define FILWIDTH_PIN 5 // Analog Input
#ifndef PS_ON_PIN
- #define PS_ON_PIN 12
+ #define PS_ON_PIN 12
#endif
-#define CASE_LIGHT_PIN 5
+#define CASE_LIGHT_PIN 5
//
// LCD / Controller
@@ -180,16 +180,16 @@
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define BEEPER_PIN 37
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
+ #define BEEPER_PIN 37
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #define LCD_PINS_D7 29
#endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
index 431d4370ba..3ed9fb9692 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,10 +28,10 @@
#define BOARD_INFO_NAME "Formbot Raptor2"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-#define FAN_PIN 6
+#define FAN_PIN 6
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 22
+ #define FIL_RUNOUT_PIN 22
#endif
#include "pins_FORMBOT_RAPTOR.h"
@@ -42,22 +42,22 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
- #if !NUM_SERVOS // Try to use servo connector first
- #define SPINDLE_LASER_ENA_PIN 6 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
- #define SPINDLE_DIR_PIN 5
- #elif !GREEDY_PANEL // Try to use AUX2
- #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
- #define SPINDLE_DIR_PIN 65
+ #if !NUM_SERVOS // Try to use servo connector first
+ #define SPINDLE_LASER_ENA_PIN 6 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
+ #define SPINDLE_DIR_PIN 5
+ #elif !GREEDY_PANEL // Try to use AUX2
+ #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+ #define SPINDLE_DIR_PIN 65
#endif
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
- #if NUM_SERVOS <= 1 // Try to use servo connector first
- #define CASE_LIGHT_PIN 6 // Hardware PWM
- #elif !GREEDY_PANEL // Try to use AUX2
- #define CASE_LIGHT_PIN 44 // Hardware PWM
+ #if NUM_SERVOS <= 1 // Try to use servo connector first
+ #define CASE_LIGHT_PIN 6 // Hardware PWM
+ #elif !GREEDY_PANEL // Try to use AUX2
+ #define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 665462c012..5176c699ee 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,6 +21,15 @@
*/
#pragma once
+/**
+ * Override default LCD timing for Formbot T-Rex 2+ machines.
+ * The long LCD cables and the routing near electrically noisy stepper motors
+ * requires a slightly longer setup and hold time on the signals.
+ */
+#define BOARD_ST7920_DELAY_1 DELAY_NS(200)
+#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
+#define BOARD_ST7920_DELAY_3 DELAY_NS(200)
+
/**
* Formbot pin assignments
*/
@@ -37,84 +46,84 @@
//
// Servos
//
-#define SERVO0_PIN 11
-#define SERVO1_PIN -1 // was 6
-#define SERVO2_PIN -1 // was 5
-#define SERVO3_PIN -1
+#define SERVO0_PIN 11
+#define SERVO1_PIN -1 // was 6
+#define SERVO2_PIN -1 // was 5
+#define SERVO3_PIN -1
//
// Limit Switches
//
-#define X_MIN_PIN 3
+#define X_MIN_PIN 3
#ifndef X_MAX_PIN
- #define X_MAX_PIN 2
+ #define X_MAX_PIN 2
#endif
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN 53
+ #define X_CS_PIN 53
#endif
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN
- #define Y_CS_PIN 49
+ #define Y_CS_PIN 49
#endif
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 62
#ifndef Z_CS_PIN
- #define Z_CS_PIN 40
+ #define Z_CS_PIN 40
#endif
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
#ifndef E0_CS_PIN
- #define E0_CS_PIN 42
+ #define E0_CS_PIN 42
#endif
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
#ifndef E1_CS_PIN
- #define E1_CS_PIN 44
+ #define E1_CS_PIN 44
#endif
-#define E2_STEP_PIN 42
-#define E2_DIR_PIN 43
-#define E2_ENABLE_PIN 44
+#define E2_STEP_PIN 42
+#define E2_DIR_PIN 43
+#define E2_ENABLE_PIN 44
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13 // Analog Input
-#define TEMP_1_PIN 15 // Analog Input
-#define TEMP_BED_PIN 3 // Analog Input
+#define TEMP_0_PIN 13 // Analog Input
+#define TEMP_1_PIN 15 // Analog Input
+#define TEMP_BED_PIN 3 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card
#else
- #define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
#endif
//
@@ -137,36 +146,36 @@
//
// Heaters / Fans
//
-#define HEATER_0_PIN 10
-#define HEATER_1_PIN 7
-#define HEATER_BED_PIN 58
+#define HEATER_0_PIN 10
+#define HEATER_1_PIN 7
+#define HEATER_BED_PIN 58
-#define FAN_PIN 9
+#define FAN_PIN 9
#if HAS_FILAMENT_SENSOR
- #define FIL_RUNOUT_PIN 4
- //#define FIL_RUNOUT2_PIN -1
+ #define FIL_RUNOUT_PIN 4
+ //#define FIL_RUNOUT2_PIN -1
#else
// Though defined as a fan pin, it is utilized as a dedicated laser pin by Formbot.
- #define FAN1_PIN 4
+ #define FAN1_PIN 4
#endif
//
// Misc. Functions
//
-#define SDSS 53
+#define SDSS 53
#ifndef LED_PIN
- #define LED_PIN 13 // The Formbot v 1 board has almost no unassigned pins on it. The Board's LED
+ #define LED_PIN 13 // The Formbot v 1 board has almost no unassigned pins on it. The Board's LED
#endif // is a good place to get a signal to control the Max7219 LED Matrix.
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN 5 // Analog Input
+#define FILWIDTH_PIN 5 // Analog Input
#ifndef PS_ON_PIN
- #define PS_ON_PIN 12
+ #define PS_ON_PIN 12
#endif
-#define CASE_LIGHT_PIN 8
+#define CASE_LIGHT_PIN 8
//
// LCD / Controller
@@ -175,22 +184,22 @@
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#ifndef BEEPER_PIN
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#endif
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
- #define SD_DETECT_PIN 49
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
+ #define SD_DETECT_PIN 49
// Allow MAX7219 to steal the KILL pin
#if !defined(KILL_PIN) && MAX7219_CLK_PIN != 41 && MAX7219_DIN_PIN != 41 && MAX7219_LOAD_PIN != 41
- #define KILL_PIN 41
+ #define KILL_PIN 41
#endif
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #define LCD_PINS_D7 29
#endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index a96585eb69..3846a7649e 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,116 +37,114 @@
//
// Servos
//
-#define SERVO0_PIN 11
-#define SERVO1_PIN -1 // was 6
-#define SERVO2_PIN -1
-#define SERVO3_PIN -1
+#define SERVO0_PIN 11
+#define SERVO1_PIN -1 // was 6
+#define SERVO2_PIN -1
+#define SERVO3_PIN -1
//
// Limit Switches
//
-#define X_MIN_PIN 3
+#define X_MIN_PIN 3
#ifndef X_MAX_PIN
- #define X_MAX_PIN 2
+ #define X_MAX_PIN 2
#endif
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN 53
+ #define X_CS_PIN 53
#endif
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN
- #define Y_CS_PIN 49
+ #define Y_CS_PIN 49
#endif
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 62
#ifndef Z_CS_PIN
- #define Z_CS_PIN 40
+ #define Z_CS_PIN 40
#endif
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
#ifndef E0_CS_PIN
- #define E0_CS_PIN 42
+ #define E0_CS_PIN 42
#endif
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
#ifndef E1_CS_PIN
- #define E1_CS_PIN 44
+ #define E1_CS_PIN 44
#endif
-#define E2_STEP_PIN 42
-#define E2_DIR_PIN 43
-#define E2_ENABLE_PIN 44
+#define E2_STEP_PIN 42
+#define E2_DIR_PIN 43
+#define E2_ENABLE_PIN 44
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13 // Analog Input
-#define TEMP_1_PIN 15 // Analog Input
-#define TEMP_BED_PIN 14 // Analog Input
+#define TEMP_0_PIN 13 // Analog Input
+#define TEMP_1_PIN 15 // Analog Input
+#define TEMP_BED_PIN 14 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card
#else
- #define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
#endif
-
-
//
// Heaters / Fans
//
-#define HEATER_0_PIN 10
-#define HEATER_1_PIN 7
-#define HEATER_BED_PIN 8
+#define HEATER_0_PIN 10
+#define HEATER_1_PIN 7
+#define HEATER_BED_PIN 8
-#define FAN_PIN 9
-#define FAN1_PIN 12
+#define FAN_PIN 9
+#define FAN1_PIN 12
-#define NUM_RUNOUT_SENSORS 2
-#define FIL_RUNOUT_PIN 22
-#define FIL_RUNOUT2_PIN 21
+#define NUM_RUNOUT_SENSORS 2
+#define FIL_RUNOUT_PIN 22
+#define FIL_RUNOUT2_PIN 21
//
// Misc. Functions
//
-#define CASE_LIGHT_PIN 5
-#define SDSS 53
+#define CASE_LIGHT_PIN 5
+#define SDSS 53
#ifndef LED_PIN
- #define LED_PIN 13
+ #define LED_PIN 13
#endif
-#define SPINDLE_LASER_PWM_PIN -1 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 4 // Pullup!
+#define SPINDLE_LASER_PWM_PIN -1 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 4 // Pullup!
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN 5 // Analog Input
+#define FILWIDTH_PIN 5 // Analog Input
//
// LCD / Controller
@@ -154,20 +152,20 @@
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
- #define SD_DETECT_PIN 49
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #define LCD_PINS_D7 29
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
+ #define SD_DETECT_PIN 49
#ifndef KILL_PIN
- #define KILL_PIN 41
+ #define KILL_PIN 41
#endif
#ifndef BEEPER_PIN
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#endif
#endif
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index d009630392..19238bc5f8 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,91 +29,87 @@
#error "Oops! Select 'FYSETC F6' in 'Tools > Board.'"
#endif
-#if ENABLED(SD_DETECT_INVERTED)
- //#error "SD_DETECT_INVERTED must be disabled for the FYSETC_F6_13 board."
-#endif
-
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "FYSETC F6 1.3"
#endif
-#define RESET_PIN 30
-#define SPI_FLASH_CS 83
+#define RESET_PIN 30
+#define SPI_FLASH_CS 83
//
// Servos
//
-#define SERVO0_PIN 13
-#define SERVO1_PIN 11 // (PS_ON_PIN)
-#define SERVO2_PIN 10 // (FIL_RUNOUT_PIN)
-#define SERVO3_PIN 4 // (RGB_LED_G_PIN)
+#define SERVO0_PIN 13
+#define SERVO1_PIN 11 // (PS_ON_PIN)
+#define SERVO2_PIN 10 // (FIL_RUNOUT_PIN)
+#define SERVO3_PIN 4 // (RGB_LED_G_PIN)
//
// Limit Switches
//
-#define X_MIN_PIN 63
-#define X_MAX_PIN 64
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 12
+#define X_MIN_PIN 63
+#define X_MAX_PIN 64
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 12
#ifndef Z_MAX_PIN
- #define Z_MAX_PIN 9
+ #define Z_MAX_PIN 9
#endif
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN SERVO2_PIN
+ #define FIL_RUNOUT_PIN SERVO2_PIN
#endif
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 9 // Servos pin
+ #define Z_MIN_PROBE_PIN 9 // Servos pin
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN 70
+ #define X_CS_PIN 70
#endif
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN
- #define Y_CS_PIN 39
+ #define Y_CS_PIN 39
#endif
-#define Z_STEP_PIN 43
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 58
+#define Z_STEP_PIN 43
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 58
#ifndef Z_CS_PIN
- #define Z_CS_PIN 74
+ #define Z_CS_PIN 74
#endif
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
#ifndef E0_CS_PIN
- #define E0_CS_PIN 47
+ #define E0_CS_PIN 47
#endif
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
#ifndef E1_CS_PIN
- #define E1_CS_PIN 32
+ #define E1_CS_PIN 32
#endif
-#define E2_STEP_PIN 59
-#define E2_DIR_PIN 57
-#define E2_ENABLE_PIN 40
+#define E2_STEP_PIN 59
+#define E2_DIR_PIN 57
+#define E2_ENABLE_PIN 40
#ifndef E2_CS_PIN
- #define E2_CS_PIN 42
+ #define E2_CS_PIN 42
#endif
//
@@ -121,7 +117,7 @@
// the jumper next to the limit switch socket when using sensorless homing.
//
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -129,76 +125,76 @@
* At the moment, F6 rx pins are not pc interrupt pins
*/
#ifndef X_SERIAL_RX_PIN
- #define X_SERIAL_RX_PIN -1 // 71
+ #define X_SERIAL_RX_PIN -1 // 71
#endif
#ifndef X_SERIAL_TX_PIN
- #define X_SERIAL_TX_PIN 72
+ #define X_SERIAL_TX_PIN 72
#endif
#ifndef Y_SERIAL_RX_PIN
- #define Y_SERIAL_RX_PIN -1 // 73
+ #define Y_SERIAL_RX_PIN -1 // 73
#endif
#ifndef Y_SERIAL_TX_PIN
- #define Y_SERIAL_TX_PIN 75
+ #define Y_SERIAL_TX_PIN 75
#endif
#ifndef Z_SERIAL_RX_PIN
- #define Z_SERIAL_RX_PIN -1 // 78
+ #define Z_SERIAL_RX_PIN -1 // 78
#endif
#ifndef Z_SERIAL_TX_PIN
- #define Z_SERIAL_TX_PIN 79
+ #define Z_SERIAL_TX_PIN 79
#endif
#ifndef E0_SERIAL_RX_PIN
- #define E0_SERIAL_RX_PIN -1 // 76
+ #define E0_SERIAL_RX_PIN -1 // 76
#endif
#ifndef E0_SERIAL_TX_PIN
- #define E0_SERIAL_TX_PIN 77
+ #define E0_SERIAL_TX_PIN 77
#endif
#ifndef E1_SERIAL_RX_PIN
- #define E1_SERIAL_RX_PIN -1 // 80
+ #define E1_SERIAL_RX_PIN -1 // 80
#endif
#ifndef E1_SERIAL_TX_PIN
- #define E1_SERIAL_TX_PIN 81
+ #define E1_SERIAL_TX_PIN 81
#endif
#ifndef E2_SERIAL_RX_PIN
- #define E2_SERIAL_RX_PIN -1 // 22
+ #define E2_SERIAL_RX_PIN -1 // 22
#endif
#ifndef E2_SERIAL_TX_PIN
- #define E2_SERIAL_TX_PIN 82
+ #define E2_SERIAL_TX_PIN 82
#endif
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 12 // Analog Input
-#define TEMP_1_PIN 13 // Analog Input
-#define TEMP_2_PIN 14 // Analog Input
-#define TEMP_BED_PIN 15 // Analog Input
+#define TEMP_0_PIN 12 // Analog Input
+#define TEMP_1_PIN 13 // Analog Input
+#define TEMP_2_PIN 14 // Analog Input
+#define TEMP_BED_PIN 15 // Analog Input
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 9 // Analog Input on X+ endstop
+ #define FILWIDTH_PIN 9 // Analog Input on X+ endstop
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 5
-#define HEATER_1_PIN 6
-#define HEATER_2_PIN 7
-#define HEATER_BED_PIN 8
+#define HEATER_0_PIN 5
+#define HEATER_1_PIN 6
+#define HEATER_2_PIN 7
+#define HEATER_BED_PIN 8
-#define FAN_PIN 44
-#define FAN1_PIN 45
-#define FAN2_PIN 46
+#define FAN_PIN 44
+#define FAN1_PIN 45
+#define FAN2_PIN 46
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define KILL_PIN 41
+#define SDSS 53
+#define LED_PIN 13
+#define KILL_PIN 41
#ifndef PS_ON_PIN
- #define PS_ON_PIN SERVO1_PIN
+ #define PS_ON_PIN SERVO1_PIN
#endif
/**
@@ -215,69 +211,69 @@
//
// LCDs and Controllers
//
-#define BEEPER_PIN 37
-#define SD_DETECT_PIN 49
+#define BEEPER_PIN 37
+#define SD_DETECT_PIN 49
#if ENABLED(FYSETC_MINI_12864)
//
// See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
//
- #define DOGLCD_A0 16
- #define DOGLCD_CS 17
+ #define DOGLCD_A0 16
+ #define DOGLCD_CS 17
#if ENABLED(FYSETC_GENERIC_12864_1_1)
- #define LCD_BACKLIGHT_PIN 27
+ #define LCD_BACKLIGHT_PIN 27
#endif
- #define KILL_PIN 41
- #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
+ #define KILL_PIN 41
+ #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
// Seems to work best if left open.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 25
+ #define RGB_LED_R_PIN 25
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN 27
+ #define RGB_LED_G_PIN 27
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN 29
+ #define RGB_LED_B_PIN 29
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN 25
+ #define NEOPIXEL_PIN 25
#endif
#elif HAS_GRAPHICAL_LCD
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #define LCD_PINS_D7 29
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS 25
- #define DOGLCD_A0 27
+ #define DOGLCD_CS 25
+ #define DOGLCD_A0 27
#endif
#endif
#if ENABLED(NEWPANEL)
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
#endif
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 3
+ #define RGB_LED_R_PIN 3
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN 4
+ #define RGB_LED_G_PIN 4
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN 9
+ #define RGB_LED_B_PIN 9
#endif
#ifndef RGB_LED_W_PIN
- #define RGB_LED_W_PIN -1
+ #define RGB_LED_W_PIN -1
#endif
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index 088955ff0c..f0eb0bf4c6 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,24 +27,24 @@
#define BOARD_NAME "FYSETC F6 1.4"
-#define Z_MAX_PIN 2
+#define Z_MAX_PIN 2
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*/
- #define X_SERIAL_RX_PIN 72
- #define X_SERIAL_TX_PIN 71
- #define Y_SERIAL_RX_PIN 73
- #define Y_SERIAL_TX_PIN 78
- #define Z_SERIAL_RX_PIN 75
- #define Z_SERIAL_TX_PIN 79
- #define E0_SERIAL_RX_PIN 77
- #define E0_SERIAL_TX_PIN 81
- #define E1_SERIAL_RX_PIN 76
- #define E1_SERIAL_TX_PIN 80
- #define E2_SERIAL_RX_PIN 62
- #define E2_SERIAL_TX_PIN 82
+ #define X_SERIAL_RX_PIN 72
+ #define X_SERIAL_TX_PIN 71
+ #define Y_SERIAL_RX_PIN 73
+ #define Y_SERIAL_TX_PIN 78
+ #define Z_SERIAL_RX_PIN 75
+ #define Z_SERIAL_TX_PIN 79
+ #define E0_SERIAL_RX_PIN 77
+ #define E0_SERIAL_TX_PIN 81
+ #define E1_SERIAL_RX_PIN 76
+ #define E1_SERIAL_TX_PIN 80
+ #define E2_SERIAL_RX_PIN 62
+ #define E2_SERIAL_TX_PIN 82
#endif
#include "pins_FYSETC_F6_13.h"
diff --git a/Marlin/src/pins/ramps/pins_K8200.h b/Marlin/src/pins/ramps/pins_K8200.h
index 41cc4dfbf8..6052232907 100644
--- a/Marlin/src/pins/ramps/pins_K8200.h
+++ b/Marlin/src/pins/ramps/pins_K8200.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index a47d21c914..4c5ba7eca1 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,8 +40,8 @@
//
// Limit Switches
//
-#define X_STOP_PIN 3
-#define Y_STOP_PIN 14
+#define X_STOP_PIN 3
+#define Y_STOP_PIN 14
#undef X_MIN_PIN
#undef X_MAX_PIN
@@ -52,13 +52,13 @@
// Steppers
//
#undef E1_STEP_PIN
-#define E1_STEP_PIN 32
+#define E1_STEP_PIN 32
//
// Heaters / Fans
//
#undef HEATER_1_PIN
-#define HEATER_1_PIN 11
+#define HEATER_1_PIN 11
//
// Misc. Functions
@@ -69,5 +69,5 @@
#if Z_STEP_PIN == 26
#undef Z_STEP_PIN
- #define Z_STEP_PIN 32
+ #define Z_STEP_PIN 32
#endif
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index bfc61d0182..09f35b1fe0 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,73 +37,73 @@
//
// Limit Switches
//
-#define X_STOP_PIN 3
-#define Y_STOP_PIN 14
-#define Z_MIN_PIN 68 // Used for bed leveling
-#define Z_MAX_PIN 66
+#define X_STOP_PIN 3
+#define Y_STOP_PIN 14
+#define Z_MIN_PIN 68 // Used for bed leveling
+#define Z_MAX_PIN 66
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 63
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 63
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
-#define E1_STEP_PIN 32
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 32
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13
+#define TEMP_0_PIN 13
//
// Heaters / Fans
//
-#define HEATER_0_PIN 10
-#define FAN_PIN 8
-#define CONTROLLER_FAN_PIN 9
+#define HEATER_0_PIN 10
+#define FAN_PIN 8
+#define CONTROLLER_FAN_PIN 9
//
// Misc. Functions
//
-#define SDSS 25
+#define SDSS 25
-#define FIL_RUNOUT_PIN 69 // PK7
-#define KILL_PIN 20 // PD1
+#define FIL_RUNOUT_PIN 69 // PK7
+#define KILL_PIN 20 // PD1
//
// LCD / Controller
//
-#define SD_DETECT_PIN 21 // PD0
-#define LCD_SDSS 53
-#define BEEPER_PIN 6
+#define SD_DETECT_PIN 21 // PD0
+#define LCD_SDSS 53
+#define BEEPER_PIN 6
-#define DOGLCD_CS 29
-#define DOGLCD_A0 27
+#define DOGLCD_CS 29
+#define DOGLCD_A0 27
-#define LCD_PINS_RS 27
-#define LCD_PINS_ENABLE 29
-#define LCD_PINS_D4 37
-#define LCD_PINS_D5 35
-#define LCD_PINS_D6 33
-#define LCD_PINS_D7 31
+#define LCD_PINS_RS 27
+#define LCD_PINS_ENABLE 29
+#define LCD_PINS_D4 37
+#define LCD_PINS_D5 35
+#define LCD_PINS_D6 33
+#define LCD_PINS_D7 31
#if ENABLED(NEWPANEL)
- #define BTN_EN1 17
- #define BTN_EN2 16
- #define BTN_ENC 23
+ #define BTN_EN1 17
+ #define BTN_EN2 16
+ #define BTN_ENC 23
#endif
diff --git a/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h b/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
index 66dddbef45..6a31142450 100644
--- a/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
+++ b/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE.h b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
similarity index 74%
rename from Marlin/src/pins/ramps/pins_MKS_BASE.h
rename to Marlin/src/pins/ramps/pins_MKS_BASE_10.h
index 75c7eb2848..b1010482c1 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,20 +32,6 @@
#endif
#define BOARD_INFO_NAME "MKS BASE 1.0"
+#define MKS_BASE_VERSION 10
-//
-// Heaters / Fans
-//
-// Power outputs EFBF or EFBE
-#define MOSFET_D_PIN 7
-
-#define CASE_LIGHT_PIN 2
-
-//
-// M3/M4/M5 - Spindle/Laser Control
-//
-#define SPINDLE_LASER_PWM_PIN 2 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 15 // Pullup!
-#define SPINDLE_DIR_PIN 19
-
-#include "pins_RAMPS.h"
+#include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index 700e2a410c..057b51a584 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
#pragma once
/**
- * MKS BASE v1.4
+ * MKS BASE v1.4 with A4982 stepper drivers and digital micro-stepping
*/
#if HOTENDS > 2 || E_STEPPERS > 2
@@ -30,52 +30,31 @@
#endif
#define BOARD_INFO_NAME "MKS BASE 1.4"
+#define MKS_BASE_VERSION 14
//
// Heaters / Fans
//
-#define MOSFET_D_PIN 7 // PH4 ** Pin16 ** PWM7 //E1
-#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9
+#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9
// Other Mods
-#define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11
-#define SERVO3_PIN 12 // PB6 ** Pin25 ** D12
-#define PS_ON_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
-#define FILWIDTH_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
-#define FIL_RUNOUT_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX
-
-//
-// M3/M4/M5 - Spindle/Laser Control
-//
-#define SPINDLE_LASER_PWM_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENA_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
-#define SPINDLE_DIR_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX
-
-//
-// Microstepping pins
-//
-#define X_MS1_PIN 5 // PE3 ** Pin5 ** PWM5
-#define X_MS2_PIN 6 // PH3 ** Pin15 ** PWM6
-#define Y_MS1_PIN 59 // PF5 ** Pin92 ** A5
-#define Y_MS2_PIN 58 // PF4 ** Pin93 ** A4
-#define Z_MS1_PIN 22 // PA0 ** Pin78 ** D22
-#define Z_MS2_PIN 39 // PG2 ** Pin70 ** D39
-#define E0_MS1_PIN 64 // PK2 ** Pin87 ** A10
-#define E0_MS2_PIN 63 // PK1 ** Pin88 ** A9
-#define E1_MS1_PIN 57 // PF3 ** Pin94 ** A3
-#define E1_MS2_PIN 4 // PG5 ** Pin1 ** PWM4
+#define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11
+#define SERVO3_PIN 12 // PB6 ** Pin25 ** D12
+#define PS_ON_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
+#define FILWIDTH_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
+#define FIL_RUNOUT_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 50
+ #define RGB_LED_R_PIN 50
#endif
#ifndef RGB_LED_R_PIN
- #define RGB_LED_G_PIN 51
+ #define RGB_LED_G_PIN 51
#endif
#ifndef RGB_LED_R_PIN
- #define RGB_LED_B_PIN 52
+ #define RGB_LED_B_PIN 52
#endif
-#include "pins_RAMPS.h"
+#include "pins_MKS_BASE_common.h"
/*
Available connectors on MKS BASE v1.4
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
index 12629706f3..683c6b7d0e 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,18 +25,11 @@
* MKS BASE v1.5 with A4982 stepper drivers and digital micro-stepping
*/
-#include "pins_MKS_BASE.h"
+#if HOTENDS > 2 || E_STEPPERS > 2
+ #error "MKS BASE 1.5 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
-/**
- * Microstepping pins
- */
-#define X_MS1_PIN 5 // Digital 3 / Pin 5 / PE3 / SERVO2_PIN
-#define X_MS2_PIN 6 // Digital 6 / Pin 14 / PH3 / SERVO1_PIN
-#define Y_MS1_PIN 59 // Analog 5 / Pin 92 / PF5
-#define Y_MS2_PIN 58 // Analog 4 / Pin 93 / PF4
-#define Z_MS1_PIN 22 // Digital 22 / Pin 78 / PA0
-#define Z_MS2_PIN 39 // Digital 39 / Pin 70 / PG2
-#define E0_MS1_PIN 63 // Analog 9 / Pin 86 / PK1
-#define E0_MS2_PIN 64 // Analog 10 / Pin 87 / PK2
-#define E1_MS1_PIN 57 // Analog 3 / Pin 93 / PF3
-#define E1_MS2_PIN 4 // Digital 4 / Pin 1 / PG5 / SERVO3_PIN
+#define BOARD_INFO_NAME "MKS BASE 1.5"
+#define MKS_BASE_VERSION 15
+
+#include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
new file mode 100644
index 0000000000..b769d655d6
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -0,0 +1,59 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * MKS BASE v1.6 with A4982 stepper drivers and digital micro-stepping
+ */
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+ #error "MKS BASE 1.6 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS BASE 1.6"
+#define MKS_BASE_VERSION 16
+
+//
+// Servos
+//
+#define SERVO1_PIN 12 // Digital 12 / Pin 25
+
+//
+// Omitted RAMPS pins
+//
+#ifndef SERVO2_PIN
+ #define SERVO2_PIN -1
+#endif
+#ifndef SERVO3_PIN
+ #define SERVO3_PIN -1
+#endif
+#ifndef FILWIDTH_PIN
+ #define FILWIDTH_PIN -1
+#endif
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN -1
+#endif
+#ifndef PS_ON_PIN
+ #define PS_ON_PIN -1
+#endif
+
+#include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h b/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
index 55448d4c0b..1b06657f09 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
new file mode 100644
index 0000000000..2d06171906
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
@@ -0,0 +1,75 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * MKS BASE – Arduino Mega2560 with RAMPS pin assignments
+ */
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "MKS BASE"
+#endif
+
+#if MKS_BASE_VERSION >= 14
+ //
+ // Heaters / Fans
+ //
+ // Power outputs EFBF or EFBE
+ #define MOSFET_D_PIN 7
+
+ //
+ // M3/M4/M5 - Spindle/Laser Control
+ //
+ #if HAS_CUTTER
+ #define SPINDLE_LASER_PWM_PIN 2 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 15 // Pullup!
+ #define SPINDLE_DIR_PIN 19
+ #endif
+
+ #ifndef CASE_LIGHT_PIN
+ #define CASE_LIGHT_PIN 2
+ #endif
+
+#endif
+
+//
+// Microstepping pins
+//
+#if MKS_BASE_VERSION >= 14 // |===== 1.4 =====|===== 1.5+ =====|
+ #define X_MS1_PIN 5 // PE3 | Pin 5 | PWM5 | | D3 | SERVO2_PIN
+ #define X_MS2_PIN 6 // PH3 | Pin 15 | PWM6 | Pin 14 | D6 | SERVO1_PIN
+ #define Y_MS1_PIN 59 // PF5 | Pin 92 | A5 | | |
+ #define Y_MS2_PIN 58 // PF4 | Pin 93 | A4 | | |
+ #define Z_MS1_PIN 22 // PA0 | Pin 78 | D22 | | |
+ #define Z_MS2_PIN 39 // PG2 | Pin 70 | D39 | | |
+ #if MKS_BASE_VERSION == 14
+ #define E0_MS1_PIN 64 // PK2 | Pin 87 | A10 | | |
+ #define E0_MS2_PIN 63 // PK1 | Pin 88 | A9 | | |
+ #else
+ #define E0_MS1_PIN 63 // PK1 | | | Pin 86 | A9 |
+ #define E0_MS2_PIN 64 // PK2 | | | Pin 87 | A10 |
+ #endif
+ #define E1_MS1_PIN 57 // PF3 | Pin 94 | A3 | Pin 93 | A3 |
+ #define E1_MS2_PIN 4 // PG5 | Pin 1 | PWM4 | | D4 | SERVO3_PIN
+#endif
+
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 9596214cb2..c4c90ba6fa 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,7 +40,7 @@
// Heaters / Fans
//
// Power outputs EFBF or EFBE
-#define MOSFET_D_PIN 7
+#define MOSFET_D_PIN 7
//
// PSU / SERVO
@@ -48,8 +48,8 @@
// If PSU_CONTROL is specified, always hijack Servo 3
//
#if ENABLED(PSU_CONTROL)
- #define SERVO3_PIN -1
- #define PS_ON_PIN 4
+ #define SERVO3_PIN -1
+ #define PS_ON_PIN 4
#endif
#include "pins_RAMPS.h"
@@ -104,44 +104,44 @@
//
// orange/white SDCD
- #define SD_DETECT_PIN 49
+ #define SD_DETECT_PIN 49
// white ENCA
- #define BTN_EN1 35
+ #define BTN_EN1 35
// green ENCB
- #define BTN_EN2 37
+ #define BTN_EN2 37
// purple ENCBTN
- #define BTN_ENC 31
+ #define BTN_ENC 31
// brown A0
- #define DOGLCD_A0 27
+ #define DOGLCD_A0 27
// green/white LCS
- #define DOGLCD_CS 29
+ #define DOGLCD_CS 29
// 50 gray MISO
// 51 yellow MOSI
// 52 orange SCK
// blue SDCS
- //#define SDSS 53
+ //#define SDSS 53
//
// VIKI2 4-wire lead
//
// blue BTN
- #define KILL_PIN 23
+ #define KILL_PIN 23
// green BUZZER
- #define BEEPER_PIN 25
+ #define BEEPER_PIN 25
// yellow RED-LED
- #define STAT_LED_RED_PIN 16
+ #define STAT_LED_RED_PIN 16
// white BLUE-LED
- #define STAT_LED_BLUE_PIN 17
+ #define STAT_LED_BLUE_PIN 17
#endif
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
index 88973baa1a..ea45f91238 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
index ff1314b2bf..3236627c3b 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,7 +35,7 @@
// Heaters / Fans
//
// Power outputs EFBF or EFBE
-#define MOSFET_D_PIN 7
+#define MOSFET_D_PIN 7
//
// CS Pins wired to avoid conflict with the LCD
@@ -43,47 +43,47 @@
//
#ifndef X_CS_PIN
- #define X_CS_PIN 63
+ #define X_CS_PIN 63
#endif
#ifndef Y_CS_PIN
- #define Y_CS_PIN 64
+ #define Y_CS_PIN 64
#endif
#ifndef Z_CS_PIN
- #define Z_CS_PIN 65
+ #define Z_CS_PIN 65
#endif
#ifndef E0_CS_PIN
- #define E0_CS_PIN 66
+ #define E0_CS_PIN 66
#endif
#ifndef E1_CS_PIN
- #define E1_CS_PIN 21
+ #define E1_CS_PIN 21
#endif
// TMC2130 Diag Pins (currently just for reference)
-#define X_DIAG_PIN 3
-#define Y_DIAG_PIN 14
-#define Z_DIAG_PIN 18
-#define E0_DIAG_PIN 2
-#define E1_DIAG_PIN 15
+#define X_DIAG_PIN 3
+#define Y_DIAG_PIN 14
+#define Z_DIAG_PIN 18
+#define E0_DIAG_PIN 2
+#define E1_DIAG_PIN 15
#ifndef SERVO1_PIN
- #define SERVO1_PIN 12
+ #define SERVO1_PIN 12
#endif
#ifndef SERVO2_PIN
- #define SERVO2_PIN 39
+ #define SERVO2_PIN 39
#endif
#ifndef SERVO3_PIN
- #define SERVO3_PIN 32
+ #define SERVO3_PIN 32
#endif
#ifndef E1_SERIAL_TX_PIN
- #define E1_SERIAL_TX_PIN 20
+ #define E1_SERIAL_TX_PIN 20
#endif
#ifndef E1_SERIAL_RX_PIN
- #define E1_SERIAL_RX_PIN 21
+ #define E1_SERIAL_RX_PIN 21
#endif
#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index f6ccff24f6..ffe7f7bb1e 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -66,19 +66,19 @@
//
#ifndef SERVO0_PIN
#ifdef IS_RAMPS_13
- #define SERVO0_PIN 7
+ #define SERVO0_PIN 7
#else
- #define SERVO0_PIN 11
+ #define SERVO0_PIN 11
#endif
#endif
#ifndef SERVO1_PIN
- #define SERVO1_PIN 6
+ #define SERVO1_PIN 6
#endif
#ifndef SERVO2_PIN
- #define SERVO2_PIN 5
+ #define SERVO2_PIN 5
#endif
#ifndef SERVO3_PIN
- #define SERVO3_PIN 4
+ #define SERVO3_PIN 4
#endif
//
@@ -86,26 +86,26 @@
//
#ifndef X_STOP_PIN
#ifndef X_MIN_PIN
- #define X_MIN_PIN 3
+ #define X_MIN_PIN 3
#endif
#ifndef X_MAX_PIN
- #define X_MAX_PIN 2
+ #define X_MAX_PIN 2
#endif
#endif
#ifndef Y_STOP_PIN
#ifndef Y_MIN_PIN
- #define Y_MIN_PIN 14
+ #define Y_MIN_PIN 14
#endif
#ifndef Y_MAX_PIN
- #define Y_MAX_PIN 15
+ #define Y_MAX_PIN 15
#endif
#endif
#ifndef Z_STOP_PIN
#ifndef Z_MIN_PIN
- #define Z_MIN_PIN 18
+ #define Z_MIN_PIN 18
#endif
#ifndef Z_MAX_PIN
- #define Z_MAX_PIN 19
+ #define Z_MAX_PIN 19
#endif
#endif
@@ -113,65 +113,67 @@
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN 53
+ #define X_CS_PIN 53
#endif
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN
- #define Y_CS_PIN 49
+ #define Y_CS_PIN 49
#endif
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
+#ifndef Z_STEP_PIN
+ #define Z_STEP_PIN 46
+#endif
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 62
#ifndef Z_CS_PIN
- #define Z_CS_PIN 40
+ #define Z_CS_PIN 40
#endif
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
#ifndef E0_CS_PIN
- #define E0_CS_PIN 42
+ #define E0_CS_PIN 42
#endif
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
#ifndef E1_CS_PIN
- #define E1_CS_PIN 44
+ #define E1_CS_PIN 44
#endif
//
// Temperature Sensors
//
#ifndef TEMP_0_PIN
- #define TEMP_0_PIN 13 // Analog Input
+ #define TEMP_0_PIN 13 // Analog Input
#endif
#ifndef TEMP_1_PIN
- #define TEMP_1_PIN 15 // Analog Input
+ #define TEMP_1_PIN 15 // Analog Input
#endif
#ifndef TEMP_BED_PIN
- #define TEMP_BED_PIN 14 // Analog Input
+ #define TEMP_BED_PIN 14 // Analog Input
#endif
+//
// SPI for Max6675 or Max31855 Thermocouple
-#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
-#else
- #define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+//
+#ifndef MAX6675_SS_PIN
+ #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
#endif
//
@@ -195,74 +197,74 @@
// Heaters / Fans
//
#ifndef MOSFET_D_PIN
- #define MOSFET_D_PIN -1
+ #define MOSFET_D_PIN -1
#endif
#ifndef RAMPS_D8_PIN
- #define RAMPS_D8_PIN 8
+ #define RAMPS_D8_PIN 8
#endif
#ifndef RAMPS_D9_PIN
- #define RAMPS_D9_PIN 9
+ #define RAMPS_D9_PIN 9
#endif
#ifndef RAMPS_D10_PIN
- #define RAMPS_D10_PIN 10
+ #define RAMPS_D10_PIN 10
#endif
-#define HEATER_0_PIN RAMPS_D10_PIN
+#define HEATER_0_PIN RAMPS_D10_PIN
-#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
- #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
- #define HEATER_1_PIN RAMPS_D9_PIN
-#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
- #define HEATER_1_PIN RAMPS_D9_PIN
- #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
- #define FAN1_PIN RAMPS_D8_PIN
-#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
- #define HEATER_BED_PIN RAMPS_D8_PIN
+#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
+ #define HEATER_BED_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
+ #define HEATER_1_PIN RAMPS_D9_PIN
+#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
+ #define HEATER_1_PIN RAMPS_D9_PIN
+ #define HEATER_BED_PIN RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
+ #define FAN1_PIN RAMPS_D8_PIN
+#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+ #define HEATER_BED_PIN RAMPS_D8_PIN
#if HOTENDS == 1
- #define FAN1_PIN MOSFET_D_PIN
+ #define FAN1_PIN MOSFET_D_PIN
#else
- #define HEATER_1_PIN MOSFET_D_PIN
+ #define HEATER_1_PIN MOSFET_D_PIN
#endif
#endif
#ifndef FAN_PIN
#if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
- #define FAN_PIN RAMPS_D9_PIN
+ #define FAN_PIN RAMPS_D9_PIN
#elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF) // Hotend, Hotend, Fan or Spindle, Fan
- #define FAN_PIN RAMPS_D8_PIN
- #elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
- #define FAN_PIN 4 // IO pin. Buffer needed
- #else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
- #define FAN_PIN RAMPS_D9_PIN
+ #define FAN_PIN RAMPS_D8_PIN
+ #elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
+ #define FAN_PIN 4 // IO pin. Buffer needed
+ #else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+ #define FAN_PIN RAMPS_D9_PIN
#endif
#endif
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
+#define SDSS 53
+#define LED_PIN 13
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 5 // Analog Input on AUX2
+ #define FILWIDTH_PIN 5 // Analog Input on AUX2
#endif
// RAMPS 1.4 DIO 4 on the servos connector
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 4
+ #define FIL_RUNOUT_PIN 4
#endif
#ifndef PS_ON_PIN
- #define PS_ON_PIN 12
+ #define PS_ON_PIN 12
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
- #if NUM_SERVOS <= 1 // Prefer the servo connector
- #define CASE_LIGHT_PIN 6 // Hardware PWM
+ #if NUM_SERVOS <= 1 // Prefer the servo connector
+ #define CASE_LIGHT_PIN 6 // Hardware PWM
#elif HAS_FREE_AUX2_PINS
- #define CASE_LIGHT_PIN 44 // Hardware PWM
+ #define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
@@ -270,14 +272,14 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
- #if !NUM_SERVOS // Use servo connector if possible
- #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
- #define SPINDLE_DIR_PIN 5
+ #if !NUM_SERVOS // Use servo connector if possible
+ #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
+ #define SPINDLE_DIR_PIN 5
#elif HAS_FREE_AUX2_PINS
- #define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
- #define SPINDLE_DIR_PIN 65
+ #define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+ #define SPINDLE_DIR_PIN 65
#else
#error "No auto-assignable Spindle/Laser pins available."
#endif
@@ -288,28 +290,28 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI 66
+ #define TMC_SW_MOSI 66
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO 44
+ #define TMC_SW_MISO 44
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK 64
+ #define TMC_SW_SCK 64
#endif
#endif
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
* Hardware serial communication ports.
* If undefined software serial is used according to the pins below
*/
- //#define X_HARDWARE_SERIAL Serial1
+ //#define X_HARDWARE_SERIAL Serial1
//#define X2_HARDWARE_SERIAL Serial1
- //#define Y_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
//#define Y2_HARDWARE_SERIAL Serial1
- //#define Z_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
//#define Z2_HARDWARE_SERIAL Serial1
//#define E0_HARDWARE_SERIAL Serial1
//#define E1_HARDWARE_SERIAL Serial1
@@ -322,73 +324,91 @@
//
#ifndef X_SERIAL_TX_PIN
- #define X_SERIAL_TX_PIN 40
+ #define X_SERIAL_TX_PIN 40
#endif
#ifndef X_SERIAL_RX_PIN
- #define X_SERIAL_RX_PIN 63
+ #define X_SERIAL_RX_PIN 63
#endif
#ifndef X2_SERIAL_TX_PIN
- #define X2_SERIAL_TX_PIN -1
+ #define X2_SERIAL_TX_PIN -1
#endif
#ifndef X2_SERIAL_RX_PIN
- #define X2_SERIAL_RX_PIN -1
+ #define X2_SERIAL_RX_PIN -1
#endif
#ifndef Y_SERIAL_TX_PIN
- #define Y_SERIAL_TX_PIN 59
+ #define Y_SERIAL_TX_PIN 59
#endif
#ifndef Y_SERIAL_RX_PIN
- #define Y_SERIAL_RX_PIN 64
+ #define Y_SERIAL_RX_PIN 64
#endif
#ifndef Y2_SERIAL_TX_PIN
- #define Y2_SERIAL_TX_PIN -1
+ #define Y2_SERIAL_TX_PIN -1
#endif
#ifndef Y2_SERIAL_RX_PIN
- #define Y2_SERIAL_RX_PIN -1
+ #define Y2_SERIAL_RX_PIN -1
#endif
#ifndef Z_SERIAL_TX_PIN
- #define Z_SERIAL_TX_PIN 42
+ #define Z_SERIAL_TX_PIN 42
#endif
#ifndef Z_SERIAL_RX_PIN
- #define Z_SERIAL_RX_PIN 65
+ #define Z_SERIAL_RX_PIN 65
#endif
#ifndef Z2_SERIAL_TX_PIN
- #define Z2_SERIAL_TX_PIN -1
+ #define Z2_SERIAL_TX_PIN -1
#endif
#ifndef Z2_SERIAL_RX_PIN
- #define Z2_SERIAL_RX_PIN -1
+ #define Z2_SERIAL_RX_PIN -1
#endif
#ifndef E0_SERIAL_TX_PIN
- #define E0_SERIAL_TX_PIN 44
+ #define E0_SERIAL_TX_PIN 44
#endif
#ifndef E0_SERIAL_RX_PIN
- #define E0_SERIAL_RX_PIN 66
+ #define E0_SERIAL_RX_PIN 66
#endif
#ifndef E1_SERIAL_TX_PIN
- #define E1_SERIAL_TX_PIN -1
+ #define E1_SERIAL_TX_PIN -1
#endif
#ifndef E1_SERIAL_RX_PIN
- #define E1_SERIAL_RX_PIN -1
+ #define E1_SERIAL_RX_PIN -1
#endif
#ifndef E2_SERIAL_TX_PIN
- #define E2_SERIAL_TX_PIN -1
+ #define E2_SERIAL_TX_PIN -1
#endif
#ifndef E2_SERIAL_RX_PIN
- #define E2_SERIAL_RX_PIN -1
+ #define E2_SERIAL_RX_PIN -1
#endif
#ifndef E3_SERIAL_TX_PIN
- #define E3_SERIAL_TX_PIN -1
+ #define E3_SERIAL_TX_PIN -1
#endif
#ifndef E3_SERIAL_RX_PIN
- #define E3_SERIAL_RX_PIN -1
+ #define E3_SERIAL_RX_PIN -1
#endif
#ifndef E4_SERIAL_TX_PIN
- #define E4_SERIAL_TX_PIN -1
+ #define E4_SERIAL_TX_PIN -1
#endif
#ifndef E4_SERIAL_RX_PIN
- #define E4_SERIAL_RX_PIN -1
+ #define E4_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_TX_PIN
+ #define E5_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_RX_PIN
+ #define E5_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_TX_PIN
+ #define E6_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_RX_PIN
+ #define E6_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_TX_PIN
+ #define E7_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_RX_PIN
+ #define E7_SERIAL_RX_PIN -1
#endif
#endif
@@ -396,13 +416,13 @@
// Průša i3 MK2 Multiplexer Support
//
#ifndef E_MUX0_PIN
- #define E_MUX0_PIN 40 // Z_CS_PIN
+ #define E_MUX0_PIN 40 // Z_CS_PIN
#endif
#ifndef E_MUX1_PIN
- #define E_MUX1_PIN 42 // E0_CS_PIN
+ #define E_MUX1_PIN 42 // E0_CS_PIN
#endif
#ifndef E_MUX2_PIN
- #define E_MUX2_PIN 44 // E1_CS_PIN
+ #define E_MUX2_PIN 44 // E1_CS_PIN
#endif
//////////////////////////
@@ -416,62 +436,62 @@
//
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS 40
- #define LCD_PINS_ENABLE 42
- #define LCD_PINS_D4 65
- #define LCD_PINS_D5 66
- #define LCD_PINS_D6 44
- #define LCD_PINS_D7 64
+ #define LCD_PINS_RS 40
+ #define LCD_PINS_ENABLE 42
+ #define LCD_PINS_D4 65
+ #define LCD_PINS_D5 66
+ #define LCD_PINS_D6 44
+ #define LCD_PINS_D7 64
#else
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS 27
- #define LCD_PINS_ENABLE 29
- #define LCD_PINS_D4 25
+ #define LCD_PINS_RS 27
+ #define LCD_PINS_ENABLE 29
+ #define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#endif
#elif ENABLED(ZONESTAR_LCD)
- #define LCD_PINS_RS 64
- #define LCD_PINS_ENABLE 44
- #define LCD_PINS_D4 63
- #define LCD_PINS_D5 40
- #define LCD_PINS_D6 42
- #define LCD_PINS_D7 65
+ #define LCD_PINS_RS 64
+ #define LCD_PINS_ENABLE 44
+ #define LCD_PINS_D4 63
+ #define LCD_PINS_D5 40
+ #define LCD_PINS_D6 42
+ #define LCD_PINS_D7 65
#else
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC 25 // Set as output on init
- #define LCD_PINS_RS 27 // Pull low for 1s to init
+ #define LCD_PINS_DC 25 // Set as output on init
+ #define LCD_PINS_RS 27 // Pull low for 1s to init
// DOGM SPI LCD Support
- #define DOGLCD_CS 16
- #define DOGLCD_MOSI 17
- #define DOGLCD_SCK 23
- #define DOGLCD_A0 LCD_PINS_DC
+ #define DOGLCD_CS 16
+ #define DOGLCD_MOSI 17
+ #define DOGLCD_SCK 23
+ #define DOGLCD_A0 LCD_PINS_DC
#else
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
#endif
- #define LCD_PINS_D7 29
+ #define LCD_PINS_D7 29
#if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
#endif
#endif
@@ -479,10 +499,10 @@
#if DISABLED(NEWPANEL)
// Buttons attached to a shift register
// Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
#endif
#endif
@@ -494,99 +514,99 @@
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#if ENABLED(CR10_STOCKDISPLAY)
- #define BTN_EN1 17
- #define BTN_EN2 23
+ #define BTN_EN1 17
+ #define BTN_EN2 23
#else
- #define BTN_EN1 31
- #define BTN_EN2 33
+ #define BTN_EN1 31
+ #define BTN_EN2 33
#endif
- #define BTN_ENC 35
+ #define BTN_ENC 35
#ifndef SD_DETECT_PIN
- #define SD_DETECT_PIN 49
+ #define SD_DETECT_PIN 49
#endif
#ifndef KILL_PIN
- #define KILL_PIN 41
+ #define KILL_PIN 41
#endif
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 39
+ #define LCD_BACKLIGHT_PIN 39
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SD_DETECT_PIN 42
#elif ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS SDSS
- #define KILL_PIN 41
+ #define BTN_EN1 47
+ #define BTN_EN2 43
+ #define BTN_ENC 32
+ #define LCD_SDSS SDSS
+ #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI)
- #define BTN_EN1 40 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 42
- #define BTN_ENC -1
+ #define BTN_EN1 40 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 42
+ #define BTN_ENC -1
- #define LCD_SDSS SDSS
- #define SD_DETECT_PIN 49
+ #define LCD_SDSS SDSS
+ #define SD_DETECT_PIN 49
#elif ANY(VIKI2, miniVIKI)
- #define DOGLCD_CS 45
- #define DOGLCD_A0 44
+ #define DOGLCD_CS 45
+ #define DOGLCD_A0 44
#define LCD_SCREEN_ROT_180
- #define BEEPER_PIN 33
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
+ #define BEEPER_PIN 33
+ #define STAT_LED_RED_PIN 32
+ #define STAT_LED_BLUE_PIN 35
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
+ #define BTN_EN1 22
+ #define BTN_EN2 7
+ #define BTN_ENC 39
- #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
- #define KILL_PIN 31
+ #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
+ #define KILL_PIN 31
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
+ #define DOGLCD_CS 29
+ #define DOGLCD_A0 27
- #define BEEPER_PIN 23
- #define LCD_BACKLIGHT_PIN 33
+ #define BEEPER_PIN 23
+ #define LCD_BACKLIGHT_PIN 33
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
+ #define BTN_EN1 35
+ #define BTN_EN2 37
+ #define BTN_ENC 31
- #define LCD_SDSS SDSS
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
+ #define LCD_SDSS SDSS
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
- #define BEEPER_PIN 37
- #define BTN_ENC 35
- #define SD_DETECT_PIN 49
+ #define BEEPER_PIN 37
+ #define BTN_ENC 35
+ #define SD_DETECT_PIN 49
#ifndef KILL_PIN
- #define KILL_PIN 41
+ #define KILL_PIN 41
#endif
- #if ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6
+ #if ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6
- #define DOGLCD_A0 27
- #define DOGLCD_CS 25
+ #define DOGLCD_A0 27
+ #define DOGLCD_CS 25
// GLCD features
// Uncomment screen orientation
@@ -595,50 +615,50 @@
//#define LCD_SCREEN_ROT_270
// not connected to a pin
- #define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!)
+ #define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!)
- #define BTN_EN1 31
- #define BTN_EN2 33
+ #define BTN_EN1 31
+ #define BTN_EN2 33
#elif ENABLED(FYSETC_MINI_12864)
// From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
- #define DOGLCD_A0 16
- #define DOGLCD_CS 17
+ #define DOGLCD_A0 16
+ #define DOGLCD_CS 17
- #define BTN_EN1 33
- #define BTN_EN2 31
+ #define BTN_EN1 33
+ #define BTN_EN2 31
- //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 25
+ #define RGB_LED_R_PIN 25
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN 27
+ #define RGB_LED_G_PIN 27
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN 29
+ #define RGB_LED_B_PIN 29
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN 25
+ #define NEOPIXEL_PIN 25
#endif
- #endif
+ #endif
#elif ENABLED(MINIPANEL)
- #define BEEPER_PIN 42
+ #define BEEPER_PIN 42
// not connected to a pin
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 66
// GLCD features
// Uncomment screen orientation
@@ -646,16 +666,16 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
+ #define BTN_EN1 40
+ #define BTN_EN2 63
+ #define BTN_ENC 59
- #define SD_DETECT_PIN 49
- #define KILL_PIN 64
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 64
#elif ENABLED(ZONESTAR_LCD)
- #define ADC_KEYPAD_PIN 12
+ #define ADC_KEYPAD_PIN 12
#elif ENABLED(AZSMZ_12864)
@@ -664,32 +684,40 @@
#else
// Beeper on AUX-4
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
// Buttons are directly attached to AUX-2
- #if ENABLED(REPRAPWORLD_KEYPAD)
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
+ #if ENABLED(PANEL_ONE)
+ #define BTN_EN1 59 // AUX2 PIN 3
+ #define BTN_EN2 63 // AUX2 PIN 4
+ #define BTN_ENC 49 // AUX3 PIN 7
#else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
+ #define BTN_EN1 37
+ #define BTN_EN2 35
+ #define BTN_ENC 31
#endif
#if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
#endif
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
+
+#if ENABLED(REPRAPWORLD_KEYPAD)
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
+ #ifndef BTN_EN1
+ #define BTN_EN1 64
+ #endif
+ #ifndef BTN_EN2
+ #define BTN_EN2 59
+ #endif
+ #ifndef BTN_ENC
+ #define BTN_ENC 63
+ #endif
+#endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_13.h b/Marlin/src/pins/ramps/pins_RAMPS_13.h
index 508064e66f..1eb883f4db 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_13.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_13.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index 1328354b7d..f6847feb4b 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -32,31 +32,31 @@
//
// Power outputs EFBF or EFBE
-#define MOSFET_D_PIN 7
+#define MOSFET_D_PIN 7
-#define FIL_RUNOUT_PIN 2
+#define FIL_RUNOUT_PIN 2
#if NUM_RUNOUT_SENSORS > 1
- #define FIL_RUNOUT2_PIN 15 // Creality CR-X can use dual runout sensors
+ #define FIL_RUNOUT2_PIN 15 // Creality CR-X can use dual runout sensors
#endif
-#define SD_DETECT_PIN 49 // Always define onboard SD detect
+#define SD_DETECT_PIN 49 // Always define onboard SD detect
-#define PS_ON_PIN 40 // Used by CR2020 Industrial series
+#define PS_ON_PIN 40 // Used by CR2020 Industrial series
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN)
- #define CASE_LIGHT_PIN 65
+ #define CASE_LIGHT_PIN 65
#endif
#include "pins_RAMPS.h"
#ifndef BEEPER_PIN
- #define BEEPER_PIN 37 // Always define beeper pin so Play Tone works with ExtUI
+ #define BEEPER_PIN 37 // Always define beeper pin so Play Tone works with ExtUI
#endif
-#define EXP1_PIN 65 // A11 - Used by CR2020 Industrial series for case
-#define EXP2_PIN 66 // A12
-#define EXP3_PIN 11 // SERVO0_PIN
-#define EXP4_PIN 12 // PS_ON_PIN
+#define EXP1_PIN 65 // A11 - Used by CR2020 Industrial series for case
+#define EXP2_PIN 66 // A12
+#define EXP3_PIN 11 // SERVO0_PIN
+#define EXP4_PIN 12 // PS_ON_PIN
-#define SUICIDE_PIN 12 // Used by CR2020 Industrial series
-#define SUICIDE_PIN_INVERTING true // Used by CR2020 Industrial series
+#define SUICIDE_PIN 12 // Used by CR2020 Industrial series
+#define SUICIDE_PIN_INVERTING true // Used by CR2020 Industrial series
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
index 43937e2137..b0ba7822ef 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,12 +27,12 @@
#define BOARD_INFO_NAME "Dagoma3D F5 RAMPS"
-#define X_STOP_PIN 2
-#define Y_STOP_PIN 3
-#define Z_STOP_PIN 15
-#define FIL_RUNOUT_PIN 39
+#define X_STOP_PIN 2
+#define Y_STOP_PIN 3
+#define Z_STOP_PIN 15
+#define FIL_RUNOUT_PIN 39
-#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN 7
//
// Import RAMPS 1.4 pins
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
index 0eb3035c1d..d6b08a1d68 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
index a55348fec1..0323366944 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,80 +37,80 @@
//
// Limit Switches
//
-#define X_MIN_PIN 3
-#define X_MAX_PIN 2
-#define Y_MIN_PIN 16
-#define Y_MAX_PIN 17
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define X_MIN_PIN 3
+#define X_MAX_PIN 2
+#define Y_MIN_PIN 16
+#define Y_MAX_PIN 17
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 19
+ #define Z_MIN_PROBE_PIN 19
#endif
//
// Steppers
//
-#define X_STEP_PIN 26
-#define X_DIR_PIN 28
-#define X_ENABLE_PIN 24
+#define X_STEP_PIN 26
+#define X_DIR_PIN 28
+#define X_ENABLE_PIN 24
-#define Y_STEP_PIN 38
-#define Y_DIR_PIN 40
-#define Y_ENABLE_PIN 36
+#define Y_STEP_PIN 38
+#define Y_DIR_PIN 40
+#define Y_ENABLE_PIN 36
-#define Z_STEP_PIN 44
-#define Z_DIR_PIN 46
-#define Z_ENABLE_PIN 42
+#define Z_STEP_PIN 44
+#define Z_DIR_PIN 46
+#define Z_ENABLE_PIN 42
-#define E0_STEP_PIN 32
-#define E0_DIR_PIN 34
-#define E0_ENABLE_PIN 30
+#define E0_STEP_PIN 32
+#define E0_DIR_PIN 34
+#define E0_ENABLE_PIN 30
//
// Temperature Sensors
//
-#define TEMP_0_PIN 2 // Analog Input
-#define TEMP_BED_PIN 1 // Analog Input
+#define TEMP_0_PIN 2 // Analog Input
+#define TEMP_BED_PIN 1 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card
#else
- #define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
#endif
//
// Heaters / Fans
//
#if ENABLED(RAMPS_V_1_0)
- #define HEATER_0_PIN 12
- #define HEATER_BED_PIN -1
+ #define HEATER_0_PIN 12
+ #define HEATER_BED_PIN -1
#ifndef FAN_PIN
- #define FAN_PIN 11
+ #define FAN_PIN 11
#endif
-#else // RAMPS_V_1_1 or RAMPS_V_1_2
- #define HEATER_0_PIN 10
- #define HEATER_BED_PIN 8
+#else // RAMPS_V_1_1 or RAMPS_V_1_2
+ #define HEATER_0_PIN 10
+ #define HEATER_BED_PIN 8
#ifndef FAN_PIN
- #define FAN_PIN 9
+ #define FAN_PIN 9
#endif
#endif
//
// Misc. Functions
//
-#define SDPOWER_PIN 48
-#define SDSS 53
-#define LED_PIN 13
-#define CASE_LIGHT_PIN 45 // Hardware PWM
+#define SDPOWER_PIN 48
+#define SDSS 53
+#define LED_PIN 13
+#define CASE_LIGHT_PIN 45 // Hardware PWM
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 41 // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
-#define SPINDLE_DIR_PIN 43
+#define SPINDLE_LASER_ENA_PIN 41 // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
+#define SPINDLE_DIR_PIN 43
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index 02193a5a03..f93b6dcc86 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -44,8 +44,8 @@
#define BOARD_INFO_NAME "RAMPS 1.4 Plus"
-#define RAMPS_D8_PIN 10
-#define RAMPS_D10_PIN 8
+#define RAMPS_D8_PIN 10
+#define RAMPS_D10_PIN 8
#include "pins_RAMPS.h"
@@ -60,13 +60,13 @@
#undef E1_DIR_PIN
#undef E1_ENABLE_PIN
-#define E0_STEP_PIN 36
-#define E0_DIR_PIN 34
-#define E0_ENABLE_PIN 30
+#define E0_STEP_PIN 36
+#define E0_DIR_PIN 34
+#define E0_ENABLE_PIN 30
-#define E1_STEP_PIN 26
-#define E1_DIR_PIN 28
-#define E1_ENABLE_PIN 24
+#define E1_STEP_PIN 26
+#define E1_DIR_PIN 28
+#define E1_ENABLE_PIN 24
#undef X_CS_PIN
#undef Y_CS_PIN
@@ -77,10 +77,10 @@
#if ENABLED(ULTRA_LCD, REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
#if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
#undef LCD_PINS_RS
- #define LCD_PINS_RS 42 // 3DYMY boards pin 16 -> 42
+ #define LCD_PINS_RS 42 // 3DYMY boards pin 16 -> 42
#undef LCD_PINS_ENABLE
- #define LCD_PINS_ENABLE 44 // 3DYMY boards pin 17 -> 44
+ #define LCD_PINS_ENABLE 44 // 3DYMY boards pin 17 -> 44
#endif
#undef LCD_PINS_D7
- #define LCD_PINS_D7 53 // 3DYMY boards pin 29 -> 53
+ #define LCD_PINS_D7 53 // 3DYMY boards pin 29 -> 53
#endif
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index c69843c621..8e84281754 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -33,15 +33,15 @@
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 19 // Z-MAX pin J14 End Stops
+ #define Z_MIN_PROBE_PIN 19 // Z-MAX pin J14 End Stops
#endif
//
// MOSFET changes
//
-#define RAMPS_D9_PIN 8 // FAN (by default)
-#define RAMPS_D10_PIN 9 // EXTRUDER 1
-#define MOSFET_D_PIN 12 // EXTRUDER 2 or FAN
+#define RAMPS_D9_PIN 8 // FAN (by default)
+#define RAMPS_D10_PIN 9 // EXTRUDER 1
+#define MOSFET_D_PIN 12 // EXTRUDER 2 or FAN
#include "pins_RAMPS.h"
@@ -52,18 +52,18 @@
#undef E0_STEP_PIN
#undef E0_DIR_PIN
#undef E0_ENABLE_PIN
-#define E0_STEP_PIN 36
-#define E0_DIR_PIN 34
-#define E0_ENABLE_PIN 30
+#define E0_STEP_PIN 36
+#define E0_DIR_PIN 34
+#define E0_ENABLE_PIN 30
#undef E1_STEP_PIN
#undef E1_DIR_PIN
#undef E1_ENABLE_PIN
-#define E1_STEP_PIN 26
-#define E1_DIR_PIN 28
-#define E1_ENABLE_PIN 24
+#define E1_STEP_PIN 26
+#define E1_DIR_PIN 28
+#define E1_ENABLE_PIN 24
-#define STEPPER_RESET_PIN 41 // Stepper drivers have a reset on RigidBot
+#define STEPPER_RESET_PIN 41 // Stepper drivers have a reset on RigidBot
//
// Temperature Sensors
@@ -71,33 +71,33 @@
#undef TEMP_0_PIN
#undef TEMP_1_PIN
#undef TEMP_BED_PIN
-#define TEMP_0_PIN 14 // Analog Input
-#define TEMP_1_PIN 13 // Analog Input
-#define TEMP_BED_PIN 15 // Analog Input
+#define TEMP_0_PIN 14 // Analog Input
+#define TEMP_1_PIN 13 // Analog Input
+#define TEMP_BED_PIN 15 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#undef MAX6675_SS_PIN
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
#else
- #define MAX6675_SS_PIN 49 // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 49 // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//
// Heaters / Fans
//
#undef HEATER_BED_PIN
-#define HEATER_BED_PIN 10
+#define HEATER_BED_PIN 10
#ifndef FAN_PIN
- #define FAN_PIN 8 // Same as RAMPS_13_EEF
+ #define FAN_PIN 8 // Same as RAMPS_13_EEF
#endif
//
// Misc. Functions
//
#undef PS_ON_PIN
-#define PS_ON_PIN -1
+#define PS_ON_PIN -1
//
// LCD / Controller
@@ -106,33 +106,33 @@
#if ENABLED(RIGIDBOT_PANEL)
#undef BEEPER_PIN
- #define BEEPER_PIN -1
+ #define BEEPER_PIN -1
// Direction buttons
- #define BTN_UP 37
- #define BTN_DWN 35
- #define BTN_LFT 33
- #define BTN_RT 32
+ #define BTN_UP 37
+ #define BTN_DWN 35
+ #define BTN_LFT 33
+ #define BTN_RT 32
// 'R' button
#undef BTN_ENC
- #define BTN_ENC 31
+ #define BTN_ENC 31
// Disable encoder
#undef BTN_EN1
- #define BTN_EN1 -1
+ #define BTN_EN1 -1
#undef BTN_EN2
- #define BTN_EN2 -1
+ #define BTN_EN2 -1
#undef SD_DETECT_PIN
- #define SD_DETECT_PIN 22
+ #define SD_DETECT_PIN 22
#elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#undef SD_DETECT_PIN
- #define SD_DETECT_PIN 22
+ #define SD_DETECT_PIN 22
#undef KILL_PIN
- #define KILL_PIN 32
+ #define KILL_PIN 32
#endif
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
index 01ccb5927a..d56ab1bb7f 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,12 +40,12 @@
#define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
#define DAC_STEPPER_SENSE 0.05 // sense resistors on rigidboard stepper chips are .05 value
-#define DAC_STEPPER_ADDRESS 0
-#define DAC_STEPPER_MAX 4096 // was 5000 but max allowable value is actually 4096
-#define DAC_STEPPER_VREF 1 // internal Vref, gain 2x = 4.096V
-#define DAC_STEPPER_GAIN 1 // value of 1 here sets gain of 2
-#define DAC_DISABLE_PIN 42 // set low to enable DAC
-#define DAC_OR_ADDRESS 0x01
+#define DAC_STEPPER_ADDRESS 0
+#define DAC_STEPPER_MAX 4096 // was 5000 but max allowable value is actually 4096
+#define DAC_STEPPER_VREF 1 // internal Vref, gain 2x = 4.096V
+#define DAC_STEPPER_GAIN 1 // value of 1 here sets gain of 2
+#define DAC_DISABLE_PIN 42 // set low to enable DAC
+#define DAC_OR_ADDRESS 0x01
#ifndef DAC_MOTOR_CURRENT_DEFAULT
#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
diff --git a/Marlin/src/pins/ramps/pins_RL200.h b/Marlin/src/pins/ramps/pins_RL200.h
index 5bee03bd95..7b0303476b 100644
--- a/Marlin/src/pins/ramps/pins_RL200.h
+++ b/Marlin/src/pins/ramps/pins_RL200.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,16 +37,16 @@
#error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
#endif
-#define E0_STEP_PIN 26 // (RUMBA E1 pins)
-#define E0_DIR_PIN 25
-#define E0_ENABLE_PIN 27
+#define E0_STEP_PIN 26 // (RUMBA E1 pins)
+#define E0_DIR_PIN 25
+#define E0_ENABLE_PIN 27
-#define E1_STEP_PIN 29 // (RUMBA E2 pins)
-#define E1_DIR_PIN 28
-#define E1_ENABLE_PIN 39
+#define E1_STEP_PIN 29 // (RUMBA E2 pins)
+#define E1_DIR_PIN 28
+#define E1_ENABLE_PIN 39
-#define Z2_STEP_PIN 23 // (RUMBA E0 pins)
-#define Z2_DIR_PIN 22
-#define Z2_ENABLE_PIN 24
+#define Z2_STEP_PIN 23 // (RUMBA E0 pins)
+#define Z2_DIR_PIN 22
+#define Z2_ENABLE_PIN 24
#include "pins_RUMBA.h"
diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index cf3bfe226c..4bf10d7399 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -41,56 +41,56 @@
//
// Servos
//
-#define SERVO0_PIN 5
+#define SERVO0_PIN 5
//
// Limit Switches
//
-#define X_MIN_PIN 37
-#define X_MAX_PIN 36
-#define Y_MIN_PIN 35
-#define Y_MAX_PIN 34
-#define Z_MIN_PIN 33
-#define Z_MAX_PIN 32
+#define X_MIN_PIN 37
+#define X_MAX_PIN 36
+#define Y_MIN_PIN 35
+#define Y_MAX_PIN 34
+#define Z_MIN_PIN 33
+#define Z_MAX_PIN 32
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 17
-#define X_DIR_PIN 16
-#define X_ENABLE_PIN 48
+#define X_STEP_PIN 17
+#define X_DIR_PIN 16
+#define X_ENABLE_PIN 48
-#define Y_STEP_PIN 54
-#define Y_DIR_PIN 47
-#define Y_ENABLE_PIN 55
+#define Y_STEP_PIN 54
+#define Y_DIR_PIN 47
+#define Y_ENABLE_PIN 55
-#define Z_STEP_PIN 57
-#define Z_DIR_PIN 56
-#define Z_ENABLE_PIN 62
+#define Z_STEP_PIN 57
+#define Z_DIR_PIN 56
+#define Z_ENABLE_PIN 62
#ifndef E0_STEP_PIN
- #define E0_STEP_PIN 23
- #define E0_DIR_PIN 22
- #define E0_ENABLE_PIN 24
+ #define E0_STEP_PIN 23
+ #define E0_DIR_PIN 22
+ #define E0_ENABLE_PIN 24
#endif
#ifndef E1_STEP_PIN
- #define E1_STEP_PIN 26
- #define E1_DIR_PIN 25
- #define E1_ENABLE_PIN 27
+ #define E1_STEP_PIN 26
+ #define E1_DIR_PIN 25
+ #define E1_ENABLE_PIN 27
#endif
#if E1_STEP_PIN != 29
- #define E2_STEP_PIN 29
- #define E2_DIR_PIN 28
- #define E2_ENABLE_PIN 39
+ #define E2_STEP_PIN 29
+ #define E2_DIR_PIN 28
+ #define E2_ENABLE_PIN 39
#endif
//
@@ -98,134 +98,134 @@
//
#ifndef TEMP_0_PIN
#if TEMP_SENSOR_0 == -1
- #define TEMP_0_PIN 6 // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
+ #define TEMP_0_PIN 6 // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
#else
- #define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used)
+ #define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used)
#endif
#endif
#ifndef TEMP_1_PIN
#if TEMP_SENSOR_1 == -1
- #define TEMP_1_PIN 5 // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
+ #define TEMP_1_PIN 5 // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
#else
- #define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used)
+ #define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used)
#endif
#endif
#if TEMP_SENSOR_2 == -1
- #define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
+ #define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
#else
- #define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used)
+ #define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used)
#endif
// Optional for extruder 4 or chamber:
-//#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
+//#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
#ifndef TEMP_CHAMBER_PIN
- //#define TEMP_CHAMBER_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
+ //#define TEMP_CHAMBER_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
#endif
#if TEMP_SENSOR_BED == -1
- #define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
+ #define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
#else
- #define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used)
+ #define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used)
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 3
-#define HEATER_2_PIN 6
-#define HEATER_3_PIN 8
-#define HEATER_BED_PIN 9
+#define HEATER_0_PIN 2
+#define HEATER_1_PIN 3
+#define HEATER_2_PIN 6
+#define HEATER_3_PIN 8
+#define HEATER_BED_PIN 9
#ifndef FAN_PIN
- #define FAN_PIN 7
+ #define FAN_PIN 7
#endif
#ifndef FAN1_PIN
- #define FAN1_PIN 8
+ #define FAN1_PIN 8
#endif
//
// Misc. Functions
//
-#define LED_PIN 13
-#define PS_ON_PIN 45
-#define KILL_PIN 46
-#define CASE_LIGHT_PIN 45
+#define LED_PIN 13
+#define PS_ON_PIN 45
+#define KILL_PIN 46
+#define CASE_LIGHT_PIN 45
//
// M3/M4/M5 - Spindle/Laser Control
//
#ifndef SPINDLE_LASER_PWM_PIN
- #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
+ #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
#endif
#ifndef SPINDLE_LASER_ENA_PIN
- #define SPINDLE_LASER_ENA_PIN 14 // Pullup!
+ #define SPINDLE_LASER_ENA_PIN 14 // Pullup!
#endif
#ifndef SPINDLE_DIR_PIN
- #define SPINDLE_DIR_PIN 15
+ #define SPINDLE_DIR_PIN 15
#endif
//
// LCD / Controller
//
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC 38 // Set as output on init
- #define LCD_PINS_RS 41 // Pull low for 1s to init
+ #define LCD_PINS_DC 38 // Set as output on init
+ #define LCD_PINS_RS 41 // Pull low for 1s to init
// DOGM SPI LCD Support
- #define DOGLCD_CS 19
- #define DOGLCD_MOSI 42
- #define DOGLCD_SCK 18
- #define DOGLCD_A0 LCD_PINS_DC
+ #define DOGLCD_CS 19
+ #define DOGLCD_MOSI 42
+ #define DOGLCD_SCK 18
+ #define DOGLCD_A0 LCD_PINS_DC
#elif ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS 42
- #define DOGLCD_A0 19
- #define DOGLCD_MOSI 51
- #define DOGLCD_SCK 52
+ #define DOGLCD_CS 42
+ #define DOGLCD_A0 19
+ #define DOGLCD_MOSI 51
+ #define DOGLCD_SCK 52
- //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN 18 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN 18 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 41
+ #define RGB_LED_R_PIN 41
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN 38
+ #define RGB_LED_G_PIN 38
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN 40
+ #define RGB_LED_B_PIN 40
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN 25
+ #define NEOPIXEL_PIN 25
#endif
#else
- #define LCD_PINS_RS 19
- #define LCD_PINS_ENABLE 42
- #define LCD_PINS_D4 18
- #define LCD_PINS_D5 38
- #define LCD_PINS_D6 41
+ #define LCD_PINS_RS 19
+ #define LCD_PINS_ENABLE 42
+ #define LCD_PINS_D4 18
+ #define LCD_PINS_D5 38
+ #define LCD_PINS_D6 41
#endif
-#define LCD_PINS_D7 40
+#define LCD_PINS_D7 40
//
// Beeper, SD Card, Encoder
//
-#define BEEPER_PIN 44
+#define BEEPER_PIN 44
#if ENABLED(SDSUPPORT)
- #define SDSS 53
- #define SD_DETECT_PIN 49
+ #define SDSS 53
+ #define SD_DETECT_PIN 49
#endif
#if ENABLED(NEWPANEL)
- #define BTN_EN1 11
- #define BTN_EN2 12
- #define BTN_ENC 43
+ #define BTN_EN1 11
+ #define BTN_EN2 12
+ #define BTN_ENC 43
#endif
diff --git a/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h b/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
index 0cc4ebb3ba..7dfa747bf4 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
index 27c746ad25..2e94490460 100644
--- a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
+++ b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TANGO.h b/Marlin/src/pins/ramps/pins_TANGO.h
index 2cc8565db2..221b30b0cb 100644
--- a/Marlin/src/pins/ramps/pins_TANGO.h
+++ b/Marlin/src/pins/ramps/pins_TANGO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,24 +27,24 @@
#define BOARD_INFO_NAME "Tango"
-#define FAN_PIN 8
-#define FAN1_PIN -1
+#define FAN_PIN 8
+#define FAN1_PIN -1
-#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN 7
#ifndef TEMP_0_PIN
#if TEMP_SENSOR_0 == -1
- #define TEMP_0_PIN 10 // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
+ #define TEMP_0_PIN 10 // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
#else
- #define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used)
+ #define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used)
#endif
#endif
#ifndef TEMP_1_PIN
#if TEMP_SENSOR_1 == -1
- #define TEMP_1_PIN 9 // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
+ #define TEMP_1_PIN 9 // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
#else
- #define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used)
+ #define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used)
#endif
#endif
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
index fd0b67c88a..c0b8630354 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 031ab8e16b..f32f006e92 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,50 +31,59 @@
// Servos
//
#if MB(TRIGORILLA_14_11)
- #define SERVO0_PIN 5
- #define SERVO1_PIN 4
- #define SERVO2_PIN 11
- #define SERVO3_PIN 6
+ #define SERVO0_PIN 5
+ #define SERVO1_PIN 4
+ #define SERVO2_PIN 11
+ #define SERVO3_PIN 6
+#endif
+
+//
+// Custom Limit Switches
+//
+//#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
+#if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
+ #define X_MAX_PIN 43
+ #define Y_MIN_PIN 19
#endif
// Labeled pins
-#define TRIGORILLA_HEATER_BED_PIN 8
-#define TRIGORILLA_HEATER_0_PIN 10
-#define TRIGORILLA_HEATER_1_PIN 45 // Anycubic Kossel: Unused
+#define TG_HEATER_BED_PIN 8
+#define TG_HEATER_0_PIN 10
+#define TG_HEATER_1_PIN 45 // Anycubic Kossel: Unused
-#define TRIGORILLA_FAN0_PIN 9 // Anycubic Kossel: Usually the part cooling fan
-#define TRIGORILLA_FAN1_PIN 7 // Anycubic Kossel: Unused
-#define TRIGORILLA_FAN2_PIN 44 // Anycubic Kossel: Hotend fan
+#define TG_FAN0_PIN 9 // Anycubic Kossel: Usually the part cooling fan
+#define TG_FAN1_PIN 7 // Anycubic Kossel: Unused
+#define TG_FAN2_PIN 44 // Anycubic Kossel: Hotend fan
// Remap MOSFET pins to common usages:
-#define RAMPS_D10_PIN TRIGORILLA_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
+#define RAMPS_D10_PIN TG_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
-#if HOTENDS > 1 // EEF and EEB
- #define RAMPS_D9_PIN TRIGORILLA_HEATER_1_PIN
+#if HOTENDS > 1 // EEF and EEB
+ #define RAMPS_D9_PIN TG_HEATER_1_PIN
#if !TEMP_SENSOR_BED
// EEF
- #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN
+ #define RAMPS_D8_PIN TG_FAN0_PIN
#else
// EEB
- #define RAMPS_D8_PIN TRIGORILLA_HEATER_BED_PIN
- #define FAN_PIN TRIGORILLA_FAN0_PIN // Override pin 4 in pins_RAMPS.h
+ #define RAMPS_D8_PIN TG_HEATER_BED_PIN
+ #define FAN_PIN TG_FAN0_PIN // Override pin 4 in pins_RAMPS.h
#endif
#elif TEMP_SENSOR_BED
// EFB (Anycubic Kossel default)
- #define RAMPS_D9_PIN TRIGORILLA_FAN0_PIN
- #define RAMPS_D8_PIN TRIGORILLA_HEATER_BED_PIN
+ #define RAMPS_D9_PIN TG_FAN0_PIN
+ #define RAMPS_D8_PIN TG_HEATER_BED_PIN
#else
// EFF
- #define RAMPS_D9_PIN TRIGORILLA_FAN1_PIN
- #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN
+ #define RAMPS_D9_PIN TG_FAN1_PIN
+ #define RAMPS_D8_PIN TG_FAN0_PIN
#endif
-#if HOTENDS > 1 || TEMP_SENSOR_BED // EEF, EEB, EFB
- #define FAN1_PIN TRIGORILLA_FAN1_PIN
+#if HOTENDS > 1 || TEMP_SENSOR_BED // EEF, EEB, EFB
+ #define FAN1_PIN TG_FAN1_PIN
#endif
-#define FAN2_PIN TRIGORILLA_FAN2_PIN
-#define ORIG_E0_AUTO_FAN_PIN TRIGORILLA_FAN2_PIN // Used in Anycubic Kossel example config
+#define FAN2_PIN TG_FAN2_PIN
+#define ORIG_E0_AUTO_FAN_PIN TG_FAN2_PIN // Used in Anycubic Kossel example config
#include "pins_RAMPS.h"
@@ -87,25 +96,25 @@
// LCD Display output pins
#if BOTH(NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D6
- #define LCD_PINS_D6 57
+ #define LCD_PINS_D6 57
#endif
// LCD Display input pins
#if ENABLED(NEWPANEL)
#if ANY(VIKI2, miniVIKI)
#undef DOGLCD_A0
- #define DOGLCD_A0 23
+ #define DOGLCD_A0 23
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#undef BEEPER_PIN
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
#undef LCD_BACKLIGHT_PIN
- #define LCD_BACKLIGHT_PIN 67
+ #define LCD_BACKLIGHT_PIN 67
#endif
#elif ENABLED(MINIPANEL)
#undef BEEPER_PIN
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
#undef DOGLCD_A0
- #define DOGLCD_A0 42
+ #define DOGLCD_A0 42
#endif
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h b/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
index 48b510d8c2..92ed852867 100644
--- a/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
+++ b/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 1c40729a87..f5c79d0b57 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,72 +34,72 @@
//
// Servos
//
-#define SERVO0_PIN 11
-#define SERVO1_PIN 12
-#define SERVO2_PIN 5
-#define SERVO3_PIN 4
+#define SERVO0_PIN 11
+#define SERVO1_PIN 12
+#define SERVO2_PIN 5
+#define SERVO3_PIN 4
//
// Limit Switches
//
-#define X_MIN_PIN 3
-#define X_MAX_PIN 2
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define X_MIN_PIN 3
+#define X_MAX_PIN 2
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN SERVO3_PIN
+ #define Z_MIN_PROBE_PIN SERVO3_PIN
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
-#define X_CS_PIN 57
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
+#define X_CS_PIN 57
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
-#define Y_CS_PIN 58
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
+#define Y_CS_PIN 58
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
-#define Z_CS_PIN 53
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 62
+#define Z_CS_PIN 53
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
-#define E0_CS_PIN 49
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
+#define E0_CS_PIN 49
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
-#define E1_CS_PIN E0_CS_PIN
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
+#define E1_CS_PIN E0_CS_PIN
-#define E2_STEP_PIN 63
-#define E2_DIR_PIN 22
-#define E2_ENABLE_PIN 59
-#define E2_CS_PIN E0_CS_PIN
+#define E2_STEP_PIN 63
+#define E2_DIR_PIN 22
+#define E2_ENABLE_PIN 59
+#define E2_CS_PIN E0_CS_PIN
-#define E3_STEP_PIN 32
-#define E3_DIR_PIN 40
-#define E3_ENABLE_PIN 39
-#define E3_CS_PIN E0_CS_PIN
+#define E3_STEP_PIN 32
+#define E3_DIR_PIN 40
+#define E3_ENABLE_PIN 39
+#define E3_CS_PIN E0_CS_PIN
-#define E4_STEP_PIN 43
-#define E4_DIR_PIN 42
-#define E4_ENABLE_PIN 47
-#define E4_CS_PIN E0_CS_PIN
+#define E4_STEP_PIN 43
+#define E4_DIR_PIN 42
+#define E4_ENABLE_PIN 47
+#define E4_CS_PIN E0_CS_PIN
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -122,31 +122,34 @@
// Software serial
//
- #define X_SERIAL_TX_PIN -1 // 59
- #define X_SERIAL_RX_PIN -1 // 63
- #define X2_SERIAL_TX_PIN -1
- #define X2_SERIAL_RX_PIN -1
+ #define X_SERIAL_TX_PIN -1 // 59
+ #define X_SERIAL_RX_PIN -1 // 63
+ #define X2_SERIAL_TX_PIN -1
+ #define X2_SERIAL_RX_PIN -1
- #define Y_SERIAL_TX_PIN -1 // 64
- #define Y_SERIAL_RX_PIN -1 // 40
- #define Y2_SERIAL_TX_PIN -1
- #define Y2_SERIAL_RX_PIN -1
+ #define Y_SERIAL_TX_PIN -1 // 64
+ #define Y_SERIAL_RX_PIN -1 // 40
+ #define Y2_SERIAL_TX_PIN -1
+ #define Y2_SERIAL_RX_PIN -1
- #define Z_SERIAL_TX_PIN -1 // 44
- #define Z_SERIAL_RX_PIN -1 // 42
- #define Z2_SERIAL_TX_PIN -1
- #define Z2_SERIAL_RX_PIN -1
+ #define Z_SERIAL_TX_PIN -1 // 44
+ #define Z_SERIAL_RX_PIN -1 // 42
+ #define Z2_SERIAL_TX_PIN -1
+ #define Z2_SERIAL_RX_PIN -1
- #define E0_SERIAL_TX_PIN -1 // 66
- #define E0_SERIAL_RX_PIN -1 // 65
- #define E1_SERIAL_TX_PIN -1
- #define E1_SERIAL_RX_PIN -1
- #define E2_SERIAL_TX_PIN -1
- #define E2_SERIAL_RX_PIN -1
- #define E3_SERIAL_TX_PIN -1
- #define E3_SERIAL_RX_PIN -1
- #define E4_SERIAL_TX_PIN -1
- #define E4_SERIAL_RX_PIN -1
+ #define E0_SERIAL_TX_PIN -1 // 66
+ #define E0_SERIAL_RX_PIN -1 // 65
+ #define E1_SERIAL_TX_PIN -1
+ #define E1_SERIAL_RX_PIN -1
+ #define E2_SERIAL_TX_PIN -1
+ #define E2_SERIAL_RX_PIN -1
+ #define E3_SERIAL_TX_PIN -1
+ #define E3_SERIAL_RX_PIN -1
+ #define E4_SERIAL_TX_PIN -1
+ #define E4_SERIAL_RX_PIN -1
+ #define E5_SERIAL_RX_PIN -1
+ #define E6_SERIAL_RX_PIN -1
+ #define E7_SERIAL_RX_PIN -1
#endif
//
@@ -167,72 +170,72 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13
-#define TEMP_1_PIN 15
-#define TEMP_2_PIN 10
-#define TEMP_3_PIN 11
-#define TEMP_BED_PIN 14
+#define TEMP_0_PIN 13
+#define TEMP_1_PIN 15
+#define TEMP_2_PIN 10
+#define TEMP_3_PIN 11
+#define TEMP_BED_PIN 14
#if TEMP_SENSOR_CHAMBER > 0
- #define TEMP_CHAMBER_PIN 12
+ #define TEMP_CHAMBER_PIN 12
#else
- #define TEMP_4_PIN 12
+ #define TEMP_4_PIN 12
#endif
// SPI for Max6675 or Max31855 Thermocouple
//#if DISABLED(SDSUPPORT)
-// #define MAX6675_SS 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
+// #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card
//#else
-// #define MAX6675_SS 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+// #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
//#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 10
-#define HEATER_1_PIN 7
-#define HEATER_2_PIN 44
-#define HEATER_BED_PIN 8
+#define HEATER_0_PIN 10
+#define HEATER_1_PIN 7
+#define HEATER_2_PIN 44
+#define HEATER_BED_PIN 8
-#define FAN_PIN 9
+#define FAN_PIN 9
#if EXTRUDERS >= 5
- #define HEATER_4_PIN 6
+ #define HEATER_4_PIN 6
#else
- #define FAN1_PIN 6
+ #define FAN1_PIN 6
#endif
#if EXTRUDERS >= 4
- #define HEATER_3_PIN 45
+ #define HEATER_3_PIN 45
#else
- #define FAN2_PIN 45
+ #define FAN2_PIN 45
#endif
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
+#define SDSS 53
+#define LED_PIN 13
//#ifndef FILWIDTH_PIN
// #define FILWIDTH_PIN 5 // Analog Input
//#endif
// DIO 4 (Servos plug) for the runout sensor.
-//#define FIL_RUNOUT_PIN SERVO3_PIN
+//#define FIL_RUNOUT_PIN SERVO3_PIN
#ifndef PS_ON_PIN
- #define PS_ON_PIN 12
+ #define PS_ON_PIN 12
#endif
//
// Case Light
//
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
- #if !NUM_SERVOS // Prefer the servo connector
- #define CASE_LIGHT_PIN 6 // Hardware PWM
- #elif HAS_FREE_AUX2_PINS // Try to use AUX 2
- #define CASE_LIGHT_PIN 44 // Hardware PWM
+ #if !NUM_SERVOS // Prefer the servo connector
+ #define CASE_LIGHT_PIN 6 // Hardware PWM
+ #elif HAS_FREE_AUX2_PINS // Try to use AUX 2
+ #define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
@@ -240,14 +243,14 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
- #if !NUM_SERVOS // Prefer the servo connector
- #define SPINDLE_LASER_ENABLE_PIN 4 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
- #define SPINDLE_DIR_PIN 5
- #elif HAS_FREE_AUX2_PINS // Try to use AUX 2
- #define SPINDLE_LASER_ENABLE_PIN 40 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
- #define SPINDLE_DIR_PIN 65
+ #if !NUM_SERVOS // Prefer the servo connector
+ #define SPINDLE_LASER_ENABLE_PIN 4 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
+ #define SPINDLE_DIR_PIN 5
+ #elif HAS_FREE_AUX2_PINS // Try to use AUX 2
+ #define SPINDLE_LASER_ENABLE_PIN 40 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+ #define SPINDLE_DIR_PIN 65
#endif
#endif
@@ -275,63 +278,63 @@
//
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS 40
- #define LCD_PINS_ENABLE 42
- #define LCD_PINS_D4 65
- #define LCD_PINS_D5 66
- #define LCD_PINS_D6 44
- #define LCD_PINS_D7 64
+ #define LCD_PINS_RS 40
+ #define LCD_PINS_ENABLE 42
+ #define LCD_PINS_D4 65
+ #define LCD_PINS_D5 66
+ #define LCD_PINS_D6 44
+ #define LCD_PINS_D7 64
#elif ENABLED(ZONESTAR_LCD)
- #define LCD_PINS_RS 64
- #define LCD_PINS_ENABLE 44
- #define LCD_PINS_D4 63
- #define LCD_PINS_D5 40
- #define LCD_PINS_D6 42
- #define LCD_PINS_D7 65
- #define ADC_KEYPAD_PIN 12
+ #define LCD_PINS_RS 64
+ #define LCD_PINS_ENABLE 44
+ #define LCD_PINS_D4 63
+ #define LCD_PINS_D5 40
+ #define LCD_PINS_D6 42
+ #define LCD_PINS_D7 65
+ #define ADC_KEYPAD_PIN 12
#else
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS 27
- #define LCD_PINS_ENABLE 29
- #define LCD_PINS_D4 25
+ #define LCD_PINS_RS 27
+ #define LCD_PINS_ENABLE 29
+ #define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#endif
#else
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC 25 // Set as output on init
- #define LCD_PINS_RS 27 // Pull low for 1s to init
+ #define LCD_PINS_DC 25 // Set as output on init
+ #define LCD_PINS_RS 27 // Pull low for 1s to init
// DOGM SPI LCD Support
- #define DOGLCD_CS 16
- #define DOGLCD_MOSI 17
- #define DOGLCD_SCK 23
- #define DOGLCD_A0 LCD_PINS_DC
+ #define DOGLCD_CS 16
+ #define DOGLCD_MOSI 17
+ #define DOGLCD_SCK 23
+ #define DOGLCD_A0 LCD_PINS_DC
#else
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
#endif
- #define LCD_PINS_D7 29
+ #define LCD_PINS_D7 29
#if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
#endif
#endif
@@ -339,10 +342,10 @@
#if DISABLED(NEWPANEL)
// Buttons attached to a shift register
// Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
#endif
#endif
@@ -354,155 +357,155 @@
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
#if ENABLED(CR10_STOCKDISPLAY)
- #define BTN_EN1 17
- #define BTN_EN2 23
+ #define BTN_EN1 17
+ #define BTN_EN2 23
#else
- #define BTN_EN1 31
- #define BTN_EN2 33
+ #define BTN_EN1 31
+ #define BTN_EN2 33
#endif
- #define BTN_ENC 35
- #define SD_DETECT_PIN 49
- //#define KILL_PIN 41
+ #define BTN_ENC 35
+ #define SD_DETECT_PIN 49
+ //#define KILL_PIN 41
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 39
+ #define LCD_BACKLIGHT_PIN 39
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SD_DETECT_PIN 42
#elif ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS 53
- //#define KILL_PIN 41
+ #define BTN_EN1 47
+ #define BTN_EN2 43
+ #define BTN_ENC 32
+ #define LCD_SDSS 53
+ //#define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI)
- #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
- #define BTN_ENC -1
+ #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+ #define BTN_ENC -1
- #define LCD_SDSS 53
- #define SD_DETECT_PIN 49
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN 49
#elif EITHER(VIKI2, miniVIKI)
- #define DOGLCD_CS 45
- #define DOGLCD_A0 44
+ #define DOGLCD_CS 45
+ #define DOGLCD_A0 44
#define LCD_SCREEN_ROT_180
- #define BEEPER_PIN 33
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
+ #define BEEPER_PIN 33
+ #define STAT_LED_RED_PIN 32
+ #define STAT_LED_BLUE_PIN 35
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
+ #define BTN_EN1 22
+ #define BTN_EN2 7
+ #define BTN_ENC 39
- #define SDSS 53
- #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
- //#define KILL_PIN 31
+ #define SDSS 53
+ #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
+ //#define KILL_PIN 31
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
+ #define DOGLCD_CS 29
+ #define DOGLCD_A0 27
- #define BEEPER_PIN 23
- #define LCD_BACKLIGHT_PIN 33
+ #define BEEPER_PIN 23
+ #define LCD_BACKLIGHT_PIN 33
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
+ #define BTN_EN1 35
+ #define BTN_EN2 37
+ #define BTN_ENC 31
- #define LCD_SDSS 53
- #define SD_DETECT_PIN 49
- //#define KILL_PIN 41
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN 49
+ //#define KILL_PIN 41
#elif ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 27
- #define DOGLCD_CS 25
+ #define DOGLCD_A0 27
+ #define DOGLCD_CS 25
// GLCD features
- //#define LCD_CONTRAST_INIT 190
+ //#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- #define BEEPER_PIN 37
+ #define BEEPER_PIN 37
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
- //#define SDSS 53
- #define SD_DETECT_PIN 49
- //#define KILL_PIN 64
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
+ //#define SDSS 53
+ #define SD_DETECT_PIN 49
+ //#define KILL_PIN 64
#elif ENABLED(MINIPANEL)
- #define BEEPER_PIN 42
+ #define BEEPER_PIN 42
// not connected to a pin
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 66
// GLCD features
- //#define LCD_CONTRAST_INIT 190
+ //#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
+ #define BTN_EN1 40
+ #define BTN_EN2 63
+ #define BTN_ENC 59
- #define SDSS 53
- #define SD_DETECT_PIN 49
- //#define KILL_PIN 64
+ #define SDSS 53
+ #define SD_DETECT_PIN 49
+ //#define KILL_PIN 64
#else
// Beeper on AUX-4
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
// Buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
#elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
+ #define BTN_EN1 59 // AUX2 PIN 3
+ #define BTN_EN2 63 // AUX2 PIN 4
+ #define BTN_ENC 49 // AUX3 PIN 7
#else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
+ #define BTN_EN1 37
+ #define BTN_EN2 35
+ #define BTN_ENC 31
#endif
#if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- //#define KILL_PIN 41
+ #define SD_DETECT_PIN 49
+ //#define KILL_PIN 41
#endif
#endif
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index c182aa96f0..776dfcc3da 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -44,97 +44,97 @@
//
// Limit Switches
//
-#define X_STOP_PIN 22
-#define Y_STOP_PIN 26
-#define Z_STOP_PIN 29
+#define X_STOP_PIN 22
+#define Y_STOP_PIN 26
+#define Z_STOP_PIN 29
//
// Steppers
//
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 27
+#define X_STEP_PIN 25
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 27
-#define Y_STEP_PIN 32
-#define Y_DIR_PIN 33
-#define Y_ENABLE_PIN 31
+#define Y_STEP_PIN 32
+#define Y_DIR_PIN 33
+#define Y_ENABLE_PIN 31
-#define Z_STEP_PIN 35
-#define Z_DIR_PIN 36
-#define Z_ENABLE_PIN 34
+#define Z_STEP_PIN 35
+#define Z_DIR_PIN 36
+#define Z_ENABLE_PIN 34
-#define E0_STEP_PIN 42
-#define E0_DIR_PIN 43
-#define E0_ENABLE_PIN 37
+#define E0_STEP_PIN 42
+#define E0_DIR_PIN 43
+#define E0_ENABLE_PIN 37
-#define E1_STEP_PIN 49
-#define E1_DIR_PIN 47
-#define E1_ENABLE_PIN 48
+#define E1_STEP_PIN 49
+#define E1_DIR_PIN 47
+#define E1_ENABLE_PIN 48
-#define MOTOR_CURRENT_PWM_XY_PIN 44
-#define MOTOR_CURRENT_PWM_Z_PIN 45
-#define MOTOR_CURRENT_PWM_E_PIN 46
+#define MOTOR_CURRENT_PWM_XY_PIN 44
+#define MOTOR_CURRENT_PWM_Z_PIN 45
+#define MOTOR_CURRENT_PWM_E_PIN 46
// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
#ifndef MOTOR_CURRENT_PWM_RANGE
- #define MOTOR_CURRENT_PWM_RANGE 2000
+ #define MOTOR_CURRENT_PWM_RANGE 2000
#endif
#define DEFAULT_PWM_MOTOR_CURRENT {1300, 1300, 1250}
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8 // Analog Input
-#define TEMP_1_PIN 9 // Analog Input
-#define TEMP_BED_PIN 10 // Analog Input
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 3
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+#define HEATER_1_PIN 3
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 7
+ #define FAN_PIN 7
#endif
-#define ORIG_E0_AUTO_FAN_PIN 77
+#define ORIG_E0_AUTO_FAN_PIN 77
//
// Misc. Functions
//
-#define SDSS 53
-#define SD_DETECT_PIN 39
-#define LED_PIN 8
-#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
-#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+#define SDSS 53
+#define SD_DETECT_PIN 39
+#define LED_PIN 8
+#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
+#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
//
// LCD / Controller
//
-#define BEEPER_PIN 18
+#define BEEPER_PIN 18
-#define LCD_PINS_RS 20
-#define LCD_PINS_ENABLE 15
-#define LCD_PINS_D4 14
-#define LCD_PINS_D5 21
-#define LCD_PINS_D6 5
-#define LCD_PINS_D7 6
+#define LCD_PINS_RS 20
+#define LCD_PINS_ENABLE 15
+#define LCD_PINS_D4 14
+#define LCD_PINS_D5 21
+#define LCD_PINS_D6 5
+#define LCD_PINS_D7 6
// Buttons are directly attached
-#define BTN_EN1 40
-#define BTN_EN2 41
-#define BTN_ENC 19
+#define BTN_EN1 40
+#define BTN_EN2 41
+#define BTN_ENC 19
//
// M3/M4/M5 - Spindle/Laser Control
//
-#if HAS_CUTTER // use the LED_PIN for spindle speed control or case light
+#if HAS_CUTTER // use the LED_PIN for spindle speed control or case light
#undef LED_PIN
- #define SPINDLE_DIR_PIN 16
- #define SPINDLE_LASER_ENA_PIN 17 // Pullup!
- #define SPINDLE_LASER_PWM_PIN 8 // Hardware PWM
+ #define SPINDLE_DIR_PIN 16
+ #define SPINDLE_LASER_ENA_PIN 17 // Pullup!
+ #define SPINDLE_LASER_PWM_PIN 8 // Hardware PWM
#else
#undef LED_PIN
- #define CASE_LIGHT_PIN 8
+ #define CASE_LIGHT_PIN 8
#endif
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER.h b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
index b2594acebc..8cc588a2f9 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -44,114 +44,114 @@
//
// Servos
//
-#define SERVO0_PIN 11
+#define SERVO0_PIN 11
//
// Limit Switches
//
-#define X_MIN_PIN 22
-#define X_MAX_PIN 24
-#define Y_MIN_PIN 26
-#define Y_MAX_PIN 28
-#define Z_MIN_PIN 30
-#define Z_MAX_PIN 32
+#define X_MIN_PIN 22
+#define X_MAX_PIN 24
+#define Y_MIN_PIN 26
+#define Y_MAX_PIN 28
+#define Z_MIN_PIN 30
+#define Z_MAX_PIN 32
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 27
+#define X_STEP_PIN 25
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 27
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 33
-#define Y_ENABLE_PIN 29
+#define Y_STEP_PIN 31
+#define Y_DIR_PIN 33
+#define Y_ENABLE_PIN 29
-#define Z_STEP_PIN 37
-#define Z_DIR_PIN 39
-#define Z_ENABLE_PIN 35
+#define Z_STEP_PIN 37
+#define Z_DIR_PIN 39
+#define Z_ENABLE_PIN 35
-#define E0_STEP_PIN 43
-#define E0_DIR_PIN 45
-#define E0_ENABLE_PIN 41
+#define E0_STEP_PIN 43
+#define E0_DIR_PIN 45
+#define E0_ENABLE_PIN 41
-#define E1_STEP_PIN 49
-#define E1_DIR_PIN 47
-#define E1_ENABLE_PIN 48
+#define E1_STEP_PIN 49
+#define E1_DIR_PIN 47
+#define E1_ENABLE_PIN 48
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8 // Analog Input
-#define TEMP_1_PIN 9 // Analog Input
-#define TEMP_BED_PIN 10 // Analog Input
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-#define HEATER_1_PIN 3
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+#define HEATER_1_PIN 3
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 7
+ #define FAN_PIN 7
#endif
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
-#define PS_ON_PIN 12
-#define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing.
-#define CASE_LIGHT_PIN 8
+#define SDSS 53
+#define LED_PIN 13
+#define PS_ON_PIN 12
+#define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing.
+#define CASE_LIGHT_PIN 8
//
// LCD / Controller
//
#if HAS_SPI_LCD
- #define BEEPER_PIN 18
+ #define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
- #define LCD_PINS_RS 20
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 16
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 5
- #define LCD_PINS_D7 6
+ #define LCD_PINS_RS 20
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 16
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 5
+ #define LCD_PINS_D7 6
// Buttons directly attached
- #define BTN_EN1 40
- #define BTN_EN2 42
- #define BTN_ENC 19
+ #define BTN_EN1 40
+ #define BTN_EN2 42
+ #define BTN_ENC 19
- #define SD_DETECT_PIN 38
+ #define SD_DETECT_PIN 38
- #else // !NEWPANEL - Old style panel with shift register
+ #else // !NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
- #define SHIFT_CLK 38
- #define SHIFT_LD 42
- #define SHIFT_OUT 40
- #define SHIFT_EN 17
+ #define SHIFT_CLK 38
+ #define SHIFT_LD 42
+ #define SHIFT_OUT 40
+ #define SHIFT_EN 17
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 5
- #define LCD_PINS_D4 6
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 20
- #define LCD_PINS_D7 19
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 5
+ #define LCD_PINS_D4 6
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 20
+ #define LCD_PINS_D7 19
- #define SD_DETECT_PIN -1
+ #define SD_DETECT_PIN -1
#endif // !NEWPANEL
@@ -160,6 +160,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN 10 // Pullup!
-#define SPINDLE_DIR_PIN 11 // use the EXP3 PWM header
+#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN 10 // Pullup!
+#define SPINDLE_DIR_PIN 11 // use the EXP3 PWM header
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index dd9aaf1292..dc12442224 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -80,134 +80,134 @@
// Limit Switches
//
#if ENABLED(BOARD_REV_1_1_TO_1_3)
- #define X_MIN_PIN 15 // SW1
- #define X_MAX_PIN 14 // SW2
- #define Y_MIN_PIN 17 // SW3
- #define Y_MAX_PIN 16 // SW4
- #define Z_MIN_PIN 19 // SW5
- #define Z_MAX_PIN 18 // SW6
+ #define X_MIN_PIN 15 // SW1
+ #define X_MAX_PIN 14 // SW2
+ #define Y_MIN_PIN 17 // SW3
+ #define Y_MAX_PIN 16 // SW4
+ #define Z_MIN_PIN 19 // SW5
+ #define Z_MAX_PIN 18 // SW6
#endif
#if ENABLED(BOARD_REV_1_0)
#if HAS_CUTTER
- #define X_STOP_PIN 13 // SW1 (didn't change) - also has a useable hardware PWM
- #define Y_STOP_PIN 12 // SW2
- #define Z_STOP_PIN 11 // SW3
+ #define X_STOP_PIN 13 // SW1 (didn't change) - also has a useable hardware PWM
+ #define Y_STOP_PIN 12 // SW2
+ #define Z_STOP_PIN 11 // SW3
#else
- #define X_MIN_PIN 13 // SW1
- #define X_MAX_PIN 12 // SW2
- #define Y_MIN_PIN 11 // SW3
- #define Y_MAX_PIN 10 // SW4
- #define Z_MIN_PIN 9 // SW5
- #define Z_MAX_PIN 8 // SW6
+ #define X_MIN_PIN 13 // SW1
+ #define X_MAX_PIN 12 // SW2
+ #define Y_MIN_PIN 11 // SW3
+ #define Y_MAX_PIN 10 // SW4
+ #define Z_MIN_PIN 9 // SW5
+ #define Z_MAX_PIN 8 // SW6
#endif
#endif
#if ENABLED(BOARD_REV_1_5)
- #define X_MIN_PIN 22
- #define X_MAX_PIN 24
- #define Y_MIN_PIN 26
- #define Y_MAX_PIN 28
- #define Z_MIN_PIN 30
- #define Z_MAX_PIN 32
+ #define X_MIN_PIN 22
+ #define X_MAX_PIN 24
+ #define Y_MIN_PIN 26
+ #define Y_MAX_PIN 28
+ #define Z_MIN_PIN 30
+ #define Z_MAX_PIN 32
#endif
//
// Z Probe (when not Z_MIN_PIN)
//
#if !defined(Z_MIN_PROBE_PIN) && !(HAS_CUTTER && ENABLED(BOARD_REV_1_0))
- #define Z_MIN_PROBE_PIN Z_MAX_PIN
+ #define Z_MIN_PROBE_PIN Z_MAX_PIN
#endif
//
// Steppers
//
-#define X_STEP_PIN 25
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 27
+#define X_STEP_PIN 25
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 27
-#define Y_STEP_PIN 31
-#define Y_DIR_PIN 33
-#define Y_ENABLE_PIN 29
+#define Y_STEP_PIN 31
+#define Y_DIR_PIN 33
+#define Y_ENABLE_PIN 29
-#define Z_STEP_PIN 37
-#define Z_DIR_PIN 39
-#define Z_ENABLE_PIN 35
+#define Z_STEP_PIN 37
+#define Z_DIR_PIN 39
+#define Z_ENABLE_PIN 35
#if HAS_CUTTER && ENABLED(BOARD_REV_1_1_TO_1_3) && EXTRUDERS == 1
// Move E0 to the spare and get Spindle/Laser signals from E0
- #define E0_STEP_PIN 49
- #define E0_DIR_PIN 47
- #define E0_ENABLE_PIN 48
+ #define E0_STEP_PIN 49
+ #define E0_DIR_PIN 47
+ #define E0_ENABLE_PIN 48
#else
- #define E0_STEP_PIN 43
- #define E0_DIR_PIN 45
- #define E0_ENABLE_PIN 41
+ #define E0_STEP_PIN 43
+ #define E0_DIR_PIN 45
+ #define E0_ENABLE_PIN 41
- #define E1_STEP_PIN 49
- #define E1_DIR_PIN 47
- #define E1_ENABLE_PIN 48
+ #define E1_STEP_PIN 49
+ #define E1_DIR_PIN 47
+ #define E1_ENABLE_PIN 48
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 8 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_0_PIN 8 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 2
-//#define HEATER_1_PIN 3 // used for case light Rev A said "1"
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 2
+//#define HEATER_1_PIN 3 // used for case light Rev A said "1"
+#define HEATER_BED_PIN 4
//
// LCD / Controller
//
#if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
- #define LCD_PINS_RS 24
- #define LCD_PINS_ENABLE 22
- #define LCD_PINS_D4 36
- #define LCD_PINS_D5 34
- #define LCD_PINS_D6 32
- #define LCD_PINS_D7 30
+ #define LCD_PINS_RS 24
+ #define LCD_PINS_ENABLE 22
+ #define LCD_PINS_D4 36
+ #define LCD_PINS_D5 34
+ #define LCD_PINS_D6 32
+ #define LCD_PINS_D7 30
#elif ENABLED(BOARD_REV_1_5, ULTRA_LCD)
- #define BEEPER_PIN 18
+ #define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
- #define LCD_PINS_RS 20
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 16
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 5
- #define LCD_PINS_D7 6
+ #define LCD_PINS_RS 20
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 16
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 5
+ #define LCD_PINS_D7 6
// Buttons directly attached
- #define BTN_EN1 40
- #define BTN_EN2 42
- #define BTN_ENC 19
+ #define BTN_EN1 40
+ #define BTN_EN2 42
+ #define BTN_ENC 19
- #define SD_DETECT_PIN 38
+ #define SD_DETECT_PIN 38
- #else // !NEWPANEL - Old style panel with shift register
+ #else // !NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
- #define SHIFT_CLK 38
- #define SHIFT_LD 42
- #define SHIFT_OUT 40
- #define SHIFT_EN 17
+ #define SHIFT_CLK 38
+ #define SHIFT_LD 42
+ #define SHIFT_OUT 40
+ #define SHIFT_EN 17
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 5
- #define LCD_PINS_D4 6
- #define LCD_PINS_D5 21
- #define LCD_PINS_D6 20
- #define LCD_PINS_D7 19
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 5
+ #define LCD_PINS_D4 6
+ #define LCD_PINS_D5 21
+ #define LCD_PINS_D6 20
+ #define LCD_PINS_D7 19
#endif // !NEWPANEL
@@ -217,17 +217,17 @@
// case light - see spindle section for more info on available hardware PWMs
//
#if !PIN_EXISTS(CASE_LIGHT) && ENABLED(BOARD_REV_1_5)
- #define CASE_LIGHT_PIN 7 // use PWM - MUST BE HARDWARE PWM
+ #define CASE_LIGHT_PIN 7 // use PWM - MUST BE HARDWARE PWM
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
- #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5) // Use the last three SW positions
- #define SPINDLE_DIR_PIN 10 // 1.0: SW4 1.5: EXP3-6 ("10")
- #define SPINDLE_LASER_PWM_PIN 9 // 1.0: SW5 1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
- #define SPINDLE_LASER_ENA_PIN 8 // 1.0: SW6 1.5: EXP3-8 ( "8") .. Pin should have a pullup!
+ #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5) // Use the last three SW positions
+ #define SPINDLE_DIR_PIN 10 // 1.0: SW4 1.5: EXP3-6 ("10")
+ #define SPINDLE_LASER_PWM_PIN 9 // 1.0: SW5 1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
+ #define SPINDLE_LASER_ENA_PIN 8 // 1.0: SW6 1.5: EXP3-8 ( "8") .. Pin should have a pullup!
#elif ENABLED(BOARD_REV_1_1_TO_1_3)
/**
* Only four hardware PWMs physically connected to anything on these boards:
@@ -241,14 +241,14 @@
* They have an LED and resistor pullup to +24V which could damage 3.3V-5V ICs.
*/
#if EXTRUDERS == 1
- #define SPINDLE_DIR_PIN 43
- #define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
- #define SPINDLE_LASER_ENA_PIN 41 // Pullup!
- #elif TEMP_SENSOR_BED == 0 // Can't use E0 so see if HEATER_BED_PIN is available
+ #define SPINDLE_DIR_PIN 43
+ #define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 41 // Pullup!
+ #elif TEMP_SENSOR_BED == 0 // Can't use E0 so see if HEATER_BED_PIN is available
#undef HEATER_BED_PIN
- #define SPINDLE_DIR_PIN 38 // Probably pin 4 on 10 pin connector closest to the E0 socket
- #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM - Special precautions usually needed.
- #define SPINDLE_LASER_ENA_PIN 40 // Pullup! (Probably pin 6 on the 10-pin
+ #define SPINDLE_DIR_PIN 38 // Probably pin 4 on 10 pin connector closest to the E0 socket
+ #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM - Special precautions usually needed.
+ #define SPINDLE_LASER_ENA_PIN 40 // Pullup! (Probably pin 6 on the 10-pin
// connector closest to the E0 socket)
#endif
#endif
diff --git a/Marlin/src/pins/ramps/pins_VORON.h b/Marlin/src/pins/ramps/pins_VORON.h
index 43c3317164..12c0a36db1 100644
--- a/Marlin/src/pins/ramps/pins_VORON.h
+++ b/Marlin/src/pins/ramps/pins_VORON.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,7 +28,7 @@
#define BOARD_INFO_NAME "VORON Design v2"
-#define RAMPS_D8_PIN 11
+#define RAMPS_D8_PIN 11
#include "pins_RAMPS.h"
@@ -36,10 +36,10 @@
// Heaters / Fans
//
#undef FAN_PIN
-#define FAN_PIN 5 // Using the pin for the controller fan since controller fan is always on.
-#define CONTROLLER_FAN_PIN 8
-#define ORIG_E0_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan
-#define ORIG_E1_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
+#define FAN_PIN 5 // Using the pin for the controller fan since controller fan is always on.
+#define CONTROLLER_FAN_PIN 8
+#define ORIG_E0_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan
+#define ORIG_E1_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
//
// LCDs and Controllers
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index bf85bfa12d..5aee07c96f 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,24 +28,24 @@
#include "pins_MKS_GEN_13.h"
-#define ZRIB_V20_D6_PIN 6 // Fan
-#define ZRIB_V20_D9_PIN 9 // Fan2
-#define ZRIB_V20_A10_PIN 10
-#define ZRIB_V20_D16_PIN 16
-#define ZRIB_V20_D17_PIN 17
-#define ZRIB_V20_D23_PIN 23
-#define ZRIB_V20_D25_PIN 25
-#define ZRIB_V20_D27_PIN 27
-#define ZRIB_V20_D29_PIN 29
-#define ZRIB_V20_D37_PIN 37
+#define ZRIB_V20_D6_PIN 6 // Fan
+#define ZRIB_V20_D9_PIN 9 // Fan2
+#define ZRIB_V20_A10_PIN 10
+#define ZRIB_V20_D16_PIN 16
+#define ZRIB_V20_D17_PIN 17
+#define ZRIB_V20_D23_PIN 23
+#define ZRIB_V20_D25_PIN 25
+#define ZRIB_V20_D27_PIN 27
+#define ZRIB_V20_D29_PIN 29
+#define ZRIB_V20_D37_PIN 37
-#define ORIG_E0_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E1_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E2_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E3_AUTO_FAN_PIN ZRIB_V20_D6_PIN
+#define ORIG_E0_AUTO_FAN_PIN ZRIB_V20_D6_PIN
+#define ORIG_E1_AUTO_FAN_PIN ZRIB_V20_D6_PIN
+#define ORIG_E2_AUTO_FAN_PIN ZRIB_V20_D6_PIN
+#define ORIG_E3_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 11 // Analog Input
+ #define FILWIDTH_PIN 11 // Analog Input
#endif
#if ENABLED(ZONESTAR_LCD)
@@ -58,12 +58,12 @@
#undef ADC_KEYPAD_PIN
#undef BEEPER_PIN
- #define LCD_PINS_RS ZRIB_V20_D16_PIN
- #define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
- #define LCD_PINS_D4 ZRIB_V20_D23_PIN
- #define LCD_PINS_D5 ZRIB_V20_D25_PIN
- #define LCD_PINS_D6 ZRIB_V20_D27_PIN
- #define LCD_PINS_D7 ZRIB_V20_D29_PIN
- #define ADC_KEYPAD_PIN ZRIB_V20_A10_PIN
- #define BEEPER_PIN ZRIB_V20_D37_PIN
+ #define LCD_PINS_RS ZRIB_V20_D16_PIN
+ #define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
+ #define LCD_PINS_D4 ZRIB_V20_D23_PIN
+ #define LCD_PINS_D5 ZRIB_V20_D25_PIN
+ #define LCD_PINS_D6 ZRIB_V20_D27_PIN
+ #define LCD_PINS_D7 ZRIB_V20_D29_PIN
+ #define ADC_KEYPAD_PIN ZRIB_V20_A10_PIN
+ #define BEEPER_PIN ZRIB_V20_D37_PIN
#endif
diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
index 8545dc488a..f55ec51567 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,129 +37,129 @@
// Servos
//
#ifndef SERVO0_PIN
- #define SERVO0_PIN 11
+ #define SERVO0_PIN 11
#endif
#ifndef SERVO3_PIN
- #define SERVO3_PIN 4
+ #define SERVO3_PIN 4
#endif
//
// Limit Switches
//
-#define X_MIN_PIN 3
+#define X_MIN_PIN 3
#ifndef X_MAX_PIN
- #define X_MAX_PIN 2
+ #define X_MAX_PIN 2
#endif
-#define Y_MIN_PIN 14
-#define Y_MAX_PIN 15
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 54
-#define X_DIR_PIN 55
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 54
+#define X_DIR_PIN 55
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN -1
+ #define X_CS_PIN -1
#endif
-#define Y_STEP_PIN 60
-#define Y_DIR_PIN 61
-#define Y_ENABLE_PIN 56
+#define Y_STEP_PIN 60
+#define Y_DIR_PIN 61
+#define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN
- #define Y_CS_PIN -1
+ #define Y_CS_PIN -1
#endif
-#define Z_STEP_PIN 46
-#define Z_DIR_PIN 48
-#define Z_ENABLE_PIN 62
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 62
#ifndef Z_CS_PIN
- #define Z_CS_PIN -1
+ #define Z_CS_PIN -1
#endif
-#define E0_STEP_PIN 26
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
#ifndef E0_CS_PIN
- #define E0_CS_PIN -1
+ #define E0_CS_PIN -1
#endif
-#define E1_STEP_PIN 36
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 30
+#define E1_STEP_PIN 36
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 30
#ifndef E1_CS_PIN
- #define E1_CS_PIN -1
+ #define E1_CS_PIN -1
#endif
// Red
-#define E2_STEP_PIN 42
-#define E2_DIR_PIN 40
-#define E2_ENABLE_PIN 65
+#define E2_STEP_PIN 42
+#define E2_DIR_PIN 40
+#define E2_ENABLE_PIN 65
#ifndef E2_CS_PIN
- #define E2_CS_PIN -1
+ #define E2_CS_PIN -1
#endif
// Black
-#define E3_STEP_PIN 44
-#define E3_DIR_PIN 64
-#define E3_ENABLE_PIN 66
+#define E3_STEP_PIN 44
+#define E3_DIR_PIN 64
+#define E3_ENABLE_PIN 66
#ifndef E3_CS_PIN
- #define E3_CS_PIN -1
+ #define E3_CS_PIN -1
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 13 // Analog Input
-#define TEMP_1_PIN 15 // Analog Input
-#define TEMP_2_PIN 5 // Analog Input (BLACK)
-#define TEMP_3_PIN 9 // Analog Input (RED)
-#define TEMP_BED_PIN 14 // Analog Input
+#define TEMP_0_PIN 13 // Analog Input
+#define TEMP_1_PIN 15 // Analog Input
+#define TEMP_2_PIN 5 // Analog Input (BLACK)
+#define TEMP_3_PIN 9 // Analog Input (RED)
+#define TEMP_BED_PIN 14 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 10
-#define HEATER_1_PIN 7
-#define HEATER_2_PIN 6
-#define HEATER_3_PIN 5
-#define HEATER_BED_PIN 8
+#define HEATER_0_PIN 10
+#define HEATER_1_PIN 7
+#define HEATER_2_PIN 6
+#define HEATER_3_PIN 5
+#define HEATER_BED_PIN 8
-#define FAN_PIN 9
+#define FAN_PIN 9
//
// Misc. Functions
//
-#define SDSS 53
-#define LED_PIN 13
+#define SDSS 53
+#define LED_PIN 13
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 5 // Analog Input on AUX2
+ #define FILWIDTH_PIN 5 // Analog Input on AUX2
#endif
// Оn the servos connector
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 4
+ #define FIL_RUNOUT_PIN 4
#endif
#ifndef PS_ON_PIN
- #define PS_ON_PIN 12
+ #define PS_ON_PIN 12
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
- #if NUM_SERVOS <= 1 // Prefer the servo connector
- #define CASE_LIGHT_PIN 6 // Hardware PWM
+ #if NUM_SERVOS <= 1 // Prefer the servo connector
+ #define CASE_LIGHT_PIN 6 // Hardware PWM
#elif HAS_FREE_AUX2_PINS
- #define CASE_LIGHT_PIN 44 // Hardware PWM
+ #define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
@@ -167,14 +167,14 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
- #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
- #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
- #define SPINDLE_DIR_PIN 5
+ #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
+ #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
+ #define SPINDLE_DIR_PIN 5
#elif HAS_FREE_AUX2_PINS
- #define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
- #define SPINDLE_DIR_PIN 65
+ #define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
+ #define SPINDLE_DIR_PIN 65
#endif
#endif
@@ -183,19 +183,19 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI 66
+ #define TMC_SW_MOSI 66
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO 44
+ #define TMC_SW_MISO 44
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK 64
+ #define TMC_SW_SCK 64
#endif
#endif
-#if HAS_DRIVER(TMC2208)
+#if HAS_TMC_UART
/**
- * TMC2208 stepper drivers
+ * TMC220x stepper drivers
*
* Hardware serial communication ports.
* If undefined software serial is used according to the pins below
@@ -217,72 +217,90 @@
//
#ifndef X_SERIAL_TX_PIN
- #define X_SERIAL_TX_PIN 40
+ #define X_SERIAL_TX_PIN 40
#endif
#ifndef X_SERIAL_RX_PIN
- #define X_SERIAL_RX_PIN 63
+ #define X_SERIAL_RX_PIN 63
#endif
#ifndef X2_SERIAL_TX_PIN
- #define X2_SERIAL_TX_PIN -1
+ #define X2_SERIAL_TX_PIN -1
#endif
#ifndef X2_SERIAL_RX_PIN
- #define X2_SERIAL_RX_PIN -1
+ #define X2_SERIAL_RX_PIN -1
#endif
#ifndef Y_SERIAL_TX_PIN
- #define Y_SERIAL_TX_PIN 59
+ #define Y_SERIAL_TX_PIN 59
#endif
#ifndef Y_SERIAL_RX_PIN
- #define Y_SERIAL_RX_PIN 64
+ #define Y_SERIAL_RX_PIN 64
#endif
#ifndef Y2_SERIAL_TX_PIN
- #define Y2_SERIAL_TX_PIN -1
+ #define Y2_SERIAL_TX_PIN -1
#endif
#ifndef Y2_SERIAL_RX_PIN
- #define Y2_SERIAL_RX_PIN -1
+ #define Y2_SERIAL_RX_PIN -1
#endif
#ifndef Z_SERIAL_TX_PIN
- #define Z_SERIAL_TX_PIN 42
+ #define Z_SERIAL_TX_PIN 42
#endif
#ifndef Z_SERIAL_RX_PIN
- #define Z_SERIAL_RX_PIN 65
+ #define Z_SERIAL_RX_PIN 65
#endif
#ifndef Z2_SERIAL_TX_PIN
- #define Z2_SERIAL_TX_PIN -1
+ #define Z2_SERIAL_TX_PIN -1
#endif
#ifndef Z2_SERIAL_RX_PIN
- #define Z2_SERIAL_RX_PIN -1
+ #define Z2_SERIAL_RX_PIN -1
#endif
#ifndef E0_SERIAL_TX_PIN
- #define E0_SERIAL_TX_PIN 44
+ #define E0_SERIAL_TX_PIN 44
#endif
#ifndef E0_SERIAL_RX_PIN
- #define E0_SERIAL_RX_PIN 66
+ #define E0_SERIAL_RX_PIN 66
#endif
#ifndef E1_SERIAL_TX_PIN
- #define E1_SERIAL_TX_PIN -1
+ #define E1_SERIAL_TX_PIN -1
#endif
#ifndef E1_SERIAL_RX_PIN
- #define E1_SERIAL_RX_PIN -1
+ #define E1_SERIAL_RX_PIN -1
#endif
#ifndef E2_SERIAL_TX_PIN
- #define E2_SERIAL_TX_PIN -1
+ #define E2_SERIAL_TX_PIN -1
#endif
#ifndef E2_SERIAL_RX_PIN
- #define E2_SERIAL_RX_PIN -1
+ #define E2_SERIAL_RX_PIN -1
#endif
#ifndef E3_SERIAL_TX_PIN
- #define E3_SERIAL_TX_PIN -1
+ #define E3_SERIAL_TX_PIN -1
#endif
#ifndef E3_SERIAL_RX_PIN
- #define E3_SERIAL_RX_PIN -1
+ #define E3_SERIAL_RX_PIN -1
#endif
#ifndef E4_SERIAL_TX_PIN
- #define E4_SERIAL_TX_PIN -1
+ #define E4_SERIAL_TX_PIN -1
#endif
#ifndef E4_SERIAL_RX_PIN
- #define E4_SERIAL_RX_PIN -1
+ #define E4_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_TX_PIN
+ #define E5_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_RX_PIN
+ #define E5_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_TX_PIN
+ #define E6_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_RX_PIN
+ #define E6_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_TX_PIN
+ #define E7_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_RX_PIN
+ #define E7_SERIAL_RX_PIN -1
#endif
#endif
diff --git a/Marlin/src/pins/sam/pins_ADSK.h b/Marlin/src/pins/sam/pins_ADSK.h
index c502f07671..61c2e1b494 100644
--- a/Marlin/src/pins/sam/pins_ADSK.h
+++ b/Marlin/src/pins/sam/pins_ADSK.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -81,55 +81,55 @@ A stepper for E0 extruder
//
// Servos
//
-#define SERVO0_PIN 61 // Analog pin 7, Digital pin 61
+#define SERVO0_PIN 61 // Analog pin 7, Digital pin 61
//
// Limit Switches
//
-#define X_MIN_PIN 9
-#define Y_MIN_PIN 10
-#define Z_MIN_PIN 11
+#define X_MIN_PIN 9
+#define Y_MIN_PIN 10
+#define Z_MIN_PIN 11
-#define Z_MIN_PROBE_PIN 62 // Analog pin 8, Digital pin 62
+#define Z_MIN_PROBE_PIN 62 // Analog pin 8, Digital pin 62
//
// Steppers
//
-#define X_STEP_PIN 2
-#define X_DIR_PIN 5
-#define X_ENABLE_PIN 8
+#define X_STEP_PIN 2
+#define X_DIR_PIN 5
+#define X_ENABLE_PIN 8
-#define Y_STEP_PIN 3
-#define Y_DIR_PIN 6
-#define Y_ENABLE_PIN 8
+#define Y_STEP_PIN 3
+#define Y_DIR_PIN 6
+#define Y_ENABLE_PIN 8
-#define Z_STEP_PIN 4
-#define Z_DIR_PIN 7
-#define Z_ENABLE_PIN 8
+#define Z_STEP_PIN 4
+#define Z_DIR_PIN 7
+#define Z_ENABLE_PIN 8
-#define E0_STEP_PIN 12
-#define E0_DIR_PIN 13
-#define E0_ENABLE_PIN 8
+#define E0_STEP_PIN 12
+#define E0_DIR_PIN 13
+#define E0_ENABLE_PIN 8
//
// Heaters / Fans
//
-#define HEATER_0_PIN 55 // "Hold": Analog pin 1, Digital pin 55
-#define HEATER_BED_PIN 57 // "CoolEn": Analog pin 3, Digital pin 57
-#define FAN_PIN 54 // "Abort": Analog pin 0, Digital pin 54
+#define HEATER_0_PIN 55 // "Hold": Analog pin 1, Digital pin 55
+#define HEATER_BED_PIN 57 // "CoolEn": Analog pin 3, Digital pin 57
+#define FAN_PIN 54 // "Abort": Analog pin 0, Digital pin 54
#undef E0_AUTO_FAN_PIN
-#define E0_AUTO_FAN_PIN 56 // "Resume": Analog pin 2, Digital pin 56
+#define E0_AUTO_FAN_PIN 56 // "Resume": Analog pin 2, Digital pin 56
//
// Temperature Sensors
//
-#define TEMP_0_PIN 4 // "SDA": Analog pin 4, Digital pin 58
-#define TEMP_BED_PIN 5 // "SCL": Analog pin 5, Digital pin 59
+#define TEMP_0_PIN 4 // "SDA": Analog pin 4, Digital pin 58
+#define TEMP_BED_PIN 5 // "SCL": Analog pin 5, Digital pin 59
//
// Misc. Functions
//
-#define SDSS 52
+#define SDSS 52
#if ENABLED(ZONESTAR_LCD)
@@ -160,13 +160,13 @@ A stepper for E0 extruder
//
// LCD / Controller
//
- #define LCD_PINS_ENABLE 14
- #define LCD_PINS_RS 15
- #define LCD_PINS_D4 16
- #define LCD_PINS_D5 17
- #define LCD_PINS_D6 18
- #define LCD_PINS_D7 19
- #define ADC_KEYPAD_PIN 6 //60 // Analog pin 6, Digital pin 60
+ #define LCD_PINS_ENABLE 14
+ #define LCD_PINS_RS 15
+ #define LCD_PINS_D4 16
+ #define LCD_PINS_D5 17
+ #define LCD_PINS_D6 18
+ #define LCD_PINS_D7 19
+ #define ADC_KEYPAD_PIN 6 //60 // Analog pin 6, Digital pin 60
/**
* The below defines will scale all the values to work properly on both
diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
index 75dd004648..8b035e8876 100644
--- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
+++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,126 +35,126 @@
//
// Servos
//
-#define SERVO0_PIN 36
-#define SERVO1_PIN 40
-#define SERVO2_PIN 41
-#define SERVO3_PIN -1
+#define SERVO0_PIN 36
+#define SERVO1_PIN 40
+#define SERVO2_PIN 41
+#define SERVO3_PIN -1
//
// Limit Switches
//
-#define X_MIN_PIN 33 // PC1
-#define X_MAX_PIN 34 // PC2
-#define Y_MIN_PIN 35 // PC3
-#define Y_MAX_PIN 37 // PC5
-#define Z_MIN_PIN 38 // PC6
-#define Z_MAX_PIN 39 // PC7
+#define X_MIN_PIN 33 // PC1
+#define X_MAX_PIN 34 // PC2
+#define Y_MIN_PIN 35 // PC3
+#define Y_MAX_PIN 37 // PC5
+#define Z_MIN_PIN 38 // PC6
+#define Z_MAX_PIN 39 // PC7
//
// Steppers
//
-#define X_STEP_PIN 96 // PB24
-#define X_DIR_PIN 2 // PB25
-#define X_ENABLE_PIN 24 // PA15, motor RESET pin
+#define X_STEP_PIN 96 // PB24
+#define X_DIR_PIN 2 // PB25
+#define X_ENABLE_PIN 24 // PA15, motor RESET pin
-#define Y_STEP_PIN 94 // PB22
-#define Y_DIR_PIN 95 // PB23
-#define Y_ENABLE_PIN 24 // PA15, motor RESET pin
+#define Y_STEP_PIN 94 // PB22
+#define Y_DIR_PIN 95 // PB23
+#define Y_ENABLE_PIN 24 // PA15, motor RESET pin
-#define Z_STEP_PIN 98 // PC27
-#define Z_DIR_PIN 3 // PC28
-#define Z_ENABLE_PIN 24 // PA15, motor RESET pin
+#define Z_STEP_PIN 98 // PC27
+#define Z_DIR_PIN 3 // PC28
+#define Z_ENABLE_PIN 24 // PA15, motor RESET pin
-#define E0_STEP_PIN 5 // PC25
-#define E0_DIR_PIN 4 // PC26
-#define E0_ENABLE_PIN 24 // PA15, motor RESET pin
+#define E0_STEP_PIN 5 // PC25
+#define E0_DIR_PIN 4 // PC26
+#define E0_ENABLE_PIN 24 // PA15, motor RESET pin
-#define E1_STEP_PIN 28 // PD3 on piggy
-#define E1_DIR_PIN 27 // PD2 on piggy
-#define E1_ENABLE_PIN 24 // PA15, motor RESET pin
+#define E1_STEP_PIN 28 // PD3 on piggy
+#define E1_DIR_PIN 27 // PD2 on piggy
+#define E1_ENABLE_PIN 24 // PA15, motor RESET pin
-#define E2_STEP_PIN 11 // PD7 on piggy
-#define E2_DIR_PIN 29 // PD6 on piggy
-#define E2_ENABLE_PIN 24 // PA15, motor RESET pin
+#define E2_STEP_PIN 11 // PD7 on piggy
+#define E2_DIR_PIN 29 // PD6 on piggy
+#define E2_ENABLE_PIN 24 // PA15, motor RESET pin
-#define E3_STEP_PIN 30 // PD9 on piggy
-#define E3_DIR_PIN 12 // PD8 on piggy
-#define E3_ENABLE_PIN 24 // PA15, motor RESET pin
+#define E3_STEP_PIN 30 // PD9 on piggy
+#define E3_DIR_PIN 12 // PD8 on piggy
+#define E3_ENABLE_PIN 24 // PA15, motor RESET pin
// Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN 99 // PC10
-#define Y_MS1_PIN 10 // PC29
-#define Z_MS1_PIN 44 // PC19
-#define E0_MS1_PIN 45 // PC18
+#define X_MS1_PIN 99 // PC10
+#define Y_MS1_PIN 10 // PC29
+#define Z_MS1_PIN 44 // PC19
+#define E0_MS1_PIN 45 // PC18
-//#define MOTOR_FAULT_PIN 22 // PB26 , motor X-Y-Z-E0 motor FAULT
+//#define MOTOR_FAULT_PIN 22 // PB26 , motor X-Y-Z-E0 motor FAULT
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // Analog Input (PA24)
-#define TEMP_1_PIN 2 // Analog Input (PA23 on piggy)
-#define TEMP_2_PIN 3 // Analog Input (PA22 on piggy)
-#define TEMP_3_PIN 4 // Analog Input (PA6 on piggy)
-#define TEMP_BED_PIN 0 // Analog Input (PA16)
+#define TEMP_0_PIN 1 // Analog Input (PA24)
+#define TEMP_1_PIN 2 // Analog Input (PA23 on piggy)
+#define TEMP_2_PIN 3 // Analog Input (PA22 on piggy)
+#define TEMP_3_PIN 4 // Analog Input (PA6 on piggy)
+#define TEMP_BED_PIN 0 // Analog Input (PA16)
//
// Heaters / Fans
//
// Note that on the Due pin A0 on the board is channel 2 on the ARM chip
-#define HEATER_0_PIN 68 // PA1
-#define HEATER_1_PIN 8 // PC22 on piggy
-#define HEATER_2_PIN 9 // PC21 on piggy
-#define HEATER_3_PIN 97 // PC20 on piggy
-#define HEATER_BED_PIN 69 // PA0
+#define HEATER_0_PIN 68 // PA1
+#define HEATER_1_PIN 8 // PC22 on piggy
+#define HEATER_2_PIN 9 // PC21 on piggy
+#define HEATER_3_PIN 97 // PC20 on piggy
+#define HEATER_BED_PIN 69 // PA0
#ifndef FAN_PIN
- #define FAN_PIN 92 // PA5
+ #define FAN_PIN 92 // PA5
#endif
-#define FAN1_PIN 31 // PA7
+#define FAN1_PIN 31 // PA7
//
// Misc. Functions
//
-#define SDSS 77 // PA28
-#define SD_DETECT_PIN 87 // PA29
-#define LED_RED_PIN 40 // PC8
-#define LED_GREEN_PIN 41 // PC9
+#define SDSS 77 // PA28
+#define SD_DETECT_PIN 87 // PA29
+#define LED_RED_PIN 40 // PC8
+#define LED_GREEN_PIN 41 // PC9
-#define EXP_VOLTAGE_LEVEL_PIN 65
+#define EXP_VOLTAGE_LEVEL_PIN 65
-#define SPI_CHAN_DAC 1
+#define SPI_CHAN_DAC 1
-#define DAC0_SYNC 53 // PB14
-#define DAC1_SYNC 6 // PC24
+#define DAC0_SYNC 53 // PB14
+#define DAC1_SYNC 6 // PC24
// 64K SPI EEPROM
#define SPI_EEPROM
-#define SPI_CHAN_EEPROM1 2
-#define SPI_EEPROM1_CS 25 // PD0
+#define SPI_CHAN_EEPROM1 2
+#define SPI_EEPROM1_CS 25 // PD0
// 2K SPI EEPROM
-#define SPI_EEPROM2_CS 26 // PD1
+#define SPI_EEPROM2_CS 26 // PD1
// FLASH SPI
// 32Mb
-#define SPI_FLASH_CS 23 // PA14
+#define SPI_FLASH_CS 23 // PA14
//
// LCD / Controller
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define LCD_PINS_RS 18
- #define LCD_PINS_ENABLE 15
- #define LCD_PINS_D4 19
- #define BEEPER_PIN 64
+ #define LCD_PINS_RS 18
+ #define LCD_PINS_ENABLE 15
+ #define LCD_PINS_D4 19
+ #define BEEPER_PIN 64
- #define BTN_EN1 14
- #define BTN_EN2 16
- #define BTN_ENC 17
+ #define BTN_EN1 14
+ #define BTN_EN2 16
+ #define BTN_ENC 17
#undef UI_VOLTAGE_LEVEL
- #define UI_VOLTAGE_LEVEL 1
+ #define UI_VOLTAGE_LEVEL 1
#endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
diff --git a/Marlin/src/pins/sam/pins_ARCHIM1.h b/Marlin/src/pins/sam/pins_ARCHIM1.h
index 83a68e776f..606e024697 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM1.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,7 +46,7 @@
//
// Timers
//
-#define STEP_TIMER_NUM 3
+#define STEP_TIMER_NUM 3
#define HAL_STEP_TIMER_ISR() void TC3_Handler()
//
@@ -56,147 +56,145 @@
//
// Servos
//
-#define SERVO0_PIN 20 // D20 PB12 (Header J20 20)
-#define SERVO1_PIN 21 // D21 PB13 (Header J20 19)
-
+#define SERVO0_PIN 20 // D20 PB12 (Header J20 20)
+#define SERVO1_PIN 21 // D21 PB13 (Header J20 19)
//
// Limit Switches
//
-#define X_MIN_PIN 14 // PD4 MIN ES1
-#define X_MAX_PIN 32 // PD10 MAX ES1
-#define Y_MIN_PIN 29 // PD6 MIN ES2
-#define Y_MAX_PIN 15 // PD5 MAX ES2
-#define Z_MIN_PIN 31 // PA7 MIN ES3
-#define Z_MAX_PIN 30 // PD9 MAX ES3
+#define X_MIN_PIN 14 // PD4 MIN ES1
+#define X_MAX_PIN 32 // PD10 MAX ES1
+#define Y_MIN_PIN 29 // PD6 MIN ES2
+#define Y_MAX_PIN 15 // PD5 MAX ES2
+#define Z_MIN_PIN 31 // PA7 MIN ES3
+#define Z_MAX_PIN 30 // PD9 MAX ES3
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 66 // D66 PB15 (Header J20 15)
+ #define FIL_RUNOUT_PIN 66 // D66 PB15 (Header J20 15)
#endif
#ifndef FIL_RUNOUT2_PIN
- #define FIL_RUNOUT2_PIN 67 // D67 PB16 (Header J20 16)
+ #define FIL_RUNOUT2_PIN 67 // D67 PB16 (Header J20 16)
#endif
-
//
// Steppers
//
-#define X_STEP_PIN 40 // PC8 STEP1 *
-#define X_DIR_PIN 59 // PA4 DIR1 *
-#define X_ENABLE_PIN 41 // PC9 EN1
+#define X_STEP_PIN 40 // PC8 STEP1 *
+#define X_DIR_PIN 59 // PA4 DIR1 *
+#define X_ENABLE_PIN 41 // PC9 EN1
-#define Y_STEP_PIN 49 // PC14 STEP2 *
-#define Y_DIR_PIN 47 // PC16 DIR2 *
-#define Y_ENABLE_PIN 48 // PC15 EN2 *
+#define Y_STEP_PIN 49 // PC14 STEP2 *
+#define Y_DIR_PIN 47 // PC16 DIR2 *
+#define Y_ENABLE_PIN 48 // PC15 EN2 *
-#define Z_STEP_PIN 36 // PC4 STEP Z *
-#define Z_DIR_PIN 107 // PB10 DIR Z *
-#define Z_ENABLE_PIN 96 // PC10 EN Z -AddOns *
+#define Z_STEP_PIN 36 // PC4 STEP Z *
+#define Z_DIR_PIN 107 // PB10 DIR Z *
+#define Z_ENABLE_PIN 96 // PC10 EN Z -AddOns *
-#define E0_STEP_PIN 78 // PB23 STEP3 *
-#define E0_DIR_PIN 22 // PB26 DIR3 *
-#define E0_ENABLE_PIN 97 // PB24 EN3 -Addons *
+#define E0_STEP_PIN 78 // PB23 STEP3 *
+#define E0_DIR_PIN 22 // PB26 DIR3 *
+#define E0_ENABLE_PIN 97 // PB24 EN3 -Addons *
-#define E1_STEP_PIN 26 // PD1 STEP4 *
-#define E1_DIR_PIN 27 // PD2 DIR4 *
-#define E1_ENABLE_PIN 28 // PD3 EN4 *
+#define E1_STEP_PIN 26 // PD1 STEP4 *
+#define E1_DIR_PIN 27 // PD2 DIR4 *
+#define E1_ENABLE_PIN 28 // PD3 EN4 *
// Microstepping mode pins *
-#define X_MS1_PIN 39 // PC7 MOD0E1 - As listed in schematic
-#define X_MS2_PIN 38 // PC6 MOD1E1
-#define X_MS3_PIN 37 // PC5 MOD2E1
+#define X_MS1_PIN 39 // PC7 MOD0E1 - As listed in schematic
+#define X_MS2_PIN 38 // PC6 MOD1E1
+#define X_MS3_PIN 37 // PC5 MOD2E1
-#define Y_MS1_PIN 50 // PC13 MODE0E2
-#define Y_MS2_PIN 51 // PC12 MODE1E2
-#define Y_MS3_PIN 92 // PC11 MODE2E2 - AddOns
+#define Y_MS1_PIN 50 // PC13 MODE0E2
+#define Y_MS2_PIN 51 // PC12 MODE1E2
+#define Y_MS3_PIN 92 // PC11 MODE2E2 - AddOns
-#define Z_MS1_PIN 44 // PC19 MOD0E Z
-#define Z_MS2_PIN 45 // PC18 MOD1E Z
-#define Z_MS3_PIN 46 // PC17 MOD2E Z
+#define Z_MS1_PIN 44 // PC19 MOD0E Z
+#define Z_MS2_PIN 45 // PC18 MOD1E Z
+#define Z_MS3_PIN 46 // PC17 MOD2E Z
-#define E0_MS1_PIN 105 // PB22 MOD0E3 - AddOns
-#define E0_MS2_PIN 106 // PC27 MOD1E3 - AddOns
-#define E0_MS3_PIN 104 // PC20 MOD2E3 - AddOns
+#define E0_MS1_PIN 105 // PB22 MOD0E3 - AddOns
+#define E0_MS2_PIN 106 // PC27 MOD1E3 - AddOns
+#define E0_MS3_PIN 104 // PC20 MOD2E3 - AddOns
-#define E1_MS1_PIN 25 // PD0 MOD0E4
-#define E1_MS2_PIN 18 // PA11 MOD1E4
-#define E1_MS3_PIN 19 // PA10 MOD2E4
+#define E1_MS1_PIN 25 // PD0 MOD0E4
+#define E1_MS2_PIN 18 // PA11 MOD1E4
+#define E1_MS3_PIN 19 // PA10 MOD2E4
// Motor current PWM pins *
-#define MOTOR_CURRENT_PWM_X_PIN 58 // PA6 X-REF TIOB2
-#define MOTOR_CURRENT_PWM_Y_PIN 12 // PD8 Y-REF TIOB8
-#define MOTOR_CURRENT_PWM_Z_PIN 10 // PC29 Z-REF TIOB7
-#define MOTOR_CURRENT_PWM_E0_PIN 3 // PC28 E1-REF TIOA7
-#define MOTOR_CURRENT_PWM_E1_PIN 11 // PD7 E2-REF TIOA8
+#define MOTOR_CURRENT_PWM_X_PIN 58 // PA6 X-REF TIOB2
+#define MOTOR_CURRENT_PWM_Y_PIN 12 // PD8 Y-REF TIOB8
+#define MOTOR_CURRENT_PWM_Z_PIN 10 // PC29 Z-REF TIOB7
+#define MOTOR_CURRENT_PWM_E0_PIN 3 // PC28 E1-REF TIOA7
+#define MOTOR_CURRENT_PWM_E1_PIN 11 // PD7 E2-REF TIOA8
-#define MOTOR_CURRENT_PWM_RANGE 2750 // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
+#define MOTOR_CURRENT_PWM_RANGE 2750 // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
#define DEFAULT_PWM_MOTOR_CURRENT { 1000, 1000, 1000 } //, 1000, 1000} // X Y Z E0 E1, 1000 = 1000mAh
//
// Temperature Sensors
//
-#define TEMP_0_PIN 10 // D10 PB19 THERM AN1 *
-#define TEMP_1_PIN 9 // D9 PB18 THERM AN2 *
-#define TEMP_2_PIN 8 // D8 PB17 THERM AN4 *
-#define TEMP_BED_PIN 11 // D11 PB20 THERM AN3 *
+#define TEMP_0_PIN 10 // D10 PB19 THERM AN1 *
+#define TEMP_1_PIN 9 // D9 PB18 THERM AN2 *
+#define TEMP_2_PIN 8 // D8 PB17 THERM AN4 *
+#define TEMP_BED_PIN 11 // D11 PB20 THERM AN3 *
//
// Heaters / Fans
//
-#define HEATER_0_PIN 6 // D6 PC24 FET_PWM3
-#define HEATER_1_PIN 7 // D7 PC23 FET_PWM4
-#define HEATER_2_PIN 8 // D8 PC22 FET_PWM5
-#define HEATER_BED_PIN 9 // D9 PC21 BED_PWM
+#define HEATER_0_PIN 6 // D6 PC24 FET_PWM3
+#define HEATER_1_PIN 7 // D7 PC23 FET_PWM4
+#define HEATER_2_PIN 8 // D8 PC22 FET_PWM5
+#define HEATER_BED_PIN 9 // D9 PC21 BED_PWM
#ifndef FAN_PIN
- #define FAN_PIN 4 // D4 PC26 FET_PWM1
+ #define FAN_PIN 4 // D4 PC26 FET_PWM1
#endif
-#define FAN1_PIN 5 // D5 PC25 FET_PWM2
+#define FAN1_PIN 5 // D5 PC25 FET_PWM2
//
// Misc. Functions
//
// Internal MicroSD card reader on the PCB
-#define INT_SCK_PIN 42 // D42 PA19/MCCK
-#define INT_MISO_PIN 43 // D43 PA20/MCCDA
-#define INT_MOSI_PIN 73 // D73 PA21/MCDA0
-#define INT_SDSS 55 // D55 PA24/MCDA3
+#define INT_SCK_PIN 42 // D42 PA19/MCCK
+#define INT_MISO_PIN 43 // D43 PA20/MCCDA
+#define INT_MOSI_PIN 73 // D73 PA21/MCDA0
+#define INT_SDSS 55 // D55 PA24/MCDA3
// External SD card reader on SC2
-#define SCK_PIN 76 // D76 PA27
-#define MISO_PIN 74 // D74 PA25
-#define MOSI_PIN 75 // D75 PA26
-#define SDSS 87 // D87 PA29
+#define SCK_PIN 76 // D76 PA27
+#define MISO_PIN 74 // D74 PA25
+#define MOSI_PIN 75 // D75 PA26
+#define SDSS 87 // D87 PA29
// 2MB SPI Flash
-#define SPI_FLASH_SS 52 // D52 PB21
+#define SPI_FLASH_SS 52 // D52 PB21
//
// LCD / Controller
//
#if HAS_SPI_LCD
- #define BEEPER_PIN 23 // D24 PA15_CTS1
- #define LCD_PINS_RS 17 // D17 PA12_RXD1
- #define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
- #define LCD_PINS_D4 69 // D69 PA0_CANTX0
- #define LCD_PINS_D5 54 // D54 PA16_SCK1
- #define LCD_PINS_D6 68 // D68 PA1_CANRX0
- #define LCD_PINS_D7 34 // D34 PC2_PWML0
+ #define BEEPER_PIN 23 // D24 PA15_CTS1
+ #define LCD_PINS_RS 17 // D17 PA12_RXD1
+ #define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
+ #define LCD_PINS_D4 69 // D69 PA0_CANTX0
+ #define LCD_PINS_D5 54 // D54 PA16_SCK1
+ #define LCD_PINS_D6 68 // D68 PA1_CANRX0
+ #define LCD_PINS_D7 34 // D34 PC2_PWML0
- #define SD_DETECT_PIN 2 // D2 PB25_TIOA0
+ #define SD_DETECT_PIN 2 // D2 PB25_TIOA0
#if ENABLED(NEWPANEL)
// Buttons on AUX-2
- #define BTN_EN1 60 // D60 PA3_TIOB1
- #define BTN_EN2 13 // D13 PB27_TIOB0
- #define BTN_ENC 16 // D16 PA13_TXD1
+ #define BTN_EN1 60 // D60 PA3_TIOB1
+ #define BTN_EN2 13 // D13 PB27_TIOB0
+ #define BTN_ENC 16 // D16 PA13_TXD1
#endif // NEWPANEL
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h
index 504e937f9f..d2114ea433 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM2.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -52,8 +52,8 @@
//
// Servos
//
-#define SERVO0_PIN 20 // D20 PB12 (Header J20 20)
-#define SERVO1_PIN 21 // D21 PB13 (Header J20 19)
+#define SERVO0_PIN 20 // D20 PB12 (Header J20 20)
+#define SERVO1_PIN 21 // D21 PB13 (Header J20 19)
//
// Limit Switches
@@ -65,83 +65,83 @@
// Otherwise use a physical endstop based configuration.
// TMC2130 Diag Pins
- #define X_DIAG_PIN 59 // PA4
- #define Y_DIAG_PIN 48 // PC15
- #define Z_DIAG_PIN 36 // PC4
- #define E0_DIAG_PIN 78 // PB23
- #define E1_DIAG_PIN 25 // PD0
+ #define X_DIAG_PIN 59 // PA4
+ #define Y_DIAG_PIN 48 // PC15
+ #define Z_DIAG_PIN 36 // PC4
+ #define E0_DIAG_PIN 78 // PB23
+ #define E1_DIAG_PIN 25 // PD0
#if X_HOME_DIR < 0
- #define X_MIN_PIN X_DIAG_PIN
- #define X_MAX_PIN 32
+ #define X_MIN_PIN X_DIAG_PIN
+ #define X_MAX_PIN 32
#else
- #define X_MIN_PIN 14
- #define X_MAX_PIN X_DIAG_PIN
+ #define X_MIN_PIN 14
+ #define X_MAX_PIN X_DIAG_PIN
#endif
#if Y_HOME_DIR < 0
- #define Y_MIN_PIN Y_DIAG_PIN
- #define Y_MAX_PIN 15
+ #define Y_MIN_PIN Y_DIAG_PIN
+ #define Y_MAX_PIN 15
#else
- #define Y_MIN_PIN 29
- #define Y_MAX_PIN Y_DIAG_PIN
+ #define Y_MIN_PIN 29
+ #define Y_MAX_PIN Y_DIAG_PIN
#endif
#else
- #define X_MIN_PIN 14 // PD4 MIN ES1
- #define X_MAX_PIN 32 // PD10 MAX ES1
- #define Y_MIN_PIN 29 // PD6 MIN ES2
- #define Y_MAX_PIN 15 // PD5 MAX ES2
+ #define X_MIN_PIN 14 // PD4 MIN ES1
+ #define X_MAX_PIN 32 // PD10 MAX ES1
+ #define Y_MIN_PIN 29 // PD6 MIN ES2
+ #define Y_MAX_PIN 15 // PD5 MAX ES2
#endif
-#define Z_MIN_PIN 31 // PA7 MIN ES3
-#define Z_MAX_PIN 30 // PD9 MAX ES3
+#define Z_MIN_PIN 31 // PA7 MIN ES3
+#define Z_MAX_PIN 30 // PD9 MAX ES3
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 32
+ #define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
-#define X_STEP_PIN 38 // PC6 X-STEP *
-#define X_DIR_PIN 37 // PC5 X-DIR *
-#define X_ENABLE_PIN 41 // PC9 EN1
+#define X_STEP_PIN 38 // PC6 X-STEP *
+#define X_DIR_PIN 37 // PC5 X-DIR *
+#define X_ENABLE_PIN 41 // PC9 EN1
#ifndef X_CS_PIN
- #define X_CS_PIN 39 // PC7 X_nCS
+ #define X_CS_PIN 39 // PC7 X_nCS
#endif
-#define Y_STEP_PIN 51 // PC12 Y-STEP *
-#define Y_DIR_PIN 92 // PC11 Y-DIR -AddOns *
-#define Y_ENABLE_PIN 49 // PC14 Y-EN *
+#define Y_STEP_PIN 51 // PC12 Y-STEP *
+#define Y_DIR_PIN 92 // PC11 Y-DIR -AddOns *
+#define Y_ENABLE_PIN 49 // PC14 Y-EN *
#ifndef Y_CS_PIN
- #define Y_CS_PIN 50 // PC13 Y_nCS
+ #define Y_CS_PIN 50 // PC13 Y_nCS
#endif
-#define Z_STEP_PIN 46 // PC17 Z-STEP *
-#define Z_DIR_PIN 47 // PC16 Z-DIR *
-#define Z_ENABLE_PIN 44 // PC19 Z-END *
+#define Z_STEP_PIN 46 // PC17 Z-STEP *
+#define Z_DIR_PIN 47 // PC16 Z-DIR *
+#define Z_ENABLE_PIN 44 // PC19 Z-END *
#ifndef Z_CS_PIN
- #define Z_CS_PIN 45 // PC18 Z_nCS
+ #define Z_CS_PIN 45 // PC18 Z_nCS
#endif
-#define E0_STEP_PIN 107 // PB10 E1-STEP -AddOns *
-#define E0_DIR_PIN 96 // PC10 E1-DIR -AddOns *
-#define E0_ENABLE_PIN 105 // PB22 E1-EN -AddOns *
+#define E0_STEP_PIN 107 // PB10 E1-STEP -AddOns *
+#define E0_DIR_PIN 96 // PC10 E1-DIR -AddOns *
+#define E0_ENABLE_PIN 105 // PB22 E1-EN -AddOns *
#ifndef E0_CS_PIN
- #define E0_CS_PIN 104 // PC20 E1_nCS -AddOns *
+ #define E0_CS_PIN 104 // PC20 E1_nCS -AddOns *
#endif
-#define E1_STEP_PIN 22 // PB26 E2_STEP *
-#define E1_DIR_PIN 97 // PB24 E2_DIR -AddOns *
-#define E1_ENABLE_PIN 18 // PA11 E2-EN
+#define E1_STEP_PIN 22 // PB26 E2_STEP *
+#define E1_DIR_PIN 97 // PB24 E2_DIR -AddOns *
+#define E1_ENABLE_PIN 18 // PA11 E2-EN
#ifndef E1_CS_PIN
- #define E1_CS_PIN 19 // PA10 E2_nCS
+ #define E1_CS_PIN 19 // PA10 E2_nCS
#endif
//
@@ -150,106 +150,106 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI 28 // PD3
+ #define TMC_SW_MOSI 28 // PD3
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO 26 // PD1
+ #define TMC_SW_MISO 26 // PD1
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK 27 // PD2
+ #define TMC_SW_SCK 27 // PD2
#endif
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 10 // D10 PB19 THERM AN1 *
-#define TEMP_1_PIN 9 // D9 PB18 THERM AN2 *
-#define TEMP_2_PIN 8 // D8 PB17 THERM AN4 *
-#define TEMP_BED_PIN 11 // D11 PB20 THERM AN3 *
+#define TEMP_0_PIN 10 // D10 PB19 THERM AN1 *
+#define TEMP_1_PIN 9 // D9 PB18 THERM AN2 *
+#define TEMP_2_PIN 8 // D8 PB17 THERM AN4 *
+#define TEMP_BED_PIN 11 // D11 PB20 THERM AN3 *
//
// Heaters / Fans
//
-#define HEATER_0_PIN 6 // D6 PC24 FET_PWM3
-#define HEATER_1_PIN 7 // D7 PC23 FET_PWM4
-#define HEATER_2_PIN 8 // D8 PC22 FET_PWM5
-#define HEATER_BED_PIN 9 // D9 PC21 BED_PWM
+#define HEATER_0_PIN 6 // D6 PC24 FET_PWM3
+#define HEATER_1_PIN 7 // D7 PC23 FET_PWM4
+#define HEATER_2_PIN 8 // D8 PC22 FET_PWM5
+#define HEATER_BED_PIN 9 // D9 PC21 BED_PWM
#ifndef FAN_PIN
- #define FAN_PIN 4 // D4 PC26 FET_PWM1
+ #define FAN_PIN 4 // D4 PC26 FET_PWM1
#endif
-#define FAN1_PIN 5 // D5 PC25 FET_PWM2
+#define FAN1_PIN 5 // D5 PC25 FET_PWM2
//
// Misc. Functions
//
// Internal MicroSD card reader on the PCB
-#define INT_SCK_PIN 42 // D42 PA19/MCCK
-#define INT_MISO_PIN 43 // D43 PA20/MCCDA
-#define INT_MOSI_PIN 73 // D73 PA21/MCDA0
-#define INT_SDSS 55 // D55 PA24/MCDA3
+#define INT_SCK_PIN 42 // D42 PA19/MCCK
+#define INT_MISO_PIN 43 // D43 PA20/MCCDA
+#define INT_MOSI_PIN 73 // D73 PA21/MCDA0
+#define INT_SDSS 55 // D55 PA24/MCDA3
// External SD card reader on SC2
-#define SCK_PIN 76 // D76 PA27
-#define MISO_PIN 74 // D74 PA25
-#define MOSI_PIN 75 // D75 PA26
-#define SDSS 87 // D87 PA29
+#define SCK_PIN 76 // D76 PA27
+#define MISO_PIN 74 // D74 PA25
+#define MOSI_PIN 75 // D75 PA26
+#define SDSS 87 // D87 PA29
// Unused Digital GPIO J20 Pins
-#define GPIO_PB1_J20_5 94 // D94 PB1 (Header J20 5)
-#define GPIO_PB0_J20_6 95 // D95 PB0 (Header J20 6)
-#define GPIO_PB3_J20_7 103 // D103 PB3 (Header J20 7)
-#define GPIO_PB2_J20_8 93 // D93 PB2 (Header J20 8)
-#define GPIO_PB6_J20_9 99 // D99 PB6 (Header J20 9)
-#define GPIO_PB5_J20_10 101 // D101 PB5 (Header J20 10)
-#define GPIO_PB8_J20_11 100 // D100 PB8 (Header J20 11)
-#define GPIO_PB4_J20_12 102 // D102 PB4 (Header J20 12)
-#define GPIO_PB9_J20_13 108 // D108 PB9 (Header J20 13)
-#define GPIO_PB7_J20_14 98 // D98 PB7 (Header J20 14)
-#define GPIO_PB15_J20_15 66 // D66 PB15 (Header J20 15)
-#define GPIO_PB16_J20_16 67 // D67 PB16 (Header J20 16)
-#define GPIO_PB14_J20_17 53 // D53 PB14 (Header J20 17)
-#define GPIO_PA18_J20_21 71 // D71 PA17 (Header J20 21)
-#define GPIO_PA17_J20_22 70 // D70 PA17 (Header J20 22)
+#define GPIO_PB1_J20_5 94 // D94 PB1 (Header J20 5)
+#define GPIO_PB0_J20_6 95 // D95 PB0 (Header J20 6)
+#define GPIO_PB3_J20_7 103 // D103 PB3 (Header J20 7)
+#define GPIO_PB2_J20_8 93 // D93 PB2 (Header J20 8)
+#define GPIO_PB6_J20_9 99 // D99 PB6 (Header J20 9)
+#define GPIO_PB5_J20_10 101 // D101 PB5 (Header J20 10)
+#define GPIO_PB8_J20_11 100 // D100 PB8 (Header J20 11)
+#define GPIO_PB4_J20_12 102 // D102 PB4 (Header J20 12)
+#define GPIO_PB9_J20_13 108 // D108 PB9 (Header J20 13)
+#define GPIO_PB7_J20_14 98 // D98 PB7 (Header J20 14)
+#define GPIO_PB15_J20_15 66 // D66 PB15 (Header J20 15)
+#define GPIO_PB16_J20_16 67 // D67 PB16 (Header J20 16)
+#define GPIO_PB14_J20_17 53 // D53 PB14 (Header J20 17)
+#define GPIO_PA18_J20_21 71 // D71 PA17 (Header J20 21)
+#define GPIO_PA17_J20_22 70 // D70 PA17 (Header J20 22)
// Case Light
-#define CASE_LIGHT_PIN GPIO_PB1_J20_5
+#define CASE_LIGHT_PIN GPIO_PB1_J20_5
// 2MB SPI Flash
-#define SPI_FLASH_SS 52 // D52 PB21
+#define SPI_FLASH_SS 52 // D52 PB21
//
// Filament Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN GPIO_PB15_J20_15
+ #define FIL_RUNOUT_PIN GPIO_PB15_J20_15
#endif
#ifndef FIL_RUNOUT2_PIN
- #define FIL_RUNOUT2_PIN GPIO_PB16_J20_16
+ #define FIL_RUNOUT2_PIN GPIO_PB16_J20_16
#endif
//
// LCD / Controller
//
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
- #define BEEPER_PIN 23 // D24 PA15_CTS1
- #define LCD_PINS_RS 17 // D17 PA12_RXD1
- #define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
- #define LCD_PINS_D4 69 // D69 PA0_CANTX0
- #define LCD_PINS_D5 54 // D54 PA16_SCK1
- #define LCD_PINS_D6 68 // D68 PA1_CANRX0
- #define LCD_PINS_D7 34 // D34 PC2_PWML0
+ #define BEEPER_PIN 23 // D24 PA15_CTS1
+ #define LCD_PINS_RS 17 // D17 PA12_RXD1
+ #define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
+ #define LCD_PINS_D4 69 // D69 PA0_CANTX0
+ #define LCD_PINS_D5 54 // D54 PA16_SCK1
+ #define LCD_PINS_D6 68 // D68 PA1_CANRX0
+ #define LCD_PINS_D7 34 // D34 PC2_PWML0
- #define SD_DETECT_PIN 2 // D2 PB25_TIOA0
+ #define SD_DETECT_PIN 2 // D2 PB25_TIOA0
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
// Buttons on AUX-2
- #define BTN_EN1 60 // D60 PA3_TIOB1
- #define BTN_EN2 13 // D13 PB27_TIOB0
- #define BTN_ENC 16 // D16 PA13_TXD1 // the click
+ #define BTN_EN1 60 // D60 PA3_TIOB1
+ #define BTN_EN2 13 // D13 PB27_TIOB0
+ #define BTN_ENC 16 // D16 PA13_TXD1 // the click
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
index fe9bfb9afd..f23d008bec 100644
--- a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
+++ b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
@@ -1,3 +1,25 @@
+/**
+ * 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 .
+ *
+ */
+
/**
* CNControls V15 for HMS434 with DUE pin assignments
*/
@@ -11,87 +33,91 @@
//
// Servos
//
-#define SERVO0_PIN 6
+#define SERVO0_PIN 6
//
// Limit Switches
//
-#define X_STOP_PIN 34
-#define Y_STOP_PIN 39
-#define Z_STOP_PIN 62
+#define X_STOP_PIN 34
+#define Y_STOP_PIN 39
+#define Z_STOP_PIN 62
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 49
+ #define Z_MIN_PROBE_PIN 49
#endif
//
// Steppers
//
-#define X_STEP_PIN 14
-#define X_DIR_PIN 25
-#define X_ENABLE_PIN 26
+#define X_STEP_PIN 14
+#define X_DIR_PIN 25
+#define X_ENABLE_PIN 26
-#define Y_STEP_PIN 11
-#define Y_DIR_PIN 12
-#define Y_ENABLE_PIN 15
+#define Y_STEP_PIN 11
+#define Y_DIR_PIN 12
+#define Y_ENABLE_PIN 15
-#define Z_STEP_PIN 24
-#define Z_DIR_PIN 27
-#define Z_ENABLE_PIN 28
+#define Z_STEP_PIN 24
+#define Z_DIR_PIN 27
+#define Z_ENABLE_PIN 28
-#define E0_STEP_PIN 64
-#define E0_DIR_PIN 65
-#define E0_ENABLE_PIN 63
+#define E0_STEP_PIN 64
+#define E0_DIR_PIN 65
+#define E0_ENABLE_PIN 63
-#define E1_STEP_PIN 8
-#define E1_DIR_PIN 7
-#define E1_ENABLE_PIN 29
+#define E1_STEP_PIN 8
+#define E1_DIR_PIN 7
+#define E1_ENABLE_PIN 29
//
// Temperature Sensors
// Analog Inputs
//
-#define TEMP_0_PIN 1
-#define TEMP_1_PIN 2
-#define TEMP_BED_PIN 4
+#define TEMP_0_PIN 1
+#define TEMP_1_PIN 2
+#define TEMP_BED_PIN 4
#ifndef TEMP_CHAMBER_PIN
- #define TEMP_CHAMBER_PIN 5
+ #define TEMP_CHAMBER_PIN 5
#endif
//
// Heaters
//
-#define HEATER_0_PIN 3
-#define HEATER_1_PIN 4
-#define HEATER_BED_PIN 32
-#define HEATER_CHAMBER_PIN 33
+#define HEATER_0_PIN 3
+#define HEATER_1_PIN 4
+#define HEATER_BED_PIN 32
+#define HEATER_CHAMBER_PIN 33
//
// Fans
//
-//#define FAN0_PIN 8
-#define ORIG_E0_AUTO_FAN_PIN 30
-#define ORIG_E1_AUTO_FAN_PIN 30
-#define ORIG_E2_AUTO_FAN_PIN 30
-#define ORIG_E3_AUTO_FAN_PIN 30
-#define ORIG_CHAMBER_AUTO_FAN_PIN 10
+//#define FAN0_PIN 8
+#define ORIG_E0_AUTO_FAN_PIN 30
+#define ORIG_E1_AUTO_FAN_PIN 30
+#define ORIG_E2_AUTO_FAN_PIN 30
+#define ORIG_E3_AUTO_FAN_PIN 30
+#define ORIG_CHAMBER_AUTO_FAN_PIN 10
//
// SD card
//
-#define SCK_PIN 76
-#define MISO_PIN 74
-#define MOSI_PIN 75
-#define SDSS 53
-#define SD_DETECT_PIN 40
+#define SCK_PIN 76
+#define MISO_PIN 74
+#define MOSI_PIN 75
+#define SDSS 53
+#define SD_DETECT_PIN 40
// Common I/O
-//#define PWM_1_PIN 6 // probe
-//#define PWM_2_PIN 13
-//#define SPARE_IO 17
-#define BEEPER_PIN 13
-#define CALIBRATION_PIN 66
-#define STAT_LED_BLUE_PIN -1
-#define STAT_LED_RED_PIN 31
+//#define PWM_1_PIN 6 // probe
+//#define PWM_2_PIN 13
+//#define SPARE_IO 17
+#define BEEPER_PIN 13
+#define STAT_LED_BLUE_PIN -1
+#define STAT_LED_RED_PIN 31
+
+// G425 CALIBRATION_GCODE default pin
+#ifndef CALIBRATION_PIN
+ #define CALIBRATION_PIN 66
+#endif
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h
index 731e31defa..8f1fb75012 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,138 +34,138 @@
//
// Servos
//
-#define SERVO0_PIN 5
-#define SERVO1_PIN 6
-#define SERVO2_PIN 13
-#define SERVO3_PIN -1
+#define SERVO0_PIN 5
+#define SERVO1_PIN 6
+#define SERVO2_PIN 13
+#define SERVO3_PIN -1
//
// Limit Switches
//
-#define X_MIN_PIN 38
-#define X_MAX_PIN 36
-#define Y_MIN_PIN 34
-#define Y_MAX_PIN 32
-#define Z_MIN_PIN 30
-#define Z_MAX_PIN 28
+#define X_MIN_PIN 38
+#define X_MAX_PIN 36
+#define Y_MIN_PIN 34
+#define Y_MAX_PIN 32
+#define Z_MIN_PIN 30
+#define Z_MAX_PIN 28
//
// Steppers
//
-#define X_STEP_PIN 2
-#define X_DIR_PIN 3
-#define X_ENABLE_PIN 22
+#define X_STEP_PIN 2
+#define X_DIR_PIN 3
+#define X_ENABLE_PIN 22
-#define Y_STEP_PIN 17
-#define Y_DIR_PIN 16
-#define Y_ENABLE_PIN 26
+#define Y_STEP_PIN 17
+#define Y_DIR_PIN 16
+#define Y_ENABLE_PIN 26
-#define Z_STEP_PIN 61 // Z1 STP
-#define Z_DIR_PIN 60 // Z1 DIR
-#define Z_ENABLE_PIN 15 // Z1 ENA
+#define Z_STEP_PIN 61 // Z1 STP
+#define Z_DIR_PIN 60 // Z1 DIR
+#define Z_ENABLE_PIN 15 // Z1 ENA
-#define E0_STEP_PIN 64 // Z2 STP
-#define E0_DIR_PIN 63 // Z2 DIR
-#define E0_ENABLE_PIN 62 // Z2 ENA
+#define E0_STEP_PIN 64 // Z2 STP
+#define E0_DIR_PIN 63 // Z2 DIR
+#define E0_ENABLE_PIN 62 // Z2 ENA
-#define E1_STEP_PIN 51 // E1 STP
-#define E1_DIR_PIN 53 // E1 DIR
-#define E1_ENABLE_PIN 65 // E1 ENA
+#define E1_STEP_PIN 51 // E1 STP
+#define E1_DIR_PIN 53 // E1 DIR
+#define E1_ENABLE_PIN 65 // E1 ENA
-#define E2_STEP_PIN 24 // E2 STP
-#define E2_DIR_PIN 23 // E2 DIR
-#define E2_ENABLE_PIN 49 // E2 ENA
+#define E2_STEP_PIN 24 // E2 STP
+#define E2_DIR_PIN 23 // E2 DIR
+#define E2_ENABLE_PIN 49 // E2 ENA
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input (HOTEND0 thermistor)
-#define TEMP_1_PIN 2 // Analog Input (HOTEND1 thermistor)
-#define TEMP_2_PIN 5 // Analog Input (unused)
-#define TEMP_BED_PIN 1 // Analog Input (BED thermistor)
+#define TEMP_0_PIN 0 // Analog Input (HOTEND0 thermistor)
+#define TEMP_1_PIN 2 // Analog Input (HOTEND1 thermistor)
+#define TEMP_2_PIN 5 // Analog Input (unused)
+#define TEMP_BED_PIN 1 // Analog Input (BED thermistor)
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN -1
+ #define MAX6675_SS_PIN -1
#else
- #define MAX6675_SS_PIN -1
+ #define MAX6675_SS_PIN -1
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 7 // HOTEND0 MOSFET
-#define HEATER_1_PIN 8 // HOTEND1 MOSFET
-#define HEATER_BED_PIN 39 // BED MOSFET
+#define HEATER_0_PIN 7 // HOTEND0 MOSFET
+#define HEATER_1_PIN 8 // HOTEND1 MOSFET
+#define HEATER_BED_PIN 39 // BED MOSFET
#ifndef FAN_PIN
- #define FAN_PIN 11 // FAN1 header on board - PRINT FAN
+ #define FAN_PIN 11 // FAN1 header on board - PRINT FAN
#endif
-#define FAN1_PIN 9 // FAN2 header on board - CONTROLLER FAN
-#define FAN2_PIN 12 // FAN3 header on board - EXTRUDER0 FAN
+#define FAN1_PIN 9 // FAN2 header on board - CONTROLLER FAN
+#define FAN2_PIN 12 // FAN3 header on board - EXTRUDER0 FAN
//
// Misc. Functions
//
-#define SDSS 4
-#define PS_ON_PIN 40
+#define SDSS 4
+#define PS_ON_PIN 40
//
// LCD / Controller
//
#if HAS_SPI_LCD
- #define LCD_PINS_RS 42
- #define LCD_PINS_ENABLE 43
- #define LCD_PINS_D4 44
- #define LCD_PINS_D5 45
- #define LCD_PINS_D6 46
- #define LCD_PINS_D7 47
+ #define LCD_PINS_RS 42
+ #define LCD_PINS_ENABLE 43
+ #define LCD_PINS_D4 44
+ #define LCD_PINS_D5 45
+ #define LCD_PINS_D6 46
+ #define LCD_PINS_D7 47
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define BEEPER_PIN 41
+ #define BEEPER_PIN 41
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
- #define SDSS 4
- #define SD_DETECT_PIN 14
+ #define SDSS 4
+ #define SD_DETECT_PIN 14
#elif ENABLED(RADDS_DISPLAY)
- #define BEEPER_PIN 41
+ #define BEEPER_PIN 41
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
- #define BTN_BACK 71
+ #define BTN_BACK 71
#undef SDSS
- #define SDSS 4
- #define SD_DETECT_PIN 14
+ #define SDSS 4
+ #define SD_DETECT_PIN 14
#elif HAS_SSD1306_OLED_I2C
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
- #define BEEPER_PIN 41
- #define LCD_SDSS 4
- #define SD_DETECT_PIN 14
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
+ #define BEEPER_PIN 41
+ #define LCD_SDSS 4
+ #define SD_DETECT_PIN 14
#elif ENABLED(SPARK_FULL_GRAPHICS)
- #define LCD_PINS_D4 29
- #define LCD_PINS_ENABLE 27
- #define LCD_PINS_RS 25
+ #define LCD_PINS_D4 29
+ #define LCD_PINS_ENABLE 27
+ #define LCD_PINS_RS 25
- #define BTN_EN1 35
- #define BTN_EN2 33
- #define BTN_ENC 37
+ #define BTN_EN1 35
+ #define BTN_EN2 33
+ #define BTN_ENC 37
- #define BEEPER_PIN -1
+ #define BEEPER_PIN -1
#endif // SPARK_FULL_GRAPHICS
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index ed9781388a..34706d5e90 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -34,141 +34,141 @@
//
// Servos
//
-#define SERVO0_PIN 5
-#define SERVO1_PIN 6
-#define SERVO2_PIN 8 // 4-pin header FAN0
-#define SERVO3_PIN -1
+#define SERVO0_PIN 5
+#define SERVO1_PIN 6
+#define SERVO2_PIN 8 // 4-pin header FAN0
+#define SERVO3_PIN -1
//
// Limit Switches
//
-#define X_MIN_PIN 38
-#define X_MAX_PIN -1
-#define Y_MIN_PIN 34
-#define Y_MAX_PIN -1
-#define Z_MIN_PIN 30
-#define Z_MAX_PIN -1
+#define X_MIN_PIN 38
+#define X_MAX_PIN -1
+#define Y_MIN_PIN 34
+#define Y_MAX_PIN -1
+#define Z_MIN_PIN 30
+#define Z_MAX_PIN -1
//
// Steppers
//
-#define X_STEP_PIN 17
-#define X_DIR_PIN 16
-#define X_ENABLE_PIN 22
+#define X_STEP_PIN 17
+#define X_DIR_PIN 16
+#define X_ENABLE_PIN 22
-#define Y_STEP_PIN 2
-#define Y_DIR_PIN 3
-#define Y_ENABLE_PIN 26
+#define Y_STEP_PIN 2
+#define Y_DIR_PIN 3
+#define Y_ENABLE_PIN 26
-#define Z_STEP_PIN 64
-#define Z_DIR_PIN 63
-#define Z_ENABLE_PIN 15
+#define Z_STEP_PIN 64
+#define Z_DIR_PIN 63
+#define Z_ENABLE_PIN 15
-#define E0_STEP_PIN 61
-#define E0_DIR_PIN 60
-#define E0_ENABLE_PIN 62
+#define E0_STEP_PIN 61
+#define E0_DIR_PIN 60
+#define E0_ENABLE_PIN 62
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input (HOTEND0 thermistor)
-#define TEMP_1_PIN 2 // Analog Input (unused)
-#define TEMP_2_PIN 5 // Analog Input (OnBoard thermistor beta 3950)
-#define TEMP_BED_PIN 1 // Analog Input (BED thermistor)
+#define TEMP_0_PIN 0 // Analog Input (HOTEND0 thermistor)
+#define TEMP_1_PIN 2 // Analog Input (unused)
+#define TEMP_2_PIN 5 // Analog Input (OnBoard thermistor beta 3950)
+#define TEMP_BED_PIN 1 // Analog Input (BED thermistor)
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 53
+ #define MAX6675_SS_PIN 53
#else
- #define MAX6675_SS_PIN 53
+ #define MAX6675_SS_PIN 53
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 13 // HOTEND0 MOSFET
-#define HEATER_BED_PIN 7 // BED MOSFET
+#define HEATER_0_PIN 13 // HOTEND0 MOSFET
+#define HEATER_BED_PIN 7 // BED MOSFET
#ifndef FAN_PIN
- #define FAN_PIN 11 // FAN1 header on board - PRINT FAN
+ #define FAN_PIN 11 // FAN1 header on board - PRINT FAN
#endif
-#define FAN1_PIN 12 // FAN2 header on board - CONTROLLER FAN
-#define FAN2_PIN 9 // FAN3 header on board - EXTRUDER0 FAN
-//#define FAN3_PIN 8 // FAN0 4-pin header on board
+#define FAN1_PIN 12 // FAN2 header on board - CONTROLLER FAN
+#define FAN2_PIN 9 // FAN3 header on board - EXTRUDER0 FAN
+//#define FAN3_PIN 8 // FAN0 4-pin header on board
//
// Misc. Functions
//
-#define SDSS 4
-#define PS_ON_PIN 40
+#define SDSS 4
+#define PS_ON_PIN 40
//
// LCD / Controller
//
#if HAS_SPI_LCD
- #define LCD_PINS_RS 42
- #define LCD_PINS_ENABLE 43
- #define LCD_PINS_D4 44
- #define LCD_PINS_D5 45
- #define LCD_PINS_D6 46
- #define LCD_PINS_D7 47
+ #define LCD_PINS_RS 42
+ #define LCD_PINS_ENABLE 43
+ #define LCD_PINS_D4 44
+ #define LCD_PINS_D5 45
+ #define LCD_PINS_D6 46
+ #define LCD_PINS_D7 47
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define BEEPER_PIN 41
+ #define BEEPER_PIN 41
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
- #define SDSS 4
- #define SD_DETECT_PIN 14
+ #define SDSS 4
+ #define SD_DETECT_PIN 14
#elif ENABLED(RADDS_DISPLAY)
- #define BEEPER_PIN 41
+ #define BEEPER_PIN 41
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
- #define BTN_BACK 71
+ #define BTN_BACK 71
#undef SDSS
- #define SDSS 4
- #define SD_DETECT_PIN 14
+ #define SDSS 4
+ #define SD_DETECT_PIN 14
#elif HAS_SSD1306_OLED_I2C
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
- #define BEEPER_PIN 41
- #define LCD_SDSS 4
- #define SD_DETECT_PIN 14
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
+ #define BEEPER_PIN 41
+ #define LCD_SDSS 4
+ #define SD_DETECT_PIN 14
#elif ENABLED(SPARK_FULL_GRAPHICS)
- #define LCD_PINS_D4 29
- #define LCD_PINS_ENABLE 27
- #define LCD_PINS_RS 25
+ #define LCD_PINS_D4 29
+ #define LCD_PINS_ENABLE 27
+ #define LCD_PINS_RS 25
- #define BTN_EN1 35
- #define BTN_EN2 33
- #define BTN_ENC 37
+ #define BTN_EN1 35
+ #define BTN_EN2 33
+ #define BTN_ENC 37
- #define BEEPER_PIN -1
+ #define BEEPER_PIN -1
#elif ENABLED(MINIPANEL)
- #define BTN_EN1 52
- #define BTN_EN2 50
- #define BTN_ENC 48
- #define LCD_SDSS 4
- #define SD_DETECT_PIN 14
- #define BEEPER_PIN 41
- #define DOGLCD_A0 46
- #define DOGLCD_CS 45
+ #define BTN_EN1 52
+ #define BTN_EN2 50
+ #define BTN_ENC 48
+ #define LCD_SDSS 4
+ #define SD_DETECT_PIN 14
+ #define BEEPER_PIN 41
+ #define DOGLCD_A0 46
+ #define DOGLCD_CS 45
#endif // SPARK_FULL_GRAPHICS
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
index d5cc3bed6a..b3a9e456a2 100644
--- a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
+++ b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,38 +36,38 @@
//
// Servos
//
-//#define SERVO0_PIN -1
-//#define SERVO1_PIN -1
+//#define SERVO0_PIN -1
+//#define SERVO1_PIN -1
//
// Limit Switches
//
-#define X_MIN_PIN 22 // PB26
-#define Y_MAX_PIN 18 // PA11
-#define Z_MIN_PIN 19 // PA10
+#define X_MIN_PIN 22 // PB26
+#define Y_MAX_PIN 18 // PA11
+#define Z_MIN_PIN 19 // PA10
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 22
+ #define Z_MIN_PROBE_PIN 22
#endif
#ifndef FIL_RUNOUT_PIN
- //#define FIL_RUNOUT_PIN 57 // PA22
+ //#define FIL_RUNOUT_PIN 57 // PA22
#endif
#ifndef FIL_RUNOUT2_PIN
- //#define FIL_RUNOUT2_PIN 21 // PB13
+ //#define FIL_RUNOUT2_PIN 21 // PB13
#endif
//
// LED defines
//
-//#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
-//#define NEOPIXEL_PIN 20 // LED driving pin on motherboard
-//#define NEOPIXEL_PIXELS 3 // Number of LEDs in the strip
-//#define SDA0 20 // PB12 NeoPixel pin I2C data
-//#define SCL0 21 // PB13 I2C clock
+//#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
+//#define NEOPIXEL_PIN 20 // LED driving pin on motherboard
+//#define NEOPIXEL_PIXELS 3 // Number of LEDs in the strip
+//#define SDA0 20 // PB12 NeoPixel pin I2C data
+//#define SCL0 21 // PB13 I2C clock
// D0_12 #REF! (INDICATOR_LED)
// B28 JTAG-CLK
@@ -79,82 +79,82 @@
//A15 UART_CTS
//PB2 Unassigned
//PB4 to PB9 Unassigned
-//#define UART_RX_PIN 0 // PA8 "RX0"
-//#define UART_TX_PIN 1 // PA9 "TX0"
-//#define UART_RTS_PIN 23 // PA14
-//#define UART_CTS_PIN 24 // PA15
+//#define UART_RX_PIN 0 // PA8 "RX0"
+//#define UART_TX_PIN 1 // PA9 "TX0"
+//#define UART_RTS_PIN 23 // PA14
+//#define UART_CTS_PIN 24 // PA15
//
// Steppers
//
-#define Z_STEP_PIN 73 // PA21 MOTOR 1
-#define Z_DIR_PIN 75 // PA26
-#define Z_ENABLE_PIN 74 // PA25
+#define Z_STEP_PIN 73 // PA21 MOTOR 1
+#define Z_DIR_PIN 75 // PA26
+#define Z_ENABLE_PIN 74 // PA25
-#define X_STEP_PIN 66 // PB15 MOTOR 2
-#define X_DIR_PIN 54 // PA16
-#define X_ENABLE_PIN 67 // PB16
+#define X_STEP_PIN 66 // PB15 MOTOR 2
+#define X_DIR_PIN 54 // PA16
+#define X_ENABLE_PIN 67 // PB16
-#define Y_STEP_PIN 34 // PA29 MOTOR 3
-#define Y_DIR_PIN 35 // PB1
-#define Y_ENABLE_PIN 36 // PB0
+#define Y_STEP_PIN 34 // PA29 MOTOR 3
+#define Y_DIR_PIN 35 // PB1
+#define Y_ENABLE_PIN 36 // PB0
-#define E0_STEP_PIN 53 // PB14 MOTOR 4
-#define E0_DIR_PIN 78 // PB23
-#define E0_ENABLE_PIN 37 // PB22
+#define E0_STEP_PIN 53 // PB14 MOTOR 4
+#define E0_DIR_PIN 78 // PB23
+#define E0_ENABLE_PIN 37 // PB22
// Microstepping mode pins
-#define Z_MS1_PIN 52 // PB21 MODE0 MOTOR 1
-#define Z_MS2_PIN 52 // PB21 MODE1
-#define Z_MS3_PIN 65 // PB20 MODE2
+#define Z_MS1_PIN 52 // PB21 MODE0 MOTOR 1
+#define Z_MS2_PIN 52 // PB21 MODE1
+#define Z_MS3_PIN 65 // PB20 MODE2
-#define X_MS1_PIN 43 // PA20 MODE0 MOTOR 2
-#define X_MS2_PIN 43 // PA20 MODE1
-#define X_MS3_PIN 42 // PA19 MODE2
+#define X_MS1_PIN 43 // PA20 MODE0 MOTOR 2
+#define X_MS2_PIN 43 // PA20 MODE1
+#define X_MS3_PIN 42 // PA19 MODE2
-#define Y_MS1_PIN 77 // PA28 MODE0 MOTOR 3
-#define Y_MS2_PIN 77 // PA28 MODE1
-#define Y_MS3_PIN 76 // PA27 MODE2
+#define Y_MS1_PIN 77 // PA28 MODE0 MOTOR 3
+#define Y_MS2_PIN 77 // PA28 MODE1
+#define Y_MS3_PIN 76 // PA27 MODE2
-#define E0_MS1_PIN 38 // PB11 MODE0 MOTOR 4
-#define E0_MS2_PIN 38 // PB11 MODE1
-#define E0_MS3_PIN 39 // PB10 MODE2
+#define E0_MS1_PIN 38 // PB11 MODE0 MOTOR 4
+#define E0_MS2_PIN 38 // PB11 MODE1
+#define E0_MS3_PIN 39 // PB10 MODE2
// Motor current PWM pins
-#define MOTOR_CURRENT_PWM_X_PIN 62 // PB17 MOTOR 1
-#define MOTOR_CURRENT_PWM_Z_PIN 63 // PB18 MOTOR 2
-#define MOTOR_CURRENT_PWM_Y_PIN 64 // PB19 MOTOR 3
-#define MOTOR_CURRENT_PWM_E_PIN 61 // PA2 MOTOR 4
+#define MOTOR_CURRENT_PWM_X_PIN 62 // PB17 MOTOR 1
+#define MOTOR_CURRENT_PWM_Z_PIN 63 // PB18 MOTOR 2
+#define MOTOR_CURRENT_PWM_Y_PIN 64 // PB19 MOTOR 3
+#define MOTOR_CURRENT_PWM_E_PIN 61 // PA2 MOTOR 4
#define DEFAULT_PWM_MOTOR_CURRENT { 300, 400, 1000} // XY Z E0, 1000 = 1000mAh
//
// Temperature Sensors
//
-#define TEMP_0_PIN 2 // digital 56 PA23
-#define TEMP_BED_PIN 5 // digital 59 PA4
+#define TEMP_0_PIN 2 // digital 56 PA23
+#define TEMP_BED_PIN 5 // digital 59 PA4
//
// Heaters / Fans
//
-#define HEATER_0_PIN 40 // PA5
-#define HEATER_BED_PIN 41 // PB24
+#define HEATER_0_PIN 40 // PA5
+#define HEATER_BED_PIN 41 // PB24
#ifndef FAN_PIN
- #define FAN_PIN 13 // PB27 Fan1A
+ #define FAN_PIN 13 // PB27 Fan1A
#endif
-#define FAN1_PIN 58 // PA6 Fan1B
+#define FAN1_PIN 58 // PA6 Fan1B
-#define FET_SAFETY_PIN 31 // PA7 must be pulsed low every 50 mS or FETs are turned off
-#define FET_SAFETY_DELAY 50 // 50 mS delay between pulses
-#define FET_SAFETY_INVERTED true // true - negative going pulse of 2 uS
+#define FET_SAFETY_PIN 31 // PA7 must be pulsed low every 50 mS or FETs are turned off
+#define FET_SAFETY_DELAY 50 // 50 mS delay between pulses
+#define FET_SAFETY_INVERTED true // true - negative going pulse of 2 uS
/////////////////////////////////////////////////////////
-#define MISO_PIN 68 // set to unused pins for now
-#define MOSI_PIN 69 // set to unused pins for now
-#define SCK_PIN 70 // set to unused pins for now
-#define SDSS 71 // set to unused pins for now
+#define MISO_PIN 68 // set to unused pins for now
+#define MOSI_PIN 69 // set to unused pins for now
+#define SCK_PIN 70 // set to unused pins for now
+#define SDSS 71 // set to unused pins for now
/**
* G2 uses 8 pins that are not available in the DUE environment:
diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
index 819b4002a4..3bc52e9387 100644
--- a/Marlin/src/pins/sam/pins_RADDS.h
+++ b/Marlin/src/pins/sam/pins_RADDS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,187 +35,187 @@
// Servos
//
#if !HAS_CUTTER
- #define SERVO0_PIN 5
+ #define SERVO0_PIN 5
#endif
-#define SERVO1_PIN 6
-#define SERVO2_PIN 39
-#define SERVO3_PIN 40
+#define SERVO1_PIN 6
+#define SERVO2_PIN 39
+#define SERVO3_PIN 40
//
// Limit Switches
//
-#define X_MIN_PIN 28
-#define X_MAX_PIN 34
-#define Y_MIN_PIN 30
-#define Y_MAX_PIN 36
-#define Z_MIN_PIN 32
-#define Z_MAX_PIN 38
+#define X_MIN_PIN 28
+#define X_MAX_PIN 34
+#define Y_MIN_PIN 30
+#define Y_MAX_PIN 36
+#define Z_MIN_PIN 32
+#define Z_MAX_PIN 38
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 38
+ #define Z_MIN_PROBE_PIN 38
#endif
//
// Steppers
//
-#define X_STEP_PIN 24
-#define X_DIR_PIN 23
-#define X_ENABLE_PIN 26
+#define X_STEP_PIN 24
+#define X_DIR_PIN 23
+#define X_ENABLE_PIN 26
#ifndef X_CS_PIN
- #define X_CS_PIN 25
+ #define X_CS_PIN 25
#endif
-#define Y_STEP_PIN 17
-#define Y_DIR_PIN 16
-#define Y_ENABLE_PIN 22
+#define Y_STEP_PIN 17
+#define Y_DIR_PIN 16
+#define Y_ENABLE_PIN 22
#ifndef Y_CS_PIN
- #define Y_CS_PIN 27
+ #define Y_CS_PIN 27
#endif
-#define Z_STEP_PIN 2
-#define Z_DIR_PIN 3
-#define Z_ENABLE_PIN 15
+#define Z_STEP_PIN 2
+#define Z_DIR_PIN 3
+#define Z_ENABLE_PIN 15
#ifndef Z_CS_PIN
- #define Z_CS_PIN 29
+ #define Z_CS_PIN 29
#endif
-#define E0_STEP_PIN 61
-#define E0_DIR_PIN 60
-#define E0_ENABLE_PIN 62
+#define E0_STEP_PIN 61
+#define E0_DIR_PIN 60
+#define E0_ENABLE_PIN 62
#ifndef E0_CS_PIN
- #define E0_CS_PIN 31
+ #define E0_CS_PIN 31
#endif
-#define E1_STEP_PIN 64
-#define E1_DIR_PIN 63
-#define E1_ENABLE_PIN 65
+#define E1_STEP_PIN 64
+#define E1_DIR_PIN 63
+#define E1_ENABLE_PIN 65
#ifndef E1_CS_PIN
- #define E1_CS_PIN 33
+ #define E1_CS_PIN 33
#endif
-#define E2_STEP_PIN 51
-#define E2_DIR_PIN 53
-#define E2_ENABLE_PIN 49
+#define E2_STEP_PIN 51
+#define E2_DIR_PIN 53
+#define E2_ENABLE_PIN 49
#ifndef E2_CS_PIN
- #define E2_CS_PIN 35
+ #define E2_CS_PIN 35
#endif
/**
* RADDS Extension Board V2 / V3
* http://doku.radds.org/dokumentation/extension-board
*/
-//#define RADDS_EXTENSION 2
+//#define RADDS_EXTENSION 2
#if RADDS_EXTENSION >= 2
- #define E3_DIR_PIN 33
- #define E3_STEP_PIN 35
- #define E3_ENABLE_PIN 37
+ #define E3_DIR_PIN 33
+ #define E3_STEP_PIN 35
+ #define E3_ENABLE_PIN 37
#ifndef E3_CS_PIN
- #define E3_CS_PIN 6
+ #define E3_CS_PIN 6
#endif
#if RADDS_EXTENSION == 3
- #define E4_DIR_PIN 27
- #define E4_STEP_PIN 29
- #define E4_ENABLE_PIN 31
+ #define E4_DIR_PIN 27
+ #define E4_STEP_PIN 29
+ #define E4_ENABLE_PIN 31
#ifndef E4_CS_PIN
- #define E4_CS_PIN 39
+ #define E4_CS_PIN 39
#endif
- #define E5_DIR_PIN 66
- #define E5_STEP_PIN 67
- #define E5_ENABLE_PIN 68
+ #define E5_DIR_PIN 66
+ #define E5_STEP_PIN 67
+ #define E5_ENABLE_PIN 68
#ifndef E5_CS_PIN
- #define E5_CS_PIN 6
+ #define E5_CS_PIN 6
#endif
- #define RADDS_EXT_MSI_PIN 69
+ #define RADDS_EXT_MSI_PIN 69
#define BOARD_INIT() OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH)
#else
- #define E4_DIR_PIN 27
- #define E4_STEP_PIN 29
- #define E4_ENABLE_PIN 31
+ #define E4_DIR_PIN 27
+ #define E4_STEP_PIN 29
+ #define E4_ENABLE_PIN 31
#ifndef E4_CS_PIN
- #define E4_CS_PIN 39
+ #define E4_CS_PIN 39
#endif
// E3 and E4 share the same MSx pins
- #define E3_MS1_PIN 67
- #define E4_MS1_PIN 67
- #define E3_MS2_PIN 68
- #define E4_MS2_PIN 68
- #define E3_MS3_PIN 69
- #define E4_MS3_PIN 69
+ #define E3_MS1_PIN 67
+ #define E4_MS1_PIN 67
+ #define E3_MS2_PIN 68
+ #define E4_MS2_PIN 68
+ #define E3_MS3_PIN 69
+ #define E4_MS3_PIN 69
- #define RADDS_EXT_VDD2_PIN 66
+ #define RADDS_EXT_VDD2_PIN 66
#define BOARD_INIT() do{ OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH); OUT_WRITE(RADDS_EXT_VDD2_PIN, HIGH); }while(0)
#endif
- #define RADDS_EXT_VDD_PIN 25
+ #define RADDS_EXT_VDD_PIN 25
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_2_PIN 2 // Analog Input
-#define TEMP_3_PIN 3 // Analog Input
-#define TEMP_4_PIN 5 // dummy so will compile when PINS_DEBUGGING is enabled
-#define TEMP_BED_PIN 4 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_2_PIN 2 // Analog Input
+#define TEMP_3_PIN 3 // Analog Input
+#define TEMP_4_PIN 5 // dummy so will compile when PINS_DEBUGGING is enabled
+#define TEMP_BED_PIN 4 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 53
+ #define MAX6675_SS_PIN 53
#else
- #define MAX6675_SS_PIN 49
+ #define MAX6675_SS_PIN 49
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 13
-#define HEATER_1_PIN 12
-#define HEATER_2_PIN 11
+#define HEATER_0_PIN 13
+#define HEATER_1_PIN 12
+#define HEATER_2_PIN 11
#if !HAS_CUTTER
- #define HEATER_BED_PIN 7 // BED
+ #define HEATER_BED_PIN 7 // BED
#endif
#ifndef FAN_PIN
- #define FAN_PIN 9
+ #define FAN_PIN 9
#endif
-#define FAN1_PIN 8
+#define FAN1_PIN 8
//
// Misc. Functions
//
-#define SD_DETECT_PIN 14
-#define PS_ON_PIN 40 // SERVO3_PIN
+#define SD_DETECT_PIN 14
+#define PS_ON_PIN 40 // SERVO3_PIN
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN 39 // SERVO2_PIN
+ #define FIL_RUNOUT_PIN 39 // SERVO2_PIN
#endif
#define I2C_EEPROM
-#define E2END 0x1FFF // 8KB
+#define E2END 0x1FFF // 8KB
//
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
#if !NUM_SERVOS
- #define SPINDLE_LASER_PWM_PIN 5 // SERVO0_PIN
+ #define SPINDLE_LASER_PWM_PIN 5 // SERVO0_PIN
#endif
- #define SPINDLE_LASER_ENA_PIN 7 // HEATER_BED_PIN - Pullup/down!
+ #define SPINDLE_LASER_ENA_PIN 7 // HEATER_BED_PIN - Pullup/down!
#endif
//
@@ -225,65 +225,65 @@
#if ENABLED(RADDS_DISPLAY)
- #define LCD_PINS_RS 42
- #define LCD_PINS_ENABLE 43
- #define LCD_PINS_D4 44
- #define LCD_PINS_D5 45
- #define LCD_PINS_D6 46
- #define LCD_PINS_D7 47
+ #define LCD_PINS_RS 42
+ #define LCD_PINS_ENABLE 43
+ #define LCD_PINS_D4 44
+ #define LCD_PINS_D5 45
+ #define LCD_PINS_D6 46
+ #define LCD_PINS_D7 47
- #define BEEPER_PIN 41
+ #define BEEPER_PIN 41
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
- #define BTN_BACK 71
+ #define BTN_BACK 71
- #define SDSS 10
- #define SD_DETECT_PIN 14
+ #define SDSS 10
+ #define SD_DETECT_PIN 14
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
// The REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER requires
// an adapter such as https://www.thingiverse.com/thing:1740725
- #define LCD_PINS_RS 42
- #define LCD_PINS_ENABLE 43
- #define LCD_PINS_D4 44
+ #define LCD_PINS_RS 42
+ #define LCD_PINS_ENABLE 43
+ #define LCD_PINS_D4 44
- #define BEEPER_PIN 41
+ #define BEEPER_PIN 41
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
- #define SDSS 10
- #define SD_DETECT_PIN 14
+ #define SDSS 10
+ #define SD_DETECT_PIN 14
#elif HAS_SSD1306_OLED_I2C
- #define BTN_EN1 50
- #define BTN_EN2 52
- #define BTN_ENC 48
- #define BEEPER_PIN 41
- #define LCD_SDSS 10
- #define SD_DETECT_PIN 14
+ #define BTN_EN1 50
+ #define BTN_EN2 52
+ #define BTN_ENC 48
+ #define BEEPER_PIN 41
+ #define LCD_SDSS 10
+ #define SD_DETECT_PIN 14
#elif ENABLED(SPARK_FULL_GRAPHICS)
- #define LCD_PINS_D4 29
- #define LCD_PINS_ENABLE 27
- #define LCD_PINS_RS 25
+ #define LCD_PINS_D4 29
+ #define LCD_PINS_ENABLE 27
+ #define LCD_PINS_RS 25
- #define BTN_EN1 35
- #define BTN_EN2 33
- #define BTN_ENC 37
+ #define BTN_EN1 35
+ #define BTN_EN2 33
+ #define BTN_ENC 37
#endif // SPARK_FULL_GRAPHICS
#endif // HAS_SPI_LCD
#ifndef SDSS
- #define SDSS 4
+ #define SDSS 4
#endif
diff --git a/Marlin/src/pins/sam/pins_RAMPS4DUE.h b/Marlin/src/pins/sam/pins_RAMPS4DUE.h
index 36c0717bce..21a2055967 100644
--- a/Marlin/src/pins/sam/pins_RAMPS4DUE.h
+++ b/Marlin/src/pins/sam/pins_RAMPS4DUE.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RAMPS_DUO.h b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
index d63d9a32a8..916dbf6430 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_DUO.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -56,20 +56,20 @@
// Temperature Sensors
//
#undef TEMP_0_PIN
-#define TEMP_0_PIN 9 // Analog Input
+#define TEMP_0_PIN 9 // Analog Input
#undef TEMP_1_PIN
-#define TEMP_1_PIN 11 // Analog Input
+#define TEMP_1_PIN 11 // Analog Input
#undef TEMP_BED_PIN
-#define TEMP_BED_PIN 10 // Analog Input
+#define TEMP_BED_PIN 10 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#undef MAX6675_SS_PIN
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 69 // Don't use 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 69 // Don't use 53 if using Display/SD card
#else
- #define MAX6675_SS_PIN 69 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 69 // Don't use 49 (SD_DETECT_PIN)
#endif
//
@@ -79,13 +79,13 @@
#if BOTH(NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D4
- #define LCD_PINS_D4 68
+ #define LCD_PINS_D4 68
#undef LCD_PINS_D5
- #define LCD_PINS_D5 69
+ #define LCD_PINS_D5 69
#undef LCD_PINS_D7
- #define LCD_PINS_D7 67
+ #define LCD_PINS_D7 67
#endif
#if ENABLED(NEWPANEL)
@@ -93,36 +93,36 @@
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#undef BTN_EN1
- #define BTN_EN1 67
+ #define BTN_EN1 67
#undef BTN_ENC
- #define BTN_ENC 66
+ #define BTN_ENC 66
#elif ENABLED(MINIPANEL)
#undef DOGLCD_CS
- #define DOGLCD_CS 69
+ #define DOGLCD_CS 69
#undef LCD_BACKLIGHT_PIN
- #define LCD_BACKLIGHT_PIN 68 // backlight LED on A14/D68
+ #define LCD_BACKLIGHT_PIN 68 // backlight LED on A14/D68
#undef KILL_PIN
- #define KILL_PIN 67
+ #define KILL_PIN 67
#undef BTN_EN2
- #define BTN_EN2 66
+ #define BTN_EN2 66
#else
#if ENABLED(REPRAPWORLD_KEYPAD)
#undef BTN_EN1
- #define BTN_EN1 67 // encoder
+ #define BTN_EN1 67 // encoder
#undef BTN_ENC
- #define BTN_ENC 66 // enter button
+ #define BTN_ENC 66 // enter button
#elif ENABLED(PANEL_ONE)
#undef BTN_EN2
- #define BTN_EN2 66 // AUX2 PIN 4
+ #define BTN_EN2 66 // AUX2 PIN 4
#endif
#endif
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 5add612cc1..297aaa9cb8 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,98 +43,98 @@
//
// Servos
//
-#define SERVO0_PIN 7
-#define SERVO1_PIN 6
-#define SERVO2_PIN 5
-#define SERVO3_PIN 3
+#define SERVO0_PIN 7
+#define SERVO1_PIN 6
+#define SERVO2_PIN 5
+#define SERVO3_PIN 3
//
// Limit Switches
//
-#define X_MIN_PIN 22
-#define X_MAX_PIN 30
-#define Y_MIN_PIN 24
-#define Y_MAX_PIN 38
-#define Z_MIN_PIN 26
-#define Z_MAX_PIN 34
+#define X_MIN_PIN 22
+#define X_MAX_PIN 30
+#define Y_MIN_PIN 24
+#define Y_MAX_PIN 38
+#define Z_MIN_PIN 26
+#define Z_MAX_PIN 34
//
// Steppers
//
-#define X_STEP_PIN 63
-#define X_DIR_PIN 62
-#define X_ENABLE_PIN 48
+#define X_STEP_PIN 63
+#define X_DIR_PIN 62
+#define X_ENABLE_PIN 48
#ifndef X_CS_PIN
- #define X_CS_PIN 68
+ #define X_CS_PIN 68
#endif
-#define Y_STEP_PIN 65
-#define Y_DIR_PIN 64
-#define Y_ENABLE_PIN 46
+#define Y_STEP_PIN 65
+#define Y_DIR_PIN 64
+#define Y_ENABLE_PIN 46
#ifndef Y_CS_PIN
- #define Y_CS_PIN 60
+ #define Y_CS_PIN 60
#endif
-#define Z_STEP_PIN 67
-#define Z_DIR_PIN 66
-#define Z_ENABLE_PIN 44
+#define Z_STEP_PIN 67
+#define Z_DIR_PIN 66
+#define Z_ENABLE_PIN 44
#ifndef Z_CS_PIN
- #define Z_CS_PIN 58
+ #define Z_CS_PIN 58
#endif
-#define E0_STEP_PIN 36
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 42
+#define E0_STEP_PIN 36
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 42
#ifndef E0_CS_PIN
- #define E0_CS_PIN 67
+ #define E0_CS_PIN 67
#endif
-#define E1_STEP_PIN 43
-#define E1_DIR_PIN 41
-#define E1_ENABLE_PIN 39
+#define E1_STEP_PIN 43
+#define E1_DIR_PIN 41
+#define E1_ENABLE_PIN 39
#ifndef E1_CS_PIN
- #define E1_CS_PIN 61
+ #define E1_CS_PIN 61
#endif
-#define E2_STEP_PIN 32
-#define E2_DIR_PIN 47
-#define E2_ENABLE_PIN 45
+#define E2_STEP_PIN 32
+#define E2_DIR_PIN 47
+#define E2_ENABLE_PIN 45
#ifndef E2_CS_PIN
- #define E2_CS_PIN 59
+ #define E2_CS_PIN 59
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // Analog Input
-#define TEMP_1_PIN 2 // Analog Input
-#define TEMP_2_PIN 3 // Analog Input
-#define TEMP_BED_PIN 0 // Analog Input
+#define TEMP_0_PIN 1 // Analog Input
+#define TEMP_1_PIN 2 // Analog Input
+#define TEMP_2_PIN 3 // Analog Input
+#define TEMP_BED_PIN 0 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 53
+ #define MAX6675_SS_PIN 53
#else
- #define MAX6675_SS_PIN 49
+ #define MAX6675_SS_PIN 49
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 9
-#define HEATER_1_PIN 10
-#define HEATER_2_PIN 11
-#define HEATER_BED_PIN 8
+#define HEATER_0_PIN 9
+#define HEATER_1_PIN 10
+#define HEATER_2_PIN 11
+#define HEATER_BED_PIN 8
#ifndef FAN_PIN
- #define FAN_PIN 12
+ #define FAN_PIN 12
#endif
//
// Misc. Functions
//
-#define SDSS 4
-#define LED_PIN 13
+#define SDSS 4
+#define LED_PIN 13
//
// LCD / Controller
@@ -142,70 +142,70 @@
#if HAS_SPI_LCD
// ramps-fd lcd adaptor
- #define BEEPER_PIN 37
- #define BTN_EN1 33
- #define BTN_EN2 31
- #define BTN_ENC 35
- #define SD_DETECT_PIN 49
+ #define BEEPER_PIN 37
+ #define BTN_EN1 33
+ #define BTN_EN2 31
+ #define BTN_ENC 35
+ #define SD_DETECT_PIN 49
#if ENABLED(NEWPANEL)
- #define LCD_PINS_RS 16
- #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
#endif
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS LCD_PINS_ENABLE
- #define DOGLCD_A0 LCD_PINS_RS
- #define DOGLCD_SCK 76
- #define DOGLCD_MOSI 75
+ #define DOGLCD_CS LCD_PINS_ENABLE
+ #define DOGLCD_A0 LCD_PINS_RS
+ #define DOGLCD_SCK 76
+ #define DOGLCD_MOSI 75
- //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 25
+ #define RGB_LED_R_PIN 25
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN 27
+ #define RGB_LED_G_PIN 27
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN 29
+ #define RGB_LED_B_PIN 29
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN 25
+ #define NEOPIXEL_PIN 25
#endif
#elif ENABLED(NEWPANEL)
- #define LCD_PINS_D4 23
- #define LCD_PINS_D5 25
- #define LCD_PINS_D6 27
- #define LCD_PINS_D7 29
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #define LCD_PINS_D7 29
#if ENABLED(MINIPANEL)
- #define DOGLCD_CS 25
- #define DOGLCD_A0 27
+ #define DOGLCD_CS 25
+ #define DOGLCD_A0 27
#endif
#endif
#if ANY(VIKI2, miniVIKI)
- #define DOGLCD_A0 16
- #define KILL_PIN 51
- #define STAT_LED_BLUE_PIN 29
- #define STAT_LED_RED_PIN 23
- #define DOGLCD_CS 17
- #define DOGLCD_SCK 76 // SCK_PIN - Required for DUE Hardware SPI
- #define DOGLCD_MOSI 75 // MOSI_PIN
- #define DOGLCD_MISO 74 // MISO_PIN
+ #define DOGLCD_A0 16
+ #define KILL_PIN 51
+ #define STAT_LED_BLUE_PIN 29
+ #define STAT_LED_RED_PIN 23
+ #define DOGLCD_CS 17
+ #define DOGLCD_SCK 76 // SCK_PIN - Required for DUE Hardware SPI
+ #define DOGLCD_MOSI 75 // MOSI_PIN
+ #define DOGLCD_MISO 74 // MISO_PIN
#endif
#endif // HAS_SPI_LCD
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -229,7 +229,7 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HOTENDS < 3 && HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
- #define SPINDLE_LASER_ENA_PIN 45 // Use E2 ENA
- #define SPINDLE_LASER_PWM_PIN 12 // Hardware PWM
- #define SPINDLE_DIR_PIN 47 // Use E2 DIR
+ #define SPINDLE_LASER_ENA_PIN 45 // Use E2 ENA
+ #define SPINDLE_LASER_PWM_PIN 12 // Hardware PWM
+ #define SPINDLE_DIR_PIN 47 // Use E2 DIR
#endif
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
index 22fdafd68e..6e7d055069 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 619b2d594d..0fd4a6b3ea 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -73,26 +73,26 @@
#define I2C_EEPROM
#define E2END 0xFFF
-#define RESET_PIN 42 // Resets the board if the jumper is attached
+#define RESET_PIN 42 // Resets the board if the jumper is attached
//
// Temperature Sensors
//
#undef TEMP_0_PIN
-#define TEMP_0_PIN 9 // Analog Input
+#define TEMP_0_PIN 9 // Analog Input
#undef TEMP_1_PIN
-#define TEMP_1_PIN 10 // Analog Input
+#define TEMP_1_PIN 10 // Analog Input
#undef TEMP_BED_PIN
-#define TEMP_BED_PIN 11 // Analog Input
+#define TEMP_BED_PIN 11 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#undef MAX6675_SS_PIN
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 67 // Don't use 53 if there is even the remote possibility of using Display/SD card
+ #define MAX6675_SS_PIN 67 // Don't use 53 if using Display/SD card
#else
- #define MAX6675_SS_PIN 67 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+ #define MAX6675_SS_PIN 67 // Don't use 49 (SD_DETECT_PIN)
#endif
//
@@ -100,12 +100,12 @@
//
// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
#if ENABLED(AZSMZ_12864)
- #define BEEPER_PIN 66 // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 65
- #define DOGLCD_A0 59
- #define DOGLCD_CS 44
- #define BTN_EN1 58
- #define BTN_EN2 40
- #define BTN_ENC 67 // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 66
- #define SD_DETECT_PIN 49 // Pin 49 for display sd interface, 72 for easy adapter board
- #define KILL_PIN 42
+ #define BEEPER_PIN 66 // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 65
+ #define DOGLCD_A0 59
+ #define DOGLCD_CS 44
+ #define BTN_EN1 58
+ #define BTN_EN2 40
+ #define BTN_ENC 67 // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 66
+ #define SD_DETECT_PIN 49 // Pin 49 for display sd interface, 72 for easy adapter board
+ #define KILL_PIN 42
#endif
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 45540e8dad..7b844b5be0 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -41,76 +41,76 @@
//
// Servos
//
-#define SERVO0_PIN 5
-#define SERVO1_PIN 3
+#define SERVO0_PIN 5
+#define SERVO1_PIN 3
//
// Limit Switches
//
-#define X_MIN_PIN 45
-#define X_MAX_PIN 39
-#define Y_MIN_PIN 46
-#define Y_MAX_PIN 41
-#define Z_MIN_PIN 47
-#define Z_MAX_PIN 43
+#define X_MIN_PIN 45
+#define X_MAX_PIN 39
+#define Y_MIN_PIN 46
+#define Y_MAX_PIN 41
+#define Z_MIN_PIN 47
+#define Z_MAX_PIN 43
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 43
+ #define Z_MIN_PROBE_PIN 43
#endif
//
// Steppers
//
-#define X_STEP_PIN 37 // Support Extension Board
-#define X_DIR_PIN 36
-#define X_ENABLE_PIN 38
+#define X_STEP_PIN 37 // Support Extension Board
+#define X_DIR_PIN 36
+#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
- #define X_CS_PIN -1
+ #define X_CS_PIN -1
#endif
-#define Y_STEP_PIN 32 // Support Extension Board
-#define Y_DIR_PIN 35
-#define Y_ENABLE_PIN 34
+#define Y_STEP_PIN 32 // Support Extension Board
+#define Y_DIR_PIN 35
+#define Y_ENABLE_PIN 34
#ifndef Y_CS_PIN
- #define Y_CS_PIN -1
+ #define Y_CS_PIN -1
#endif
-#define Z_STEP_PIN 30 // Support Extension Board
-#define Z_DIR_PIN 2
-#define Z_ENABLE_PIN 33
+#define Z_STEP_PIN 30 // Support Extension Board
+#define Z_DIR_PIN 2
+#define Z_ENABLE_PIN 33
#ifndef Z_CS_PIN
- #define Z_CS_PIN -1
+ #define Z_CS_PIN -1
#endif
-#define E0_STEP_PIN 29
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 31
+#define E0_STEP_PIN 29
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 31
#ifndef E0_CS_PIN
- #define E0_CS_PIN -1
+ #define E0_CS_PIN -1
#endif
-#define E1_STEP_PIN 22
-#define E1_DIR_PIN 24
-#define E1_ENABLE_PIN 26
+#define E1_STEP_PIN 22
+#define E1_DIR_PIN 24
+#define E1_ENABLE_PIN 26
#ifndef E1_CS_PIN
- #define E1_CS_PIN -1
+ #define E1_CS_PIN -1
#endif
-#define E2_STEP_PIN 25
-#define E2_DIR_PIN 23
-#define E2_ENABLE_PIN 27
+#define E2_STEP_PIN 25
+#define E2_DIR_PIN 23
+#define E2_ENABLE_PIN 27
#ifndef E2_CS_PIN
- #define E2_CS_PIN -1
+ #define E2_CS_PIN -1
#endif
-#define E3_STEP_PIN 15 // Only For Extension Board
-#define E3_DIR_PIN 14
-#define E3_ENABLE_PIN 61
+#define E3_STEP_PIN 15 // Only For Extension Board
+#define E3_DIR_PIN 14
+#define E3_ENABLE_PIN 61
#ifndef E3_CS_PIN
- #define E3_CS_PIN -1
+ #define E3_CS_PIN -1
#endif
// For Future: Microstepping pins - Mapping not from fastio.h (?)
@@ -119,77 +119,77 @@
//#define E3_MS3_PIN ?
#if HAS_CUSTOM_PROBE_PIN
- #define Z_MIN_PROBE_PIN 49
+ #define Z_MIN_PROBE_PIN 49
#endif
#if HAS_FILAMENT_SENSOR
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN Y_MIN_PIN
+ #define FIL_RUNOUT_PIN Y_MIN_PIN
#endif
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 13
-#define HEATER_1_PIN 12
-#define HEATER_2_PIN 11
-#define HEATER_BED_PIN 7 // BED H1
+#define HEATER_0_PIN 13
+#define HEATER_1_PIN 12
+#define HEATER_2_PIN 11
+#define HEATER_BED_PIN 7 // BED H1
#ifndef FAN_PIN
- #define FAN_PIN 9
+ #define FAN_PIN 9
#endif
-#define FAN1_PIN 8
-#define CONTROLLER_FAN_PIN -1
+#define FAN1_PIN 8
+#define CONTROLLER_FAN_PIN -1
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // ANALOG A0
-#define TEMP_1_PIN 1 // ANALOG A1
-#define TEMP_2_PIN 2 // ANALOG A2
-#define TEMP_3_PIN 3 // ANALOG A3
-#define TEMP_BED_PIN 4 // ANALOG A4
+#define TEMP_0_PIN 0 // ANALOG A0
+#define TEMP_1_PIN 1 // ANALOG A1
+#define TEMP_2_PIN 2 // ANALOG A2
+#define TEMP_3_PIN 3 // ANALOG A3
+#define TEMP_BED_PIN 4 // ANALOG A4
// The thermocouple uses Analog pins
-#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
- #define TEMP_4_PIN 5 // A5
- #define TEMP_5_PIN 6 // A6 (Marlin 2.0 not support)
+#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
+ #define TEMP_4_PIN 5 // A5
+ #define TEMP_5_PIN 6 // A6 (Marlin 2.0 not support)
#endif
// SPI for Max6675 or Max31855 Thermocouple
/*
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 53
+ #define MAX6675_SS_PIN 53
#else
- #define MAX6675_SS_PIN 49
+ #define MAX6675_SS_PIN 49
#endif
*/
//
// Misc. Functions
//
-#define SDSS 4 // 4,10,52 if using HW SPI.
-#define LED_PIN -1 // 13 - HEATER_0_PIN
-#define PS_ON_PIN -1 // 65
+#define SDSS 4 // 4,10,52 if using HW SPI.
+#define LED_PIN -1 // 13 - HEATER_0_PIN
+#define PS_ON_PIN -1 // 65
// MKS TFT / Nextion Use internal USART-1
-#define TFT_LCD_MODULE_COM 1
-#define TFT_LCD_MODULE_BAUDRATE 115600
+#define TFT_LCD_MODULE_COM 1
+#define TFT_LCD_MODULE_BAUDRATE 115600
// ESP WiFi Use internal USART-2
-#define ESP_WIFI_MODULE_COM 2
-#define ESP_WIFI_MODULE_BAUDRATE 115600
-#define ESP_WIFI_MODULE_RESET_PIN -1
-#define PIGGY_GPIO_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115600
+#define ESP_WIFI_MODULE_RESET_PIN -1
+#define PIGGY_GPIO_PIN -1
//
// EEPROM
//
-#define E2END 0x7FFF // 32Kb (24lc256)
-#define I2C_EEPROM // EEPROM on I2C-0
-//#define EEPROM_SD // EEPROM on SDCARD
-//#define SPI_EEPROM // EEPROM on SPI-0
+#define E2END 0x7FFF // 32Kb (24lc256)
+#define I2C_EEPROM // EEPROM on I2C-0
+//#define EEPROM_SD // EEPROM on SDCARD
+//#define SPI_EEPROM // EEPROM on SPI-0
//#define SPI_CHAN_EEPROM1 ?
//#define SPI_EEPROM1_CS ?
// 2K EEPROM
@@ -203,72 +203,72 @@
#if HAS_SPI_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define BEEPER_PIN 62
- #define LCD_PINS_D4 48
- #define LCD_PINS_D5 50
- #define LCD_PINS_D6 52
- #define LCD_PINS_D7 53
- #define SD_DETECT_PIN 51
+ #define BEEPER_PIN 62
+ #define LCD_PINS_D4 48
+ #define LCD_PINS_D5 50
+ #define LCD_PINS_D6 52
+ #define LCD_PINS_D7 53
+ #define SD_DETECT_PIN 51
#endif
#if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define LCD_PINS_RS 63
- #define LCD_PINS_ENABLE 64
+ #define LCD_PINS_RS 63
+ #define LCD_PINS_ENABLE 64
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define LCD_PINS_RS 52
- #define LCD_PINS_ENABLE 53
+ #define LCD_PINS_RS 52
+ #define LCD_PINS_ENABLE 53
#elif HAS_SSD1306_OLED_I2C
- #define BEEPER_PIN 62
- #define LCD_SDSS 10
- #define SD_DETECT_PIN 51
+ #define BEEPER_PIN 62
+ #define LCD_SDSS 10
+ #define SD_DETECT_PIN 51
#elif ENABLED(FYSETC_MINI_12864)
- #define BEEPER_PIN 62
- #define DOGLCD_CS 64
- #define DOGLCD_A0 63
+ #define BEEPER_PIN 62
+ #define DOGLCD_CS 64
+ #define DOGLCD_A0 63
- //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN 48 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN 48 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 50 // D5
+ #define RGB_LED_R_PIN 50 // D5
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN 52 // D6
+ #define RGB_LED_G_PIN 52 // D6
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN 53 // D7
+ #define RGB_LED_B_PIN 53 // D7
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN 50 // D5
+ #define NEOPIXEL_PIN 50 // D5
#endif
#elif ENABLED(SPARK_FULL_GRAPHICS)
//http://doku.radds.org/dokumentation/other-electronics/sparklcd/
#error "Oops! SPARK_FULL_GRAPHICS not supported with RURAMPS4D."
- //#define LCD_PINS_D4 29 //?
- //#define LCD_PINS_ENABLE 27 //?
- //#define LCD_PINS_RS 25 //?
- //#define BTN_EN1 35 //?
- //#define BTN_EN2 33 //?
- //#define BTN_ENC 37 //?
+ //#define LCD_PINS_D4 29 //?
+ //#define LCD_PINS_ENABLE 27 //?
+ //#define LCD_PINS_RS 25 //?
+ //#define BTN_EN1 35 //?
+ //#define BTN_EN2 33 //?
+ //#define BTN_ENC 37 //?
#endif // SPARK_FULL_GRAPHICS
#if ENABLED(NEWPANEL)
- #define BTN_EN1 44
- #define BTN_EN2 42
- #define BTN_ENC 40
+ #define BTN_EN1 44
+ #define BTN_EN2 42
+ #define BTN_ENC 40
#endif
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index c8ff71673b..3ba6fd17cf 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -41,141 +41,141 @@
//
// Servos
//
-#define SERVO0_PIN 5
-#define SERVO1_PIN 3
+#define SERVO0_PIN 5
+#define SERVO1_PIN 3
//
// Limit Switches
//
-#define X_MIN_PIN 45
-#define X_MAX_PIN 39
-#define Y_MIN_PIN 46
-#define Y_MAX_PIN 41
-#define Z_MIN_PIN 47
-#define Z_MAX_PIN 43
+#define X_MIN_PIN 45
+#define X_MAX_PIN 39
+#define Y_MIN_PIN 46
+#define Y_MAX_PIN 41
+#define Z_MIN_PIN 47
+#define Z_MAX_PIN 43
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 49
+ #define Z_MIN_PROBE_PIN 49
#endif
//
// Steppers
//
-#define X_STEP_PIN 37 // Support Extension Board
-#define X_DIR_PIN 36
-#define X_ENABLE_PIN 31
+#define X_STEP_PIN 37 // Support Extension Board
+#define X_DIR_PIN 36
+#define X_ENABLE_PIN 31
#ifndef X_CS_PIN
- #define X_CS_PIN 38
+ #define X_CS_PIN 38
#endif
-#define Y_STEP_PIN 32 // Support Extension Board
-#define Y_DIR_PIN 35
-#define Y_ENABLE_PIN 31
+#define Y_STEP_PIN 32 // Support Extension Board
+#define Y_DIR_PIN 35
+#define Y_ENABLE_PIN 31
#ifndef Y_CS_PIN
- #define Y_CS_PIN 34
+ #define Y_CS_PIN 34
#endif
-#define Z_STEP_PIN 30 // Support Extension Board
-#define Z_DIR_PIN 2
-#define Z_ENABLE_PIN 31
+#define Z_STEP_PIN 30 // Support Extension Board
+#define Z_DIR_PIN 2
+#define Z_ENABLE_PIN 31
#ifndef Z_CS_PIN
- #define Z_CS_PIN 10
+ #define Z_CS_PIN 10
#endif
-#define E0_STEP_PIN 29
-#define E0_DIR_PIN 28
-#define E0_ENABLE_PIN 33
+#define E0_STEP_PIN 29
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 33
#ifndef E0_CS_PIN
- #define E0_CS_PIN 14
+ #define E0_CS_PIN 14
#endif
-#define E1_STEP_PIN 22
-#define E1_DIR_PIN 24
-#define E1_ENABLE_PIN 26
+#define E1_STEP_PIN 22
+#define E1_DIR_PIN 24
+#define E1_ENABLE_PIN 26
#ifndef E1_CS_PIN
- #define E1_CS_PIN 15
+ #define E1_CS_PIN 15
#endif
-#define E2_STEP_PIN 25
-#define E2_DIR_PIN 23
-#define E2_ENABLE_PIN 27
+#define E2_STEP_PIN 25
+#define E2_DIR_PIN 23
+#define E2_ENABLE_PIN 27
#ifndef E2_CS_PIN
- #define E2_CS_PIN 61
+ #define E2_CS_PIN 61
#endif
#if HAS_CUSTOM_PROBE_PIN
- #define Z_MIN_PROBE_PIN 49
+ #define Z_MIN_PROBE_PIN 49
#endif
#if HAS_FILAMENT_SENSOR
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN Y_MIN_PIN
+ #define FIL_RUNOUT_PIN Y_MIN_PIN
#endif
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 13
-#define HEATER_1_PIN 12
-#define HEATER_2_PIN 11
-#define HEATER_BED_PIN 7 // BED H1
+#define HEATER_0_PIN 13
+#define HEATER_1_PIN 12
+#define HEATER_2_PIN 11
+#define HEATER_BED_PIN 7 // BED H1
-#define FAN_PIN 9
-#define FAN1_PIN 8
-#define CONTROLLER_FAN_PIN -1
+#define FAN_PIN 9
+#define FAN1_PIN 8
+#define CONTROLLER_FAN_PIN -1
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // ANALOG A0
-#define TEMP_1_PIN 1 // ANALOG A1
-#define TEMP_2_PIN 2 // ANALOG A2
-#define TEMP_3_PIN 3 // ANALOG A3
-#define TEMP_BED_PIN 4 // ANALOG A4
+#define TEMP_0_PIN 0 // ANALOG A0
+#define TEMP_1_PIN 1 // ANALOG A1
+#define TEMP_2_PIN 2 // ANALOG A2
+#define TEMP_3_PIN 3 // ANALOG A3
+#define TEMP_BED_PIN 4 // ANALOG A4
// The thermocouple uses Analog pins
-#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
- #define TEMP_4_PIN 5 // A5
- #define TEMP_5_PIN 6 // A6 (Marlin 2.0 not support)
+#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
+ #define TEMP_4_PIN 5 // A5
+ #define TEMP_5_PIN 6 // A6 (Marlin 2.0 not support)
#endif
// SPI for Max6675 or Max31855 Thermocouple
/*
#if DISABLED(SDSUPPORT)
- #define MAX6675_SS_PIN 53
+ #define MAX6675_SS_PIN 53
#else
- #define MAX6675_SS_PIN 49
+ #define MAX6675_SS_PIN 49
#endif
*/
//
// Misc. Functions
//
-#define SDSS 4 // 4,10,52 if using HW SPI.
-#define LED_PIN -1 // 13 - HEATER_0_PIN
-#define PS_ON_PIN -1 // 65
+#define SDSS 4 // 4,10,52 if using HW SPI.
+#define LED_PIN -1 // 13 - HEATER_0_PIN
+#define PS_ON_PIN -1 // 65
// MKS TFT / Nextion Use internal USART-1
-#define TFT_LCD_MODULE_COM 1
-#define TFT_LCD_MODULE_BAUDRATE 115200
+#define TFT_LCD_MODULE_COM 1
+#define TFT_LCD_MODULE_BAUDRATE 115200
// ESP WiFi Use internal USART-2
-#define ESP_WIFI_MODULE_COM 2
-#define ESP_WIFI_MODULE_BAUDRATE 115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
-#define PIGGY_GPIO_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN -1
+#define PIGGY_GPIO_PIN -1
//
// EEPROM
//
-#define E2END 0x7FFF // 32Kb (24lc256)
-#define I2C_EEPROM // EEPROM on I2C-0
-//#define EEPROM_SD // EEPROM on SDCARD
-//#define SPI_EEPROM // EEPROM on SPI-0
+#define E2END 0x7FFF // 32Kb (24lc256)
+#define I2C_EEPROM // EEPROM on I2C-0
+//#define EEPROM_SD // EEPROM on SDCARD
+//#define SPI_EEPROM // EEPROM on SPI-0
//#define SPI_CHAN_EEPROM1 ?
//#define SPI_EEPROM1_CS ?
// 2K EEPROM
@@ -189,70 +189,70 @@
#if HAS_SPI_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define BEEPER_PIN 62
- #define LCD_PINS_D4 48
- #define LCD_PINS_D5 50
- #define LCD_PINS_D6 52
- #define LCD_PINS_D7 53
- #define SD_DETECT_PIN 51
+ #define BEEPER_PIN 62
+ #define LCD_PINS_D4 48
+ #define LCD_PINS_D5 50
+ #define LCD_PINS_D6 52
+ #define LCD_PINS_D7 53
+ #define SD_DETECT_PIN 51
#endif
#if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define LCD_PINS_RS 63
- #define LCD_PINS_ENABLE 64
+ #define LCD_PINS_RS 63
+ #define LCD_PINS_ENABLE 64
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define LCD_PINS_RS 52
- #define LCD_PINS_ENABLE 53
+ #define LCD_PINS_RS 52
+ #define LCD_PINS_ENABLE 53
#elif HAS_SSD1306_OLED_I2C
- #define BEEPER_PIN 62
- #define LCD_SDSS 10
- #define SD_DETECT_PIN 51
+ #define BEEPER_PIN 62
+ #define LCD_SDSS 10
+ #define SD_DETECT_PIN 51
#elif ENABLED(FYSETC_MINI_12864)
- #define BEEPER_PIN 62
- #define DOGLCD_CS 64
- #define DOGLCD_A0 63
+ #define BEEPER_PIN 62
+ #define DOGLCD_CS 64
+ #define DOGLCD_A0 63
- //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
- // results in LCD soft SPI mode 3, SD soft SPI mode 0
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
- #define LCD_RESET_PIN 48 // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN 48 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN 50 // D5
+ #define RGB_LED_R_PIN 50 // D5
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN 52 // D6
+ #define RGB_LED_G_PIN 52 // D6
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN 53 // D7
+ #define RGB_LED_B_PIN 53 // D7
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN 50 // D5
+ #define NEOPIXEL_PIN 50 // D5
#endif
#elif ENABLED(MKS_MINI_12864)
- #define ORIG_BEEPER_PIN 62
+ #define ORIG_BEEPER_PIN 62
- #define DOGLCD_A0 52
- #define DOGLCD_CS 50
+ #define DOGLCD_A0 52
+ #define DOGLCD_CS 50
- #define SD_DETECT_PIN 51
+ #define SD_DETECT_PIN 51
#endif
#if ENABLED(NEWPANEL)
- #define BTN_EN1 44
- #define BTN_EN2 42
- #define BTN_ENC 40
+ #define BTN_EN1 44
+ #define BTN_EN2 42
+ #define BTN_ENC 40
#endif
#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
index 94fb7cddc1..ae01d5da4c 100644
--- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
+++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,140 +35,140 @@
// Servos
//
#if NUM_SERVOS > 0
- #define SERVO0_PIN 11
+ #define SERVO0_PIN 11
#if NUM_SERVOS > 1
- #define SERVO1_PIN 12
+ #define SERVO1_PIN 12
#endif
#endif
//
// Limit Switches
//
-#define X_MIN_PIN 31
-#define X_MAX_PIN 30
-#define Y_MIN_PIN 12
-#define Y_MAX_PIN 11
-#define Z_MIN_PIN 29
-#define Z_MAX_PIN 28
+#define X_MIN_PIN 31
+#define X_MAX_PIN 30
+#define Y_MIN_PIN 12
+#define Y_MAX_PIN 11
+#define Z_MIN_PIN 29
+#define Z_MAX_PIN 28
//
// Steppers
//
-#define X_STEP_PIN 35
-#define X_DIR_PIN 34
-#define X_ENABLE_PIN 37
+#define X_STEP_PIN 35
+#define X_DIR_PIN 34
+#define X_ENABLE_PIN 37
#ifndef X_CS_PIN
- #define X_CS_PIN 18
+ #define X_CS_PIN 18
#endif
-#define Y_STEP_PIN 22
-#define Y_DIR_PIN 23
-#define Y_ENABLE_PIN 33
+#define Y_STEP_PIN 22
+#define Y_DIR_PIN 23
+#define Y_ENABLE_PIN 33
#ifndef Y_CS_PIN
- #define Y_CS_PIN 19
+ #define Y_CS_PIN 19
#endif
-#define Z_STEP_PIN 25
-#define Z_DIR_PIN 26
-#define Z_ENABLE_PIN 24
+#define Z_STEP_PIN 25
+#define Z_DIR_PIN 26
+#define Z_ENABLE_PIN 24
#ifndef Z_CS_PIN
- #define Z_CS_PIN 16
+ #define Z_CS_PIN 16
#endif
-#define E0_STEP_PIN 47
-#define E0_DIR_PIN 46
-#define E0_ENABLE_PIN 48
+#define E0_STEP_PIN 47
+#define E0_DIR_PIN 46
+#define E0_ENABLE_PIN 48
#ifndef E0_CS_PIN
- #define E0_CS_PIN 17
+ #define E0_CS_PIN 17
#endif
-#define E1_STEP_PIN 44
-#define E1_DIR_PIN 36
-#define E1_ENABLE_PIN 45
+#define E1_STEP_PIN 44
+#define E1_DIR_PIN 36
+#define E1_ENABLE_PIN 45
#ifndef E1_CS_PIN
- #define E1_CS_PIN -1
+ #define E1_CS_PIN -1
#endif
-#define E2_STEP_PIN 42
-#define E2_DIR_PIN 41
-#define E2_ENABLE_PIN 43
+#define E2_STEP_PIN 42
+#define E2_DIR_PIN 41
+#define E2_ENABLE_PIN 43
#ifndef E2_CS_PIN
- #define E2_CS_PIN -1
+ #define E2_CS_PIN -1
#endif
-#define E3_STEP_PIN 39
-#define E3_DIR_PIN 38
-#define E3_ENABLE_PIN 40
+#define E3_STEP_PIN 39
+#define E3_DIR_PIN 38
+#define E3_ENABLE_PIN 40
#ifndef E3_CS_PIN
- #define E3_CS_PIN -1
+ #define E3_CS_PIN -1
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 2 // Analog Input
-#define TEMP_2_PIN 3 // Analog Input
-#define TEMP_3_PIN 4 // Analog Input
-#define TEMP_BED_PIN 1 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 2 // Analog Input
+#define TEMP_2_PIN 3 // Analog Input
+#define TEMP_3_PIN 4 // Analog Input
+#define TEMP_BED_PIN 1 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 3
-#define HEATER_1_PIN 8
-#define HEATER_2_PIN 7
-#define HEATER_3_PIN 9
-#define HEATER_BED_PIN 2
+#define HEATER_0_PIN 3
+#define HEATER_1_PIN 8
+#define HEATER_2_PIN 7
+#define HEATER_3_PIN 9
+#define HEATER_BED_PIN 2
#ifndef FAN_PIN
- #define FAN_PIN 6
+ #define FAN_PIN 6
#endif
-#define FAN2_PIN 5
+#define FAN2_PIN 5
//
// Misc. Functions
//
-#define SDSS 59
-#define SD_DETECT_PIN 60
-#define LED_PIN 13
-#define PS_ON_PIN 32
+#define SDSS 59
+#define SD_DETECT_PIN 60
+#define LED_PIN 13
+#define PS_ON_PIN 32
//
// SPI Buses
//
-#define DAC0_SYNC 53 // PB14
-#define SPI_CHAN_DAC 1
+#define DAC0_SYNC 53 // PB14
+#define SPI_CHAN_DAC 1
-#define SPI_CHAN_EEPROM1 -1
-#define SPI_EEPROM1_CS -1
-#define SPI_EEPROM2_CS -1
-#define SPI_FLASH_CS -1
+#define SPI_CHAN_EEPROM1 -1
+#define SPI_EEPROM1_CS -1
+#define SPI_EEPROM2_CS -1
+#define SPI_FLASH_CS -1
// SPI for Max6675 or Max31855 Thermocouple
-#define MAX6675_SS_PIN 65
-#define MAX31855_SS0 65
-#define MAX31855_SS1 52
-#define MAX31855_SS2 50
-#define MAX31855_SS3 51
+#define MAX6675_SS_PIN 65
+#define MAX31855_SS0 65
+#define MAX31855_SS1 52
+#define MAX31855_SS2 50
+#define MAX31855_SS3 51
-#define ENC424_SS 61
+#define ENC424_SS 61
//
// LCD / Controller
//
-#define BEEPER_PIN 27
+#define BEEPER_PIN 27
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS A8 // CS chip select / SS chip slave select
- #define LCD_PINS_ENABLE MOSI // SID (MOSI)
- #define LCD_PINS_D4 SCK // SCK (CLK) clock
+ #define LCD_PINS_RS A8 // CS chip select / SS chip slave select
+ #define LCD_PINS_ENABLE MOSI // SID (MOSI)
+ #define LCD_PINS_D4 SCK // SCK (CLK) clock
- #define BTN_EN1 20
- #define BTN_EN2 21
- #define BTN_ENC 64
+ #define BTN_EN1 20
+ #define BTN_EN2 21
+ #define BTN_ENC 64
#endif // REPRAPWORLD_GRAPHICAL_LCD
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
new file mode 100644
index 0000000000..f02a8b86bd
--- /dev/null
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -0,0 +1,612 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * AGCM4 with RAMPS v1.4.4 pin assignments
+ */
+
+#ifndef ARDUINO_GRAND_CENTRAL_M4
+ #error "Oops! Select 'Adafruit Grand Central M4' in 'Tools > Board.'"
+#endif
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "AGCM4 RAMPS 1.4.4"
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN 11
+#define SERVO1_PIN 6
+#define SERVO2_PIN 5
+#define SERVO3_PIN 4
+
+//
+// EEPROM
+//
+//#define QSPI_EEPROM // Use AGCM4 onboard QSPI EEPROM (Uses 4K of RAM)
+#define I2C_EEPROM // EEPROM on I2C-0
+#define E2END 0x7FFF // 32K (24lc256)
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN 3
+#define X_MAX_PIN 2
+#define Y_MIN_PIN 14
+#define Y_MAX_PIN 15
+#define Z_MIN_PIN 18
+#define Z_MAX_PIN 19
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN 18
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN 67 // Mega/Due:54 - AGCM4:67
+#define X_DIR_PIN 68 // Mega/Due:55 - AGCM4:68
+#define X_ENABLE_PIN 38
+#ifndef X_CS_PIN
+ #define X_CS_PIN 47
+#endif
+
+#define Y_STEP_PIN 73 // Mega/Due:60 - AGCM4:73
+#define Y_DIR_PIN 74 // Mega/Due:61 - AGCM4:74
+#define Y_ENABLE_PIN 69 // Mega/Due:56 - AGCM4:69
+#ifndef Y_CS_PIN
+ #define Y_CS_PIN 45
+#endif
+
+#define Z_STEP_PIN 46
+#define Z_DIR_PIN 48
+#define Z_ENABLE_PIN 54 // Mega/Due:62 - AGCM4:54
+#ifndef Z_CS_PIN
+ #define Z_CS_PIN 32
+#endif
+
+#define Z2_STEP_PIN 36
+#define Z2_DIR_PIN 34
+#define Z2_ENABLE_PIN 30
+#ifndef Z2_CS_PIN
+ #define Z2_CS_PIN 22
+#endif
+
+#define E0_STEP_PIN 26
+#define E0_DIR_PIN 28
+#define E0_ENABLE_PIN 24
+#ifndef E0_CS_PIN
+ #define E0_CS_PIN 43
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 13
+#define TEMP_BED_PIN 14
+#define TEMP_CHAMBER_PIN 15
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN 10
+#define HEATER_BED_PIN 8
+#define FAN_PIN 9
+#define FAN1_PIN 7
+#define FAN2_PIN 12
+
+//
+// Misc. Functions
+//
+#define SDSS 53
+#define LED_PIN 13
+
+#ifndef FILWIDTH_PIN
+ #define FILWIDTH_PIN 5 // Analog Input on AUX2
+#endif
+
+// RAMPS 1.4 DIO 4 on the servos connector
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN 4
+#endif
+
+#ifndef PS_ON_PIN
+ #define PS_ON_PIN 39
+#endif
+
+#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
+ #if NUM_SERVOS <= 1 // Prefer the servo connector
+ #define CASE_LIGHT_PIN 6 // Hardware PWM
+ #endif
+#endif
+
+//
+// M3/M4/M5 - Spindle/Laser Control
+//
+#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
+ #if !NUM_SERVOS // Use servo connector if possible
+ #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
+ #define SPINDLE_DIR_PIN 5
+ #else
+ #error "No auto-assignable Spindle/Laser pins available."
+ #endif
+#endif
+
+//
+// TMC software SPI
+//
+#if ENABLED(TMC_USE_SW_SPI)
+ #ifndef TMC_SW_MOSI
+ #define TMC_SW_MOSI 58 // Mega/Due:66 - AGCM4:58
+ #endif
+ #ifndef TMC_SW_MISO
+ #define TMC_SW_MISO 44
+ #endif
+ #ifndef TMC_SW_SCK
+ #define TMC_SW_SCK 56 // Mega/Due:64 - AGCM4:56
+ #endif
+#endif
+
+#if HAS_TMC_UART
+ /**
+ * TMC2208/TMC2209 stepper drivers
+ *
+ * Hardware serial communication ports.
+ * If undefined software serial is used according to the pins below
+ */
+ //#define X_HARDWARE_SERIAL Serial1
+ //#define X2_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
+ //#define Y2_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
+ //#define Z2_HARDWARE_SERIAL Serial1
+ //#define E0_HARDWARE_SERIAL Serial1
+ //#define E1_HARDWARE_SERIAL Serial1
+ //#define E2_HARDWARE_SERIAL Serial1
+ //#define E3_HARDWARE_SERIAL Serial1
+ //#define E4_HARDWARE_SERIAL Serial1
+
+ //
+ // Software serial
+ //
+
+ #ifndef X_SERIAL_TX_PIN
+ #define X_SERIAL_TX_PIN 47
+ #endif
+ #ifndef X_SERIAL_RX_PIN
+ #define X_SERIAL_RX_PIN 47
+ #endif
+ #ifndef X2_SERIAL_TX_PIN
+ #define X2_SERIAL_TX_PIN -1
+ #endif
+ #ifndef X2_SERIAL_RX_PIN
+ #define X2_SERIAL_RX_PIN -1
+ #endif
+
+ #ifndef Y_SERIAL_TX_PIN
+ #define Y_SERIAL_TX_PIN 45
+ #endif
+ #ifndef Y_SERIAL_RX_PIN
+ #define Y_SERIAL_RX_PIN 45
+ #endif
+ #ifndef Y2_SERIAL_TX_PIN
+ #define Y2_SERIAL_TX_PIN -1
+ #endif
+ #ifndef Y2_SERIAL_RX_PIN
+ #define Y2_SERIAL_RX_PIN -1
+ #endif
+
+ #ifndef Z_SERIAL_TX_PIN
+ #define Z_SERIAL_TX_PIN 32
+ #endif
+ #ifndef Z_SERIAL_RX_PIN
+ #define Z_SERIAL_RX_PIN 32
+ #endif
+ #ifndef Z2_SERIAL_TX_PIN
+ #define Z2_SERIAL_TX_PIN 22
+ #endif
+ #ifndef Z2_SERIAL_RX_PIN
+ #define Z2_SERIAL_RX_PIN 22
+ #endif
+
+ #ifndef E0_SERIAL_TX_PIN
+ #define E0_SERIAL_TX_PIN 43
+ #endif
+ #ifndef E0_SERIAL_RX_PIN
+ #define E0_SERIAL_RX_PIN 43
+ #endif
+ #ifndef E1_SERIAL_TX_PIN
+ #define E1_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E1_SERIAL_RX_PIN
+ #define E1_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E2_SERIAL_TX_PIN
+ #define E2_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E2_SERIAL_RX_PIN
+ #define E2_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E3_SERIAL_TX_PIN
+ #define E3_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E3_SERIAL_RX_PIN
+ #define E3_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E4_SERIAL_TX_PIN
+ #define E4_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E4_SERIAL_RX_PIN
+ #define E4_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_TX_PIN
+ #define E5_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E5_SERIAL_RX_PIN
+ #define E5_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_TX_PIN
+ #define E6_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E6_SERIAL_RX_PIN
+ #define E6_SERIAL_RX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_TX_PIN
+ #define E7_SERIAL_TX_PIN -1
+ #endif
+ #ifndef E7_SERIAL_RX_PIN
+ #define E7_SERIAL_RX_PIN -1
+ #endif
+#endif
+
+//////////////////////////
+// LCDs and Controllers //
+//////////////////////////
+
+#if HAS_SPI_LCD
+
+ //
+ // LCD Display output pins
+ //
+ #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+ // TO TEST
+ // #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ // #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ // #define LCD_PINS_D4 52 // SCK (CLK) clock
+
+ #elif BOTH(NEWPANEL, PANEL_ONE)
+
+ // TO TEST
+ // #define LCD_PINS_RS 40
+ // #define LCD_PINS_ENABLE 42
+ // #define LCD_PINS_D4 57 // Mega/Due:65 - AGCM4:57
+ // #define LCD_PINS_D5 58 // Mega/Due:66 - AGCM4:58
+ // #define LCD_PINS_D6 44
+ // #define LCD_PINS_D7 56 // Mega/Due:64 - AGCM4:56
+
+ #else
+
+ #if ENABLED(CR10_STOCKDISPLAY)
+
+ // TO TEST
+ // #define LCD_PINS_RS 27
+ // #define LCD_PINS_ENABLE 29
+ // #define LCD_PINS_D4 25
+
+ #if DISABLED(NEWPANEL)
+ // TO TEST
+ // #define BEEPER_PIN 37
+ #endif
+
+ #elif ENABLED(ZONESTAR_LCD)
+
+ // TO TEST
+ // #define LCD_PINS_RS 56 // Mega/Due:64 - AGCM4:56
+ // #define LCD_PINS_ENABLE 44
+ // #define LCD_PINS_D4 55 // Mega/Due:63 - AGCM4:55
+ // #define LCD_PINS_D5 40
+ // #define LCD_PINS_D6 42
+ // #define LCD_PINS_D7 57 // Mega/Due:65 - AGCM4:57
+
+ #else
+
+ #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
+ // TO TEST
+ // #define LCD_PINS_DC 25 // Set as output on init
+ // #define LCD_PINS_RS 27 // Pull low for 1s to init
+ // DOGM SPI LCD Support
+ // #define DOGLCD_CS 16
+ // #define DOGLCD_MOSI 17
+ // #define DOGLCD_SCK 23
+ // #define DOGLCD_A0 LCD_PINS_DC
+ #else
+ #define LCD_PINS_RS 16
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 23
+ #define LCD_PINS_D5 25
+ #define LCD_PINS_D6 27
+ #endif
+
+ #define LCD_PINS_D7 29
+
+ #if DISABLED(NEWPANEL)
+ #define BEEPER_PIN 33
+ #endif
+
+ #endif
+
+ #if DISABLED(NEWPANEL)
+ // Buttons attached to a shift register
+ // Not wired yet
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
+ #endif
+
+ #endif
+
+ //
+ // LCD Display input pins
+ //
+ #if ENABLED(NEWPANEL)
+
+ #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+ #define BEEPER_PIN 37
+
+ #if ENABLED(CR10_STOCKDISPLAY)
+ // TO TEST
+ // #define BTN_EN1 17
+ // #define BTN_EN2 23
+ #else
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #endif
+
+ #define BTN_ENC 35
+ #ifndef SD_DETECT_PIN
+ #define SD_DETECT_PIN 49
+ #endif
+ #define KILL_PIN 41
+
+ #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+ // TO TEST
+ // #define LCD_BACKLIGHT_PIN 39
+ #endif
+
+ #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+ // TO TEST
+ // #define BTN_EN1 56 // Mega/Due:64 - AGCM4:56
+ // #define BTN_EN2 72 // Mega/Due:59 - AGCM4:72
+ // #define BTN_ENC 55
+ // #define SD_DETECT_PIN 42
+
+ #elif ENABLED(LCD_I2C_PANELOLU2)
+
+ // TO TEST
+ // #define BTN_EN1 47
+ // #define BTN_EN2 43
+ // #define BTN_ENC 32
+ // #define LCD_SDSS SDSS
+ // #define KILL_PIN 41
+
+ #elif ENABLED(LCD_I2C_VIKI)
+
+ // TO TEST
+ // #define BTN_EN1 40 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ // #define BTN_EN2 42
+ // #define BTN_ENC -1
+
+ // #define LCD_SDSS SDSS
+ // #define SD_DETECT_PIN 49
+
+ #elif ANY(VIKI2, miniVIKI)
+
+ // TO TEST
+ // #define DOGLCD_CS 45
+ // #define DOGLCD_A0 44
+ // #define LCD_SCREEN_ROT_180
+
+ // #define BEEPER_PIN 33
+ // #define STAT_LED_RED_PIN 32
+ // #define STAT_LED_BLUE_PIN 35
+
+ // #define BTN_EN1 22
+ // #define BTN_EN2 7
+ // #define BTN_ENC 39
+
+ // #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
+ // #define KILL_PIN 31
+
+ #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+
+ // TO TEST
+ // #define DOGLCD_CS 29
+ // #define DOGLCD_A0 27
+
+ // #define BEEPER_PIN 23
+ // #define LCD_BACKLIGHT_PIN 33
+
+ // #define BTN_EN1 35
+ // #define BTN_EN2 37
+ // #define BTN_ENC 31
+
+ // #define LCD_SDSS SDSS
+ // #define SD_DETECT_PIN 49
+ // #define KILL_PIN 41
+
+ #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
+
+ // TO TEST
+ //#define BEEPER_PIN 37
+ //#define BTN_ENC 35
+ //#define SD_DETECT_PIN 49
+
+ //#ifndef KILL_PIN
+ // #define KILL_PIN 41
+ //#endif
+
+ #if ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6
+
+ // TO TEST
+ // #define DOGLCD_A0 27
+ // #define DOGLCD_CS 25
+
+ // GLCD features
+ // Uncomment screen orientation
+ // #define LCD_SCREEN_ROT_90
+ // #define LCD_SCREEN_ROT_180
+ // #define LCD_SCREEN_ROT_270
+
+ // not connected to a pin
+ // #define LCD_BACKLIGHT_PIN 57 // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
+
+ // #define BTN_EN1 31
+ // #define BTN_EN2 33
+
+ #elif ENABLED(FYSETC_MINI_12864)
+
+ // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+
+ // TO TEST
+ // #define DOGLCD_A0 16
+ // #define DOGLCD_CS 17
+
+ // #define BTN_EN1 33
+ // #define BTN_EN2 31
+
+ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
+ // results in LCD soft SPI mode 3, SD soft SPI mode 0
+
+ // #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
+
+ #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+ #ifndef RGB_LED_R_PIN
+ // TO TEST
+ // #define RGB_LED_R_PIN 25
+ #endif
+ #ifndef RGB_LED_G_PIN
+ // TO TEST
+ // #define RGB_LED_G_PIN 27
+ #endif
+ #ifndef RGB_LED_B_PIN
+ // TO TEST
+ // #define RGB_LED_B_PIN 29
+ #endif
+ #elif ENABLED(FYSETC_MINI_12864_2_1)
+ // TO TEST
+ // #define NEOPIXEL_PIN 25
+ #endif
+
+ #endif
+
+ #elif ENABLED(MINIPANEL)
+
+ // TO TEST
+ // #define BEEPER_PIN 42
+ // not connected to a pin
+ // #define LCD_BACKLIGHT_PIN 57 // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
+
+ // #define DOGLCD_A0 44
+ // #define DOGLCD_CS 58 // Mega/Due:66 - AGCM4:58
+
+ // GLCD features
+ // Uncomment screen orientation
+ // #define LCD_SCREEN_ROT_90
+ // #define LCD_SCREEN_ROT_180
+ // #define LCD_SCREEN_ROT_270
+
+ // #define BTN_EN1 40
+ // #define BTN_EN2 55 // Mega/Due:63 - AGCM4:55
+ // #define BTN_ENC 72 // Mega/Due:59 - AGCM4:72
+
+ // #define SD_DETECT_PIN 49
+ // #define KILL_PIN 56 // Mega/Due:64 - AGCM4:56
+
+ #elif ENABLED(ZONESTAR_LCD)
+
+ // TO TEST
+ // #define ADC_KEYPAD_PIN 12
+
+ #elif ENABLED(AZSMZ_12864)
+
+ // TO TEST
+
+ #else
+
+ // Beeper on AUX-4
+ // #define BEEPER_PIN 33
+
+ // Buttons are directly attached to AUX-2
+ #if ENABLED(REPRAPWORLD_KEYPAD)
+ // TO TEST
+ // #define SHIFT_OUT 40
+ // #define SHIFT_CLK 44
+ // #define SHIFT_LD 42
+ // #define BTN_EN1 56 // Mega/Due:64 - AGCM4:56
+ // #define BTN_EN2 72 // Mega/Due:59 - AGCM4:72
+ // #define BTN_ENC 55 // Mega/Due:63 - AGCM4:55
+ #elif ENABLED(PANEL_ONE)
+ // TO TEST
+ // #define BTN_EN1 72 // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
+ // #define BTN_EN2 55 // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
+ // #define BTN_ENC 49 // AUX3 PIN 7
+ #else
+ // TO TEST
+ // #define BTN_EN1 37
+ // #define BTN_EN2 35
+ // #define BTN_ENC 31
+ #endif
+
+ #if ENABLED(G3D_PANEL)
+ // TO TEST
+ // #define SD_DETECT_PIN 49
+ // #define KILL_PIN 41
+ #endif
+
+ #endif
+ #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
+
+//
+// SD Support
+//
+#ifndef SDCARD_CONNECTION
+ #define SDCARD_CONNECTION ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(ONBOARD)
+ #undef SDSS
+ #define SDSS 83
+ #undef SD_DETECT_PIN
+ #define SD_DETECT_PIN 95
+#endif
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index 6e49bad616..73145a3cdb 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -98,50 +98,50 @@
//
// Limit Switches
//
-#define X_STOP_PIN 18
-#define Y_STOP_PIN 19
-#define Z_STOP_PIN 20
+#define X_STOP_PIN 18
+#define Y_STOP_PIN 19
+#define Z_STOP_PIN 20
//
// Steppers
//
-#define X_STEP_PIN 15
-#define X_DIR_PIN 21
-#define X_ENABLE_PIN 14
+#define X_STEP_PIN 15
+#define X_DIR_PIN 21
+#define X_ENABLE_PIN 14
-#define Y_STEP_PIN 22
-#define Y_DIR_PIN 23
-#define Y_ENABLE_PIN 14
+#define Y_STEP_PIN 22
+#define Y_DIR_PIN 23
+#define Y_ENABLE_PIN 14
-#define Z_STEP_PIN 3
-#define Z_DIR_PIN 2
-#define Z_ENABLE_PIN 26
+#define Z_STEP_PIN 3
+#define Z_DIR_PIN 2
+#define Z_ENABLE_PIN 26
-#define E0_STEP_PIN 1
-#define E0_DIR_PIN 0
-#define E0_ENABLE_PIN 14
+#define E0_STEP_PIN 1
+#define E0_DIR_PIN 0
+#define E0_ENABLE_PIN 14
//
// Temperature Sensors
//
-#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed)
+#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 13 // (extruder)
-#define HEATER_BED_PIN 12 // (bed)
+#define HEATER_0_PIN 13 // (extruder)
+#define HEATER_BED_PIN 12 // (bed)
#ifndef FAN_PIN
- #define FAN_PIN 4
+ #define FAN_PIN 4
#endif
//
// Misc. Functions
//
-#define SDSS 31
-#define LED_PIN -1
+#define SDSS 31
+#define LED_PIN -1
/**
* LCD / Controller
@@ -153,36 +153,36 @@
*/
#if HAS_SPI_LCD
- #define LCD_SDSS 28
+ #define LCD_SDSS 28
#if ENABLED(ADC_KEYPAD)
- #define SERVO0_PIN 27 // free for BLTouch/3D-Touch
- #define LCD_PINS_RS 28
- #define LCD_PINS_ENABLE 29
- #define LCD_PINS_D4 10
- #define LCD_PINS_D5 11
- #define LCD_PINS_D6 16
- #define LCD_PINS_D7 17
- #define ADC_KEYPAD_PIN 1
+ #define SERVO0_PIN 27 // free for BLTouch/3D-Touch
+ #define LCD_PINS_RS 28
+ #define LCD_PINS_ENABLE 29
+ #define LCD_PINS_D4 10
+ #define LCD_PINS_D5 11
+ #define LCD_PINS_D6 16
+ #define LCD_PINS_D7 17
+ #define ADC_KEYPAD_PIN 1
#elif EITHER(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD)
// Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
// display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
// See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
- #define SERVO0_PIN 29 // free for BLTouch/3D-Touch
- #define BEEPER_PIN 17
- #define LCD_PINS_RS 27
- #define LCD_PINS_ENABLE 28
- #define LCD_PINS_D4 30
- #define BTN_EN1 11
- #define BTN_EN2 10
- #define BTN_ENC 16
+ #define SERVO0_PIN 29 // free for BLTouch/3D-Touch
+ #define BEEPER_PIN 17
+ #define LCD_PINS_RS 27
+ #define LCD_PINS_ENABLE 28
+ #define LCD_PINS_D4 30
+ #define BTN_EN1 11
+ #define BTN_EN2 10
+ #define BTN_ENC 16
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
#define BOARD_ST7920_DELAY_2 DELAY_NS(63)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
- #define STD_ENCODER_PULSES_PER_STEP 4
- #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
+ #define STD_ENCODER_PULSES_PER_STEP 4
+ #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
#endif
#else
- #define SERVO0_PIN 27
+ #define SERVO0_PIN 27
#endif
/**
diff --git a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
index 4140dc4b95..4c991c5e9e 100644
--- a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
+++ b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
index 3059f6c898..b9a917d65d 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -55,47 +55,47 @@
#endif
#define BOARD_INFO_NAME "Gen3 Monolithic"
-#define DEBUG_PIN 0
+#define DEBUG_PIN 0
//
// Limit Switches
//
-#define X_STOP_PIN 20
-#define Y_STOP_PIN 25
-#define Z_STOP_PIN 30
+#define X_STOP_PIN 20
+#define Y_STOP_PIN 25
+#define Z_STOP_PIN 30
//
// Steppers
//
-#define X_STEP_PIN 15
-#define X_DIR_PIN 18
-#define X_ENABLE_PIN 24 // actually uses Y_enable_pin
+#define X_STEP_PIN 15
+#define X_DIR_PIN 18
+#define X_ENABLE_PIN 24 // actually uses Y_enable_pin
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24 // shared with X_enable_pin
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24 // shared with X_enable_pin
-#define Z_STEP_PIN 27
-#define Z_DIR_PIN 28
-#define Z_ENABLE_PIN 29
+#define Z_STEP_PIN 27
+#define Z_DIR_PIN 28
+#define Z_ENABLE_PIN 29
-#define E0_STEP_PIN 12
-#define E0_DIR_PIN 17
-#define E0_ENABLE_PIN 3
+#define E0_STEP_PIN 12
+#define E0_DIR_PIN 17
+#define E0_ENABLE_PIN 3
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_0_PIN 0 // Analog Input
//
// Heaters
//
-#define HEATER_0_PIN 16
+#define HEATER_0_PIN 16
//
// Misc. Functions
//
-#define PS_ON_PIN 14 // Alex, does this work on the card?
+#define PS_ON_PIN 14 // Alex, does this work on the card?
// Alex extras from Gen3+
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
index e370a888f3..6cd6fdaf27 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -50,7 +50,6 @@
*
*/
-
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644P' or 'ATmega1284P' in 'Tools > Processor.'"
#endif
@@ -60,43 +59,43 @@
//
// Limit Switches
//
-#define X_STOP_PIN 20
-#define Y_STOP_PIN 25
-#define Z_STOP_PIN 30
+#define X_STOP_PIN 20
+#define Y_STOP_PIN 25
+#define Z_STOP_PIN 30
//
// Steppers
//
-#define X_STEP_PIN 15
-#define X_DIR_PIN 18
-#define X_ENABLE_PIN 19
+#define X_STEP_PIN 15
+#define X_DIR_PIN 18
+#define X_ENABLE_PIN 19
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24
-#define Z_STEP_PIN 27
-#define Z_DIR_PIN 28
-#define Z_ENABLE_PIN 29
+#define Z_STEP_PIN 27
+#define Z_DIR_PIN 28
+#define Z_ENABLE_PIN 29
-#define E0_STEP_PIN 17
-#define E0_DIR_PIN 21
-#define E0_ENABLE_PIN 13
+#define E0_STEP_PIN 17
+#define E0_DIR_PIN 21
+#define E0_ENABLE_PIN 13
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN 5 // Analog Input (pin 34 bed)
+#define TEMP_0_PIN 0 // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN 5 // Analog Input (pin 34 bed)
//
// Heaters
//
-#define HEATER_0_PIN 12
-#define HEATER_BED_PIN 16
+#define HEATER_0_PIN 12
+#define HEATER_BED_PIN 16
//
// Misc. Functions
//
-#define SDSS 4
-#define PS_ON_PIN 14
+#define SDSS 4
+#define PS_ON_PIN 14
diff --git a/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin/src/pins/sanguino/pins_GEN6.h
index 294b4df2f5..0d2449ae6e 100644
--- a/Marlin/src/pins/sanguino/pins_GEN6.h
+++ b/Marlin/src/pins/sanguino/pins_GEN6.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -63,58 +63,58 @@
//
// Limit Switches
//
-#define X_STOP_PIN 20
-#define Y_STOP_PIN 25
-#define Z_STOP_PIN 30
+#define X_STOP_PIN 20
+#define Y_STOP_PIN 25
+#define Z_STOP_PIN 30
//
// Steppers
//
-#define X_STEP_PIN 15
-#define X_DIR_PIN 18
-#define X_ENABLE_PIN 19
+#define X_STEP_PIN 15
+#define X_DIR_PIN 18
+#define X_ENABLE_PIN 19
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24
-#define Z_STEP_PIN 27
-#define Z_DIR_PIN 28
-#define Z_ENABLE_PIN 29
+#define Z_STEP_PIN 27
+#define Z_DIR_PIN 28
+#define Z_ENABLE_PIN 29
-#define E0_STEP_PIN 4 // Edited @ EJE Electronics 20100715
-#define E0_DIR_PIN 2 // Edited @ EJE Electronics 20100715
-#define E0_ENABLE_PIN 3 // Added @ EJE Electronics 20100715
+#define E0_STEP_PIN 4 // Edited @ EJE Electronics 20100715
+#define E0_DIR_PIN 2 // Edited @ EJE Electronics 20100715
+#define E0_ENABLE_PIN 3 // Added @ EJE Electronics 20100715
//
// Temperature Sensor
//
-#define TEMP_0_PIN 5 // Analog Input
+#define TEMP_0_PIN 5 // Analog Input
//
// Heaters
//
-#define HEATER_0_PIN 14 // changed @ rkoeppl 20110410
+#define HEATER_0_PIN 14 // changed @ rkoeppl 20110410
#if !MB(GEN6)
- #define HEATER_BED_PIN 1 // changed @ rkoeppl 20110410
- #define TEMP_BED_PIN 0 // Analog Input
+ #define HEATER_BED_PIN 1 // changed @ rkoeppl 20110410
+ #define TEMP_BED_PIN 0 // Analog Input
#endif
//
// Misc. Functions
//
-#define SDSS 17
-#define DEBUG_PIN 0
-#define CASE_LIGHT_PIN 16 // Hardware PWM
+#define SDSS 17
+#define DEBUG_PIN 0
+#define CASE_LIGHT_PIN 16 // Hardware PWM
// RS485 pins
-#define TX_ENABLE_PIN 12
-#define RX_ENABLE_PIN 13
+#define TX_ENABLE_PIN 12
+#define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
-#define SPINDLE_DIR_PIN 6
+#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
+#define SPINDLE_DIR_PIN 6
diff --git a/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h b/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
index fc4d8b6e10..14e1c67b6f 100644
--- a/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
+++ b/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_12.h b/Marlin/src/pins/sanguino/pins_GEN7_12.h
index 53e4e04df8..bb0e44a300 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_12.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_12.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -61,90 +61,89 @@
#endif
#ifndef GEN7_VERSION
- #define GEN7_VERSION 12 // v1.x
+ #define GEN7_VERSION 12 // v1.x
#endif
//
// Limit Switches
//
-#define X_MIN_PIN 7
-#define Y_MIN_PIN 5
-#define Z_MIN_PIN 1
-#define Z_MAX_PIN 0
-#define Y_MAX_PIN 2
-#define X_MAX_PIN 6
-
+#define X_MIN_PIN 7
+#define Y_MIN_PIN 5
+#define Z_MIN_PIN 1
+#define Z_MAX_PIN 0
+#define Y_MAX_PIN 2
+#define X_MAX_PIN 6
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 0
+ #define Z_MIN_PROBE_PIN 0
#endif
//
// Steppers
//
-#define X_STEP_PIN 19
-#define X_DIR_PIN 18
-#define X_ENABLE_PIN 24
+#define X_STEP_PIN 19
+#define X_DIR_PIN 18
+#define X_ENABLE_PIN 24
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24
-#define Z_STEP_PIN 26
-#define Z_DIR_PIN 25
-#define Z_ENABLE_PIN 24
+#define Z_STEP_PIN 26
+#define Z_DIR_PIN 25
+#define Z_ENABLE_PIN 24
-#define E0_STEP_PIN 28
-#define E0_DIR_PIN 27
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 28
+#define E0_DIR_PIN 27
+#define E0_ENABLE_PIN 24
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_0_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 3
+#define HEATER_0_PIN 4
+#define HEATER_BED_PIN 3
-#if !defined(FAN_PIN) && GEN7_VERSION < 13 // Gen7 v1.3 removed the fan pin
- #define FAN_PIN 31
+#if !defined(FAN_PIN) && GEN7_VERSION < 13 // Gen7 v1.3 removed the fan pin
+ #define FAN_PIN 31
#endif
//
// Misc. Functions
//
-#define PS_ON_PIN 15
+#define PS_ON_PIN 15
#if GEN7_VERSION < 13
- #define CASE_LIGHT_PIN 16 // Hardware PWM
-#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
- #define CASE_LIGHT_PIN 15 // Hardware PWM
+ #define CASE_LIGHT_PIN 16 // Hardware PWM
+#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
+ #define CASE_LIGHT_PIN 15 // Hardware PWM
#endif
// All these generations of Gen7 supply thermistor power
// via PS_ON, so ignore bad thermistor readings
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-#define DEBUG_PIN 0
+#define DEBUG_PIN 0
// RS485 pins
-#define TX_ENABLE_PIN 12
-#define RX_ENABLE_PIN 13
+#define TX_ENABLE_PIN 12
+#define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
-#define SPINDLE_DIR_PIN 11
+#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
+#define SPINDLE_DIR_PIN 11
#if GEN7_VERSION < 13
- #define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
-#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
- #define SPINDLE_LASER_PWM_PIN 15 // Hardware PWM
+ #define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
+#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
+ #define SPINDLE_LASER_PWM_PIN 15 // Hardware PWM
#endif
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_13.h b/Marlin/src/pins/sanguino/pins_GEN7_13.h
index 7f66ac1a9a..728dfd8a5c 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_13.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_13.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_14.h b/Marlin/src/pins/sanguino/pins_GEN7_14.h
index df18f6e781..9dc9f2808b 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_14.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_14.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -58,62 +58,62 @@
#define BOARD_INFO_NAME "Gen7 v1.4"
-#define GEN7_VERSION 14 // v1.4
+#define GEN7_VERSION 14 // v1.4
//
// Limit switches
//
-#define X_STOP_PIN 0
-#define Y_STOP_PIN 1
-#define Z_STOP_PIN 2
+#define X_STOP_PIN 0
+#define Y_STOP_PIN 1
+#define Z_STOP_PIN 2
//
// Steppers
//
-#define X_STEP_PIN 29
-#define X_DIR_PIN 28
-#define X_ENABLE_PIN 25
+#define X_STEP_PIN 29
+#define X_DIR_PIN 28
+#define X_ENABLE_PIN 25
-#define Y_STEP_PIN 27
-#define Y_DIR_PIN 26
-#define Y_ENABLE_PIN 25
+#define Y_STEP_PIN 27
+#define Y_DIR_PIN 26
+#define Y_ENABLE_PIN 25
-#define Z_STEP_PIN 23
-#define Z_DIR_PIN 22
-#define Z_ENABLE_PIN 25
+#define Z_STEP_PIN 23
+#define Z_DIR_PIN 22
+#define Z_ENABLE_PIN 25
-#define E0_STEP_PIN 19
-#define E0_DIR_PIN 18
-#define E0_ENABLE_PIN 25
+#define E0_STEP_PIN 19
+#define E0_DIR_PIN 18
+#define E0_ENABLE_PIN 25
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // Analog Input
-#define TEMP_BED_PIN 0 // Analog Input
+#define TEMP_0_PIN 1 // Analog Input
+#define TEMP_BED_PIN 0 // Analog Input
//
// Heaters
//
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 3
+#define HEATER_0_PIN 4
+#define HEATER_BED_PIN 3
//
// Misc. Functions
//
-#define PS_ON_PIN 15
-#define CASE_LIGHT_PIN 15 // Hardware PWM
+#define PS_ON_PIN 15
+#define CASE_LIGHT_PIN 15 // Hardware PWM
// A pin for debugging
-#define DEBUG_PIN 0
+#define DEBUG_PIN 0
// RS485 pins
-#define TX_ENABLE_PIN 12
-#define RX_ENABLE_PIN 13
+#define TX_ENABLE_PIN 12
+#define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 20 // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
-#define SPINDLE_DIR_PIN 21
+#define SPINDLE_LASER_ENA_PIN 20 // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
+#define SPINDLE_DIR_PIN 21
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
index 8605f0d469..67a9762fa0 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -64,76 +64,76 @@
//
// Limit Switches
//
-#define X_STOP_PIN 0
-#define Y_STOP_PIN 1
-#define Z_STOP_PIN 2
+#define X_STOP_PIN 0
+#define Y_STOP_PIN 1
+#define Z_STOP_PIN 2
//
// Steppers
//
-#define X_STEP_PIN 21 // different from standard GEN7
-#define X_DIR_PIN 20 // different from standard GEN7
-#define X_ENABLE_PIN 24
+#define X_STEP_PIN 21 // different from standard GEN7
+#define X_DIR_PIN 20 // different from standard GEN7
+#define X_ENABLE_PIN 24
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24
-#define Z_STEP_PIN 26
-#define Z_DIR_PIN 25
-#define Z_ENABLE_PIN 24
+#define Z_STEP_PIN 26
+#define Z_DIR_PIN 25
+#define Z_ENABLE_PIN 24
-#define E0_STEP_PIN 28
-#define E0_DIR_PIN 27
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 28
+#define E0_DIR_PIN 27
+#define E0_ENABLE_PIN 24
//
// Temperature Sensors
//
-#define TEMP_0_PIN 2 // Analog Input
-#define TEMP_BED_PIN 1 // Analog Input (pin 34 bed)
+#define TEMP_0_PIN 2 // Analog Input
+#define TEMP_BED_PIN 1 // Analog Input (pin 34 bed)
//
// Heaters
//
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 3 // (bed)
+#define HEATER_0_PIN 4
+#define HEATER_BED_PIN 3 // (bed)
//
// Misc. Functions
//
-#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support
-#define PS_ON_PIN 19
-#define CASE_LIGHT_PIN 15 // Hardware PWM
+#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support
+#define PS_ON_PIN 19
+#define CASE_LIGHT_PIN 15 // Hardware PWM
// A pin for debugging
-#define DEBUG_PIN -1
+#define DEBUG_PIN -1
//
// LCD / Controller
//
-#define BEEPER_PIN -1
+#define BEEPER_PIN -1
// 4bit LCD Support
-#define LCD_PINS_RS 18
-#define LCD_PINS_ENABLE 17
-#define LCD_PINS_D4 16
-#define LCD_PINS_D5 15
-#define LCD_PINS_D6 13
-#define LCD_PINS_D7 14
+#define LCD_PINS_RS 18
+#define LCD_PINS_ENABLE 17
+#define LCD_PINS_D4 16
+#define LCD_PINS_D5 15
+#define LCD_PINS_D6 13
+#define LCD_PINS_D7 14
// Buttons are directly attached
-#define BTN_EN1 11
-#define BTN_EN2 10
-#define BTN_ENC 12
+#define BTN_EN1 11
+#define BTN_EN2 10
+#define BTN_ENC 12
// RS485 pins
-//#define TX_ENABLE_PIN 12
-//#define RX_ENABLE_PIN 13
+//#define TX_ENABLE_PIN 12
+//#define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
-#define SPINDLE_DIR_PIN 6
+#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
+#define SPINDLE_DIR_PIN 6
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index ad0a58509b..b73c1150de 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 59faeee770..10a52705e7 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,15 +46,15 @@
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
-#undef FIL_RUNOUT_PIN // Uses Beeper/LED Pin Pulled to GND
+#undef FIL_RUNOUT_PIN // Uses Beeper/LED Pin Pulled to GND
-#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
-#define LCD_PINS_RS 28 // ST9720 CS
-#define LCD_PINS_ENABLE 17 // ST9720 DAT
-#define LCD_PINS_D4 30 // ST9720 CLK
+#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
+#define LCD_PINS_RS 28 // ST9720 CS
+#define LCD_PINS_ENABLE 17 // ST9720 DAT
+#define LCD_PINS_D4 30 // ST9720 CLK
#if ENABLED(BLTOUCH)
- #define SERVO0_PIN 27
+ #define SERVO0_PIN 27
#undef BEEPER_PIN
#endif
@@ -67,7 +67,7 @@
#if ENABLED(MINIPANEL)
#undef DOGLCD_CS
- #define DOGLCD_CS LCD_PINS_RS
+ #define DOGLCD_CS LCD_PINS_RS
#endif
/**
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h b/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
index ef1f1332c1..59baa2d6dd 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index fd3f482c06..8e682453b4 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,12 +36,12 @@
#undef BTN_EN2
#undef BTN_ENC
-#define LCD_PINS_RS 17 // ST9720 CS
-#define LCD_PINS_ENABLE 16 // ST9720 DAT
-#define LCD_PINS_D4 11 // ST9720 CLK
-#define BTN_EN1 30
-#define BTN_EN2 29
-#define BTN_ENC 28
+#define LCD_PINS_RS 17 // ST9720 CS
+#define LCD_PINS_ENABLE 16 // ST9720 DAT
+#define LCD_PINS_D4 11 // ST9720 CLK
+#define BTN_EN1 30
+#define BTN_EN2 29
+#define BTN_ENC 28
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index d4b05e316e..88b80dfb89 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -40,16 +40,16 @@
#undef BTN_ENC
#undef LCD_SDSS
-#define Z_ENABLE_PIN 14
-#define LCD_PINS_RS 30
-#define LCD_PINS_ENABLE 28
-#define LCD_PINS_D4 16
-#define LCD_PINS_D5 17
-#define LCD_PINS_D6 27
-#define LCD_PINS_D7 29
-#define BTN_EN1 10
-#define BTN_EN2 11
-#define BTN_ENC 26
+#define Z_ENABLE_PIN 14
+#define LCD_PINS_RS 30
+#define LCD_PINS_ENABLE 28
+#define LCD_PINS_D4 16
+#define LCD_PINS_D5 17
+#define LCD_PINS_D6 27
+#define LCD_PINS_D7 29
+#define BTN_EN1 10
+#define BTN_EN2 11
+#define BTN_ENC 26
#if HAS_GRAPHICAL_LCD
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
diff --git a/Marlin/src/pins/sanguino/pins_OMCA.h b/Marlin/src/pins/sanguino/pins_OMCA.h
index 8c50483574..774910bd7d 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -86,66 +86,66 @@
//
// Limit Switches
//
-#define X_STOP_PIN 0
-#define Y_STOP_PIN 1
-#define Z_STOP_PIN 2
+#define X_STOP_PIN 0
+#define Y_STOP_PIN 1
+#define Z_STOP_PIN 2
//
// Steppers
//
-#define X_STEP_PIN 26
-#define X_DIR_PIN 25
-#define X_ENABLE_PIN 10
+#define X_STEP_PIN 26
+#define X_DIR_PIN 25
+#define X_ENABLE_PIN 10
-#define Y_STEP_PIN 28
-#define Y_DIR_PIN 27
-#define Y_ENABLE_PIN 10
+#define Y_STEP_PIN 28
+#define Y_DIR_PIN 27
+#define Y_ENABLE_PIN 10
-#define Z_STEP_PIN 23
-#define Z_DIR_PIN 22
-#define Z_ENABLE_PIN 10
+#define Z_STEP_PIN 23
+#define Z_DIR_PIN 22
+#define Z_ENABLE_PIN 10
-#define E0_STEP_PIN 24
-#define E0_DIR_PIN 21
-#define E0_ENABLE_PIN 10
+#define E0_STEP_PIN 24
+#define E0_DIR_PIN 21
+#define E0_ENABLE_PIN 10
-#define E1_STEP_PIN -1 // 21
-#define E1_DIR_PIN -1 // 20
-#define E1_ENABLE_PIN -1 // 19
+#define E1_STEP_PIN -1 // 21
+#define E1_DIR_PIN -1 // 20
+#define E1_ENABLE_PIN -1 // 19
-#define E2_STEP_PIN -1 // 21
-#define E2_DIR_PIN -1 // 20
-#define E2_ENABLE_PIN -1 // 18
+#define E2_STEP_PIN -1 // 21
+#define E2_DIR_PIN -1 // 20
+#define E2_ENABLE_PIN -1 // 18
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input
-#define TEMP_1_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input (1,2 or I2C)
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_1_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input (1,2 or I2C)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 3 // DONE PWM on RIGHT connector
-#define HEATER_BED_PIN 4
+#define HEATER_0_PIN 3 // DONE PWM on RIGHT connector
+#define HEATER_BED_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 14 // PWM on MIDDLE connector
+ #define FAN_PIN 14 // PWM on MIDDLE connector
#endif
//
// Misc. Functions
//
-#define SDSS 11
+#define SDSS 11
-#define I2C_SCL_PIN 16
-#define I2C_SDA_PIN 17
+#define I2C_SCL_PIN 16
+#define I2C_SDA_PIN 17
// future proofing
-#define __FS 20
-#define __FD 19
-#define __GS 18
-#define __GD 13
+#define __FS 20
+#define __FD 19
+#define __GS 18
+#define __GD 13
-#define UNUSED_PWM 14 // PWM on LEFT connector
+#define UNUSED_PWM 14 // PWM on LEFT connector
diff --git a/Marlin/src/pins/sanguino/pins_OMCA_A.h b/Marlin/src/pins/sanguino/pins_OMCA_A.h
index 94a186241b..73237743b8 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA_A.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA_A.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -85,54 +85,54 @@
//
// Limit Switches
//
-#define X_STOP_PIN 0
-#define Y_STOP_PIN 1
-#define Z_STOP_PIN 2
+#define X_STOP_PIN 0
+#define Y_STOP_PIN 1
+#define Z_STOP_PIN 2
//
// Steppers
//
-#define X_STEP_PIN 21
-#define X_DIR_PIN 20
-#define X_ENABLE_PIN 24
+#define X_STEP_PIN 21
+#define X_DIR_PIN 20
+#define X_ENABLE_PIN 24
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24
-#define Z_STEP_PIN 26
-#define Z_DIR_PIN 25
-#define Z_ENABLE_PIN 24
+#define Z_STEP_PIN 26
+#define Z_DIR_PIN 25
+#define Z_ENABLE_PIN 24
-#define E0_STEP_PIN 28
-#define E0_DIR_PIN 27
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 28
+#define E0_DIR_PIN 27
+#define E0_ENABLE_PIN 24
-#define E1_STEP_PIN -1 // 19
-#define E1_DIR_PIN -1 // 18
-#define E1_ENABLE_PIN 24
+#define E1_STEP_PIN -1 // 19
+#define E1_DIR_PIN -1 // 18
+#define E1_ENABLE_PIN 24
-#define E2_STEP_PIN -1 // 17
-#define E2_DIR_PIN -1 // 16
-#define E2_ENABLE_PIN 24
+#define E2_STEP_PIN -1 // 17
+#define E2_DIR_PIN -1 // 16
+#define E2_ENABLE_PIN 24
//
// Temperature Sensors
//
-#define TEMP_0_PIN 0 // Analog Input (D27)
+#define TEMP_0_PIN 0 // Analog Input (D27)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 4
+#define HEATER_0_PIN 4
#ifndef FAN_PIN
- #define FAN_PIN 3
+ #define FAN_PIN 3
#endif
//
// Misc. Functions
//
-#define SDSS 11
+#define SDSS 11
/* Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31) */
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index d6d7efcf70..50d3a53779 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -63,60 +63,60 @@
//
// Limit Switches
//
-#define X_STOP_PIN 18
-#define Y_STOP_PIN 19
-#define Z_STOP_PIN 20
+#define X_STOP_PIN 18
+#define Y_STOP_PIN 19
+#define Z_STOP_PIN 20
//
// Steppers
//
-#define X_STEP_PIN 15
-#define X_DIR_PIN 21
+#define X_STEP_PIN 15
+#define X_DIR_PIN 21
-#define Y_STEP_PIN 22
-#define Y_DIR_PIN 23
+#define Y_STEP_PIN 22
+#define Y_DIR_PIN 23
-#define Z_STEP_PIN 3
-#define Z_DIR_PIN 2
+#define Z_STEP_PIN 3
+#define Z_DIR_PIN 2
-#define E0_STEP_PIN 1
-#define E0_DIR_PIN 0
+#define E0_STEP_PIN 1
+#define E0_DIR_PIN 0
//
// Temperature Sensors
//
-#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed)
+#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 13 // (extruder)
+#define HEATER_0_PIN 13 // (extruder)
#if ENABLED(SANGUINOLOLU_V_1_2)
- #define HEATER_BED_PIN 12 // (bed)
- #define X_ENABLE_PIN 14
- #define Y_ENABLE_PIN 14
- #define Z_ENABLE_PIN 26
- #define E0_ENABLE_PIN 14
+ #define HEATER_BED_PIN 12 // (bed)
+ #define X_ENABLE_PIN 14
+ #define Y_ENABLE_PIN 14
+ #define Z_ENABLE_PIN 26
+ #define E0_ENABLE_PIN 14
#if !defined(FAN_PIN) && ENABLED(LCD_I2C_PANELOLU2)
- #define FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
+ #define FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
#endif
#else
- #define HEATER_BED_PIN 14 // (bed)
- #define X_ENABLE_PIN -1
- #define Y_ENABLE_PIN -1
- #define Z_ENABLE_PIN -1
- #define E0_ENABLE_PIN -1
+ #define HEATER_BED_PIN 14 // (bed)
+ #define X_ENABLE_PIN -1
+ #define Y_ENABLE_PIN -1
+ #define Z_ENABLE_PIN -1
+ #define E0_ENABLE_PIN -1
#endif
#if !defined(FAN_PIN) && (MB(AZTEEG_X1, STB_11) || IS_MELZI)
- #define FAN_PIN 4 // Works for Panelolu2 too
+ #define FAN_PIN 4 // Works for Panelolu2 too
#endif
//
@@ -129,17 +129,17 @@
* If you encounter issues with these pins, upgrade your
* Sanguino libraries! See #368.
*/
-//#define SDSS 24
-#define SDSS 31
+//#define SDSS 24
+#define SDSS 31
#if IS_MELZI
- #define LED_PIN 27
+ #define LED_PIN 27
#elif MB(STB_11)
- #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
+ #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif
-#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL) // try to use IO Header
- #define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
+#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
+ #define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
#endif
/**
@@ -156,57 +156,57 @@
//
#if HAS_SPI_LCD
- #define SD_DETECT_PIN -1
+ #define SD_DETECT_PIN -1
#if HAS_GRAPHICAL_LCD
#if ENABLED(LCD_FOR_MELZI)
- #define LCD_PINS_RS 17
- #define LCD_PINS_ENABLE 16
- #define LCD_PINS_D4 11
+ #define LCD_PINS_RS 17
+ #define LCD_PINS_ENABLE 16
+ #define LCD_PINS_D4 11
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
#define BOARD_ST7920_DELAY_2 DELAY_NS(188)
#define BOARD_ST7920_DELAY_3 DELAY_NS(0)
- #elif ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
+ #elif ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if IS_MELZI
- #define LCD_PINS_RS 30 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 29 // SID (MOSI)
- #define LCD_PINS_D4 17 // SCK (CLK) clock
+ #define LCD_PINS_RS 30 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 29 // SID (MOSI)
+ #define LCD_PINS_D4 17 // SCK (CLK) clock
// Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
// Marlin so this can be used for BEEPER_PIN. You can use this pin
// with M42 instead of BEEPER_PIN.
- #define BEEPER_PIN 27
- #else // Sanguinololu >=1.3
- #define LCD_PINS_RS 4
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 30
- #define LCD_PINS_D5 29
- #define LCD_PINS_D6 28
- #define LCD_PINS_D7 27
+ #define BEEPER_PIN 27
+ #else // Sanguinololu >=1.3
+ #define LCD_PINS_RS 4
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 30
+ #define LCD_PINS_D5 29
+ #define LCD_PINS_D6 28
+ #define LCD_PINS_D7 27
#endif
#else
- #define DOGLCD_A0 30
+ #define DOGLCD_A0 30
#if ENABLED(MAKRPANEL)
- #define BEEPER_PIN 29
- #define DOGLCD_CS 17
- #define LCD_BACKLIGHT_PIN 28 // PA3
+ #define BEEPER_PIN 29
+ #define DOGLCD_CS 17
+ #define LCD_BACKLIGHT_PIN 28 // PA3
#elif IS_MELZI
- #define BEEPER_PIN 27
- #define DOGLCD_CS 28
+ #define BEEPER_PIN 27
+ #define DOGLCD_CS 28
- #else // !MAKRPANEL
+ #else // !MAKRPANEL
- #define DOGLCD_CS 29
+ #define DOGLCD_CS 29
#endif
@@ -218,57 +218,57 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
+ #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
- #define LCD_PINS_RS 28
- #define LCD_PINS_ENABLE 29
- #define LCD_PINS_D4 10
- #define LCD_PINS_D5 11
- #define LCD_PINS_D6 16
- #define LCD_PINS_D7 17
+ #define LCD_PINS_RS 28
+ #define LCD_PINS_ENABLE 29
+ #define LCD_PINS_D4 10
+ #define LCD_PINS_D5 11
+ #define LCD_PINS_D6 16
+ #define LCD_PINS_D7 17
#else
- #define LCD_PINS_RS 4
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 30
- #define LCD_PINS_D5 29
- #define LCD_PINS_D6 28
- #define LCD_PINS_D7 27
+ #define LCD_PINS_RS 4
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 30
+ #define LCD_PINS_D5 29
+ #define LCD_PINS_D6 28
+ #define LCD_PINS_D7 27
#endif
#if ENABLED(LCD_FOR_MELZI)
- #define BTN_ENC 28
- #define BTN_EN1 29
- #define BTN_EN2 30
+ #define BTN_ENC 28
+ #define BTN_EN1 29
+ #define BTN_EN2 30
- #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
+ #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
- #define ADC_KEYPAD_PIN 1
- #define BTN_EN1 -1
- #define BTN_EN2 -1
+ #define ADC_KEYPAD_PIN 1
+ #define BTN_EN1 -1
+ #define BTN_EN2 -1
#elif ENABLED(LCD_I2C_PANELOLU2)
#if IS_MELZI
- #define BTN_ENC 29
- #define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
+ #define BTN_ENC 29
+ #define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#else
- #define BTN_ENC 30
+ #define BTN_ENC 30
#endif
- #else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
+ #else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
- #define BTN_ENC 16
- #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
+ #define BTN_ENC 16
+ #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif
#if ENABLED(NEWPANEL) && !defined(BTN_EN1)
- #define BTN_EN1 11
- #define BTN_EN2 10
+ #define BTN_EN1 11
+ #define BTN_EN2 10
#endif
#endif // HAS_SPI_LCD
@@ -277,13 +277,13 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
- #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL) // try to use IO Header
+ #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
- #define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
- #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
- #define SPINDLE_DIR_PIN 11
+ #define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
+ #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
+ #define SPINDLE_DIR_PIN 11
- #elif !MB(MELZI) // use X stepper motor socket
+ #elif !MB(MELZI) // use X stepper motor socket
/**
* To control the spindle speed and have an LCD you must sacrifice
@@ -315,11 +315,11 @@
#undef X_DIR_PIN
#undef X_ENABLE_PIN
#undef X_STEP_PIN
- #define X_DIR_PIN 0
- #define X_ENABLE_PIN 14
- #define X_STEP_PIN 1
- #define SPINDLE_LASER_PWM_PIN 15 // Hardware PWM
- #define SPINDLE_LASER_ENA_PIN 21 // Pullup!
- #define SPINDLE_DIR_PIN -1 // No pin available on the socket for the direction pin
+ #define X_DIR_PIN 0
+ #define X_ENABLE_PIN 14
+ #define X_STEP_PIN 1
+ #define SPINDLE_LASER_PWM_PIN 15 // Hardware PWM
+ #define SPINDLE_LASER_ENA_PIN 21 // Pullup!
+ #define SPINDLE_DIR_PIN -1 // No pin available on the socket for the direction pin
#endif
#endif
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
index f4b05e4f6e..3254a01a15 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_SETHI.h b/Marlin/src/pins/sanguino/pins_SETHI.h
index 79c3209b4b..b945869cbc 100644
--- a/Marlin/src/pins/sanguino/pins_SETHI.h
+++ b/Marlin/src/pins/sanguino/pins_SETHI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -57,69 +57,69 @@
#define BOARD_INFO_NAME "Sethi 3D_1"
#ifndef GEN7_VERSION
- #define GEN7_VERSION 12 // v1.x
+ #define GEN7_VERSION 12 // v1.x
#endif
//
// Limit Switches
//
-#define X_STOP_PIN 2
-#define Y_STOP_PIN 0
-#define Z_MIN_PIN 1
-#define Z_MAX_PIN 0
+#define X_STOP_PIN 2
+#define Y_STOP_PIN 0
+#define Z_MIN_PIN 1
+#define Z_MAX_PIN 0
//
// Steppers
//
-#define X_STEP_PIN 19
-#define X_DIR_PIN 18
-#define X_ENABLE_PIN 24
+#define X_STEP_PIN 19
+#define X_DIR_PIN 18
+#define X_ENABLE_PIN 24
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 22
-#define Y_ENABLE_PIN 24
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 22
+#define Y_ENABLE_PIN 24
-#define Z_STEP_PIN 26
-#define Z_DIR_PIN 25
-#define Z_ENABLE_PIN 24
+#define Z_STEP_PIN 26
+#define Z_DIR_PIN 25
+#define Z_ENABLE_PIN 24
-#define E0_STEP_PIN 28
-#define E0_DIR_PIN 27
-#define E0_ENABLE_PIN 24
+#define E0_STEP_PIN 28
+#define E0_DIR_PIN 27
+#define E0_ENABLE_PIN 24
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // Analog Input
-#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_0_PIN 1 // Analog Input
+#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 4
-#define HEATER_BED_PIN 3
+#define HEATER_0_PIN 4
+#define HEATER_BED_PIN 3
#ifndef FAN_PIN
#if GEN7_VERSION >= 13
// Gen7 v1.3 removed the fan pin
- #define FAN_PIN -1
+ #define FAN_PIN -1
#else
- #define FAN_PIN 31
+ #define FAN_PIN 31
#endif
#endif
//
// Misc. Functions
//
-#define PS_ON_PIN 15
+#define PS_ON_PIN 15
// All these generations of Gen7 supply thermistor power
// via PS_ON, so ignore bad thermistor readings
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
// our pin for debugging.
-#define DEBUG_PIN 0
+#define DEBUG_PIN 0
// our RS485 pins
-#define TX_ENABLE_PIN 12
-#define RX_ENABLE_PIN 13
+#define TX_ENABLE_PIN 12
+#define RX_ENABLE_PIN 13
diff --git a/Marlin/src/pins/sanguino/pins_STB_11.h b/Marlin/src/pins/sanguino/pins_STB_11.h
index 9a79853467..774fb00403 100644
--- a/Marlin/src/pins/sanguino/pins_STB_11.h
+++ b/Marlin/src/pins/sanguino/pins_STB_11.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 2492f31816..180bc8d6f6 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -278,9 +278,9 @@
#endif
#define _E6_CS
+#define _E6_MS1
#define _E6_MS2
#define _E6_MS3
-#define _E6_MS4
#if E_NEEDED(6)
#if PIN_EXISTS(E6_CS) && AXIS_HAS_SPI(E6)
@@ -302,9 +302,9 @@
#endif
#define _E7_CS
+#define _E7_MS1
+#define _E7_MS2
#define _E7_MS3
-#define _E7_MS4
-#define _E7_MS5
#if E_NEEDED(7)
#if PIN_EXISTS(E7_CS) && AXIS_HAS_SPI(E7)
diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h
deleted file mode 100644
index 495654a82c..0000000000
--- a/Marlin/src/pins/stm32/pins_ARMED.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef STM32F4
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "Arm'ed supports up to 2 hotends / E-steppers."
-#endif
-
-#ifndef ARMED_V1_0
- #define ARMED_V1_1
-#endif
-
-#undef BOARD_INFO_NAME // Defined on the command line by Arduino Core STM32
-#define BOARD_INFO_NAME "Arm'ed"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-#define I2C_EEPROM
-
-#undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
-#define E2END 0xFFF // 4KB
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PE0
-#define Y_STOP_PIN PE1
-#define Z_STOP_PIN PE14
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-//#ifndef Z_MIN_PROBE_PIN
-// #define Z_MIN_PROBE_PIN PA4
-//#endif
-
-//
-// Filament Runout Sensor
-//
-#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PA3
-#endif
-
-//
-// Steppers
-//
-
-#ifdef ARMED_SWAP_X_E1
- #define X_STEP_PIN PE4
- #define X_DIR_PIN PE2
- #define X_ENABLE_PIN PE3
- #define X_CS_PIN PE5
-#else
- #define X_STEP_PIN PD3
- #define X_DIR_PIN PD2
- #define X_ENABLE_PIN PD0
- #define X_CS_PIN PD1
-#endif
-
-#define Y_STEP_PIN PE11
-#define Y_DIR_PIN PE10
-#define Y_ENABLE_PIN PE13
-#define Y_CS_PIN PE12
-
-#define Z_STEP_PIN PD6
-#define Z_DIR_PIN PD7
-#define Z_ENABLE_PIN PD4
-#define Z_CS_PIN PD5
-
-#define E0_STEP_PIN PB5
-#define E0_DIR_PIN PB6
-#ifdef ARMED_V1_1
- #define E0_ENABLE_PIN PC12
-#else
- #define E0_ENABLE_PIN PB3
-#endif
-#define E0_CS_PIN PB4
-
-#ifdef ARMED_SWAP_X_E1
- #define E1_STEP_PIN PD3
- #define E1_DIR_PIN PD2
- #define E1_ENABLE_PIN PD0
- #define E1_CS_PIN PD1
-#else
- #define E1_STEP_PIN PE4
- #define E1_DIR_PIN PE2
- #define E1_ENABLE_PIN PE3
- #define E1_CS_PIN PE5
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC0 // Analog Input
-#define TEMP_1_PIN PC1 // Analog Input
-#define TEMP_BED_PIN PC2 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PA1 // Hardware PWM
-#define HEATER_1_PIN PA2 // Hardware PWM
-#define HEATER_BED_PIN PA0 // Hardware PWM
-
-#define FAN_PIN PC6 // Hardware PWM, Part cooling fan
-#define FAN1_PIN PC7 // Hardware PWM, Extruder fan
-#define FAN2_PIN PC8 // Hardware PWM, Controller fan
-
-//
-// Misc functions
-//
-#define SDSS PE7
-#define LED_PIN PB7 // Heart beat
-#define PS_ON_PIN PA10
-#define KILL_PIN PA8
-#define PWR_LOSS PA4 // Power loss / nAC_FAULT
-
-//
-// LCD / Controller
-//
-#define SD_DETECT_PIN PA15
-#define BEEPER_PIN PC9
-
-#if ENABLED(FYSETC_MINI_12864)
- //
- // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
- //
- #define DOGLCD_A0 PE9
- #define DOGLCD_CS PE8
-
- #define LCD_BACKLIGHT_PIN -1
-
- #define LCD_RESET_PIN PB12 // Must be high or open for LCD to operate normally.
-
- #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
- #ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PB13
- #endif
- #ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PB14
- #endif
- #ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PB15
- #endif
- #elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN PB13
- #endif
-#else
- #define LCD_PINS_RS PE9
- #define LCD_PINS_ENABLE PE8
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
-
- #if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS PB13
- #define DOGLCD_A0 PB14
- #endif
-#endif
-
-#define BTN_EN1 PC4
-#define BTN_EN2 PC5
-#define BTN_ENC PC3
-
-//
-// Extension pins
-//
-#define EXT0_PIN PB0
-#define EXT1_PIN PB1
-#define EXT2_PIN PB2
-#define EXT3_PIN PD8
-#define EXT4_PIN PD9
-#define EXT5_PIN PD10
-#define EXT6_PIN PD11
-#define EXT7_PIN PD12
-#define EXT8_PIN PB10
-#define EXT9_PIN PB11
diff --git a/Marlin/src/pins/stm32/pins_BEAST.h b/Marlin/src/pins/stm32/pins_BEAST.h
deleted file mode 100644
index 7b1f61d918..0000000000
--- a/Marlin/src/pins/stm32/pins_BEAST.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#if !defined(__STM32F1__) && !defined(__STM32F4__)
- #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
-#endif
-
-/**
- * 21017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME "Beast STM32"
-#define DEFAULT_MACHINE_NAME "STM32F103RET6"
-
-// Enable I2C_EEPROM for testing
-#define I2C_EEPROM
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Steppers
-//
-#define X_STEP_PIN PE0
-#define X_DIR_PIN PE1
-#define X_ENABLE_PIN PC0
-#define X_MIN_PIN PD5
-#define X_MAX_PIN -1
-
-#define Y_STEP_PIN PE2
-#define Y_DIR_PIN PE3
-#define Y_ENABLE_PIN PC1
-#define Y_MIN_PIN PD6
-#define Y_MAX_PIN
-
-#define Z_STEP_PIN PE4
-#define Z_DIR_PIN PE5
-#define Z_ENABLE_PIN PC2
-#define Z_MIN_PIN PD7
-#define Z_MAX_PIN -1
-
-#define Y2_STEP_PIN -1
-#define Y2_DIR_PIN -1
-#define Y2_ENABLE_PIN -1
-
-#define Z2_STEP_PIN -1
-#define Z2_DIR_PIN -1
-#define Z2_ENABLE_PIN -1
-
-#define E0_STEP_PIN PE6
-#define E0_DIR_PIN PE7
-#define E0_ENABLE_PIN PC3
-
-/**
- * TODO: Currently using same Enable pin to all steppers.
- */
-
-#define E1_STEP_PIN PE8
-#define E1_DIR_PIN PE9
-#define E1_ENABLE_PIN PC4
-
-#define E2_STEP_PIN PE10
-#define E2_DIR_PIN PE11
-#define E2_ENABLE_PIN PC5
-
-//
-// Misc. Functions
-//
-#define SDSS PA15
-#define LED_PIN PB2
-
-#define PS_ON_PIN -1
-#define KILL_PIN -1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PD12 // EXTRUDER 1
-#define HEATER_1_PIN PD13
-#define HEATER_2_PIN PD14
-
-#define HEATER_BED_PIN PB9 // BED
-#define HEATER_BED2_PIN -1 // BED2
-#define HEATER_BED3_PIN -1 // BED3
-
-#ifndef FAN_PIN
- #define FAN_PIN PB10
-#endif
-
-#define FAN_SOFT_PWM
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN PA0 // Analog Input
-#define TEMP_0_PIN PA1 // Analog Input
-#define TEMP_1_PIN PA2 // Analog Input
-#define TEMP_2_PIN PA3 // Analog Input
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
- #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
- #elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #else
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
- // Buttons attached to a shift register
- // Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
- #endif
- #endif
-
- #if ENABLED(NEWPANEL)
-
- #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
- #define BEEPER_PIN 37
-
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
-
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
-
- #if ENABLED(BQ_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 39
- #endif
-
- #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
-
- #elif ENABLED(LCD_I2C_PANELOLU2)
-
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS 53
- #define SD_DETECT_PIN -1
- #define KILL_PIN 41
-
- #elif ENABLED(LCD_I2C_VIKI)
-
- #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
- #define BTN_ENC -1
- #define LCD_SDSS 53
- #define SD_DETECT_PIN 49
-
- #elif ANY(VIKI2, miniVIKI)
-
- #define BEEPER_PIN 33
-
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 45
- #define LCD_SCREEN_ROT_180
-
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
-
- #define SDSS 53
- #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
-
- #define KILL_PIN 31
-
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
-
- #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
- #define SD_DETECT_PIN 49
- #define LCD_SDSS 53
- #define KILL_PIN 41
- #define BEEPER_PIN 23
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
- #define LCD_BACKLIGHT_PIN 33
-
- #elif ENABLED(MINIPANEL)
-
- #define BEEPER_PIN 42
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define SDSS 53
-
- #define KILL_PIN 64
- // GLCD features
- // Uncomment screen orientation
- //#define LCD_SCREEN_ROT_90
- //#define LCD_SCREEN_ROT_180
- //#define LCD_SCREEN_ROT_270
- // The encoder and click button
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
- // not connected to a pin
- #define SD_DETECT_PIN 49
-
- #else
-
- // Beeper on AUX-4
- #define BEEPER_PIN 33
-
- // Buttons directly attached to AUX-2
- #if ENABLED(REPRAPWORLD_KEYPAD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
- #elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
- #else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
- #endif
-
- #if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
- #else
- //#define SD_DETECT_PIN -1 // Ramps doesn't use this
- #endif
-
- #endif
- #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
deleted file mode 100644
index 74a715a8d2..0000000000
--- a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * STM32F407VET6 with RAMPS-like shield
- * 'Black' STM32F407VET6 board - http://wiki.stm32duino.com/index.php?title=STM32F407
- * Shield - https://github.com/jmz52/Hardware
- */
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
-#endif
-
-#ifndef BOARD_INFO_NAME
- #define BOARD_INFO_NAME "Black STM32F4VET6"
-#endif
-
-#define DEFAULT_MACHINE_NAME "STM32F407VET6"
-
-//#define I2C_EEPROM
-//#define E2END 0x1FFF // 8KB
-#define SRAM_EEPROM_EMULATION
-
-//
-// Servos
-//
-#define SERVO0_PIN PC6
-#define SERVO1_PIN PC7
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PC13
-#define X_MAX_PIN PA15
-#define Y_MIN_PIN PA5
-#define Y_MAX_PIN PD12
-#define Z_MIN_PIN PD14
-#define Z_MAX_PIN PD15
-
-//
-// Steppers
-//
-#define X_STEP_PIN PC4
-#define X_DIR_PIN PA4
-#define X_ENABLE_PIN PE7
-
-#define Y_STEP_PIN PE5
-#define Y_DIR_PIN PE2
-#define Y_ENABLE_PIN PE6
-
-#define Z_STEP_PIN PD5
-#define Z_DIR_PIN PD3
-#define Z_ENABLE_PIN PD6
-
-#define E0_STEP_PIN PD7
-#define E0_DIR_PIN PD0
-#define E0_ENABLE_PIN PB9
-
-#define E1_STEP_PIN PE0
-#define E1_DIR_PIN PE1
-#define E1_ENABLE_PIN PB8
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC0 // T0
-#define TEMP_1_PIN PC1 // T1
-#define TEMP_BED_PIN PC2 // TB
-
-#ifndef TEMP_CHAMBER_PIN
- #define TEMP_CHAMBER_PIN PC3 // TC
-#endif
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PA2 // Heater0
-#define HEATER_1_PIN PA3 // Heater1
-#define HEATER_BED_PIN PA1 // Hotbed
-
-#define FAN_PIN PE9 // Fan0
-#define FAN1_PIN PE11 // Fan1
-#define FAN2_PIN PE13 // Fan2
-#define FAN3_PIN PE14 // Fan3
-
-//
-// Misc. Functions
-//
-#define SDSS PB12
-#define LED_PIN PA6
-//#define LED_PIN PA7
-#define KILL_PIN PB1
-
-//
-// LCD / Controller
-//
-#define SD_DETECT_PIN PC5
-//#define SD_DETECT_PIN PA8 // SDIO SD_DETECT_PIN, external SDIO card reader only
-
-#define BEEPER_PIN PD10
-#define LCD_PINS_RS PE15
-#define LCD_PINS_ENABLE PD8
-#define LCD_PINS_D4 PE10
-#define LCD_PINS_D5 PE12
-#define LCD_PINS_D6 PD1
-#define LCD_PINS_D7 PE8
-#define BTN_ENC PD9
-#define BTN_EN1 PD4
-#define BTN_EN2 PD13
-
-#define DOGLCD_CS LCD_PINS_D5
-#define DOGLCD_A0 LCD_PINS_D6
diff --git a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
deleted file mode 100644
index 8ed2e50d25..0000000000
--- a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef TARGET_STM32F4
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 8 || E_STEPPERS > 8
- #error "BIGTREE GTR V1.0 supports up to 8 hotends / E-steppers."
-#elif HOTENDS > MAX_EXTRUDERS || E_STEPPERS > MAX_EXTRUDERS
- #error "Marlin extruder/hotends limit! Increase MAX_EXTRUDERS to continue."
-#endif
-
-#define BOARD_INFO_NAME "BIGTREE GTR 1.0"
-
-// Use one of these or SDCard-based Emulation will be used
-//#define I2C_EEPROM
-//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
-//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
-
-#define TP // Enable to define servo and probe pins
-
-//
-// Servos
-//
-#if ENABLED(TP)
- #define SERVO0_PIN PB11
-#endif
-
-#define PS_ON_PIN PH6
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PF2
-#define X_MAX_PIN PG14
-#define Y_MIN_PIN PC13
-#define Y_MAX_PIN PG9
-#define Z_MIN_PIN PE0
-#define Z_MAX_PIN PD3
-
-//
-// Pins on the extender
-//
-//#define X_MIN_PIN PI4
-//#define X2_MIN_PIN PF12
-//#define Y_MIN_PIN PF4
-//#define Y2_MIN_PIN PI7
-//#define Z_MIN_PIN PF6
-
-#if ENABLED(TP) && !defined(Z_MIN_PROBE_PIN)
- #define Z_MIN_PROBE_PIN PH11 // Z Probe must be PH11
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN PC15
-#define X_DIR_PIN PF0
-#define X_ENABLE_PIN PF1
-#ifndef X_CS_PIN
- #define X_CS_PIN PC14
-#endif
-
-#define Y_STEP_PIN PE3
-#define Y_DIR_PIN PE2
-#define Y_ENABLE_PIN PE4
-#ifndef Y_CS_PIN
- #define Y_CS_PIN PE1
-#endif
-
-#define Z_STEP_PIN PB8
-#define Z_DIR_PIN PB7 // PB7
-#define Z_ENABLE_PIN PB9
-#ifndef Z_CS_PIN
- #define Z_CS_PIN PB5
-#endif
-
-#define E0_STEP_PIN PG12
-#define E0_DIR_PIN PG11
-#define E0_ENABLE_PIN PG13
-#ifndef E0_CS_PIN
- #define E0_CS_PIN PG10
-#endif
-
-#define E1_STEP_PIN PD6
-#define E1_DIR_PIN PD5
-#define E1_ENABLE_PIN PD7
-#ifndef E1_CS_PIN
- #define E1_CS_PIN PD4
-#endif
-
-#define E2_STEP_PIN PD1
-#define E2_DIR_PIN PD0
-#define E2_ENABLE_PIN PD2
-#ifndef E2_CS_PIN
- #define E2_CS_PIN PC12
-#endif
-
-#define E3_STEP_PIN PF3
-#define E3_DIR_PIN PG3
-#define E3_ENABLE_PIN PF8
-#ifndef E3_CS_PIN
- #define E3_CS_PIN PG4
-#endif
-
-#define E4_STEP_PIN PD14
-#define E4_DIR_PIN PD11
-#define E4_ENABLE_PIN PG2
-#ifndef E4_CS_PIN
- #define E4_CS_PIN PE15
-#endif
-
-#define E5_STEP_PIN PE12
-#define E5_DIR_PIN PE10
-#define E5_ENABLE_PIN PF14
-#ifndef E5_CS_PIN
- #define E5_CS_PIN PE7
-#endif
-
-#define E6_STEP_PIN PG0
-#define E6_DIR_PIN PG1
-#define E6_ENABLE_PIN PE8
-#ifndef E6_CS_PIN
- #define E6_CS_PIN PF15
-#endif
-
-#define E7_STEP_PIN PH12
-#define E7_DIR_PIN PH15
-#define E7_ENABLE_PIN PI0
-#ifndef E7_CS_PIN
- #define E7_CS_PIN PH14
-#endif
-
-//
-// Software SPI pins for TMC2130 stepper drivers
-//
-#if ENABLED(TMC_USE_SW_SPI)
- #ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PG15
- #endif
- #ifndef TMC_SW_MISO
- #define TMC_SW_MISO PB6
- #endif
- #ifndef TMC_SW_SCK
- #define TMC_SW_SCK PB3
- #endif
-#endif
-
-#if HAS_TMC220x
- /**
- * TMC2208/TMC2209 stepper drivers
- *
- * Hardware serial communication ports.
- * If undefined software serial is used according to the pins below
- */
- //#define X_HARDWARE_SERIAL Serial
- //#define X2_HARDWARE_SERIAL Serial1
- //#define Y_HARDWARE_SERIAL Serial1
- //#define Y2_HARDWARE_SERIAL Serial1
- //#define Z_HARDWARE_SERIAL Serial1
- //#define Z2_HARDWARE_SERIAL Serial1
- //#define E0_HARDWARE_SERIAL Serial1
- //#define E1_HARDWARE_SERIAL Serial1
- //#define E2_HARDWARE_SERIAL Serial1
- //#define E3_HARDWARE_SERIAL Serial1
- //#define E4_HARDWARE_SERIAL Serial1
- //#define E5_HARDWARE_SERIAL Serial1
- //#define E6_HARDWARE_SERIAL Serial1
- //#define E7_HARDWARE_SERIAL Serial1
-
- //
- // Software serial
- //
- #define X_SERIAL_TX_PIN PC14
- #define X_SERIAL_RX_PIN PC14
-
- #define Y_SERIAL_TX_PIN PE1
- #define Y_SERIAL_RX_PIN PE1
-
- #define Z_SERIAL_TX_PIN PB5
- #define Z_SERIAL_RX_PIN PB5
-
- #define E0_SERIAL_TX_PIN PG10
- #define E0_SERIAL_RX_PIN PG10
-
- #define E1_SERIAL_TX_PIN PD4
- #define E1_SERIAL_RX_PIN PD4
-
- #define E2_SERIAL_TX_PIN PC12
- #define E2_SERIAL_RX_PIN PC12
-
- #define E3_SERIAL_TX_PIN PG4
- #define E3_SERIAL_RX_PIN PG4
-
- #define E4_SERIAL_TX_PIN PE15
- #define E4_SERIAL_RX_PIN PE15
-
- #define E5_SERIAL_TX_PIN PE7
- #define E5_SERIAL_RX_PIN PE7
-
- #define E6_SERIAL_TX_PIN PF15
- #define E6_SERIAL_RX_PIN PF15
-
- #define E7_SERIAL_TX_PIN PH14
- #define E7_SERIAL_RX_PIN PH14
-
- // Reduce baud rate to improve software serial reliability
- #define TMC_BAUD_RATE 19200
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC1 // T1 <-> E0
-#define TEMP_1_PIN PC2 // T2 <-> E1
-#define TEMP_2_PIN PC3 // T3 <-> E2
-
-#define TEMP_3_PIN PA3 // T4 <-> E3
-#define TEMP_4_PIN PF9 // T5 <-> E4
-#define TEMP_5_PIN PF10 // T6 <-> E5
-//#define TEMP_6_PIN PF7 // T7 <-> E6
-//#define TEMP_7_PIN PF5 // T8 <-> E7
-
-#define TEMP_BED_PIN PC0 // T0 <-> Bed
-
-// SPI for Max6675 or Max31855 Thermocouple
-// Uses a separate SPI bus
-// If you have a two-way thermocouple, you can customize two THERMO_CSx_PIN pins (x:1~2)
-
-#define THERMO_SCK_PIN PI1 // SCK
-#define THERMO_DO_PIN PI2 // MISO
-#define THERMO_CS1_PIN PH9 // CS1
-#define THERMO_CS2_PIN PH2 // CS2
-
-#define MAX6675_SS_PIN THERMO_CS1_PIN
-#define MAX6675_SS2_PIN THERMO_CS2_PIN
-#define MAX6675_SCK_PIN THERMO_SCK_PIN
-#define MAX6675_DO_PIN THERMO_DO_PIN
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PB1 // Heater0
-#define HEATER_1_PIN PA1 // Heater1
-#define HEATER_2_PIN PB0 // Heater2
-
-#define HEATER_3_PIN PD15 // Heater3
-#define HEATER_4_PIN PD13 // Heater4
-#define HEATER_5_PIN PD12 // Heater5
-//#define HEATER_6_PIN PE13 // Heater6
-//#define HEATER_7_PIN PI6 // Heater7
-
-#define HEATER_BED_PIN PA2 // Hotbed
-
-#define FAN_PIN PE5 // Fan0
-#define FAN1_PIN PE6 // Fan1
-#define FAN2_PIN PC8 // Fan2
-
-#define FAN3_PIN PI5 // Fan3
-#define FAN4_PIN PE9 // Fan4
-#define FAN5_PIN PE11 // Fan5
-//#define FAN6_PIN PC9 // Fan6
-//#define FAN7_PIN PE14 // Fan7
-
-//
-// By default the onboard SD (SPI1) is enabled
-//
-#define CUSTOM_SPI_PINS
-#if DISABLED(CUSTOM_SPI_PINS)
- #define SDSS PB12
-#endif
-
-// HAL SPI1 pins group
-#if ENABLED(CUSTOM_SPI_PINS)
- #define SDSS PA4
- #define SD_DETECT_PIN PC4
- #define LCD_SDSS PA4
-
- #define SCK_PIN PA5
- #define MISO_PIN PA6
- #define MOSI_PIN PA7
- #define SS_PIN PA4 // Chip select for SD card used by Marlin
-#endif
-
-/**
- * _____ _____
- * NC | · · | GND 5V | · · | GND
- * RESET | · · | PB10(SD_DETECT) (LCD_D7) PG5 | · · | PG6 (LCD_D6)
- * (MOSI)PB15 | · · | PH10(BTN_EN2) (LCD_D5) PG7 | · · | PG8 (LCD_D4)
- * (SD_SS)PB12 | · · | PD10(BTN_EN1) (LCD_RS) PA8 | · · | PC10 (LCD_EN)
- * (SCK)PB13 | · · | PB14(MISO) (BTN_ENC) PA15 | · · | PC11 (BEEPER)
- * ￣￣ ￣￣
- * EXP2 EXP1
- */
-
-//
-// LCDs and Controllers
-//
-#if HAS_SPI_LCD
- #define BEEPER_PIN PC11
- #define BTN_ENC PA15
-
- #if ENABLED(CR10_STOCKDISPLAY)
-
- #define LCD_PINS_RS PA8
-
- #define BTN_EN1 PD10
- #define BTN_EN2 PH10
-
- #define LCD_PINS_ENABLE PG7
- #define LCD_PINS_D4 PG8
-
- //#undef ST7920_DELAY_1
- //#undef ST7920_DELAY_2
- //#undef ST7920_DELAY_3
-
- #else
-
- #define LCD_PINS_RS PA8
-
- #define BTN_EN1 PD10
- #define BTN_EN2 PH10
-
- #if DISABLED(CUSTOM_SPI_PINS)
- #define SD_DETECT_PIN PB10
- #define LCD_SDSS PB12
- #endif
-
- #define LCD_PINS_ENABLE PC10
- #define LCD_PINS_D4 PG8
-
- #if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS PC10
- #define DOGLCD_A0 PA8
- //#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN PG8 // Must be high or open for LCD to operate normally.
- #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
- #ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PG7
- #endif
- #ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PG6
- #endif
- #ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PG5
- #endif
- #elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN PF13
- #endif
- #endif // !FYSETC_MINI_12864
-
- #if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PG7
- #define LCD_PINS_D6 PG6
- #define LCD_PINS_D7 PG5
- #endif
-
- #endif
-
- // Alter timing for graphical display
- #if HAS_GRAPHICAL_LCD
- #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
- #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
- #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
- #endif
-
- //#define DOGLCD_CS PB12
- //#define DOGLCD_A0 PA8
- //#define LCD_PINS_DC PB14
- //#define DOGLCD_MOSI PB15
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
deleted file mode 100644
index b23ab1c2db..0000000000
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef TARGET_STM32F1
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
-
-#define BOARD_INFO_NAME "BIGTREE SKR E3 DIP V1.0"
-
-// Release PB3/PB4 (TMC_SW Pins) from JTAG pins
-#define DISABLE_JTAG
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-#define FLASH_EEPROM_EMULATION
-#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB
-#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
-#undef E2END
-#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
-
-//
-// Servos
-//
-#define SERVO0_PIN PA1
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PC1
-#define Y_STOP_PIN PC0
-#define Z_STOP_PIN PC15
-
-//
-// Z Probe must be this pin
-//
-#define Z_MIN_PROBE_PIN PC14
-
-//
-// Filament Runout Sensor
-//
-#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PC2
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PC7
-#define X_STEP_PIN PC6
-#define X_DIR_PIN PB15
-#ifndef X_CS_PIN
- #define X_CS_PIN PC10
-#endif
-
-#define Y_ENABLE_PIN PB14
-#define Y_STEP_PIN PB13
-#define Y_DIR_PIN PB12
-#ifndef Y_CS_PIN
- #define Y_CS_PIN PC11
-#endif
-
-#define Z_ENABLE_PIN PB11
-#define Z_STEP_PIN PB10
-#define Z_DIR_PIN PB2
-#ifndef Z_CS_PIN
- #define Z_CS_PIN PC12
-#endif
-
-#define E0_ENABLE_PIN PB1
-#define E0_STEP_PIN PB0
-#define E0_DIR_PIN PC5
-#ifndef E0_CS_PIN
- #define E0_CS_PIN PD2
-#endif
-
-//
-// Software SPI pins for TMC2130 stepper drivers
-//
-#if ENABLED(TMC_USE_SW_SPI)
- #ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PB5
- #endif
- #ifndef TMC_SW_MISO
- #define TMC_SW_MISO PB4
- #endif
- #ifndef TMC_SW_SCK
- #define TMC_SW_SCK PB3
- #endif
-#endif
-
-#if HAS_TMC220x
- /**
- * TMC2208/TMC2209 stepper drivers
- *
- * Hardware serial communication ports.
- * If undefined software serial is used according to the pins below
- */
- //#define X_HARDWARE_SERIAL Serial1
- //#define Y_HARDWARE_SERIAL Serial1
- //#define Z_HARDWARE_SERIAL Serial1
- //#define E0_HARDWARE_SERIAL Serial1
-
- //
- // Software serial
- //
- #define X_SERIAL_TX_PIN PC10
- #define X_SERIAL_RX_PIN PC10
-
- #define Y_SERIAL_TX_PIN PC11
- #define Y_SERIAL_RX_PIN PC11
-
- #define Z_SERIAL_TX_PIN PC12
- #define Z_SERIAL_RX_PIN PC12
-
- #define E0_SERIAL_TX_PIN PD2
- #define E0_SERIAL_RX_PIN PD2
-
- // Reduce baud rate to improve software serial reliability
- #define TMC_BAUD_RATE 19200
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PA0 // Analog Input
-#define TEMP_BED_PIN PC3 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC8 // EXTRUDER
-#define HEATER_BED_PIN PC9 // BED
-#define FAN_PIN PA8
-
-//
-// USB connect control
-//
-#define USB_CONNECT_PIN PC13
-#define USB_CONNECT_INVERTING false
-
-#define SD_DETECT_PIN PC4
-
-/**
- * _____
- * 5V | · · | GND
- * (LCD_EN) PB7 | · · | PB8 (LCD_RS)
- * (LCD_D4) PB9 | · · | PA10 (BTN_EN2)
- * RESET | · · | PA9 (BTN_EN1)
- * (BTN_ENC) PB6 | · · | PA15 (BEEPER)
- * -----
- * EXP1
- */
-#if HAS_SPI_LCD
- #define BEEPER_PIN PA15
- #define BTN_ENC PB6
-
- #if ENABLED(CR10_STOCKDISPLAY)
-
- #define LCD_PINS_RS PB8
-
- #define BTN_EN1 PA9
- #define BTN_EN2 PA10
-
- #define LCD_PINS_ENABLE PB7
- #define LCD_PINS_D4 PB9
-
- #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
-
- /** Creality Ender-2 display pinout
- * _____
- * 5V | · · | GND
- * (MOSI) PB7 | · · | PB8 (LCD_RS)
- * (LCD_A0) PB9 | · · | PA10 (BTN_EN2)
- * RESET | · · | PA9 (BTN_EN1)
- * (BTN_ENC) PB6 | · · | PA15 (SCK)
- * -----
- * EXP1
- */
-
- #define BTN_EN1 PA9
- #define BTN_EN2 PA10
- #define DOGLCD_CS PB8
- #define DOGLCD_A0 PB9
- #define DOGLCD_SCK PA15
- #define DOGLCD_MOSI PB7
- #define FORCE_SOFT_SPI
- #define LCD_BACKLIGHT_PIN -1
-
- #else
- #error "Only CR10_STOCKDISPLAY and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
- #endif
-
-#endif // HAS_SPI_LCD
-
-//
-// SD Support
-//
-#define HAS_ONBOARD_SD
-
-#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
-#endif
-
-#define ON_BOARD_SPI_DEVICE 1 //SPI1
-#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
deleted file mode 100644
index 82a1f62009..0000000000
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef TARGET_STM32F1
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
-
-// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
-#define DISABLE_JTAG
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-#define FLASH_EEPROM_EMULATION
-#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB
-#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
-#undef E2END
-#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
-
-//
-// Servos
-//
-#define SERVO0_PIN PA1
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PC0
-#define Y_STOP_PIN PC1
-#define Z_STOP_PIN PC2
-
-//
-// Z Probe must be this pins
-//
-#define Z_MIN_PROBE_PIN PC14
-
-//
-// Filament Runout Sensor
-//
-#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PC15 // "E0-STOP"
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PB14
-#define X_STEP_PIN PB13
-#define X_DIR_PIN PB12
-
-#define Y_ENABLE_PIN PB11
-#define Y_STEP_PIN PB10
-#define Y_DIR_PIN PB2
-
-#define Z_ENABLE_PIN PB1
-#define Z_STEP_PIN PB0
-#define Z_DIR_PIN PC5
-
-#define E0_ENABLE_PIN PD2
-#define E0_STEP_PIN PB3
-#define E0_DIR_PIN PB4
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PA0 // Analog Input
-#define TEMP_BED_PIN PC3 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC8 // EXTRUDER
-#define HEATER_BED_PIN PC9 // BED
-#define FAN_PIN PA8
-
-//
-// USB connect control
-//
-#define USB_CONNECT_PIN PC13
-#define USB_CONNECT_INVERTING false
-
-#define SD_DETECT_PIN PC4
-
-/**
- * _____
- * 5V | · · | GND
- * (LCD_EN) PB7 | · · | PB8 (LCD_RS)
- * (LCD_D4) PB9 | · · | PA10 (BTN_EN2)
- * RESET | · · | PA9 (BTN_EN1)
- * (BTN_ENC) PB6 | · · | PB5 (BEEPER)
- * -----
- * EXP1
- */
-#if HAS_SPI_LCD
-
- #if ENABLED(CR10_STOCKDISPLAY)
-
- #define BEEPER_PIN PB5
- #define BTN_ENC PB6
-
- #define LCD_PINS_RS PB8
-
- #define BTN_EN1 PA9
- #define BTN_EN2 PA10
-
- #define LCD_PINS_ENABLE PB7
- #define LCD_PINS_D4 PB9
-
- #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
-
- #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
-
- #define LCD_PINS_RS PB9
- #define LCD_PINS_ENABLE PB6
- #define LCD_PINS_D4 PB8
- #define LCD_PINS_D5 PA10
- #define LCD_PINS_D6 PA9
- #define LCD_PINS_D7 PB5
- #define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
-
- #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
-
- /** Creality Ender-2 display pinout
- * _____
- * 5V | · · | GND
- * (MOSI) PB7 | · · | PB8 (LCD_RS)
- * (LCD_A0) PB9 | · · | PA10 (BTN_EN2)
- * RESET | · · | PA9 (BTN_EN1)
- * (BTN_ENC) PB6 | · · | PB5 (SCK)
- * -----
- * EXP1
- */
- #define BTN_EN1 PA9
- #define BTN_EN2 PA10
- #define BTN_ENC PB6
-
- #define DOGLCD_CS PB8
- #define DOGLCD_A0 PB9
- #define DOGLCD_SCK PB5
- #define DOGLCD_MOSI PB7
- #define FORCE_SOFT_SPI
- #define LCD_BACKLIGHT_PIN -1
-
- #else
-
- #error "Only ZONESTAR_LCD, MKS_MINI_12864, ENDER2_STOCKDISPLAY, and CR10_STOCKDISPLAY are currently supported on the BIGTREE_SKR_MINI_E3."
-
- #endif
-
-#endif // HAS_SPI_LCD
-
-//
-// SD Support
-//
-#define HAS_ONBOARD_SD
-
-#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
-#endif
-
-#define ON_BOARD_SPI_DEVICE 1 // SPI1
-#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
deleted file mode 100644
index dad46716fd..0000000000
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef TARGET_STM32F4
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
- #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME "BIGTREE SKR Pro 1.1" // redefined?
-
-// Use one of these or SDCard-based Emulation will be used
-//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
-//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
-
-//
-// Servos
-//
-#define SERVO0_PIN PA1
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PB10
-#define X_MAX_PIN PE15
-#define Y_MIN_PIN PE12
-#define Y_MAX_PIN PE10
-#define Z_MIN_PIN PG8
-#define Z_MAX_PIN PG5
-
-//
-// Z Probe must be this pins
-//
-#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN PA2
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN PE9
-#define X_DIR_PIN PF1
-#define X_ENABLE_PIN PF2
-#ifndef X_CS_PIN
- #define X_CS_PIN PA15
-#endif
-
-#define Y_STEP_PIN PE11
-#define Y_DIR_PIN PE8
-#define Y_ENABLE_PIN PD7
- #ifndef Y_CS_PIN
- #define Y_CS_PIN PB8
-#endif
-
-#define Z_STEP_PIN PE13
-#define Z_DIR_PIN PC2
-#define Z_ENABLE_PIN PC0
-#ifndef Z_CS_PIN
- #define Z_CS_PIN PB9
-#endif
-
-#define E0_STEP_PIN PE14
-#define E0_DIR_PIN PA0
-#define E0_ENABLE_PIN PC3
-#ifndef E0_CS_PIN
- #define E0_CS_PIN PB3
-#endif
-
-#define E1_STEP_PIN PD15
-#define E1_DIR_PIN PE7
-#define E1_ENABLE_PIN PA3
-#ifndef E1_CS_PIN
- #define E1_CS_PIN PG15
-#endif
-
-#define E2_STEP_PIN PD13
-#define E2_DIR_PIN PG9
-#define E2_ENABLE_PIN PF0
-#ifndef E2_CS_PIN
- #define E2_CS_PIN PG12
-#endif
-
-//
-// Software SPI pins for TMC2130 stepper drivers
-//
-#if ENABLED(TMC_USE_SW_SPI)
- #ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PC12
- #endif
- #ifndef TMC_SW_MISO
- #define TMC_SW_MISO PC11
- #endif
- #ifndef TMC_SW_SCK
- #define TMC_SW_SCK PC10
- #endif
-#endif
-
-#if HAS_TMC220x
- /**
- * TMC2208/TMC2209 stepper drivers
- *
- * Hardware serial communication ports.
- * If undefined software serial is used according to the pins below
- */
- //#define X_HARDWARE_SERIAL Serial
- //#define X2_HARDWARE_SERIAL Serial1
- //#define Y_HARDWARE_SERIAL Serial1
- //#define Y2_HARDWARE_SERIAL Serial1
- //#define Z_HARDWARE_SERIAL Serial1
- //#define Z2_HARDWARE_SERIAL Serial1
- //#define E0_HARDWARE_SERIAL Serial1
- //#define E1_HARDWARE_SERIAL Serial1
- //#define E2_HARDWARE_SERIAL Serial1
- //#define E3_HARDWARE_SERIAL Serial1
- //#define E4_HARDWARE_SERIAL Serial1
-
- //
- // Software serial
- //
- #define X_SERIAL_TX_PIN PC13
- #define X_SERIAL_RX_PIN PC13
-
- #define Y_SERIAL_TX_PIN PE3
- #define Y_SERIAL_RX_PIN PE3
-
- #define Z_SERIAL_TX_PIN PE1
- #define Z_SERIAL_RX_PIN PE1
-
- #define E0_SERIAL_TX_PIN PD4
- #define E0_SERIAL_RX_PIN PD4
-
- #define E1_SERIAL_TX_PIN PD1
- #define E1_SERIAL_RX_PIN PD1
-
- #define E2_SERIAL_TX_PIN PD6
- #define E2_SERIAL_RX_PIN PD6
-
- // Reduce baud rate to improve software serial reliability
- #define TMC_BAUD_RATE 19200
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PF4 // T1 <-> E0
-#define TEMP_1_PIN PF5 // T2 <-> E1
-#define TEMP_2_PIN PF6 // T3 <-> E2
-#define TEMP_BED_PIN PF3 // T0 <-> Bed
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PB1 // Heater0
-#define HEATER_1_PIN PD14 // Heater1
-#define HEATER_2_PIN PB0 // Heater1
-#define HEATER_BED_PIN PD12 // Hotbed
-#define FAN_PIN PC8 // Fan0
-#define FAN1_PIN PE5 // Fan1
-#define FAN2_PIN PE6 // Fan2
-
-//
-// Misc. Functions
-//
-#define SDSS PB12
-
-/**
- * _____ _____
- * NC | · · | GND 5V | · · | GND
- * RESET | · · | PF12(SD_DETECT) (LCD_D7) PG7 | · · | PG6 (LCD_D6)
- * (MOSI)PB15 | · · | PF11(BTN_EN2) (LCD_D5) PG3 | · · | PG2 (LCD_D4)
- * (SD_SS)PB12 | · · | PG10(BTN_EN1) (LCD_RS) PD10 | · · | PD11 (LCD_EN)
- * (SCK)PB13 | · · | PB14(MISO) (BTN_ENC) PA8 | · · | PG4 (BEEPER)
- * ￣￣ ￣￣
- * EXP2 EXP1
- */
-
-//
-// LCDs and Controllers
-//
-#if HAS_SPI_LCD
- #define BEEPER_PIN PG4
- #define BTN_ENC PA8
-
- #if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS PG6
-
- #define BTN_EN1 PD11
- #define BTN_EN2 PG2
-
- #define LCD_PINS_ENABLE PG7
- #define LCD_PINS_D4 PG3
-
- // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
- // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
- #undef ST7920_DELAY_1
- #undef ST7920_DELAY_2
- #undef ST7920_DELAY_3
-
-
- #else
-
- #define LCD_PINS_RS PD10
-
- #define BTN_EN1 PG10
- #define BTN_EN2 PF11
- #define SD_DETECT_PIN PF12
-
- #define LCD_SDSS PB12
-
- #define LCD_PINS_ENABLE PD11
- #define LCD_PINS_D4 PG2
-
- #if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS PD11
- #define DOGLCD_A0 PD10
- //#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN PG2 // Must be high or open for LCD to operate normally.
- #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
- #ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PG3
- #endif
- #ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PG6
- #endif
- #ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PG7
- #endif
- #elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN PG3
- #endif
- #endif // !FYSETC_MINI_12864
-
- #if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PG3
- #define LCD_PINS_D6 PG6
- #define LCD_PINS_D7 PG7
- #endif
-
- #endif
-
- // Alter timing for graphical display
- #if HAS_GRAPHICAL_LCD
- #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
- #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
- #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
- #endif
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_CHITU3D.h b/Marlin/src/pins/stm32/pins_CHITU3D.h
deleted file mode 100644
index 48b57b3502..0000000000
--- a/Marlin/src/pins/stm32/pins_CHITU3D.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#if !defined(__STM32F1__) && !defined(__STM32F4__)
- #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
-#endif
-
-/**
- * 2017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME "Chitu3D"
-#define DEFAULT_MACHINE_NAME "STM32F103RET6"
-
-// Enable I2C_EEPROM for testing
-//#define I2C_EEPROM
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Steppers
-//
-#define X_STEP_PIN PE5
-#define X_DIR_PIN PE6
-#define X_ENABLE_PIN PC13
-#define X_MIN_PIN PG10
-#define X_MAX_PIN -1
-
-#define Y_STEP_PIN PE2
-#define Y_DIR_PIN PE3
-#define Y_ENABLE_PIN PE4
-#define Y_MIN_PIN PA12
-#define Y_MAX_PIN
-
-#define Z_STEP_PIN PB9
-#define Z_DIR_PIN PE0
-#define Z_ENABLE_PIN PE1
-#define Z_MIN_PIN PA14
-#define Z_MAX_PIN -1
-
-#define Y2_STEP_PIN -1
-#define Y2_DIR_PIN -1
-#define Y2_ENABLE_PIN -1
-
-#define Z2_STEP_PIN -1
-#define Z2_DIR_PIN -1
-#define Z2_ENABLE_PIN -1
-
-#define E0_STEP_PIN PB4
-#define E0_DIR_PIN PB5
-#define E0_ENABLE_PIN PB8
-
-
-
-#define E1_STEP_PIN -1
-#define E1_DIR_PIN -1
-#define E1_ENABLE_PIN -1
-
-#define E2_STEP_PIN -1
-#define E2_DIR_PIN -1
-#define E2_ENABLE_PIN -1
-
-//
-// Misc. Functions
-//
-#define SDSS -1
-#define LED_PIN -1
-#define CASE_LIGHT_PIN 8
-
-#define PS_ON_PIN -1
-#define KILL_PIN PD6 // LED strip 24v
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PD12 // HOT-END
-#define HEATER_1_PIN -1
-#define HEATER_2_PIN -1
-
-#define HEATER_BED_PIN PG11 // HOT-BED
-#define HEATER_BED2_PIN -1 // BED2
-#define HEATER_BED3_PIN -1 // BED3
-
-#ifndef FAN_PIN
- #define FAN_PIN PG14 // MAIN BOARD FAN
-#endif
-
-#define FAN_SOFT_PWM
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN PA0 // Analog Input
-#define TEMP_0_PIN PA1 // Analog Input
-#define TEMP_1_PIN -1 // Analog Input
-#define TEMP_2_PIN -1 // Analog Input
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
- #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
- #elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #else
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
- // Buttons attached to a shift register
- // Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
- #endif
- #endif
-
- #if ENABLED(NEWPANEL)
-
- #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
- #define BEEPER_PIN 37
-
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
-
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
-
- #if ENABLED(BQ_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 39
- #endif
-
- #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
-
- #elif ENABLED(LCD_I2C_PANELOLU2)
-
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS 53
- #define SD_DETECT_PIN -1
- #define KILL_PIN 41
-
- #elif ENABLED(LCD_I2C_VIKI)
-
- #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
- #define BTN_ENC -1
- #define LCD_SDSS 53
- #define SD_DETECT_PIN 49
-
- #elif ANY(VIKI2, miniVIKI)
-
- #define BEEPER_PIN 33
-
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 45
- #define LCD_SCREEN_ROT_180
-
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
-
- #define SDSS 53
- #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
-
- #define KILL_PIN 31
-
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
-
- #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
- #define SD_DETECT_PIN 49
- #define LCD_SDSS 53
- #define KILL_PIN 41
- #define BEEPER_PIN 23
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
- #define LCD_BACKLIGHT_PIN 33
-
- #elif ENABLED(MINIPANEL)
-
- #define BEEPER_PIN 42
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define SDSS 53
-
- #define KILL_PIN 64
- // GLCD features
- // Uncomment screen orientation
- //#define LCD_SCREEN_ROT_90
- //#define LCD_SCREEN_ROT_180
- //#define LCD_SCREEN_ROT_270
- // The encoder and click button
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
- // not connected to a pin
- #define SD_DETECT_PIN 49
-
- #else
-
- // Beeper on AUX-4
- #define BEEPER_PIN 33
-
- // Buttons directly attached to AUX-2
- #if ENABLED(REPRAPWORLD_KEYPAD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
- #elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
- #else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
- #endif
-
- #if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
- #else
- //#define SD_DETECT_PIN -1 // Ramps doesn't use this
- #endif
-
- #endif
- #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_FLYF407ZG.h b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
deleted file mode 100644
index ea3f5d1146..0000000000
--- a/Marlin/src/pins/stm32/pins_FLYF407ZG.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 6 || E_STEPPERS > 6
- #error "FLYF407ZG supports up to 6 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME "FLYF407ZG"
-#define BOARD_WEBSITE_URL "github.com/FLYmaker/FLYF407ZG"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-#undef E2END
-#define E2END 0xFFF // 4KB
-
-//
-// Servos
-//
-#define SERVO0_PIN PE11
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PC3
-#define X_MAX_PIN PC2
-#define Y_MIN_PIN PF2
-#define Y_MAX_PIN PF1
-#define Z_MIN_PIN PF0
-#define Z_MAX_PIN PC15
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#define Z_MIN_PROBE_PIN PC14 // Z3_PIN
-
-//
-// Steppers
-//
-
-#define X_STEP_PIN PB9
-#define X_DIR_PIN PE0
-#define X_ENABLE_PIN PE1
-#ifndef X_CS_PIN
- #define X_CS_PIN PG13
-#endif
-
-#define Y_STEP_PIN PB8
-#define Y_DIR_PIN PG11
-#define Y_ENABLE_PIN PG12
-#ifndef Y_CS_PIN
- #define Y_CS_PIN PG10
-#endif
-
-#define Z_STEP_PIN PA8
-#define Z_DIR_PIN PD6
-#define Z_ENABLE_PIN PD7
-#ifndef Z_CS_PIN
- #define Z_CS_PIN PD5
-#endif
-
-#define E0_STEP_PIN PC7
-#define E0_DIR_PIN PD3
-#define E0_ENABLE_PIN PD4
-#ifndef E0_CS_PIN
- #define E0_CS_PIN PD1
-#endif
-
-#define E1_STEP_PIN PC6
-#define E1_DIR_PIN PA15
-#define E1_ENABLE_PIN PD0
-#ifndef E1_CS_PIN
- #define E1_CS_PIN PA14
-#endif
-
-#define E2_STEP_PIN PD15
-#define E2_DIR_PIN PG7
-#define E2_ENABLE_PIN PG8
-#ifndef E2_CS_PIN
- #define E2_CS_PIN PG6
-#endif
-
-#define E3_STEP_PIN PD14
-#define E3_DIR_PIN PG4
-#define E3_ENABLE_PIN PG5
-#ifndef E3_CS_PIN
- #define E3_CS_PIN PG3
-#endif
-
-#define E4_STEP_PIN PD13
-#define E4_DIR_PIN PD11
-#define E4_ENABLE_PIN PG2
-#ifndef E4_CS_PIN
- #define E4_CS_PIN PD10
-#endif
-
-#define E5_STEP_PIN PD12
-#define E5_DIR_PIN PD8
-#define E5_ENABLE_PIN PD9
-#ifndef E5_CS_PIN
- #define E5_CS_PIN PB12
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PA0 // Analog Input
-#define TEMP_1_PIN PC1 // Analog Input
-#define TEMP_2_PIN PC0 // Analog Input
-#define TEMP_3_PIN PF10 // Analog Input
-#define TEMP_4_PIN PF5 // Analog Input
-#define TEMP_5_PIN PF4 // Analog Input
-#define TEMP_BED_PIN PF3 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PF7
-#define HEATER_1_PIN PF6
-#define HEATER_2_PIN PE6
-#define HEATER_3_PIN PE5
-#define HEATER_4_PIN PE4
-#define HEATER_5_PIN PA2
-#define HEATER_BED_PIN PE2
-
-#ifndef FAN_PIN
- #define FAN_PIN PF8
-#endif
-#define FAN1_PIN PF9
-#define FAN2_PIN PE3
-#define FAN3_PIN PA1
-#define FAN4_PIN PE13
-#define FAN5_PIN PB11
-
-//
-// Trinamic Software SPI
-//
-
-#if ENABLED(TMC_USE_SW_SPI)
- #ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PB15
- #endif
- #ifndef TMC_SW_MISO
- #define TMC_SW_MISO PB14
- #endif
- #ifndef TMC_SW_SCK
- #define TMC_SW_SCK PB13
- #endif
-#endif
-
-//
-// Trinamic Software Serial
-//
-
-#if HAS_TMC220x
- #define X_SERIAL_TX_PIN PG13
- #define X_SERIAL_RX_PIN PG13
-
- #define Y_SERIAL_TX_PIN PG10
- #define Y_SERIAL_RX_PIN PG10
-
- #define Z_SERIAL_TX_PIN PD5
- #define Z_SERIAL_RX_PIN PD5
-
- #define E0_SERIAL_TX_PIN PD1
- #define E0_SERIAL_RX_PIN PD1
-
- #define E1_SERIAL_TX_PIN PA14
- #define E1_SERIAL_RX_PIN PA14
-
- #define E2_SERIAL_TX_PIN PG6
- #define E2_SERIAL_RX_PIN PG6
-
- #define E3_SERIAL_TX_PIN PG3
- #define E3_SERIAL_RX_PIN PG3
-
- #define E4_SERIAL_TX_PIN PD10
- #define E4_SERIAL_RX_PIN PD10
-
- #define E5_SERIAL_TX_PIN PB12
- #define E5_SERIAL_RX_PIN PB12
-
-#endif
-
-
-//
-// LCD / Controller
-//
-#define SCK_PIN PB13
-#define MISO_PIN PB14
-#define MOSI_PIN PB15
-#define SDSS PF11
-#define SD_DETECT_PIN PB2
-#define BEEPER_PIN PB10
-#define LCD_PINS_RS PE12
-#define LCD_PINS_ENABLE PE14
-#define LCD_PINS_D4 PE10
-#define LCD_PINS_D5 PE9
-#define LCD_PINS_D6 PE8
-#define LCD_PINS_D7 PE7
-#define BTN_EN1 PC4
-#define BTN_EN2 PC5
-#define BTN_ENC PE15
-
-//
-// Filament runout
-//
-
-#define FIL_RUNOUT_PIN PA3
-
-//
-// ST7920 Delays
-//
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
-#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
-#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
deleted file mode 100644
index 33756e437a..0000000000
--- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef STM32F4
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
- #error "RUMBA32 supports up to 3 hotends / E-steppers."
-#endif
-
-#ifndef BOARD_INFO_NAME
- #define BOARD_INFO_NAME "FYSETC_S6"
-#endif
-#ifndef DEFAULT_MACHINE_NAME
- #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-#endif
-
-// change the prio to 3 , 2 is for software serial
-//#define TEMP_TIMER_IRQ_PRIO 3
-
-//
-// EEPROM Emulation
-//
-#define FLASH_EEPROM_EMULATION
-//#define SRAM_EEPROM_EMULATION
-//#define I2C_EEPROM
-#ifdef I2C_EEPROM
- #undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
- #define E2END 0xFFF // 4KB
-#endif
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PB14
-#define X_MAX_PIN PA1
-#define Y_MIN_PIN PB13
-#define Y_MAX_PIN PA2
-#define Z_MIN_PIN PA0
-#define Z_MAX_PIN PA3
-
-//
-// Servos
-// share with Z_MAX_PIN
-//
-#define SERVO0_PIN PA3
-
-//
-// Steppers
-//
-#define X_STEP_PIN PE11
-#define X_DIR_PIN PE10
-#define X_ENABLE_PIN PE12
-#define X_CS_PIN PE7
-
-#define Y_STEP_PIN PD8
-#define Y_DIR_PIN PB12
-#define Y_ENABLE_PIN PD9
-#define Y_CS_PIN PE15
-
-#define Z_STEP_PIN PD14
-#define Z_DIR_PIN PD13
-#define Z_ENABLE_PIN PD15
-#define Z_CS_PIN PD10
-
-#define E0_STEP_PIN PD5
-#define E0_DIR_PIN PD6
-#define E0_ENABLE_PIN PD4
-#define E0_CS_PIN PD7
-
-#define E1_STEP_PIN PE6
-#define E1_DIR_PIN PC13
-#define E1_ENABLE_PIN PE5
-#define E1_CS_PIN PC14
-
-#define E2_STEP_PIN PE2
-#define E2_DIR_PIN PE4
-#define E2_ENABLE_PIN PE3
-#define E2_CS_PIN PC15
-
-#if HAS_TMC220x
- //
- // TMC2208/TMC2209 stepper drivers
- //
-
- //
- // Software serial
- //
- #define X_SERIAL_TX_PIN PE9
- #define X_SERIAL_RX_PIN PE8
-
- #define Y_SERIAL_TX_PIN PE14
- #define Y_SERIAL_RX_PIN PE13
-
- #define Z_SERIAL_TX_PIN PD11
- #define Z_SERIAL_RX_PIN PD12
-
- #define E0_SERIAL_TX_PIN PD3
- #define E0_SERIAL_RX_PIN PA15
-
- #define E1_SERIAL_TX_PIN PC4
- #define E1_SERIAL_RX_PIN PC5
-
- #define E2_SERIAL_TX_PIN PE1
- #define E2_SERIAL_RX_PIN PE0
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC0
-#define TEMP_1_PIN PC1
-#define TEMP_2_PIN PC2
-#define TEMP_BED_PIN PC3
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PB3
-#define HEATER_1_PIN PB4
-#define HEATER_2_PIN PB15
-#define HEATER_BED_PIN PC8
-
-#define FAN_PIN PB0
-#define FAN1_PIN PB1
-#define FAN2_PIN PB2
-
-//
-// SPI
-//
-#define SCK_PIN PA5
-#define MISO_PIN PA6
-#define MOSI_PIN PA7
-
-//
-// Misc. Functions
-//
-//#define LED_PIN PB14
-//#define BTN_PIN PC10
-//#define PS_ON_PIN PE11
-//#define KILL_PIN PC5
-
-#define SDSS PA4
-
-//
-// LCD / Controller
-//
-#if HAS_SPI_LCD
- #define BEEPER_PIN PC9
- #define BTN_ENC PA8
-
- #if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS PD0
-
- #define BTN_EN1 PC11
- #define BTN_EN2 PC10
-
- #define LCD_PINS_ENABLE PD1
- #define LCD_PINS_D4 PC12
-
- // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
- // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
- #undef ST7920_DELAY_1
- #undef ST7920_DELAY_2
- #undef ST7920_DELAY_3
-
- #else
-
- #define LCD_PINS_RS PD2
-
- #define BTN_EN1 PC6
- #define BTN_EN2 PC7
- #define SD_DETECT_PIN PB10
-
- #define LCD_SDSS PA4
-
- #define LCD_PINS_ENABLE PC11
- #define LCD_PINS_D4 PC10
-
- #if ENABLED(FYSETC_MINI_12864)
- // See https://wiki.fysetc.com/Mini12864_Panel
- #define DOGLCD_CS PC11
- #define DOGLCD_A0 PD2
- #if ENABLED(FYSETC_GENERIC_12864_1_1)
- #define LCD_BACKLIGHT_PIN PD0
- #endif
- #define LCD_RESET_PIN PC10 // Must be high or open for LCD to operate normally.
- #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
- #ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PC12
- #endif
- #ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PD0
- #endif
- #ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PD1
- #endif
- #elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN PC12
- #endif
- #endif // !FYSETC_MINI_12864
-
- #if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PC12
- #define LCD_PINS_D6 PD0
- #define LCD_PINS_D7 PD1
- #endif
-
- #endif
-
- // Alter timing for graphical display
- #if HAS_GRAPHICAL_LCD
- #ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
- #endif
- #ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
- #endif
- #ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(600)
- #endif
- #endif
-
-#endif // HAS_SPI_LCD
-
-#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PB6
-#endif
-#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PB5
-#endif
-#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PB7
-#endif
-#ifndef RGB_LED_W_PIN
- #define RGB_LED_W_PIN -1
-#endif
diff --git a/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h b/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
deleted file mode 100644
index a55bd34bcb..0000000000
--- a/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * To build with Arduino IDE use "Discovery F407VG"
- * To build with PlatformIO use environment "STM32F4"
- */
-#if !defined(STM32F4) && !defined(STM32F4xx)
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "STM32F4 supports up to 2 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME "Misc. STM32F4"
-#define DEFAULT_MACHINE_NAME "STM32F407VET6"
-
-//#define I2C_EEPROM
-
-#ifndef E2END
- #define E2END 0xFFF // 4KB
-#endif
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PE0
-#define X_MAX_PIN -1
-#define Y_MIN_PIN PE1
-#define Y_MAX_PIN -1
-#define Z_MIN_PIN PE14
-#define Z_MAX_PIN -1
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-
-//#ifndef Z_MIN_PROBE_PIN
-// #define Z_MIN_PROBE_PIN PA4
-//#endif
-
-//
-// Steppers
-//
-
-#define X_STEP_PIN PD3
-#define X_DIR_PIN PD2
-#define X_ENABLE_PIN PD0
-//#ifndef X_CS_PIN
-// #define X_CS_PIN PD1
-//#endif
-
-#define Y_STEP_PIN PE11
-#define Y_DIR_PIN PE10
-#define Y_ENABLE_PIN PE13
-//#ifndef Y_CS_PIN
-// #define Y_CS_PIN PE12
-//#endif
-
-#define Z_STEP_PIN PD6
-#define Z_DIR_PIN PD7
-#define Z_ENABLE_PIN PD4
-//#ifndef Z_CS_PIN
-// #define Z_CS_PIN PD5
-//#endif
-
-#define E0_STEP_PIN PB5
-#define E0_DIR_PIN PB6
-#define E0_ENABLE_PIN PB3
-//#ifndef E0_CS_PIN
-// #define E0_CS_PIN PB4
-//#endif
-
-#define E1_STEP_PIN PE4
-#define E1_DIR_PIN PE2
-#define E1_ENABLE_PIN PE3
-//#ifndef E1_CS_PIN
-// #define E1_CS_PIN PE5
-//#endif
-
-#define SCK_PIN PA5
-#define MISO_PIN PA6
-#define MOSI_PIN PA7
-
-//
-// Temperature Sensors
-//
-
-#define TEMP_0_PIN PC0 // Analog Input
-#define TEMP_1_PIN PC1 // Analog Input
-#define TEMP_BED_PIN PC2 // Analog Input
-
-//
-// Heaters / Fans
-//
-
-#define HEATER_0_PIN PA1
-#define HEATER_1_PIN PA2
-#define HEATER_BED_PIN PA0
-
-#ifndef FAN_PIN
- #define FAN_PIN PC6
-#endif
-#define FAN1_PIN PC7
-#define FAN2_PIN PC8
-
-#define ORIG_E0_AUTO_FAN_PIN FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Misc. Functions
-//
-
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN PF13
-
-//
-// Průša i3 MK2 Multi Material Multiplexer Support
-//
-
-//#define E_MUX0_PIN PG3
-//#define E_MUX1_PIN PG4
-
-//
-// Servos
-//
-
-//#define SERVO0_PIN PE13
-//#define SERVO1_PIN PE14
-
-
-#define SDSS PE7
-#define SS_PIN PE7
-#define LED_PIN PB7 //Alive
-#define PS_ON_PIN PA10
-#define KILL_PIN PA8
-#define PWR_LOSS PA4 //Power loss / nAC_FAULT
-
-//
-// LCD / Controller
-//
-
-#define SD_DETECT_PIN PA15
-#define BEEPER_PIN PC9
-#define LCD_PINS_RS PE9
-#define LCD_PINS_ENABLE PE8
-#define LCD_PINS_D4 PB12
-#define LCD_PINS_D5 PB13
-#define LCD_PINS_D6 PB14
-#define LCD_PINS_D7 PB15
-#define BTN_EN1 PC4
-#define BTN_EN2 PC5
-#define BTN_ENC PC3
-
-//
-// Filament runout
-//
-
-#define FIL_RUNOUT_PIN PA3
-
-//
-// ST7920 Delays
-//
-#if HAS_GRAPHICAL_LCD
- #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
- #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
- #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
deleted file mode 100644
index d0e082dbd0..0000000000
--- a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
- /**
- * ╦╔═╗╔═╗┬ ┬┬─┐┌─┐┬─┐┌─┐╔═╗┌─┐┬─┐┬ ┬┌┬┐ ┌─┐┌─┐┌┬┐
- * ║║ ╦╠═╣│ │├┬┘│ │├┬┘├─┤╠╣ │ │├┬┘│ ││││ │ │ ││││
- * ╚╝╚═╝╩ ╩└─┘┴└─└─┘┴└─┴ ┴╚ └─┘┴└─└─┘┴ ┴o└─┘└─┘┴ ┴
- * Pin assignments for 32-bit JGAurora A5S & A1
- */
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
- #error "JGAurora 32-bit board only supports 1 hotend / E-stepper. Comment out this line to continue."
-#endif
-#define BOARD_INFO_NAME "JGAurora A5S A1 board"
-
-#ifndef STM32_XL_DENSITY
- #define STM32_XL_DENSITY
-#endif
-
-// #define MCU_STM32F103ZE // not yet required
-// Enable EEPROM Emulation for this board, so that we don't overwrite factory data
-
-//#define I2C_EEPROM // AT24C64
-//#define E2END 0x7FFF // 64KB
-//#define FLASH_EEPROM_EMULATION
-//#define E2END 0xFFF // 4KB
-//#define E2END uint32(EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE * 2) - 1)
-//#define EEPROM_CHITCHAT
-//#define DEBUG_EEPROM_READWRITE
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PC6
-#define Y_STOP_PIN PG8
-#define Z_STOP_PIN PG7
-//#define X_MAX_PIN PC5
-//#define Y_MAX_PIN PC4
-//#define Z_MAX_PIN PB0
-
-//
-// Steppers
-//
-#define X_STEP_PIN PD6
-#define X_DIR_PIN PD3
-#define X_ENABLE_PIN PG9
-
-#define Y_STEP_PIN PG12
-#define Y_DIR_PIN PG11
-#define Y_ENABLE_PIN PG13
-
-#define Z_STEP_PIN PG15
-#define Z_DIR_PIN PG14
-#define Z_ENABLE_PIN PB8
-
-#define E0_STEP_PIN PE2
-#define E0_DIR_PIN PB9
-#define E0_ENABLE_PIN PE3
-
-#define E1_STEP_PIN PE5
-#define E1_DIR_PIN PE4
-#define E1_ENABLE_PIN PE6
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC2
-#define TEMP_BED_PIN PC1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PA2
-#define HEATER_BED_PIN PA3
-
-#define FAN_PIN PA1
-
-#define FIL_RUNOUT_PIN PC7
-
-//
-// LCD
-//
-#define LCD_BACKLIGHT_PIN PF11
-#define FSMC_CS_PIN PD7
-#define FSMC_RS_PIN PG0
-
-#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV DMA2
-#define FSMC_DMA_CHANNEL DMA_CH5
-
-//
-// SD Card
-//
-#define SD_DETECT_PIN PF10
-
-//
-// Misc.
-//
-#define BEEPER_PIN PC3 // use PB7 to shut up if desired
-#define LED_PIN PC13
-
-//
-// Touch support
-//
-#if ENABLED(TOUCH_BUTTONS)
- #define TOUCH_CS_PIN PA4
- #define TOUCH_INT_PIN PC4
-#endif
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_K.h b/Marlin/src/pins/stm32/pins_LERDGE_K.h
deleted file mode 100644
index 10a36d8c6f..0000000000
--- a/Marlin/src/pins/stm32/pins_LERDGE_K.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * 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 .
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "LERDGE K supports up to 2 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME "Lerdge K"
-#define DEFAULT_MACHINE_NAME "LERDGE"
-
-#define I2C_EEPROM
-
-// Ignore temp readings during develpment.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Servos
-//
-//#define SERVO0_PIN PD12
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PG3
-#define Y_STOP_PIN PG4
-#define Z_STOP_PIN PG5
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-//#ifndef Z_MIN_PROBE_PIN
-// #define Z_MIN_PROBE_PIN PB15
-//#endif
-
-//
-// Filament runout
-//
-#define FIL_RUNOUT_PIN PE6
-#define FIL_RUNOUT2_PIN PE7
-
-//
-// Steppers
-//
-#define X_STEP_PIN PG1
-#define X_DIR_PIN PB10
-#define X_ENABLE_PIN PG0
-//#ifndef X_CS_PIN
-// #define X_CS_PIN PE0
-//#endif
-
-#define Y_STEP_PIN PF14
-#define Y_DIR_PIN PF15
-#define Y_ENABLE_PIN PF13
-//#ifndef Y_CS_PIN
-// #define Y_CS_PIN PE1
-//#endif
-
-#define Z_STEP_PIN PF11
-#define Z_DIR_PIN PF12
-#define Z_ENABLE_PIN PC5
-//#ifndef Z_CS_PIN
-// #define Z_CS_PIN PE2
-//#endif
-
-#define E0_STEP_PIN PC14
-#define E0_DIR_PIN PC13
-#define E0_ENABLE_PIN PC15
-//#ifndef E0_CS_PIN
-// #define E0_CS_PIN PE3
-//#endif
-
-#define E1_STEP_PIN PF1
-#define E1_DIR_PIN PF0
-#define E1_ENABLE_PIN PF2
-//#ifndef E1_CS_PIN
-// #define E1_CS_PIN PE4
-//#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC1 // Analog Input
-#define TEMP_1_PIN PC2 // Analog Input
-#define TEMP_BED_PIN PC0 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PA1
-#define HEATER_1_PIN PA0
-#define HEATER_BED_PIN PA2
-
-#ifndef FAN_PIN
- #define FAN_PIN PC15
-#endif
-#define FAN1_PIN PF6
-#define FAN2_PIN PF7
-
-#define ORIG_E0_AUTO_FAN_PIN FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// LED / Lighting
-//
-//#define CASE_LIGHT_PIN_CI -1
-//#define CASE_LIGHT_PIN_DO -1
-//#define NEOPIXEL_PIN -1
-
-//
-// Prusa i3 MK2 Multi-Material Multiplexer Support
-//
-//#define E_MUX0_PIN -1
-//#define E_MUX1_PIN -1
-
-//
-// SD support
-//
-#define SDIO_SUPPORT
-
-//
-// Misc. Functions
-//
-#define SDSS PC11
-#define LED_PIN PC7 // Alive
-#define PS_ON_PIN -1
-#define KILL_PIN -1
-#define POWER_LOSS_PIN -1 // Power-loss / nAC_FAULT
-
-#define SCK_PIN PC12
-#define MISO_PIN PC8
-#define MOSI_PIN PD2
-#define SS_PIN PC11
-
-//
-// LCD / Controller
-//
-
-// TODO: Replace these with the correct FSMC pins, once known
-#define SD_DETECT_PIN -1
-#define BEEPER_PIN PD12
-#define LCD_PINS_RS -1
-#define LCD_PINS_ENABLE -1
-#define LCD_PINS_D4 -1
-#define LCD_PINS_D5 -1
-#define LCD_PINS_D6 -1
-#define LCD_PINS_D7 -1
-
-#define BTN_EN1 PE3
-#define BTN_EN2 PE4
-#define BTN_ENC PE2
-
-//
-// ST7920 Delays
-//
-#if HAS_GRAPHICAL_LCD
- #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
- #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
- #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_X.h b/Marlin/src/pins/stm32/pins_LERDGE_X.h
deleted file mode 100644
index c9c1da17e8..0000000000
--- a/Marlin/src/pins/stm32/pins_LERDGE_X.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * 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 .
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "LERDGE X supports up to 2 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME "Lerdge X"
-#define DEFAULT_MACHINE_NAME "LERDGE"
-
-//#define I2C_EEPROM
-
-//
-// Servos
-//
-//#define SERVO0_PIN PD12
-//#define SERVO1_PIN -1
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PB12
-#define Y_STOP_PIN PB13
-#define Z_STOP_PIN PB14
-
-//
-// Filament runout
-//
-#define FIL_RUNOUT_PIN PE1
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-//#ifndef Z_MIN_PROBE_PIN
-// #define Z_MIN_PROBE_PIN PB15
-//#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN PB10
-#define X_DIR_PIN PB2
-#define X_ENABLE_PIN PB11
-//#ifndef X_CS_PIN
-// #define X_CS_PIN PD1
-//#endif
-
-#define Y_STEP_PIN PB0
-#define Y_DIR_PIN PC5
-#define Y_ENABLE_PIN PB1
-//#ifndef Y_CS_PIN
-// #define Y_CS_PIN PE12
-//#endif
-
-#define Z_STEP_PIN PA7
-#define Z_DIR_PIN PA6
-#define Z_ENABLE_PIN PC4
-//#ifndef Z_CS_PIN
-// #define Z_CS_PIN PD5
-//#endif
-
-#define E0_STEP_PIN PA4
-#define E0_DIR_PIN PA3
-#define E0_ENABLE_PIN PA5
-//#ifndef E0_CS_PIN
-// #define E0_CS_PIN PB4
-//#endif
-
-#define E1_STEP_PIN -1
-#define E1_DIR_PIN -1
-#define E1_ENABLE_PIN -1
-//#ifndef E1_CS_PIN
-// #define E1_CS_PIN PE5
-//#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC0 // Analog Input
-#define TEMP_1_PIN -1 // Analog Input
-#define TEMP_BED_PIN PC1 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PA1
-#define HEATER_1_PIN -1
-#define HEATER_BED_PIN PA2
-
-#ifndef FAN_PIN
-// #define FAN_PIN PC15
-#endif
-#define FAN1_PIN PC15
-#define FAN2_PIN PA0
-
-#define ORIG_E0_AUTO_FAN_PIN PC15 // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Prusa i3 MK2 Multi Material Multiplexer Support
-//
-//#define E_MUX0_PIN -1
-//#define E_MUX1_PIN -1
-
-//
-// LED / Lighting
-//
-//#define CASE_LIGHT_PIN_CI -1
-//#define CASE_LIGHT_PIN_DO -1
-//#define NEOPIXEL_PIN -1
-
-//
-// Misc. Functions
-//
-#define SDSS PC11
-#define LED_PIN PC7 // Alive
-#define PS_ON_PIN -1
-#define KILL_PIN -1
-#define POWER_LOSS_PIN -1 // Power-loss / nAC_FAULT
-
-#define SCK_PIN PC12
-#define MISO_PIN PC8
-#define MOSI_PIN PD2
-#define SS_PIN PC11
-
-//
-// SD support
-//
-#define SDIO_SUPPORT
-
-//
-// LCD / Controller
-//
-
-// The LCD is initialized in FSMC mode
-#define SD_DETECT_PIN -1
-#define BEEPER_PIN PD12
-
-#define BTN_EN1 PE3
-#define BTN_EN2 PE4
-#define BTN_ENC PE2
-
-#define LCD_RESET_PIN PD6
-#define LCD_BACKLIGHT_PIN PD3
-#define FSMC_CS_PIN PD4
-#define FSMC_RS_PIN PD11
-#define TOUCH_CS PB6
-
-//
-// ST7920 Delays
-//
-#if HAS_GRAPHICAL_LCD
- #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
- #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
- #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h
deleted file mode 100644
index f43ffa129b..0000000000
--- a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * 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 .
- *
- */
-#pragma once
-
-/**
- * Longer3D LK1/LK2 & Alfawise U20/U30 (STM32F103VET6) board pin assignments
- */
-
-#if !defined(__STM32F1__) && !defined(STM32F1xx)
- #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
- #error "Longer3D board only supports 1 hotend / E-stepper. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "Longer3D"
-#define ALFAWISE_UX0 // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
-
-//#define DISABLE_DEBUG // We still want to debug with STLINK...
-#define DISABLE_JTAG // We free the jtag pins (PA15) but keep STLINK
- // Release PB4 (STEP_X_PIN) from JTAG NRST role.
-//
-// Limit Switches
-//
-#define X_MIN_PIN PC1 // pin 16
-#define X_MAX_PIN PC0 // pin 15 (Filament sensor on Alfawise setup)
-#define Y_MIN_PIN PC15 // pin 9
-#define Y_MAX_PIN PC14 // pin 8 (Unused in stock Alfawise setup)
-#define Z_MIN_PIN PE6 // pin 5 Standard Endstop or Z_Probe endstop function
-#define Z_MAX_PIN PE5 // pin 4 (Unused in stock Alfawise setup)
- // May be used for BLTouch Servo function on older variants (<= V08)
-#define ONBOARD_ENDSTOPPULLUPS
-
-//
-// Filament Sensor
-//
-#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PC0 // XMAX plug on PCB used as filament runout sensor on Alfawise boards (inverting true)
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PB5 // pin 91
-#define X_STEP_PIN PB4 // pin 90
-#define X_DIR_PIN PB3 // pin 89
-
-#define Y_ENABLE_PIN PB8 // pin 95
-#define Y_STEP_PIN PB7 // pin 93
-#define Y_DIR_PIN PB6 // pin 92
-
-#define Z_ENABLE_PIN PE1 // pin 98
-#define Z_STEP_PIN PE0 // pin 97
-#define Z_DIR_PIN PB9 // pin 96
-
-#define E0_ENABLE_PIN PE4 // pin 3
-#define E0_STEP_PIN PE3 // pin 2
-#define E0_DIR_PIN PE2 // pin 1
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PA0 // pin 23 (Nozzle 100K/3950 thermistor)
-#define TEMP_BED_PIN PA1 // pin 24 (Hot Bed 100K/3950 thermistor)
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PD3 // pin 84 (Nozzle Heat Mosfet)
-#define HEATER_BED_PIN PA8 // pin 67 (Hot Bed Mosfet)
-
-#define FAN_PIN PA15 // pin 77 (4cm Fan)
-#define FAN_SOFT_PWM // Required to avoid issues with heating or STLink
-#define FAN_MIN_PWM 35 // Fan will not start in 1-30 range
-#define FAN_MAX_PWM 255
-
-//#define BEEPER_PIN PD13 // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor
- // Can drive a PC Buzzer, if connected between PWM and 5V pins
-
-#define LED_PIN PC2 // pin 17
-
-//
-// PWM for a servo probe
-// Other servo devices are not supported on this board!
-//
-#if HAS_Z_SERVO_PROBE
- #define SERVO0_PIN PD13 // Open drain PWM pin on the V0G (GND or floating 5V)
- #define SERVO0_PWM_OD // Comment this if using PE5
-
- //#define SERVO0_PIN PE5 // Pulled up PWM pin on the V08 (3.3V or 0)
- //#undef Z_MAX_PIN // Uncomment if using ZMAX connector (PE5)
-#endif
-
-/**
- * Note: Alfawise screens use various TFT controllers. Supported screens
- * are based on the ILI9341, ILI9328 and ST7798V. Define init sequences for
- * other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
- *
- * If the screen stays white, disable 'LCD_RESET_PIN' to let the bootloader
- * init the screen.
- *
- * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
- * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
- */
-
-#define LCD_RESET_PIN PC4 // pin 33
-#define LCD_BACKLIGHT_PIN PD12 // pin 59
-#define FSMC_CS_PIN PD7 // pin 88 = FSMC_NE1
-#define FSMC_RS_PIN PD11 // pin 58 A16 Register. Only one address needed
-
-#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV DMA2
-#define FSMC_DMA_CHANNEL DMA_CH5
-
-#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
-#define DOGLCD_SCK -1
-
-/**
- * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
- * mixed up MOSI and MISO pins. SPI is managed in SW, and needs pins
- * declared below.
- */
-#if ENABLED(TOUCH_BUTTONS)
- #define TOUCH_CS_PIN PB12 // pin 51 SPI2_NSS
- #define TOUCH_SCK_PIN PB13 // pin 52
- #define TOUCH_MOSI_PIN PB14 // pin 53
- #define TOUCH_MISO_PIN PB15 // pin 54
- #define TOUCH_INT_PIN PC6 // pin 63 (PenIRQ coming from ADS7843)
-#endif
-
-//
-// Persistent Storage
-// If no option is selected below the SD Card will be used
-//
-//#define SPI_EEPROM
-#define FLASH_EEPROM_EMULATION
-
-#undef E2END
-#if ENABLED(SPI_EEPROM)
- // SPI1 EEPROM Winbond W25Q64 (8MB/64Mbits)
- #define SPI_CHAN_EEPROM1 1
- #define SPI_EEPROM1_CS PC5 // pin 34
- #define EEPROM_SCK BOARD_SPI1_SCK_PIN // PA5 pin 30
- #define EEPROM_MISO BOARD_SPI1_MISO_PIN // PA6 pin 31
- #define EEPROM_MOSI BOARD_SPI1_MOSI_PIN // PA7 pin 32
- #define EEPROM_PAGE_SIZE 0x1000U // 4KB (from datasheet)
- #define E2END ((16 * EEPROM_PAGE_SIZE)-1) // Limit to 64KB for now...
-#elif ENABLED(FLASH_EEPROM_EMULATION)
- // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
- #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
- #define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
- #define E2END (EEPROM_PAGE_SIZE - 1)
-#else
- #define E2END (0x7FFU) // On SD, Limit to 2KB, require this amount of RAM
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN.h
deleted file mode 100644
index b01eb6f7a2..0000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * MKS Robin (STM32F130ZET6) board pin assignments
- *
- * https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin/Hardware
- */
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "MKS Robin"
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_JTAG
-
-//
-// Servos
-//
-#define SERVO0_PIN PC3 // XS1 - 5
-#define SERVO1_PIN PA1 // XS1 - 6
-#define SERVO2_PIN PF9 // XS2 - 5
-#define SERVO3_PIN PF8 // XS2 - 6
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PB12
-#define X_MAX_PIN PB0
-#define Y_MIN_PIN PC5
-#define Y_MAX_PIN PC4
-#define Z_MIN_PIN PA4
-#define Z_MAX_PIN PF7
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PB9
-#define X_STEP_PIN PB8
-#define X_DIR_PIN PB5
-
-#define Y_ENABLE_PIN PB4
-#define Y_STEP_PIN PG15
-#define Y_DIR_PIN PG10
-
-#define Z_ENABLE_PIN PD7
-#define Z_STEP_PIN PD3
-#define Z_DIR_PIN PG14
-
-#define E0_ENABLE_PIN PG13
-#define E0_STEP_PIN PG8
-#define E0_DIR_PIN PA15
-
-#define E1_ENABLE_PIN PA12
-#define E1_STEP_PIN PA11
-#define E1_DIR_PIN PA8
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC1 // TH1
-#define TEMP_1_PIN PC2 // TH2
-#define TEMP_BED_PIN PC0 // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC7 // HEATER1
-#define HEATER_1_PIN PA6 // HEATER2
-#define HEATER_BED_PIN PC6 // HOT BED
-
-#define FAN_PIN PA7 // FAN
-
-/**
- * Note: MKS Robin board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
- */
-//#define MAX6675_SS_PIN PE5 // TC1 - CS1
-//#define MAX6675_SS_PIN PE6 // TC2 - CS2
-
-#define POWER_LOSS_PIN PA2 // PW_DET
-#define PS_ON_PIN PA3 // PW_OFF
-#define FIL_RUNOUT_PIN PF11 // MT_DET
-
-#define BEEPER_PIN PC13
-#define LED_PIN PB2
-
-/**
- * Note: MKS Robin TFT screens use various TFT controllers
- * Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
- * ILI9488 is not supported
- * Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
- *
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- *
- * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
- * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
- */
-//#define LCD_RESET_PIN PF6
-#define LCD_BACKLIGHT_PIN PG11
-#define FSMC_CS_PIN PG12 // NE4
-#define FSMC_RS_PIN PF0 // A0
-
-#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV DMA2
-#define FSMC_DMA_CHANNEL DMA_CH5
-
-#if ENABLED(TOUCH_BUTTONS)
- #define TOUCH_CS_PIN PB1 // SPI2_NSS
- #define TOUCH_SCK_PIN PB13 // SPI2_SCK
- #define TOUCH_MISO_PIN PB14 // SPI2_MISO
- #define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
-#endif
-
-// SPI1(PA7) & SPI3(PB5) not available
-#define ENABLE_SPI2
-
-#if ENABLED(SDIO_SUPPORT)
- #define SCK_PIN PB13 // SPI2
- #define MISO_PIN PB14 // SPI2
- #define MOSI_PIN PB15 // SPI2
- #define SS_PIN -1 // PB12 is X-
- #define SD_DETECT_PIN PF12 // SD_CD
-#else
- // SD as custom software SPI (SDIO pins)
- #define SCK_PIN PC12
- #define MISO_PIN PC8
- #define MOSI_PIN PD2
- #define SS_PIN -1
- #define ONBOARD_SD_CS_PIN PC11
- #define SDSS PD2
- #define SD_DETECT_PIN -1
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
deleted file mode 100644
index 98529e747b..0000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef STM32F4
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "MKS_ROBIN2 supports up to 2 hotends / E-steppers."
-#endif
-
-#ifndef BOARD_INFO_NAME
- #define BOARD_NAME "MKS_ROBIN2"
-#endif
-
-#ifndef DEFAULT_MACHINE_NAME
- #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-#endif
-
-#define SRAM_EEPROM_EMULATION
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PG8
-#define X_MAX_PIN PG7
-#define Y_MIN_PIN PG6
-#define Y_MAX_PIN PG5
-#define Z_MIN_PIN PG4
-#define Z_MAX_PIN PG3
-
-//
-// Servos
-//
-#define SERVO0_PIN PB0 // XS2-5
-#define SERVO1_PIN PF7 // XS1-5
-#define SERVO2_PIN PF8 // XS1-6
-
-//
-// Steppers
-//
-#define X_STEP_PIN PE6
-#define X_DIR_PIN PE5
-#define X_ENABLE_PIN PC13
-
-#define Y_STEP_PIN PE3
-#define Y_DIR_PIN PE2
-#define Y_ENABLE_PIN PE4
-
-#define Z_STEP_PIN PE0
-#define Z_DIR_PIN PB9
-#define Z_ENABLE_PIN PE1
-
-#define E0_STEP_PIN PG10
-#define E0_DIR_PIN PG9
-#define E0_ENABLE_PIN PB8
-
-#define E1_STEP_PIN PD3
-#define E1_DIR_PIN PA15
-#define E1_ENABLE_PIN PD6
-
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC1 // T1 <-> E0
-#define TEMP_1_PIN PC2 // T2 <-> E1
-#define TEMP_BED_PIN PC0 // T0 <-> Bed
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PF3 // Heater0
-#define HEATER_1_PIN PF2 // Heater1
-#define HEATER_BED_PIN PF4 // Hotbed
-#define FAN_PIN PA7 // Fan0
-
-//
-// Misc. Functions
-//
-#define SDSS -1 // PB12
-
-#define SD_DETECT_PIN PF9
-#define BEEPER_PIN PG2
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
deleted file mode 100644
index c86b62cddd..0000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
- #error "MKS Robin Lite supports only 1 hotend / E-stepper. Comment out this line to continue."
-#endif
-
-#ifndef BOARD_INFO_NAME
- #define BOARD_INFO_NAME "MKS Robin Lite"
-#endif
-#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
-
-//#define DISABLE_DEBUG
-#define DISABLE_JTAG
-#define ENABLE_SPI2
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PC13
-#define Y_STOP_PIN PC0
-#define Z_MIN_PIN PC12
-#define Z_MAX_PIN PB9
-
-//
-// Steppers
-//
-#define X_STEP_PIN PC6
-#define X_DIR_PIN PB12
-#define X_ENABLE_PIN PB10
-
-#define Y_STEP_PIN PB11
-#define Y_DIR_PIN PB2
-#define Y_ENABLE_PIN PB10
-
-#define Z_STEP_PIN PB1
-#define Z_DIR_PIN PC5
-#define Z_ENABLE_PIN PB10
-
-#define E0_STEP_PIN PC4
-#define E0_DIR_PIN PA5
-#define E0_ENABLE_PIN PA4
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC9
-#define FAN_PIN PA8
-#define HEATER_BED_PIN PC8
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN PA1
-#define TEMP_0_PIN PA0
-
-#define FIL_RUNOUT_PIN PB8 // MT_DET
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
- #define BEEPER_PIN PD2
- #define BTN_ENC PB3
- #define LCD_PINS_RS PC3
-
- #define BTN_EN1 PB5
- #define BTN_EN2 PB4
-
- #define LCD_PINS_ENABLE PC2
-
- #if ENABLED(MKS_MINI_12864)
-
- #define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN -1
- #define DOGLCD_A0 PC1
- #define DOGLCD_CS PC2
- #define DOGLCD_SCK PB13
- #define DOGLCD_MOSI PB15
-
- #else // !MKS_MINI_12864
-
- #define LCD_PINS_D4 PC1
- #if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 -1
- #define LCD_PINS_D6 -1
- #define LCD_PINS_D7 -1
- #endif
-
- #endif // !MKS_MINI_12864
-
-#endif // HAS_SPI_LCD
-
-// Motor current PWM pins
-#define MOTOR_CURRENT_PWM_XY_PIN PB0
-#define MOTOR_CURRENT_PWM_Z_PIN PA7
-#define MOTOR_CURRENT_PWM_E_PIN PA6
-#define MOTOR_CURRENT_PWM_RANGE (65535/10/3.3) // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
-#define DEFAULT_PWM_MOTOR_CURRENT { 1000, 1000, 1000 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
-
-//
-// SD Card
-//
-#define ENABLE_SPI2
-#define SD_DETECT_PIN PC10
-#define SCK_PIN PB13
-#define MISO_PIN P1B4
-#define MOSI_PIN P1B5
-#define SS_PIN PA15
-
-#if HAS_GRAPHICAL_LCD
- #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
- #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
- #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
deleted file mode 100644
index 6d6787903b..0000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * MKS Robin Lite 3 (STM32F103RCT6) board pin assignments
- */
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "MKS Robin Lite3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#ifndef BOARD_INFO_NAME
- #define BOARD_INFO_NAME "MKS Robin Lite3"
-#endif
-#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
-
-//#define DISABLE_DEBUG
-#define DISABLE_JTAG
-#define ENABLE_SPI2
-
-//
-// Servos
-//
-#define SERVO0_PIN PA3
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PA12
-#define Y_STOP_PIN PA11
-#define Z_MIN_PIN PC6
-#define Z_MAX_PIN PB1
-
-//
-// Steppers
-//
-#define X_STEP_PIN PC0
-#define X_DIR_PIN PB2
-#define X_ENABLE_PIN PC13
-
-#define Y_STEP_PIN PC2
-#define Y_DIR_PIN PB9
-#define Y_ENABLE_PIN PB12
-
-#define Z_STEP_PIN PB7
-#define Z_DIR_PIN PB6
-#define Z_ENABLE_PIN PB8
-
-#define E0_STEP_PIN PB4
-#define E0_DIR_PIN PB3
-#define E0_ENABLE_PIN PB5
-
-#define E1_STEP_PIN PC12
-#define E1_DIR_PIN PC11
-#define E1_ENABLE_PIN PD2
-
-//
-// Heaters 0,1 / Fans / Bed
-//
-#define HEATER_0_PIN PC9
-#define HEATER_1_PIN PC7
-#define FAN_PIN PA8
-#define HEATER_BED_PIN PC8
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN PA1 //TB
-#define TEMP_0_PIN PA0 //TH1
-#define TEMP_1_PIN PA2 //TH2
-
-#define FIL_RUNOUT_PIN PB10 // MT_DET
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
- #define BEEPER_PIN PC1
- #define BTN_ENC PC3
- #define LCD_PINS_ENABLE PA4
- #define LCD_PINS_RS PA5
- #define BTN_EN1 PB11
- #define BTN_EN2 PB0
-
- // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
- #if ENABLED(MKS_MINI_12864)
-
- #define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN -1
- #define DOGLCD_A0 PC4
- #define DOGLCD_CS PA7
- #define DOGLCD_SCK PB13
- #define DOGLCD_MOSI PB15
-
- // Required for MKS_MINI_12864 with this board
- #define MKS_LCD12864B
- #undef SHOW_BOOTSCREEN
-
- #else // !MKS_MINI_12864
-
- #define LCD_PINS_D4 PA6
- #if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PA7
- #define LCD_PINS_D6 PC4
- #define LCD_PINS_D7 PC5
- #endif
-
- #endif // !MKS_MINI_12864
-
-#endif // HAS_SPI_LCD
-
-//
-// SD Card
-//
-#define ENABLE_SPI2
-#define SD_DETECT_PIN PC10
-#define SCK_PIN PB13
-#define MISO_PIN PB14
-#define MOSI_PIN PB15
-#define SS_PIN PA15
-
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(125)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
deleted file mode 100644
index 50f2017201..0000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * MKS Robin MINI (STM32F130VET6) board pin assignments
- */
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
- #error "MKS Robin mini supports up to 1 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "MKS Robin mini"
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_DEBUG
-
-#define FLASH_EEPROM_EMULATION
-// 2K in a AT24C16N
-#define EEPROM_PAGE_SIZE (uint16)0x800 // 2048
-#define EEPROM_START_ADDRESS ((uint32)(0x8000000 + 512 * 1024 - 2 * EEPROM_PAGE_SIZE))
-#define E2END (EEPROM_PAGE_SIZE - 1)
-
-//
-// Note: MKS Robin mini board is using SPI2 interface.
-//
-#define SPI_MODULE 2
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PA15
-#define Y_STOP_PIN PA12
-#define Z_MIN_PIN PA11
-#define Z_MAX_PIN PC4
-
-#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PA4 // MT_DET
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PE4
-#define X_STEP_PIN PE3
-#define X_DIR_PIN PE2
-
-#define Y_ENABLE_PIN PE1
-#define Y_STEP_PIN PE0
-#define Y_DIR_PIN PB9
-
-#define Z_ENABLE_PIN PB8
-#define Z_STEP_PIN PB5
-#define Z_DIR_PIN PB4
-
-#define E0_ENABLE_PIN PB3
-#define E0_STEP_PIN PD6
-#define E0_DIR_PIN PD3
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC1 // TH1
-#define TEMP_BED_PIN PC0 // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC3 // HEATER1
-#define HEATER_BED_PIN PA0 // HOT BED
-
-#define FAN_PIN PB1 // FAN
-
-//
-// Thermocouples
-//
-//#define MAX6675_SS_PIN PE5 // TC1 - CS1
-//#define MAX6675_SS_PIN PE6 // TC2 - CS2
-
-//
-// Misc. Functions
-//
-#define POWER_LOSS_PIN PA2 // PW_DET
-#define PS_ON_PIN PA3 // PW_OFF
-
-//#define LED_PIN PB2
-
-//
-// LCD / Controller
-//
-#define BEEPER_PIN PC5
-#define SD_DETECT_PIN PD12
-
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- */
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define FSMC_CS_PIN PD7 // NE4
- #define FSMC_RS_PIN PD11 // A0
-
- #define LCD_RESET_PIN PC6
- #define NO_LCD_REINIT // Suppress LCD re-initialization
-
- #define LCD_BACKLIGHT_PIN PD13
-
- #if ENABLED(TOUCH_BUTTONS)
- #define TOUCH_CS_PIN PC2
- #define TOUCH_SCK_PIN PB13
- #define TOUCH_MOSI_PIN PB15
- #define TOUCH_MISO_PIN PB14
- #endif
-#endif
-
-// Motor current PWM pins
-#define MOTOR_CURRENT_PWM_XY_PIN PA6
-#define MOTOR_CURRENT_PWM_Z_PIN PA7
-#define MOTOR_CURRENT_PWM_E_PIN PB0
-#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
-#define DEFAULT_PWM_MOTOR_CURRENT { 1030, 1030, 1030 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
-
-// This is a kind of workaround in case native marlin "digipot" interface won't work.
-// Required to enable related code in STM32F1/HAL.cpp
-//#ifndef MKS_ROBIN_MINI_VREF_PWM
-// #define MKS_ROBIN_MINI_VREF_PWM
-//#endif
-
-//#define VREF_XY_PIN PA6
-//#define VREF_Z_PIN PA7
-//#define VREF_E1_PIN PB0
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
deleted file mode 100644
index 95337c07ef..0000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * MKS Robin nano (STM32F130VET6) board pin assignments
- */
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "MKS Robin nano"
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_DEBUG
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PA15
-#define Y_STOP_PIN PA12
-#define Z_MIN_PIN PA11
-#define Z_MAX_PIN PC4
-
-#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PA4 // MT_DET
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PE4
-#define X_STEP_PIN PE3
-#define X_DIR_PIN PE2
-
-#define Y_ENABLE_PIN PE1
-#define Y_STEP_PIN PE0
-#define Y_DIR_PIN PB9
-
-#define Z_ENABLE_PIN PB8
-#define Z_STEP_PIN PB5
-#define Z_DIR_PIN PB4
-
-#define E0_ENABLE_PIN PB3
-#define E0_STEP_PIN PD6
-#define E0_DIR_PIN PD3
-
-#define E1_ENABLE_PIN PA3
-#define E1_STEP_PIN PA6
-#define E1_DIR_PIN PA1
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC1 // TH1
-#define TEMP_1_PIN PC2 // TH2
-#define TEMP_BED_PIN PC0 // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC3 // HEATER1
-#define HEATER_1_PIN PB0 // HEATER2
-#define HEATER_BED_PIN PA0 // HOT BED
-
-#define FAN_PIN PB1 // FAN
-
-//
-// Thermocouples
-//
-//#define MAX6675_SS_PIN PE5 // TC1 - CS1
-//#define MAX6675_SS_PIN PE6 // TC2 - CS2
-
-//
-// Misc. Functions
-//
-#define POWER_LOSS_PIN PA2 // PW_DET
-#define PS_ON_PIN PA3 // PW_OFF
-
-#define LED_PIN PB2
-
-//
-// SD Card
-//
-#define SDIO_SUPPORT
-#define SD_DETECT_PIN PD12
-
-//
-// LCD / Controller
-//
-#define BEEPER_PIN PC5
-
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- */
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define FSMC_CS_PIN PD7 // NE4
- #define FSMC_RS_PIN PD11 // A0
-
- #define LCD_RESET_PIN PC6 // FSMC_RST
- #define NO_LCD_REINIT // Suppress LCD re-initialization
-
- #define LCD_BACKLIGHT_PIN PD13
-
- #if ENABLED(TOUCH_BUTTONS)
- #define TOUCH_CS_PIN PA7 // SPI2_NSS
- #define TOUCH_SCK_PIN PB13 // SPI2_SCK
- #define TOUCH_MISO_PIN PB14 // SPI2_MISO
- #define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
- #endif
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
deleted file mode 100644
index d080e90744..0000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-/**
- * MKS Robin pro (STM32F103ZET6) board pin assignments
- */
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
- #error "MKS Robin pro supports up to 3 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "MKS Robin pro"
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_DEBUG
-
-//
-// Note: MKS Robin board is using SPI2 interface.
-//
-//#define SPI_MODULE 2
-#define ENABLE_SPI2
-
-//
-// Servos
-//
-#define SERVO0_PIN PA8 // BLTOUCH
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PA15
-#define X_MAX_PIN PG7
-#define Y_MIN_PIN PA12
-#define Y_MAX_PIN PG8
-#define Z_MIN_PIN PA11
-#define Z_MAX_PIN PC4
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PE4
-#define X_STEP_PIN PE3
-#define X_DIR_PIN PE2
-#ifndef X_CS_PIN
- #define X_CS_PIN PF8
-#endif
-
-#define Y_ENABLE_PIN PE1
-#define Y_STEP_PIN PE0
-#define Y_DIR_PIN PB9
-#ifndef Y_CS_PIN
- #define Y_CS_PIN PF3
-#endif
-
-#define Z_ENABLE_PIN PB8
-#define Z_STEP_PIN PB5
-#define Z_DIR_PIN PB4
-#ifndef Z_CS_PIN
- #define Z_CS_PIN PF6
-#endif
-
-#define E0_ENABLE_PIN PB3
-#define E0_STEP_PIN PD6
-#define E0_DIR_PIN PD3
-#ifndef E0_CS_PIN
- #define E0_CS_PIN PG15
-#endif
-
-#define E1_ENABLE_PIN PA3
-#define E1_STEP_PIN PA6
-#define E1_DIR_PIN PA1
-#ifndef E1_CS_PIN
- #define E1_CS_PIN PG10
-#endif
-
-#define E2_ENABLE_PIN PF0
-#define E2_STEP_PIN PF2
-#define E2_DIR_PIN PF1
-#ifndef E2_CS_PIN
- #define E2_CS_PIN PG9
-#endif
-//
-// Software SPI pins for TMC2130 stepper drivers
-//
-#if ENABLED(TMC_USE_SW_SPI)
- #ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PB15
- #endif
- #ifndef TMC_SW_MISO
- #define TMC_SW_MISO PB14
- #endif
- #ifndef TMC_SW_SCK
- #define TMC_SW_SCK PB13
- #endif
-#endif
-
-#if HAS_TMC220x
- /**
- * TMC2208/TMC2209 stepper drivers
- *
- * Hardware serial communication ports.
- * If undefined software serial is used according to the pins below
- */
- //#define X_HARDWARE_SERIAL Serial
- //#define X2_HARDWARE_SERIAL Serial1
- //#define Y_HARDWARE_SERIAL Serial1
- //#define Y2_HARDWARE_SERIAL Serial1
- //#define Z_HARDWARE_SERIAL Serial1
- //#define Z2_HARDWARE_SERIAL Serial1
- //#define E0_HARDWARE_SERIAL Serial1
- //#define E1_HARDWARE_SERIAL Serial1
- //#define E2_HARDWARE_SERIAL Serial1
- //#define E3_HARDWARE_SERIAL Serial1
- //#define E4_HARDWARE_SERIAL Serial1
-
- //
- // Software serial
- //
- #define X_SERIAL_TX_PIN PF7
- #define X_SERIAL_RX_PIN PF8
-
- #define Y_SERIAL_TX_PIN PF4
- #define Y_SERIAL_RX_PIN PF3
-
- #define Z_SERIAL_TX_PIN PF5
- #define Z_SERIAL_RX_PIN PF6
-
- #define E0_SERIAL_TX_PIN PG13
- #define E0_SERIAL_RX_PIN PG15
-
- #define E1_SERIAL_TX_PIN PG12
- #define E1_SERIAL_RX_PIN PG10
-
- #define E2_SERIAL_TX_PIN PC13
- #define E2_SERIAL_RX_PIN PG9
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC1 // TH1
-#define TEMP_1_PIN PC2 // TH2
-#define TEMP_2_PIN PC3 // TH3
-#define TEMP_BED_PIN PC0 // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PF10 // +HE0-
-#define HEATER_1_PIN PB0 // +HE1-
-#define HEATER_2_PIN PF9 // +HE2-
-#define HEATER_BED_PIN PA0 // +HOT-BED-
-#define FAN_PIN PB1 // +FAN-
-
-/**
- * Note: MKS Robin Pro board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
- */
-//#define MAX6675_SS_PIN PE5 // TC1 - CS1
-//#define MAX6675_SS_PIN PF11 // TC2 - CS2
-
-#define POWER_LOSS_PIN PA2 // PW_DET
-#define PS_ON_PIN PG11 // PW_OFF
-#define FIL_RUNOUT_PIN PA4 // MT_DET1
-//#define FIL_RUNOUT_PIN PE6 // MT_DET2
-//#define FIL_RUNOUT_PIN PG14 // MT_DET3
-
-//
-// SD Card
-//
-#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
-#endif
-
-#if SD_CONNECTION_IS(LCD)
- #define ENABLE_SPI2
- #define SD_DETECT_PIN PG3
- #define SCK_PIN PB13
- #define MISO_PIN PB14
- #define MOSI_PIN PB15
- #define SS_PIN PG6
-#elif SD_CONNECTION_IS(ONBOARD)
- #define SDIO_SUPPORT
- #define SD_DETECT_PIN PD12
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
- #error "No custom SD drive cable defined for this board."
-#endif
-
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- */
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define FSMC_CS_PIN PD7 // NE4
- #define FSMC_RS_PIN PD11 // A0
-
- #define LCD_RESET_PIN PF6
- #define NO_LCD_REINIT // Suppress LCD re-initialization
-
- #define LCD_BACKLIGHT_PIN PD13
-
- #if ENABLED(TOUCH_BUTTONS)
- #define TOUCH_CS_PIN PA7
- #else
- #define BEEPER_PIN PC5
- #define BTN_ENC PG2
- #define BTN_EN1 PG5
- #define BTN_EN2 PG4
- #endif
-
-#elif HAS_SPI_LCD
-
- #define BEEPER_PIN PC5
- #define BTN_ENC PG2
- #define LCD_PINS_ENABLE PG0
- #define LCD_PINS_RS PG1
- #define BTN_EN1 PG5
- #define BTN_EN2 PG4
-
- // MKS MINI12864 and MKS LCD12864B. If using MKS LCD12864A (Need to remove RPK2 resistor)
- #if ENABLED(MKS_MINI_12864)
-
- #define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN -1
- #define DOGLCD_A0 PF12
- #define DOGLCD_CS PF15
- #define DOGLCD_SCK PB13
- #define DOGLCD_MOSI PB15
-
- #else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
-
- #define LCD_PINS_D4 PF14
- #if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PF15
- #define LCD_PINS_D6 PF12
- #define LCD_PINS_D7 PF13
- #endif
-
- #endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
-#endif
-
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(125)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_REMRAM_V1.h b/Marlin/src/pins/stm32/pins_REMRAM_V1.h
deleted file mode 100644
index aa9d6ea178..0000000000
--- a/Marlin/src/pins/stm32/pins_REMRAM_V1.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef STM32F7xx
- #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
-#endif
-
-#define BOARD_INFO_NAME "RemRam v1"
-#define DEFAULT_MACHINE_NAME "RemRam"
-
-#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM
-
-#if HOTENDS > 1 || E_STEPPERS > 1
- #error "RemRam supports only one hotend / E-stepper."
-#endif
-
-//
-// Limit Switches
-//
-#if DISABLED(SENSORLESS_HOMING)
- #define X_MIN_PIN 58
- #define X_MAX_PIN 59
- #define Y_MIN_PIN 60
- #define Y_MAX_PIN 61
- #define Z_MIN_PIN 62
- #define Z_MAX_PIN 63
-#else
- #define X_STOP_PIN 36
- #define Y_STOP_PIN 39
- #define Z_MIN_PIN 62
- #define Z_MAX_PIN 42
-#endif
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 26 // EXT_D1
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN 22
-#define X_DIR_PIN 35
-#define X_ENABLE_PIN 34
-#define X_CS_PIN 14
-
-#define Y_STEP_PIN 23
-#define Y_DIR_PIN 38
-#define Y_ENABLE_PIN 37
-#define Y_CS_PIN 15
-
-#define Z_STEP_PIN 24
-#define Z_DIR_PIN 41
-#define Z_ENABLE_PIN 40
-#define Z_CS_PIN 16
-
-#define E0_STEP_PIN 25
-#define E0_DIR_PIN 44
-#define E0_ENABLE_PIN 43
-#define E0_CS_PIN 10
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN 64 // THERM_1
-#define TEMP_1_PIN 65 // THERM_2
-#define TEMP_BED_PIN 66 // THERM_3
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN 33
-#define HEATER_BED_PIN 31
-
-#ifndef FAN_PIN
- #define FAN_PIN 30 // "FAN1"
-#endif
-#define FAN1_PIN 32 // "FAN2"
-
-#define ORIG_E0_AUTO_FAN_PIN 32 // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Servos
-//
-#define SERVO0_PIN 26 // PWM_EXT1
-#define SERVO1_PIN 27 // PWM_EXT2
-
-#define SDSS 57 // Onboard SD card reader
-//#define SDSS 9 // LCD SD card reader
-#define LED_PIN 21 // STATUS_LED
-
-//
-// LCD / Controller
-//
-#define SD_DETECT_PIN 56 // SD_CARD_DET
-#define BEEPER_PIN 46 // LCD_BEEPER
-#define LCD_PINS_RS 49 // LCD_RS
-#define LCD_PINS_ENABLE 48 // LCD_EN
-#define LCD_PINS_D4 50 // LCD_D4
-#define LCD_PINS_D5 51 // LCD_D5
-#define LCD_PINS_D6 52 // LCD_D6
-#define LCD_PINS_D7 53 // LCD_D7
-#define BTN_EN1 54 // BTN_EN1
-#define BTN_EN2 55 // BTN_EN2
-#define BTN_ENC 47 // BTN_ENC
-
-//
-// Timers
-//
-
-#define STEP_TIMER 2
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32.h b/Marlin/src/pins/stm32/pins_RUMBA32.h
deleted file mode 100644
index 26b4540c2b..0000000000
--- a/Marlin/src/pins/stm32/pins_RUMBA32.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef STM32F4
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
- #error "RUMBA32 supports up to 3 hotends / E-steppers."
-#endif
-
-#define RUMBA32_V1_0
-#define BOARD_INFO_NAME "RUMBA32"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-//#define I2C_EEPROM
-#define E2END 0xFFF // 4KB
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PB12
-#define X_MAX_PIN PB13
-#define Y_MIN_PIN PB15
-#define Y_MAX_PIN PD8
-#define Z_MIN_PIN PD9
-#define Z_MAX_PIN PD10
-
-//
-// Steppers
-//
-#define X_STEP_PIN PA0
-#define X_DIR_PIN PC15
-#define X_ENABLE_PIN PC11
-#define X_CS_PIN PC14
-
-#define Y_STEP_PIN PE5
-#define Y_DIR_PIN PE6
-#define Y_ENABLE_PIN PE3
-#define Y_CS_PIN PE4
-
-#define Z_STEP_PIN PE1
-#define Z_DIR_PIN PE2
-#define Z_ENABLE_PIN PB7
-#define Z_CS_PIN PE0
-
-#define E0_STEP_PIN PB5
-#define E0_DIR_PIN PB6
-#define E0_ENABLE_PIN PC12
-#define E0_CS_PIN PC13
-
-#define E1_STEP_PIN PD6
-#define E1_DIR_PIN PD7
-#define E1_ENABLE_PIN PD4
-#define E1_CS_PIN PD5
-
-#define E2_STEP_PIN PD2
-#define E2_DIR_PIN PD3
-#define E2_ENABLE_PIN PD0
-#define E2_CS_PIN PD1
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PC4
-#define TEMP_1_PIN PC3
-#define TEMP_2_PIN PC2
-#define TEMP_3_PIN PC1
-#define TEMP_BED_PIN PC0
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC6
-#define HEATER_1_PIN PC7
-#define HEATER_2_PIN PC8
-#define HEATER_BED_PIN PA1
-
-#define FAN_PIN PC9
-#define FAN1_PIN PA8
-
-//
-// I2C
-//
-#define SCK_PIN PA5
-#define MISO_PIN PA6
-#define MOSI_PIN PA7
-
-//
-// Misc. Functions
-//
-#define LED_PIN PB14
-#define BTN_PIN PC10
-#define PS_ON_PIN PE11
-#define KILL_PIN PC5
-
-#define SDSS PA2
-#define SD_DETECT_PIN PB0
-#define BEEPER_PIN PE8
-
-//
-// LCD / Controller
-//
-#define LCD_PINS_RS PE10
-#define LCD_PINS_ENABLE PE9
-#define LCD_PINS_D4 PE12
-#define LCD_PINS_D5 PE13
-#define LCD_PINS_D6 PE14
-#define LCD_PINS_D7 PE15
-#define BTN_EN1 PB1
-#define BTN_EN2 PB2
-#define BTN_ENC PE7
diff --git a/Marlin/src/pins/stm32/pins_STM32F1R.h b/Marlin/src/pins/stm32/pins_STM32F1R.h
deleted file mode 100644
index ccafcad1f7..0000000000
--- a/Marlin/src/pins/stm32/pins_STM32F1R.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef __STM32F1__
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
-
-/**
- * 21017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME "Misc. STM32F1R"
-#define DEFAULT_MACHINE_NAME "STM32F103RET6"
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PB3
-#define Y_STOP_PIN PB4
-#define Z_STOP_PIN PB5
-
-//
-// Steppers
-//
-#define X_STEP_PIN PC0
-#define X_DIR_PIN PC1
-#define X_ENABLE_PIN PA8
-
-#define Y_STEP_PIN PC2
-#define Y_DIR_PIN PC3
-#define Y_ENABLE_PIN PA8
-
-#define Z_STEP_PIN PC4
-#define Z_DIR_PIN PC5
-#define Z_ENABLE_PIN PA8
-
-#define E0_STEP_PIN PC6
-#define E0_DIR_PIN PC7
-#define E0_ENABLE_PIN PA8
-
-/**
- * TODO: Currently using same Enable pin to all steppers.
- */
-
-#define E1_STEP_PIN PC8
-#define E1_DIR_PIN PC9
-#define E1_ENABLE_PIN PA8
-
-#define E2_STEP_PIN PC10
-#define E2_DIR_PIN PC11
-#define E2_ENABLE_PIN PA8
-
-//
-// Misc. Functions
-//
-#define SDSS PA4
-#define LED_PIN PD2
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PB0 // EXTRUDER 1
-#define HEATER_1_PIN PB1
-
-#define HEATER_BED_PIN PA3 // BED
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN PA0 // Analog Input
-#define TEMP_0_PIN PA1 // Analog Input
-#define TEMP_1_PIN PA2 // Analog Input
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
- #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
- #elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #else
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
- // Buttons attached to a shift register
- // Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
- #endif
- #endif
-
- #if ENABLED(NEWPANEL)
-
- #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
- #define BEEPER_PIN 37
-
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
-
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
-
- #if ENABLED(BQ_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 39
- #endif
-
- #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
-
- #elif ENABLED(LCD_I2C_PANELOLU2)
-
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS 53
- #define SD_DETECT_PIN -1
- #define KILL_PIN 41
-
- #elif ENABLED(LCD_I2C_VIKI)
-
- #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
- #define BTN_ENC -1
- #define LCD_SDSS 53
- #define SD_DETECT_PIN 49
-
- #elif ANY(VIKI2, miniVIKI)
-
- #define BEEPER_PIN 33
-
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 45
- #define LCD_SCREEN_ROT_180
-
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
-
- #define SDSS 53
- #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
-
- #define KILL_PIN 31
-
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
-
- #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
- #define SD_DETECT_PIN 49
- #define LCD_SDSS 53
- #define KILL_PIN 41
- #define BEEPER_PIN 23
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
- #define LCD_BACKLIGHT_PIN 33
-
- #elif ENABLED(MINIPANEL)
-
- #define BEEPER_PIN 42
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define SDSS 53
-
- #define KILL_PIN 64
- // GLCD features
- // Uncomment screen orientation
- //#define LCD_SCREEN_ROT_90
- //#define LCD_SCREEN_ROT_180
- //#define LCD_SCREEN_ROT_270
- // The encoder and click button
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
- // not connected to a pin
- #define SD_DETECT_PIN 49
-
- #else
-
- // Beeper on AUX-4
- #define BEEPER_PIN 33
-
- // Buttons directly attached to AUX-2
- #if ENABLED(REPRAPWORLD_KEYPAD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
- #elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
- #else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
- #endif
-
- #if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
- #else
- //#define SD_DETECT_PIN -1 // Ramps doesn't use this
- #endif
-
- #endif
- #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_STM3R_MINI.h b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
deleted file mode 100644
index 9192ae453e..0000000000
--- a/Marlin/src/pins/stm32/pins_STM3R_MINI.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#if !defined(__STM32F1__) && !defined(__STM32F4__)
- #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
-#endif
-
-/**
- * 21017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME "STM3R Mini"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-// Enable I2C_EEPROM for testing
-#define I2C_EEPROM
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PD0
-#define Y_STOP_PIN PD1
-#define Z_STOP_PIN PD4
-
-//
-// Steppers
-//
-#define X_STEP_PIN PE1
-#define X_DIR_PIN PE0
-#define X_ENABLE_PIN PC0
-
-#define Y_STEP_PIN PE3
-#define Y_DIR_PIN PE2
-#define Y_ENABLE_PIN PC1
-
-#define Z_STEP_PIN PE5
-#define Z_DIR_PIN PE4
-#define Z_ENABLE_PIN PC2
-
-#define E0_STEP_PIN PE7
-#define E0_DIR_PIN PE6
-#define E0_ENABLE_PIN PC3
-
-#define E1_STEP_PIN PE9
-#define E1_DIR_PIN PE8
-#define E1_ENABLE_PIN PC4
-
-#define E2_STEP_PIN PE11
-#define E2_DIR_PIN PE10
-#define E2_ENABLE_PIN PC5
-
-//
-// Misc. Functions
-//
-#define SDSS PA15
-#define LED_PIN PB2
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PD12 // EXTRUDER 1
-//#define HEATER_1_PIN PD13
-
-#define HEATER_BED_PIN PB9 // BED
-//#define HEATER_BED2_PIN -1 // BED2
-//#define HEATER_BED3_PIN -1 // BED3
-
-#ifndef FAN_PIN
- #define FAN_PIN PD14
-#endif
-#define FAN1_PIN PD13
-
-#define FAN_SOFT_PWM
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN PA0
-#define TEMP_0_PIN PA1
-#define TEMP_1_PIN PA2
-#define TEMP_2_PIN PA3
-
-// Laser control
-#if HAS_CUTTER
- #define SPINDLE_LASER_PWM_PIN PB8
- #define SPINDLE_LASER_ENA_PIN PD5
-#endif
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
- #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
- #elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #else
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
- #if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
- // Buttons attached to a shift register
- // Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
- #endif
- #endif
-
- #if ENABLED(TOUCH_BUTTONS)
-
- #define TOUCH_CS_PIN PB12 // SPI2_NSS
- #define TOUCH_SCK_PIN PB13
- #define TOUCH_MOSI_PIN PB14
- #define TOUCH_MISO_PIN PB15
- #define TOUCH_INT_PIN PC6 // (PenIRQ coming from ADS7843)
-
- #elif ENABLED(NEWPANEL)
-
- #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
- #define BEEPER_PIN 37
-
- #define BTN_EN1 31
- #define BTN_EN2 33
- #define BTN_ENC 35
-
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
-
- #if ENABLED(BQ_LCD_SMART_CONTROLLER)
- #define LCD_BACKLIGHT_PIN 39
- #endif
-
- #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
-
- #elif ENABLED(LCD_I2C_PANELOLU2)
-
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS 53
- #define SD_DETECT_PIN -1
- #define KILL_PIN 41
-
- #elif ENABLED(LCD_I2C_VIKI)
-
- #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
- #define BTN_ENC -1
- #define LCD_SDSS 53
- #define SD_DETECT_PIN 49
-
- #elif ANY(VIKI2, miniVIKI)
-
- #define BEEPER_PIN 33
-
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 45
- #define LCD_SCREEN_ROT_180
-
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
-
- #define SDSS 53
- #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
-
- #define KILL_PIN 31
-
- #define STAT_LED_RED_PIN 32
- #define STAT_LED_BLUE_PIN 35
-
- #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
- #define SD_DETECT_PIN 49
- #define LCD_SDSS 53
- #define KILL_PIN 41
- #define BEEPER_PIN 23
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
- #define LCD_BACKLIGHT_PIN 33
-
- #elif ENABLED(MINIPANEL)
-
- #define BEEPER_PIN 42
- // Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define SDSS 53
-
- #define KILL_PIN 64
- // GLCD features
- // Uncomment screen orientation
- //#define LCD_SCREEN_ROT_90
- //#define LCD_SCREEN_ROT_180
- //#define LCD_SCREEN_ROT_270
- // The encoder and click button
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
- // not connected to a pin
- #define SD_DETECT_PIN 49
-
- #else
-
- // Beeper on AUX-4
- #define BEEPER_PIN 33
-
- // Buttons directly attached to AUX-2
- #if ENABLED(REPRAPWORLD_KEYPAD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
- #elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
- #else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
- #endif
-
- #if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
- #else
- //#define SD_DETECT_PIN -1 // Ramps doesn't use this
- #endif
-
- #endif
- #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_THE_BORG.h b/Marlin/src/pins/stm32/pins_THE_BORG.h
deleted file mode 100644
index 1f8569e4ea..0000000000
--- a/Marlin/src/pins/stm32/pins_THE_BORG.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#ifndef STM32F7
- #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
- #error "The-Borg supports up to 3 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME "The-Borge"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-#define E2END 0xFFF // EEPROM end address
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN PE9
-#define X_MAX_PIN PE10
-#define Y_MIN_PIN PE7
-#define Y_MAX_PIN PE8
-#define Z_MIN_PIN PF15
-#define Z_MAX_PIN PG0
-#define E_MIN_PIN PE2
-#define E_MAX_PIN PE3
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN PA4
-#endif
-
-//
-// Steppers
-//
-#define STEPPER_ENABLE_PIN PE0
-
-#define X_STEP_PIN PC6 // 96, 39 in Arduino
-#define X_DIR_PIN PC7
-#define X_ENABLE_PIN PC8
-
-
-#define Y_STEP_PIN PD9
-#define Y_DIR_PIN PD10
-#define Y_ENABLE_PIN PD11
-
-#define Z_STEP_PIN PE15
-#define Z_DIR_PIN PG1
-#define Z_ENABLE_PIN PD8
-
-
-#define E0_STEP_PIN PB1
-#define E0_DIR_PIN PB2
-#define E0_ENABLE_PIN PE11
-
-
-#define E1_STEP_PIN PC4
-#define E1_DIR_PIN PC5
-#define E1_ENABLE_PIN PB0
-
-
-#define E2_STEP_PIN PC13
-#define E2_DIR_PIN PC14
-#define E2_ENABLE_PIN PC15
-
-#define Z2_STEP_PIN PC13
-#define Z2_DIR_PIN PC14
-#define Z2_ENABLE_PIN PC15
-
-
-#define SCK_PIN PA5
-#define MISO_PIN PA6
-#define MOSI_PIN PA7
-
-#define SPI1_SCK_PIN PA5
-#define SPI1_MISO_PIN PA6
-#define SPI1_MOSI_PIN PA7
-
-#define SPI6_SCK_PIN PG13
-#define SPI6_MISO_PIN PG12
-#define SPI6_MOSI_PIN PG14
-
-//
-// Temperature Sensors
-//
-
-#define TEMP_0_PIN PC3 // Analog Input
-#define TEMP_1_PIN PC2 // Analog Input
-#define TEMP_2_PIN PC1 // Analog Input
-#define TEMP_3_PIN PC0 // Analog Input
-
-#define TEMP_BED_PIN PF10 // Analog Input
-
-#define TEMP_5_PIN PE12 // Analog Input, Probe temp
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PD15
-#define HEATER_1_PIN PD14
-#define HEATER_BED_PIN PF6
-
-#ifndef FAN_PIN
- #define FAN_PIN PD13
-#endif
-#define FAN1_PIN PA0
-#define FAN2_PIN PA1
-
-#define ORIG_E0_AUTO_FAN_PIN PA1 // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Misc. Functions
-//
-
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN PF13
-
-//
-// Průša i3 MK2 Multi Material Multiplexer Support
-//
-
-#define E_MUX0_PIN PG3
-#define E_MUX1_PIN PG4
-
-//
-// Servos
-//
-
-#define SERVO0_PIN PE13
-#define SERVO1_PIN PE14
-
-
-#define SDSS PA8
-#define SS_PIN PA8
-#define LED_PIN PA2 // Alive
-#define PS_ON_PIN PA3
-#define KILL_PIN -1 //PD5 // EXP2-10
-#define PWR_LOSS PG5 // Power loss / nAC_FAULT
-
-//
-// MAX7219_DEBUG
-//
-#define MAX7219_CLK_PIN PG10 // EXP1-1
-#define MAX7219_DIN_PIN PD7 // EXP1-3
-#define MAX7219_LOAD_PIN PD1 // EXP1-5
-
-//
-// LCD / Controller
-//
-//#define SD_DETECT_PIN -1 //PB6) // EXP2-4
-#define BEEPER_PIN PG10 // EXP1-1
-#define LCD_PINS_RS PG9 // EXP1-4
-#define LCD_PINS_ENABLE PD7 // EXP1-3
-#define LCD_PINS_D4 PD1 // EXP1-5
-#define LCD_PINS_D5 PF0 // EXP1-6
-#define LCD_PINS_D6 PD3 // EXP1-7
-#define LCD_PINS_D7 PD4 // EXP1-8
-#define BTN_EN1 PD6 // EXP2-5
-#define BTN_EN2 PD0 // EXP2-3
-#define BTN_ENC PG11 // EXP1-2
diff --git a/Marlin/src/pins/stm32/pins_VAKE403D.h b/Marlin/src/pins/stm32/pins_VAKE403D.h
deleted file mode 100644
index df23f3b318..0000000000
--- a/Marlin/src/pins/stm32/pins_VAKE403D.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 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 .
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
- #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
- #error "STM32F4 supports up to 2 hotends / E-steppers."
-#endif
-
-#define DEFAULT_MACHINE_NAME "STM32F446VET6"
-#define BOARD_NAME "STM32F4 VAkE"
-
-//#define I2C_EEPROM
-
-#define E2END 0xFFF // EEPROM end address (4kB)
-
-//
-// Servos
-//
-//#define SERVO0_PIN PE13
-//#define SERVO1_PIN PE14
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PE10
-#define Y_STOP_PIN PE9
-#define Z_STOP_PIN PE8
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN PA4
-#endif
-
-//
-// Filament runout
-//
-#define FIL_RUNOUT_PIN PA3
-
-//
-// Steppers
-//
-
-#define STEPPER_ENABLE_PIN PB2
-
-#define X_STEP_PIN PC6 // X_STEP
-#define X_DIR_PIN PC7 // X_DIR
-#define X_ENABLE_PIN PB2 //
-#ifndef X_CS_PIN
- #define X_CS_PIN PC8 // X_CS
-#endif
-
-#define Y_STEP_PIN PD9 // Y_STEP
-#define Y_DIR_PIN PD10 // Y_DIR
-#define Y_ENABLE_PIN PB2 //
-#ifndef Y_CS_PIN
- #define Y_CS_PIN PD11 // Y_CS
-#endif
-
-#define Z_STEP_PIN PE15 // Z_STEP
-#define Z_DIR_PIN PB10 // Z_DIR
-#define Z_ENABLE_PIN PB2
-#ifndef Z_CS_PIN
- #define Z_CS_PIN PD8
-#endif
-
-#define E0_STEP_PIN PB1
-#define E0_DIR_PIN PB13
-#define E0_ENABLE_PIN PB2
-#ifndef E0_CS_PIN
- #define E0_CS_PIN PE11
-#endif
-
-#define E1_STEP_PIN PC4
-#define E1_DIR_PIN PC5
-#define E1_ENABLE_PIN PB2
-#ifndef E1_CS_PIN
- #define E1_CS_PIN PB0
-#endif
-
-#define SCK_PIN PE12 // PA5 // SPI1 for SD card
-#define MISO_PIN PE13 // PA6
-#define MOSI_PIN PE14 // PA7
-
-// added for SD card : optional or not ???
-//#define SD_CHIP_SELECT_PIN SDSS // The default chip select pin for the SD card is SS.
-// The following three pins must not be redefined for hardware SPI.
-//#define SPI_MOSI_PIN MOSI_PIN // SPI Master Out Slave In pin
-//#define SPI_MISO_PIN MISO_PIN // SPI Master In Slave Out pin
-//#define SPI_SCK_PIN SCK_PIN // SPI Clock pin
-
-//
-// Temperature Sensors (Analog inputs)
-//
-
-#define TEMP_0_PIN PC0 // Analog Input
-#define TEMP_1_PIN PC1 // Analog Input
-#define TEMP_2_PIN PC2 // Analog Input
-#define TEMP_3_PIN PC3 // Analog Input
-#define TEMP_BED_PIN PC3 // Analog Input
-
-//
-// Heaters / Fans
-//
-
-#define HEATER_0_PIN PD15
-#define HEATER_1_PIN PD14
-#define HEATER_BED_PIN PD12
-
-#ifndef FAN_PIN
- #define FAN_PIN PD13
-#endif
-#define FAN1_PIN PB5 // PA0
-#define FAN2_PIN PB4 // PA1
-
-#define ORIG_E0_AUTO_FAN_PIN PD13 // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Misc. Functions
-//
-
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN PF13
-
-//
-// Prusa i3 MK2 Multi Material Multiplexer Support
-//
-//#define E_MUX0_PIN PG3
-//#define E_MUX1_PIN PG4
-
-#define LED_PIN PB14 // Alive
-#define PS_ON_PIN PE0
-#define KILL_PIN PD5
-#define POWER_LOSS_PIN PA4 // ?? Power loss / nAC_FAULT
-
-#if ENABLED(SDSUPPORT)
- #define SD_DETECT_PIN PB7
- #define SS_PIN PB_15 // USD_CS -> CS for onboard SD
-#endif
-
-//
-// LCD / Controller
-//
-#if HAS_SPI_LCD
- #if ENABLED(SDSUPPORT)
- #define SDSS PB6 // CS for SD card in LCD
- #endif
- #define BEEPER_PIN PC9
- #define LCD_PINS_RS PC12
- #define LCD_PINS_ENABLE PD7
- #define LCD_PINS_D4 PD1
- #define LCD_PINS_D5 PD2
- #define LCD_PINS_D6 PD3
- #define LCD_PINS_D7 PD4
- #define BTN_EN1 PD6
- #define BTN_EN2 PD0
- #define BTN_ENC PB12
-#endif
-
-//
-// ST7920 Delays
-//
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
-#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
-#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
new file mode 100644
index 0000000000..fef8eeb617
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -0,0 +1,233 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef TARGET_STM32F1
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#endif
+
+#define BOARD_INFO_NAME "BIGTREE SKR E3 DIP V1.0"
+
+// Release PB3/PB4 (TMC_SW Pins) from JTAG pins
+#define DISABLE_JTAG
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+#define FLASH_EEPROM_EMULATION
+#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB
+#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
+#undef E2END
+#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
+
+//
+// Servos
+//
+#define SERVO0_PIN PA1 // SERVOS
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PC1 // X-STOP
+#define Y_STOP_PIN PC0 // Y-STOP
+#define Z_STOP_PIN PC15 // Z-STOP
+
+//
+// Z Probe must be this pin
+//
+#define Z_MIN_PROBE_PIN PC14 // PROBE
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PC2 // E0-STOP
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN PC7
+#define X_STEP_PIN PC6
+#define X_DIR_PIN PB15
+#ifndef X_CS_PIN
+ #define X_CS_PIN PC10
+#endif
+
+#define Y_ENABLE_PIN PB14
+#define Y_STEP_PIN PB13
+#define Y_DIR_PIN PB12
+#ifndef Y_CS_PIN
+ #define Y_CS_PIN PC11
+#endif
+
+#define Z_ENABLE_PIN PB11
+#define Z_STEP_PIN PB10
+#define Z_DIR_PIN PB2
+#ifndef Z_CS_PIN
+ #define Z_CS_PIN PC12
+#endif
+
+#define E0_ENABLE_PIN PB1
+#define E0_STEP_PIN PB0
+#define E0_DIR_PIN PC5
+#ifndef E0_CS_PIN
+ #define E0_CS_PIN PD2
+#endif
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+ #ifndef TMC_SW_MOSI
+ #define TMC_SW_MOSI PB5
+ #endif
+ #ifndef TMC_SW_MISO
+ #define TMC_SW_MISO PB4
+ #endif
+ #ifndef TMC_SW_SCK
+ #define TMC_SW_SCK PB3
+ #endif
+#endif
+
+#if HAS_TMC_UART
+ /**
+ * TMC2208/TMC2209 stepper drivers
+ *
+ * Hardware serial communication ports.
+ * If undefined software serial is used according to the pins below
+ */
+ //#define X_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
+ //#define E0_HARDWARE_SERIAL Serial1
+
+ //
+ // Software serial
+ //
+ #define X_SERIAL_TX_PIN PC10
+ #define X_SERIAL_RX_PIN PC10
+
+ #define Y_SERIAL_TX_PIN PC11
+ #define Y_SERIAL_RX_PIN PC11
+
+ #define Z_SERIAL_TX_PIN PC12
+ #define Z_SERIAL_RX_PIN PC12
+
+ #define E0_SERIAL_TX_PIN PD2
+ #define E0_SERIAL_RX_PIN PD2
+
+ // Reduce baud rate to improve software serial reliability
+ #define TMC_BAUD_RATE 19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PA0 // Analog Input "TH0"
+#define TEMP_BED_PIN PC3 // Analog Input "TB0"
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PC8 // HE
+#define HEATER_BED_PIN PC9 // HB
+#define FAN_PIN PA8 // FAN0
+
+//
+// USB connect control
+//
+#define USB_CONNECT_PIN PC13
+#define USB_CONNECT_INVERTING false
+
+#define SD_DETECT_PIN PC4
+
+/**
+ * _____
+ * 5V | 1 2 | GND
+ * (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS)
+ * (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
+ * RESET | 7 8 | PA9 (BTN_EN1)
+ * (BTN_ENC) PB6 | 9 10| PA15 (BEEPER)
+ * -----
+ * EXP1
+ */
+
+#define EXPA1_03_PIN PB7
+#define EXPA1_04_PIN PB8
+#define EXPA1_05_PIN PB9
+#define EXPA1_06_PIN PA10
+#define EXPA1_07_PIN -1
+#define EXPA1_08_PIN PA9
+#define EXPA1_09_PIN PB6
+#define EXPA1_10_PIN PA15
+
+#if HAS_SPI_LCD
+ #define BTN_ENC EXPA1_09_PIN
+ #define BTN_EN1 EXPA1_08_PIN
+ #define BTN_EN2 EXPA1_06_PIN
+
+ #if ENABLED(CR10_STOCKDISPLAY)
+
+ #define BEEPER_PIN EXPA1_10_PIN
+
+ #define LCD_PINS_RS EXPA1_04_PIN
+ #define LCD_PINS_ENABLE EXPA1_03_PIN
+ #define LCD_PINS_D4 EXPA1_05_PIN
+
+ #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+
+ /** Creality Ender-2 display pinout
+ * _____
+ * 5V | 1 2 | GND
+ * (MOSI) PB7 | 3 4 | PB8 (LCD_RS)
+ * (LCD_A0) PB9 | 5 6 PA10 (BTN_EN2)
+ * RESET | 7 8 | PA9 (BTN_EN1)
+ * (BTN_ENC) PB6 | 9 10| PA15 (SCK)
+ * -----
+ * EXP1
+ */
+
+ #define DOGLCD_CS EXPA1_04_PIN
+ #define DOGLCD_A0 EXPA1_05_PIN
+ #define DOGLCD_SCK EXPA1_10_PIN
+ #define DOGLCD_MOSI EXPA1_03_PIN
+ #define FORCE_SOFT_SPI
+ #define LCD_BACKLIGHT_PIN -1
+
+ #else
+ #error "Only CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
+ #endif
+
+#endif // HAS_SPI_LCD
+
+//
+// SD Support
+//
+#define HAS_ONBOARD_SD
+
+#ifndef SDCARD_CONNECTION
+ #define SDCARD_CONNECTION ONBOARD
+#endif
+
+#define ON_BOARD_SPI_DEVICE 1 //SPI1
+#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
new file mode 100644
index 0000000000..15bc01263a
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
@@ -0,0 +1,191 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef TARGET_STM32F1
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#endif
+
+// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
+#define DISABLE_JTAG
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+#define FLASH_EEPROM_EMULATION
+#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB
+#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
+#undef E2END
+#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
+
+//
+// Servos
+//
+#define SERVO0_PIN PA1
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PC0
+#define Y_STOP_PIN PC1
+#define Z_STOP_PIN PC2
+
+//
+// Z Probe must be this pins
+//
+#define Z_MIN_PROBE_PIN PC14
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PC15 // "E0-STOP"
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN PB14
+#define X_STEP_PIN PB13
+#define X_DIR_PIN PB12
+
+#define Y_ENABLE_PIN PB11
+#define Y_STEP_PIN PB10
+#define Y_DIR_PIN PB2
+
+#define Z_ENABLE_PIN PB1
+#define Z_STEP_PIN PB0
+#define Z_DIR_PIN PC5
+
+#define E0_ENABLE_PIN PD2
+#define E0_STEP_PIN PB3
+#define E0_DIR_PIN PB4
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PA0 // Analog Input
+#define TEMP_BED_PIN PC3 // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PC8 // EXTRUDER
+#define HEATER_BED_PIN PC9 // BED
+#define FAN_PIN PA8
+
+//
+// USB connect control
+//
+#define USB_CONNECT_PIN PC13
+#define USB_CONNECT_INVERTING false
+
+#define SD_DETECT_PIN PC4
+
+/**
+ * _____
+ * 5V | 1 2 | GND
+ * (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS)
+ * (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
+ * RESET | 7 8 | PA9 (BTN_EN1)
+ * (BTN_ENC) PB6 | 9 10| PB5 (BEEPER)
+ * -----
+ * EXP1
+ */
+
+#define EXPA1_03_PIN PB7
+#define EXPA1_04_PIN PB8
+#define EXPA1_05_PIN PB9
+#define EXPA1_06_PIN PA10
+#define EXPA1_07_PIN -1
+#define EXPA1_08_PIN PA9
+#define EXPA1_09_PIN PB6
+#define EXPA1_10_PIN PB5
+
+#if HAS_SPI_LCD
+
+ #if ENABLED(CR10_STOCKDISPLAY)
+
+ #define BEEPER_PIN EXPA1_10_PIN
+
+ #define BTN_EN1 EXPA1_08_PIN
+ #define BTN_EN2 EXPA1_06_PIN
+ #define BTN_ENC EXPA1_09_PIN
+
+ #define LCD_PINS_RS EXPA1_04_PIN
+ #define LCD_PINS_ENABLE EXPA1_03_PIN
+ #define LCD_PINS_D4 EXPA1_05_PIN
+
+ #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
+ #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
+
+ #define LCD_PINS_RS EXPA1_05_PIN
+ #define LCD_PINS_ENABLE EXPA1_09_PIN
+ #define LCD_PINS_D4 EXPA1_04_PIN
+ #define LCD_PINS_D5 EXPA1_06_PIN
+ #define LCD_PINS_D6 EXPA1_08_PIN
+ #define LCD_PINS_D7 EXPA1_10_PIN
+ #define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
+ #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+
+ /** Creality Ender-2 display pinout
+ * _____
+ * 5V | 1 2 | GND
+ * (MOSI) PB7 | 3 4 | PB8 (LCD_RS)
+ * (LCD_A0) PB9 | 5 6 PA10 (BTN_EN2)
+ * RESET | 7 8 | PA9 (BTN_EN1)
+ * (BTN_ENC) PB6 | 9 10| PB5 (SCK)
+ * -----
+ * EXP1
+ */
+ #define BTN_EN1 EXPA1_08_PIN
+ #define BTN_EN2 EXPA1_06_PIN
+ #define BTN_ENC EXPA1_09_PIN
+
+ #define DOGLCD_CS EXPA1_04_PIN
+ #define DOGLCD_A0 EXPA1_05_PIN
+ #define DOGLCD_SCK EXPA1_10_PIN
+ #define DOGLCD_MOSI EXPA1_03_PIN
+ #define FORCE_SOFT_SPI
+ #define LCD_BACKLIGHT_PIN -1
+
+ #else
+
+ #error "Only ZONESTAR_LCD, MKS_MINI_12864, ENDER2_STOCKDISPLAY, and CR10_STOCKDISPLAY are currently supported on the BIGTREE_SKR_MINI_E3."
+
+ #endif
+
+#endif // HAS_SPI_LCD
+
+//
+// SD Support
+//
+#define HAS_ONBOARD_SD
+
+#ifndef SDCARD_CONNECTION
+ #define SDCARD_CONNECTION ONBOARD
+#endif
+
+#define ON_BOARD_SPI_DEVICE 1 // SPI1
+#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
similarity index 90%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
index bd2078e5d9..f909cce83a 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,10 +26,10 @@
#define BOARD_INFO_NAME "BIGTREE SKR Mini E3"
/**
- * TMC2209 stepper drivers
+ * TMC220x stepper drivers
* Hardware serial communication ports.
*/
-#if HAS_DRIVER(TMC2209)
+#if HAS_TMC_UART
#define X_HARDWARE_SERIAL Serial4
#define Y_HARDWARE_SERIAL Serial4
#define Z_HARDWARE_SERIAL Serial4
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
similarity index 66%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
index 67da8571fb..961620ee8b 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -25,26 +25,26 @@
#define BOARD_INFO_NAME "BIGTREE SKR Mini E3 V1.2"
-#define NEOPIXEL_PIN PC7 // LED driving pin
+#define NEOPIXEL_PIN PC7 // LED driving pin
/**
* TMC2208/TMC2209 stepper drivers
*/
-#if HAS_TMC220x
+#if HAS_TMC_UART
//
// Software serial
//
- #define X_SERIAL_TX_PIN PB15
- #define X_SERIAL_RX_PIN PB15
+ #define X_SERIAL_TX_PIN PB15
+ #define X_SERIAL_RX_PIN PB15
- #define Y_SERIAL_TX_PIN PC6
- #define Y_SERIAL_RX_PIN PC6
+ #define Y_SERIAL_TX_PIN PC6
+ #define Y_SERIAL_RX_PIN PC6
- #define Z_SERIAL_TX_PIN PC10
- #define Z_SERIAL_RX_PIN PC10
+ #define Z_SERIAL_TX_PIN PC10
+ #define Z_SERIAL_RX_PIN PC10
- #define E0_SERIAL_TX_PIN PC11
- #define E0_SERIAL_RX_PIN PC11
+ #define E0_SERIAL_TX_PIN PC11
+ #define E0_SERIAL_RX_PIN PC11
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
similarity index 50%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
index 3c6b673b6e..fff3af5b6b 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -41,57 +41,57 @@
//
// Limit Switches
//
-#define X_MIN_PIN PC2
-#define X_MAX_PIN PA2
-#define Y_MIN_PIN PC1
-#define Y_MAX_PIN PA1
-#define Z_MIN_PIN PC0
-#define Z_MAX_PIN PC3
+#define X_MIN_PIN PC2
+#define X_MAX_PIN PA2
+#define Y_MIN_PIN PC1
+#define Y_MAX_PIN PA1
+#define Z_MIN_PIN PC0
+#define Z_MAX_PIN PC3
//
// Steppers
//
-#define X_STEP_PIN PC6
-#define X_DIR_PIN PC7
-#define X_ENABLE_PIN PB15
+#define X_STEP_PIN PC6
+#define X_DIR_PIN PC7
+#define X_ENABLE_PIN PB15
-#define Y_STEP_PIN PB13
-#define Y_DIR_PIN PB14
-#define Y_ENABLE_PIN PB12
+#define Y_STEP_PIN PB13
+#define Y_DIR_PIN PB14
+#define Y_ENABLE_PIN PB12
-#define Z_STEP_PIN PB10
-#define Z_DIR_PIN PB11
-#define Z_ENABLE_PIN PB2
+#define Z_STEP_PIN PB10
+#define Z_DIR_PIN PB11
+#define Z_ENABLE_PIN PB2
-#define E0_STEP_PIN PC5
-#define E0_DIR_PIN PB0
-#define E0_ENABLE_PIN PC4
+#define E0_STEP_PIN PC5
+#define E0_DIR_PIN PB0
+#define E0_ENABLE_PIN PC4
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK PB3
+ #define TMC_SW_SCK PB3
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO PB4
+ #define TMC_SW_MISO PB4
#endif
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PB5
+ #define TMC_SW_MOSI PB5
#endif
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN PA8
-#define FAN_PIN PC8
-#define HEATER_BED_PIN PC9
+#define HEATER_0_PIN PA8
+#define FAN_PIN PC8
+#define HEATER_BED_PIN PC9
//
// Temperature Sensors
//
-#define TEMP_BED_PIN PB1 // Analog Input
-#define TEMP_0_PIN PA0 // Analog Input
+#define TEMP_BED_PIN PB1 // Analog Input
+#define TEMP_0_PIN PA0 // Analog Input
//
// LCD Pins
@@ -109,41 +109,41 @@
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN PC10
- #define BTN_ENC PC11
+ #define BEEPER_PIN PC10
+ #define BTN_ENC PC11
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS PC15
+ #define LCD_PINS_RS PC15
- #define BTN_EN1 PB6
- #define BTN_EN2 PC13
+ #define BTN_EN1 PB6
+ #define BTN_EN2 PC13
- #define LCD_PINS_ENABLE PC14
- #define LCD_PINS_D4 PB7
+ #define LCD_PINS_ENABLE PC14
+ #define LCD_PINS_D4 PB7
#else
- #define LCD_PINS_RS PC12
+ #define LCD_PINS_RS PC12
- #define BTN_EN1 PD2
- #define BTN_EN2 PB8
+ #define BTN_EN1 PD2
+ #define BTN_EN2 PB8
- #define LCD_PINS_ENABLE PB6
+ #define LCD_PINS_ENABLE PB6
#if ENABLED(FYSETC_MINI_12864)
- #define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN PC13
- #define DOGLCD_A0 PC12
- #define DOGLCD_CS PB6
- #define DOGLCD_SCK PB3
- #define DOGLCD_MOSI PB5
+ #define LCD_BACKLIGHT_PIN -1
+ #define LCD_RESET_PIN PC13
+ #define DOGLCD_A0 PC12
+ #define DOGLCD_CS PB6
+ #define DOGLCD_SCK PB3
+ #define DOGLCD_MOSI PB5
- #define FORCE_SOFT_SPI // SPI MODE3
+ #define FORCE_SOFT_SPI // SPI MODE3
- #define LED_PIN PB7 // red pwm
- //#define LED_PIN PC15 // green
- //#define LED_PIN PC14 // blue
+ #define LED_PIN PB7 // red pwm
+ //#define LED_PIN PC15 // green
+ //#define LED_PIN PC14 // blue
//#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
// #ifndef RGB_LED_R_PIN
@@ -159,13 +159,13 @@
// #define NEOPIXEL_PIN PB7
//#endif
- #else // !FYSETC_MINI_12864
+ #else // !FYSETC_MINI_12864
- #define LCD_PINS_D4 PC13
+ #define LCD_PINS_D4 PC13
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PB7
- #define LCD_PINS_D6 PC15
- #define LCD_PINS_D7 PC14
+ #define LCD_PINS_D5 PB7
+ #define LCD_PINS_D6 PC15
+ #define LCD_PINS_D7 PC14
#endif
#endif // !FYSETC_MINI_12864
@@ -182,26 +182,26 @@
// set SDCARD_CONNECTION form 'ONBOARD' to 'LCD' and use an external SD (connected to LCD)
#define HAS_ONBOARD_SD
#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
+ #define SDCARD_CONNECTION ONBOARD
#endif
#if SD_CONNECTION_IS(LCD)
#define ENABLE_SPI3
- #define SD_DETECT_PIN PB9
- #define SCK_PIN PB3
- #define MISO_PIN PB4
- #define MOSI_PIN PB5
- #define SS_PIN PA15
+ #define SD_DETECT_PIN PB9
+ #define SCK_PIN PB3
+ #define MISO_PIN PB4
+ #define MOSI_PIN PB5
+ #define SS_PIN PA15
#elif SD_CONNECTION_IS(ONBOARD)
#define ENABLE_SPI1
- #define SD_DETECT_PIN PA3
- #define SCK_PIN PA5
- #define MISO_PIN PA6
- #define MOSI_PIN PA7
- #define SS_PIN PA4
+ #define SD_DETECT_PIN PA3
+ #define SCK_PIN PA5
+ #define MISO_PIN PA6
+ #define MOSI_PIN PA7
+ #define SS_PIN PA4
#endif
-#define ON_BOARD_SPI_DEVICE 1 //SPI1
-#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
+#define ON_BOARD_SPI_DEVICE 1 //SPI1
+#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
#if HAS_GRAPHICAL_LCD
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
new file mode 100644
index 0000000000..b9272c7211
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -0,0 +1,281 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if !defined(__STM32F1__) && !defined(__STM32F4__)
+ #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 2017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME "Chitu3D"
+#define DEFAULT_MACHINE_NAME "STM32F103RET6"
+
+// Enable I2C_EEPROM for testing
+//#define I2C_EEPROM
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Steppers
+//
+#define X_STEP_PIN PE5
+#define X_DIR_PIN PE6
+#define X_ENABLE_PIN PC13
+#define X_MIN_PIN PG10
+#define X_MAX_PIN -1
+
+#define Y_STEP_PIN PE2
+#define Y_DIR_PIN PE3
+#define Y_ENABLE_PIN PE4
+#define Y_MIN_PIN PA12
+#define Y_MAX_PIN
+
+#define Z_STEP_PIN PB9
+#define Z_DIR_PIN PE0
+#define Z_ENABLE_PIN PE1
+#define Z_MIN_PIN PA14
+#define Z_MAX_PIN -1
+
+#define Y2_STEP_PIN -1
+#define Y2_DIR_PIN -1
+#define Y2_ENABLE_PIN -1
+
+#define Z2_STEP_PIN -1
+#define Z2_DIR_PIN -1
+#define Z2_ENABLE_PIN -1
+
+#define E0_STEP_PIN PB4
+#define E0_DIR_PIN PB5
+#define E0_ENABLE_PIN PB8
+
+#define E1_STEP_PIN -1
+#define E1_DIR_PIN -1
+#define E1_ENABLE_PIN -1
+
+#define E2_STEP_PIN -1
+#define E2_DIR_PIN -1
+#define E2_ENABLE_PIN -1
+
+//
+// Misc. Functions
+//
+#define SDSS -1
+#define LED_PIN -1
+#define CASE_LIGHT_PIN PA8 // 8
+
+#define PS_ON_PIN -1
+#define KILL_PIN PD6 // LED strip 24v
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PD12 // HOT-END
+#define HEATER_1_PIN -1
+#define HEATER_2_PIN -1
+
+#define HEATER_BED_PIN PG11 // HOT-BED
+#define HEATER_BED2_PIN -1 // BED2
+#define HEATER_BED3_PIN -1 // BED3
+
+#ifndef FAN_PIN
+ #define FAN_PIN PG14 // MAIN BOARD FAN
+#endif
+
+#define FAN_SOFT_PWM
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN PA0 // Analog Input
+#define TEMP_0_PIN PA1 // Analog Input
+#define TEMP_1_PIN -1 // Analog Input
+#define TEMP_2_PIN -1 // Analog Input
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+ #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+ #define LCD_PINS_RS PD1 // 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE PD3 // 51 // SID (MOSI)
+ #define LCD_PINS_D4 PD4 // 52 // SCK (CLK) clock
+ #elif BOTH(NEWPANEL, PANEL_ONE)
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #else
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #if DISABLED(NEWPANEL)
+ #define BEEPER_PIN PC1 // 33
+ // Buttons attached to a shift register
+ // Not wired yet
+ //#define SHIFT_CLK PC6 // 38
+ //#define SHIFT_LD PC10 // 42
+ //#define SHIFT_OUT PC8 // 40
+ //#define SHIFT_EN PA1 // 17
+ #endif
+ #endif
+
+ #if ENABLED(NEWPANEL)
+
+ #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+ #define BEEPER_PIN PC5
+
+ #define BTN_EN1 PB15 // 31
+ #define BTN_EN2 PC1 // 33
+ #define BTN_ENC PC3 // 35
+
+ #define SD_DETECT_PIN PD1 // 49
+ #define KILL_PIN PC9 // 41
+
+ #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+ #define LCD_BACKLIGHT_PIN PC7 // 39
+ #endif
+
+ #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+ #define BTN_EN1 PE0 // 64
+ #define BTN_EN2 PD11 // 59
+ #define BTN_ENC PD15 // 63
+ #define SD_DETECT_PIN PC10 // 42
+
+ #elif ENABLED(LCD_I2C_PANELOLU2)
+
+ #define BTN_EN1 PC15 // 47
+ #define BTN_EN2 PC11 // 43
+ #define BTN_ENC PC0 // 32
+ #define LCD_SDSS PD5 // 53
+ #define SD_DETECT_PIN -1
+ #define KILL_PIN PC9 // 41
+
+ #elif ENABLED(LCD_I2C_VIKI)
+
+ #define BTN_EN1 PB6 // 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 PA7 // 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+ #define BTN_ENC -1
+ #define LCD_SDSS PD5 // 53
+ #define SD_DETECT_PIN PD1 // 49
+
+ #elif ANY(VIKI2, miniVIKI)
+
+ #define BEEPER_PIN PC1 // 33
+
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 PC12 // 44
+ #define DOGLCD_CS PC13 // 45
+ #define LCD_SCREEN_ROT_180
+
+ #define BTN_EN1 PB6 // 22
+ #define BTN_EN2 PA7 // 7
+ #define BTN_ENC PC7 // 39
+
+ #define SDSS PD5 // 53
+ #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
+
+ #define KILL_PIN PB15 // 31
+
+ #define STAT_LED_RED_PIN PC0 // 32
+ #define STAT_LED_BLUE_PIN PC3 // 35
+
+ #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+ #define BTN_EN1 PC3 // 35
+ #define BTN_EN2 PC5 // 37
+ #define BTN_ENC PB15 // 31
+ #define SD_DETECT_PIN PD1 // 49
+ #define LCD_SDSS PD5 // 53
+ #define KILL_PIN PC9 // 41
+ #define BEEPER_PIN PB7 // 23
+ #define DOGLCD_CS PB13 // 29
+ #define DOGLCD_A0 PB11 // 27
+ #define LCD_BACKLIGHT_PIN PC1 // 33
+
+ #elif ENABLED(MINIPANEL)
+
+ #define BEEPER_PIN PC10 // 42
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 PC12 // 44
+ #define DOGLCD_CS PE2 // 66
+ #define LCD_BACKLIGHT_PIN PE1 // 65 // backlight LED on A11/D65
+ #define SDSS PD5 // 53
+
+ #define KILL_PIN PE0 // 64
+ // GLCD features
+ // Uncomment screen orientation
+ //#define LCD_SCREEN_ROT_90
+ //#define LCD_SCREEN_ROT_180
+ //#define LCD_SCREEN_ROT_270
+ // The encoder and click button
+ #define BTN_EN1 PC8 // 40
+ #define BTN_EN2 PD15 // 63
+ #define BTN_ENC PD11 // 59
+ // not connected to a pin
+ #define SD_DETECT_PIN PD1 // 49
+
+ #else
+
+ // Beeper on AUX-4
+ #define BEEPER_PIN PC1 // 33
+
+ // Buttons directly attached to AUX-2
+ #if ENABLED(REPRAPWORLD_KEYPAD)
+ #define BTN_EN1 PE0 // 64
+ #define BTN_EN2 PD11 // 59
+ #define BTN_ENC PD15 // 63
+ #define SHIFT_OUT PC8 // 40
+ #define SHIFT_CLK PC12 // 44
+ #define SHIFT_LD PC10 // 42
+ #elif ENABLED(PANEL_ONE)
+ #define BTN_EN1 PD11 // 59 // AUX2 PIN 3
+ #define BTN_EN2 PD15 // 63 // AUX2 PIN 4
+ #define BTN_ENC PD1 // 49 // AUX3 PIN 7
+ #else
+ #define BTN_EN1 PC5 // 37
+ #define BTN_EN2 PC3 // 35
+ #define BTN_ENC PB15 // 31
+ #endif
+
+ #if ENABLED(G3D_PANEL)
+ #define SD_DETECT_PIN PD1 // 49
+ #define KILL_PIN PC9 // 41
+ #else
+ //#define SD_DETECT_PIN -1 // Ramps doesn't use this
+ #endif
+
+ #endif
+ #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
index d55bdcc150..dcd1119c86 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -46,55 +46,55 @@
//
// Limit Switches
//
-#define X_STOP_PIN PA1
-#define Y_STOP_PIN PA0
-#define Z_STOP_PIN PB14
+#define X_STOP_PIN PA1
+#define Y_STOP_PIN PA0
+#define Z_STOP_PIN PB14
//
// Filament runout
//
#ifdef pins_v2_20190128
- #define FIL_RUNOUT_PIN PB15
+ #define FIL_RUNOUT_PIN PB15
#else
- #define FIL_RUNOUT_PIN PB5
+ #define FIL_RUNOUT_PIN PB5
#endif
//
// Steppers
//
-#define X_STEP_PIN PB8
-#define X_DIR_PIN PB9
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PB8
+#define X_DIR_PIN PB9
+#define X_ENABLE_PIN PA8
-#define Y_STEP_PIN PB2
+#define Y_STEP_PIN PB2
#ifdef pins_v2_20190128
- #define Y_DIR_PIN PB3
+ #define Y_DIR_PIN PB3
#else
- #define Y_DIR_PIN PB0
+ #define Y_DIR_PIN PB0
#endif
-#define Y_ENABLE_PIN PB1
+#define Y_ENABLE_PIN PB1
-#define Z_STEP_PIN PC0
-#define Z_DIR_PIN PC1
-#define Z_ENABLE_PIN PC2
+#define Z_STEP_PIN PC0
+#define Z_DIR_PIN PC1
+#define Z_ENABLE_PIN PC2
-#define E0_STEP_PIN PC15
-#define E0_DIR_PIN PC14
-#define E0_ENABLE_PIN PC13
+#define E0_STEP_PIN PC15
+#define E0_DIR_PIN PC14
+#define E0_ENABLE_PIN PC13
//
// Stepper current PWM
//
// X:PA2 Y:PA3 Z:PB12 E:PB13 // changed for test
-//#define MOTOR_CURRENT_PWM_XY_PIN PA3
-//#define MOTOR_CURRENT_PWM_Z_PIN PA2 // PB12
-//#define MOTOR_CURRENT_PWM_XY_PIN PB6
-//#define MOTOR_CURRENT_PWM_Z_PIN PB7 // PB12
-//#define MOTOR_CURRENT_PWM_E_PIN -1 // PB13
+//#define MOTOR_CURRENT_PWM_XY_PIN PA3
+//#define MOTOR_CURRENT_PWM_Z_PIN PA2 // PB12
+//#define MOTOR_CURRENT_PWM_XY_PIN PB6
+//#define MOTOR_CURRENT_PWM_Z_PIN PB7 // PB12
+//#define MOTOR_CURRENT_PWM_E_PIN -1 // PB13
// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
#ifndef MOTOR_CURRENT_PWM_RANGE
- #define MOTOR_CURRENT_PWM_RANGE 1500 // geo-f:old 2000
+ #define MOTOR_CURRENT_PWM_RANGE 1500 // geo-f:old 2000
#endif
#define DEFAULT_PWM_MOTOR_CURRENT {500, 500, 400} // geo-f:old 1300 1300 1250
@@ -112,37 +112,37 @@
//
// Heaters / Fans
//
-#define HEATER_0_PIN PC7
-#define HEATER_BED_PIN PC6
+#define HEATER_0_PIN PC7
+#define HEATER_BED_PIN PC6
#ifndef FAN_PIN
- #define FAN_PIN PC8
+ #define FAN_PIN PC8
#endif
//
// Temperature Sensors
//
-#define TEMP_BED_PIN PC5 // Analog Input
-#define TEMP_0_PIN PC4 // Analog Input
+#define TEMP_BED_PIN PC5 // Analog Input
+#define TEMP_0_PIN PC4 // Analog Input
//
// Misc. Functions
//
-#define SDSS PA4
+#define SDSS PA4
//
// LCD Pins
//
#if HAS_SPI_LCD
- #define BEEPER_PIN PC9
+ #define BEEPER_PIN PC9
#if HAS_GRAPHICAL_LCD
- #define DOGLCD_A0 PA15
+ #define DOGLCD_A0 PA15
#ifdef pins_v2_20190128
- #define DOGLCD_CS PB5
+ #define DOGLCD_CS PB5
#else
- #define DOGLCD_CS PB7
+ #define DOGLCD_CS PB7
#endif
//#define LCD_CONTRAST_INIT 190
@@ -153,36 +153,36 @@
#endif
// not connected to a pin
- #define SD_DETECT_PIN PC3
+ #define SD_DETECT_PIN PC3
#if ENABLED(NEWPANEL)
// The encoder and click button
- #define BTN_EN1 PC10
- #define BTN_EN2 PC11
- #define BTN_ENC PC12
+ #define BTN_EN1 PC10
+ #define BTN_EN2 PC11
+ #define BTN_ENC PC12
#endif
#ifdef pins_v2_20190128
- #define LCD_RESET_PIN PB4
+ #define LCD_RESET_PIN PB4
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PB0
+ #define RGB_LED_R_PIN PB0
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PB6
+ #define RGB_LED_G_PIN PB6
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PB7
+ #define RGB_LED_B_PIN PB7
#endif
#else
- #define LCD_RESET_PIN PB6
+ #define LCD_RESET_PIN PB6
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PB3
+ #define RGB_LED_R_PIN PB3
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PB4
+ #define RGB_LED_G_PIN PB4
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PB5
+ #define RGB_LED_B_PIN PB5
#endif
#endif
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
similarity index 52%
rename from Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 28b37cc841..e726ca1831 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -44,38 +44,38 @@
//
// Servos
//
-#define SERVO0_PIN PA0
+#define SERVO0_PIN PA0
//
// Limit Switches
//
-#define X_STOP_PIN PA1
-#define Y_STOP_PIN PB4
-#define Z_STOP_PIN PA15
+#define X_STOP_PIN PA1
+#define Y_STOP_PIN PB4
+#define Z_STOP_PIN PA15
//
// Filament runout
//
-#define FIL_RUNOUT_PIN PB5
+#define FIL_RUNOUT_PIN PB5
//
// Steppers
//
-#define X_STEP_PIN PB8
-#define X_DIR_PIN PB9
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PB8
+#define X_DIR_PIN PB9
+#define X_ENABLE_PIN PA8
-#define Y_STEP_PIN PB2
-#define Y_DIR_PIN PB3
-#define Y_ENABLE_PIN PB1
+#define Y_STEP_PIN PB2
+#define Y_DIR_PIN PB3
+#define Y_ENABLE_PIN PB1
-#define Z_STEP_PIN PC0
-#define Z_DIR_PIN PC1
-#define Z_ENABLE_PIN PC2
+#define Z_STEP_PIN PC0
+#define Z_DIR_PIN PC1
+#define Z_ENABLE_PIN PC2
-#define E0_STEP_PIN PC15
-#define E0_DIR_PIN PC14
-#define E0_ENABLE_PIN PC13
+#define E0_STEP_PIN PC15
+#define E0_DIR_PIN PC14
+#define E0_ENABLE_PIN PC13
#define X_HARDWARE_SERIAL MSerial2
#define Y_HARDWARE_SERIAL MSerial2
@@ -85,35 +85,35 @@
//
// Heaters / Fans
//
-#define HEATER_0_PIN PC6
-#define HEATER_BED_PIN PC7
+#define HEATER_0_PIN PC6
+#define HEATER_BED_PIN PC7
#ifndef FAN_PIN
- #define FAN_PIN PC8
+ #define FAN_PIN PC8
#endif
//
// Temperature Sensors
//
-#define TEMP_BED_PIN PC5 // Analog Input
-#define TEMP_0_PIN PC4 // Analog Input
+#define TEMP_BED_PIN PC5 // Analog Input
+#define TEMP_0_PIN PC4 // Analog Input
//
// Misc. Functions
//
-#define SDSS PA4
+#define SDSS PA4
//
// LCD Pins
//
#if HAS_SPI_LCD
- #define BEEPER_PIN PC9
+ #define BEEPER_PIN PC9
#if HAS_GRAPHICAL_LCD
- #define DOGLCD_A0 PB14
- #define DOGLCD_CS PB12
- #define DOGLCD_SCK PB13
- #define DOGLCD_MOSI PB15
+ #define DOGLCD_A0 PB14
+ #define DOGLCD_CS PB12
+ #define DOGLCD_SCK PB13
+ #define DOGLCD_MOSI PB15
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
@@ -123,29 +123,29 @@
#endif
#endif
- #define LCD_PINS_RS PB12 // CS -- SOFT SPI for ENDER3 LCD
- #define LCD_PINS_D4 PB13 // SCLK
- #define LCD_PINS_ENABLE PB15 // DATA MOSI
+ #define LCD_PINS_RS PB12 // CS -- SOFT SPI for ENDER3 LCD
+ #define LCD_PINS_D4 PB13 // SCLK
+ #define LCD_PINS_ENABLE PB15 // DATA MOSI
// not connected to a pin
- #define SD_DETECT_PIN PC3
+ #define SD_DETECT_PIN PC3
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PB0
+ #define RGB_LED_R_PIN PB0
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PB7
+ #define RGB_LED_G_PIN PB7
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PB6
+ #define RGB_LED_B_PIN PB6
#endif
//#define LCD_CONTRAST_INIT 190
#if ENABLED(NEWPANEL)
- #define BTN_EN1 PC11
- #define BTN_EN2 PC10
- #define BTN_ENC PC12
+ #define BTN_EN1 PC11
+ #define BTN_EN2 PC10
+ #define BTN_ENC PC12
#endif
#endif
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
similarity index 71%
rename from Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
index 236bb17f61..9c6412c0cb 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,9 +36,9 @@
#undef RGB_LED_G_PIN
#undef RGB_LED_B_PIN
-#define FAN1_PIN PB0 // Fan1
+#define FAN1_PIN PB0 // Fan1
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
@@ -47,17 +47,17 @@
//
// Software serial
//
- #define X_SERIAL_TX_PIN PA11
- #define X_SERIAL_RX_PIN PA12
+ #define X_SERIAL_TX_PIN PA11
+ #define X_SERIAL_RX_PIN PA12
- #define Y_SERIAL_TX_PIN PB6
- #define Y_SERIAL_RX_PIN PB7
+ #define Y_SERIAL_TX_PIN PB6
+ #define Y_SERIAL_RX_PIN PB7
- #define Z_SERIAL_TX_PIN PB10
- #define Z_SERIAL_RX_PIN PB11
+ #define Z_SERIAL_TX_PIN PB10
+ #define Z_SERIAL_RX_PIN PB11
- #define E0_SERIAL_TX_PIN PA2
- #define E0_SERIAL_RX_PIN PA3
+ #define E0_SERIAL_TX_PIN PA2
+ #define E0_SERIAL_RX_PIN PA3
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_GTM32_MINI.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index 36d7377ffa..38cc615f64 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -53,32 +53,32 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF // 4KB
//
// Limit Switches
//
-#define X_MIN_PIN PE5 // ENDSTOPS 15,17
-#define X_MAX_PIN PE4 // ENDSTOPS 16,18
-#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
-#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
-#define Z_MIN_PIN PE1 // ENDSTOPS 3,5
-#define Z_MAX_PIN PE0 // ENDSTOPS 4,6
+#define X_MIN_PIN PE5 // ENDSTOPS 15,17
+#define X_MAX_PIN PE4 // ENDSTOPS 16,18
+#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
+#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
+#define Z_MIN_PIN PE1 // ENDSTOPS 3,5
+#define Z_MAX_PIN PE0 // ENDSTOPS 4,6
//
// Steppers
//
-#define X_STEP_PIN PC6
-#define X_DIR_PIN PD13
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PC6
+#define X_DIR_PIN PD13
+#define X_ENABLE_PIN PA8
-#define Y_STEP_PIN PA12
-#define Y_DIR_PIN PA11
-#define Y_ENABLE_PIN PA15
+#define Y_STEP_PIN PA12
+#define Y_DIR_PIN PA11
+#define Y_ENABLE_PIN PA15
-#define Z_STEP_PIN PD6
-#define Z_DIR_PIN PD3
-#define Z_ENABLE_PIN PB3
+#define Z_STEP_PIN PD6
+#define Z_DIR_PIN PD3
+#define Z_ENABLE_PIN PB3
// Extruder stepper pins
// NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
// That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
// stick that drives the EXT0 output on the board.
//
-#define E0_STEP_PIN PC14
-#define E0_DIR_PIN PC13
-#define E0_ENABLE_PIN PC15
+#define E0_STEP_PIN PC14
+#define E0_DIR_PIN PC13
+#define E0_ENABLE_PIN PC15
-#define E1_STEP_PIN PA0
-#define E1_DIR_PIN PB6
-#define E1_ENABLE_PIN PA1
+#define E1_STEP_PIN PA0
+#define E1_DIR_PIN PB6
+#define E1_ENABLE_PIN PA1
-#define E2_STEP_PIN PB2
-#define E2_DIR_PIN PB11
-#define E2_ENABLE_PIN PC4
+#define E2_STEP_PIN PB2
+#define E2_DIR_PIN PB11
+#define E2_ENABLE_PIN PC4
//
// Heaters / Fans
//
-#define HEATER_0_PIN PB0 // EXT0 port
-#define HEATER_1_PIN PB5 // EXT1 port
-#define HEATER_2_PIN PB4 // EXT2 port
-#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
+#define HEATER_0_PIN PB0 // EXT0 port
+#define HEATER_1_PIN PB5 // EXT1 port
+#define HEATER_2_PIN PB4 // EXT2 port
+#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
//
// These are FAN PWM pins on EXT0..EXT2 connectors.
//
-//#define FAN_PIN PB9 // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
-#define FAN1_PIN PB8 // EXT1 port
-#define FAN2_PIN PB7 // EXT2 port
+//#define FAN_PIN PB9 // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
+#define FAN1_PIN PB8 // EXT1 port
+#define FAN2_PIN PB7 // EXT2 port
//
// Temperature Sensors
//
-#define TEMP_0_PIN PC2 // EXT0 port
-#define TEMP_1_PIN PC1 // EXT1 port
-#define TEMP_2_PIN PC0 // EXT2 port
-#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
+#define TEMP_0_PIN PC2 // EXT0 port
+#define TEMP_1_PIN PC1 // EXT1 port
+#define TEMP_2_PIN PC0 // EXT2 port
+#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
//
// Misc. Functions
//
-#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
+#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
//
// LCD / Controller
@@ -138,19 +138,19 @@
// Geeetech's LCD2004A Control Panel is very much like
// RepRapDiscount Smart Controller, but adds an FFC40 connector
//
- #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE PE14 // SID (MOSI)
- #define LCD_PINS_D4 PD8 // SCK (CLK) clock
- #define LCD_PINS_D5 PD9
- #define LCD_PINS_D6 PD10
- #define LCD_PINS_D7 PE15
+ #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE PE14 // SID (MOSI)
+ #define LCD_PINS_D4 PD8 // SCK (CLK) clock
+ #define LCD_PINS_D5 PD9
+ #define LCD_PINS_D6 PD10
+ #define LCD_PINS_D7 PE15
#else
//
// Serial LCDs can be implemented in ExtUI
//
- //#define LCD_UART_TX PD8
- //#define LCD_UART_RX PD9
+ //#define LCD_UART_TX PD8
+ //#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
@@ -167,9 +167,9 @@
// RepRapDiscount Smart Controller, but adds an FFC40 connector
// connected with a flat wire to J2 connector on the board.
//
- #define BTN_EN1 PE8
- #define BTN_EN2 PE9
- #define BTN_ENC PE13
+ #define BTN_EN1 PE8
+ #define BTN_EN2 PE9
+ #define BTN_ENC PE13
#define GTM32_PRO_VB_USE_LCD_BEEPER
#define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -182,10 +182,10 @@
// This is pin 32 on J2 FFC40 and pin, goes to the beeper
// on Geeetech's version of RepRapDiscount Smart Controller
// (e.g. on Rostock 301)
- #define BEEPER_PIN PE12
+ #define BEEPER_PIN PE12
#else
// This is the beeper on the board itself
- #define BEEPER_PIN PB10
+ #define BEEPER_PIN PB10
#endif
/**
@@ -203,28 +203,28 @@
//
// SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
//
- #define SS_PIN PC11
- #define SCK_PIN PC12
- #define MOSI_PIN PD2
- #define MISO_PIN PC8
- #define SD_DETECT_PIN PC7
+ #define SS_PIN PC11
+ #define SCK_PIN PC12
+ #define MOSI_PIN PD2
+ #define MISO_PIN PC8
+ #define SD_DETECT_PIN PC7
#else
//
// Use the on-board card socket labeled TF_CARD_SOCKET
//
- #define SS_PIN PA4
- #define SCK_PIN PA5
- #define MOSI_PIN PA7
- #define MISO_PIN PA6
- #define SD_DETECT_PIN -1 // Card detect is not connected
+ #define SS_PIN PA4
+ #define SCK_PIN PA5
+ #define MOSI_PIN PA7
+ #define MISO_PIN PA6
+ #define SD_DETECT_PIN -1 // Card detect is not connected
#endif
-#define SDSS SS_PIN
+#define SDSS SS_PIN
//
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
// Must define WIFISUPPORT in Configuration.h for the printer.
//
-#define ESP_WIFI_MODULE_COM 2
-#define ESP_WIFI_MODULE_BAUDRATE 115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN -1
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index c4b7b37b94..873d02b065 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -53,32 +53,32 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF // 4KB
//
// Limit Switches
//
-#define X_MIN_PIN PE5 // ENDSTOPS 15,17
-#define X_MAX_PIN PE4 // ENDSTOPS 16,18
-#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
-#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
-#define Z_MIN_PIN PE0 // ENDSTOPS 3,5
-#define Z_MAX_PIN PE1 // ENDSTOPS 4,6
+#define X_MIN_PIN PE5 // ENDSTOPS 15,17
+#define X_MAX_PIN PE4 // ENDSTOPS 16,18
+#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
+#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
+#define Z_MIN_PIN PE0 // ENDSTOPS 3,5
+#define Z_MAX_PIN PE1 // ENDSTOPS 4,6
//
// Steppers
//
-#define X_STEP_PIN PC6
-#define X_DIR_PIN PD13
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PC6
+#define X_DIR_PIN PD13
+#define X_ENABLE_PIN PA8
-#define Y_STEP_PIN PA12
-#define Y_DIR_PIN PA11
-#define Y_ENABLE_PIN PA15
+#define Y_STEP_PIN PA12
+#define Y_DIR_PIN PA11
+#define Y_ENABLE_PIN PA15
-#define Z_STEP_PIN PD6
-#define Z_DIR_PIN PD3
-#define Z_ENABLE_PIN PB3
+#define Z_STEP_PIN PD6
+#define Z_DIR_PIN PD3
+#define Z_ENABLE_PIN PB3
// Extruder stepper pins
// NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
// That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
// stick that drives the EXT0 output on the board.
//
-#define E0_STEP_PIN PC14
-#define E0_DIR_PIN PC13
-#define E0_ENABLE_PIN PC15
+#define E0_STEP_PIN PC14
+#define E0_DIR_PIN PC13
+#define E0_ENABLE_PIN PC15
-#define E1_STEP_PIN PA0
-#define E1_DIR_PIN PB6
-#define E1_ENABLE_PIN PA1
+#define E1_STEP_PIN PA0
+#define E1_DIR_PIN PB6
+#define E1_ENABLE_PIN PA1
-#define E2_STEP_PIN PB2
-#define E2_DIR_PIN PB11
-#define E2_ENABLE_PIN PC4
+#define E2_STEP_PIN PB2
+#define E2_DIR_PIN PB11
+#define E2_ENABLE_PIN PC4
//
// Heaters / Fans
//
-#define HEATER_0_PIN PB0 // EXT0 port
-#define HEATER_1_PIN PB5 // EXT1 port
-#define HEATER_2_PIN PB4 // EXT2 port
-#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
+#define HEATER_0_PIN PB0 // EXT0 port
+#define HEATER_1_PIN PB5 // EXT1 port
+#define HEATER_2_PIN PB4 // EXT2 port
+#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
//
// These are FAN PWM pins on EXT0..EXT2 connectors.
//
-//#define FAN_PIN PB9 // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
-#define FAN1_PIN PB8 // EXT1 port
-#define FAN2_PIN PB7 // EXT2 port
+//#define FAN_PIN PB9 // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
+#define FAN1_PIN PB8 // EXT1 port
+#define FAN2_PIN PB7 // EXT2 port
//
// Temperature Sensors
//
-#define TEMP_0_PIN PC2 // EXT0 port
-#define TEMP_1_PIN PC1 // EXT1 port
-#define TEMP_2_PIN PC0 // EXT2 port
-#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
+#define TEMP_0_PIN PC2 // EXT0 port
+#define TEMP_1_PIN PC1 // EXT1 port
+#define TEMP_2_PIN PC0 // EXT2 port
+#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
//
// Misc. Functions
//
-#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
+#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
//
// LCD / Controller
@@ -139,16 +139,16 @@
// RepRapDiscount Smart Controller, but adds an FFC40 connector
// connected with a flat wire to J2 connector on the board.
//
- #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE PE14 // SID (MOSI)
- #define LCD_PINS_D4 PD8 // SCK (CLK) clock
- #define LCD_PINS_D5 PD9
- #define LCD_PINS_D6 PD10
- #define LCD_PINS_D7 PE15
+ #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE PE14 // SID (MOSI)
+ #define LCD_PINS_D4 PD8 // SCK (CLK) clock
+ #define LCD_PINS_D5 PD9
+ #define LCD_PINS_D6 PD10
+ #define LCD_PINS_D7 PE15
- #define BTN_EN1 PE8
- #define BTN_EN2 PE9
- #define BTN_ENC PE13
+ #define BTN_EN1 PE8
+ #define BTN_EN2 PE9
+ #define BTN_ENC PE13
#define GTM32_PRO_VB_USE_LCD_BEEPER
#define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -157,8 +157,8 @@
//
// Serial LCDs can be implemented in ExtUI
//
- //#define LCD_UART_TX PD8
- //#define LCD_UART_RX PD9
+ //#define LCD_UART_TX PD8
+ //#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
@@ -182,10 +182,10 @@
// This is pin 32 on J2 FFC40 and pin, goes to the beeper
// on Geeetech's version of RepRapDiscount Smart Controller
// (e.g. on Rostock 301)
- #define BEEPER_PIN PE12
+ #define BEEPER_PIN PE12
#else
// This is the beeper on the board itself
- #define BEEPER_PIN PB10
+ #define BEEPER_PIN PB10
#endif
/**
@@ -203,28 +203,28 @@
//
// SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
//
- #define SS_PIN PC11
- #define SCK_PIN PC12
- #define MOSI_PIN PD2
- #define MISO_PIN PC8
- #define SD_DETECT_PIN PC7
+ #define SS_PIN PC11
+ #define SCK_PIN PC12
+ #define MOSI_PIN PD2
+ #define MISO_PIN PC8
+ #define SD_DETECT_PIN PC7
#else
//
// Use the on-board card socket labeled TF_CARD_SOCKET
//
- #define SS_PIN PA4
- #define SCK_PIN PA5
- #define MOSI_PIN PA7
- #define MISO_PIN PA6
- #define SD_DETECT_PIN -1 // Card detect is not connected
+ #define SS_PIN PA4
+ #define SCK_PIN PA5
+ #define MOSI_PIN PA7
+ #define MISO_PIN PA6
+ #define SD_DETECT_PIN -1 // Card detect is not connected
#endif
-#define SDSS SS_PIN
+#define SDSS SS_PIN
//
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
// Must define WIFISUPPORT in Configuration.h for the printer.
//
-#define ESP_WIFI_MODULE_COM 2
-#define ESP_WIFI_MODULE_BAUDRATE 115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN -1
diff --git a/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index 36d7377ffa..38cc615f64 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -53,32 +53,32 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF // 4KB
//
// Limit Switches
//
-#define X_MIN_PIN PE5 // ENDSTOPS 15,17
-#define X_MAX_PIN PE4 // ENDSTOPS 16,18
-#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
-#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
-#define Z_MIN_PIN PE1 // ENDSTOPS 3,5
-#define Z_MAX_PIN PE0 // ENDSTOPS 4,6
+#define X_MIN_PIN PE5 // ENDSTOPS 15,17
+#define X_MAX_PIN PE4 // ENDSTOPS 16,18
+#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
+#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
+#define Z_MIN_PIN PE1 // ENDSTOPS 3,5
+#define Z_MAX_PIN PE0 // ENDSTOPS 4,6
//
// Steppers
//
-#define X_STEP_PIN PC6
-#define X_DIR_PIN PD13
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PC6
+#define X_DIR_PIN PD13
+#define X_ENABLE_PIN PA8
-#define Y_STEP_PIN PA12
-#define Y_DIR_PIN PA11
-#define Y_ENABLE_PIN PA15
+#define Y_STEP_PIN PA12
+#define Y_DIR_PIN PA11
+#define Y_ENABLE_PIN PA15
-#define Z_STEP_PIN PD6
-#define Z_DIR_PIN PD3
-#define Z_ENABLE_PIN PB3
+#define Z_STEP_PIN PD6
+#define Z_DIR_PIN PD3
+#define Z_ENABLE_PIN PB3
// Extruder stepper pins
// NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
// That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
// stick that drives the EXT0 output on the board.
//
-#define E0_STEP_PIN PC14
-#define E0_DIR_PIN PC13
-#define E0_ENABLE_PIN PC15
+#define E0_STEP_PIN PC14
+#define E0_DIR_PIN PC13
+#define E0_ENABLE_PIN PC15
-#define E1_STEP_PIN PA0
-#define E1_DIR_PIN PB6
-#define E1_ENABLE_PIN PA1
+#define E1_STEP_PIN PA0
+#define E1_DIR_PIN PB6
+#define E1_ENABLE_PIN PA1
-#define E2_STEP_PIN PB2
-#define E2_DIR_PIN PB11
-#define E2_ENABLE_PIN PC4
+#define E2_STEP_PIN PB2
+#define E2_DIR_PIN PB11
+#define E2_ENABLE_PIN PC4
//
// Heaters / Fans
//
-#define HEATER_0_PIN PB0 // EXT0 port
-#define HEATER_1_PIN PB5 // EXT1 port
-#define HEATER_2_PIN PB4 // EXT2 port
-#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
+#define HEATER_0_PIN PB0 // EXT0 port
+#define HEATER_1_PIN PB5 // EXT1 port
+#define HEATER_2_PIN PB4 // EXT2 port
+#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
//
// These are FAN PWM pins on EXT0..EXT2 connectors.
//
-//#define FAN_PIN PB9 // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
-#define FAN1_PIN PB8 // EXT1 port
-#define FAN2_PIN PB7 // EXT2 port
+//#define FAN_PIN PB9 // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
+#define FAN1_PIN PB8 // EXT1 port
+#define FAN2_PIN PB7 // EXT2 port
//
// Temperature Sensors
//
-#define TEMP_0_PIN PC2 // EXT0 port
-#define TEMP_1_PIN PC1 // EXT1 port
-#define TEMP_2_PIN PC0 // EXT2 port
-#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
+#define TEMP_0_PIN PC2 // EXT0 port
+#define TEMP_1_PIN PC1 // EXT1 port
+#define TEMP_2_PIN PC0 // EXT2 port
+#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
//
// Misc. Functions
//
-#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
+#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
//
// LCD / Controller
@@ -138,19 +138,19 @@
// Geeetech's LCD2004A Control Panel is very much like
// RepRapDiscount Smart Controller, but adds an FFC40 connector
//
- #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE PE14 // SID (MOSI)
- #define LCD_PINS_D4 PD8 // SCK (CLK) clock
- #define LCD_PINS_D5 PD9
- #define LCD_PINS_D6 PD10
- #define LCD_PINS_D7 PE15
+ #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE PE14 // SID (MOSI)
+ #define LCD_PINS_D4 PD8 // SCK (CLK) clock
+ #define LCD_PINS_D5 PD9
+ #define LCD_PINS_D6 PD10
+ #define LCD_PINS_D7 PE15
#else
//
// Serial LCDs can be implemented in ExtUI
//
- //#define LCD_UART_TX PD8
- //#define LCD_UART_RX PD9
+ //#define LCD_UART_TX PD8
+ //#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
@@ -167,9 +167,9 @@
// RepRapDiscount Smart Controller, but adds an FFC40 connector
// connected with a flat wire to J2 connector on the board.
//
- #define BTN_EN1 PE8
- #define BTN_EN2 PE9
- #define BTN_ENC PE13
+ #define BTN_EN1 PE8
+ #define BTN_EN2 PE9
+ #define BTN_ENC PE13
#define GTM32_PRO_VB_USE_LCD_BEEPER
#define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -182,10 +182,10 @@
// This is pin 32 on J2 FFC40 and pin, goes to the beeper
// on Geeetech's version of RepRapDiscount Smart Controller
// (e.g. on Rostock 301)
- #define BEEPER_PIN PE12
+ #define BEEPER_PIN PE12
#else
// This is the beeper on the board itself
- #define BEEPER_PIN PB10
+ #define BEEPER_PIN PB10
#endif
/**
@@ -203,28 +203,28 @@
//
// SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
//
- #define SS_PIN PC11
- #define SCK_PIN PC12
- #define MOSI_PIN PD2
- #define MISO_PIN PC8
- #define SD_DETECT_PIN PC7
+ #define SS_PIN PC11
+ #define SCK_PIN PC12
+ #define MOSI_PIN PD2
+ #define MISO_PIN PC8
+ #define SD_DETECT_PIN PC7
#else
//
// Use the on-board card socket labeled TF_CARD_SOCKET
//
- #define SS_PIN PA4
- #define SCK_PIN PA5
- #define MOSI_PIN PA7
- #define MISO_PIN PA6
- #define SD_DETECT_PIN -1 // Card detect is not connected
+ #define SS_PIN PA4
+ #define SCK_PIN PA5
+ #define MOSI_PIN PA7
+ #define MISO_PIN PA6
+ #define SD_DETECT_PIN -1 // Card detect is not connected
#endif
-#define SDSS SS_PIN
+#define SDSS SS_PIN
//
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
// Must define WIFISUPPORT in Configuration.h for the printer.
//
-#define ESP_WIFI_MODULE_COM 2
-#define ESP_WIFI_MODULE_BAUDRATE 115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN -1
diff --git a/Marlin/src/pins/stm32/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
similarity index 51%
rename from Marlin/src/pins/stm32/pins_GTM32_REV_B.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index fcb510e161..24196ad892 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -53,32 +53,32 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF // 4KB
//
// Limit Switches
//
-#define X_MIN_PIN PE5 // ENDSTOPS 15,17
-#define X_MAX_PIN PE4 // ENDSTOPS 16,18
-#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
-#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
-#define Z_MIN_PIN PE1 // ENDSTOPS 3,5
-#define Z_MAX_PIN PE0 // ENDSTOPS 4,6
+#define X_MIN_PIN PE5 // ENDSTOPS 15,17
+#define X_MAX_PIN PE4 // ENDSTOPS 16,18
+#define Y_MIN_PIN PE3 // ENDSTOPS 9,11
+#define Y_MAX_PIN PE2 // ENDSTOPS 10,12
+#define Z_MIN_PIN PE1 // ENDSTOPS 3,5
+#define Z_MAX_PIN PE0 // ENDSTOPS 4,6
//
// Steppers
//
-#define X_STEP_PIN PC6
-#define X_DIR_PIN PD13
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PC6
+#define X_DIR_PIN PD13
+#define X_ENABLE_PIN PA8
-#define Y_STEP_PIN PA12
-#define Y_DIR_PIN PA11
-#define Y_ENABLE_PIN PA15
+#define Y_STEP_PIN PA12
+#define Y_DIR_PIN PA11
+#define Y_ENABLE_PIN PA15
-#define Z_STEP_PIN PD6
-#define Z_DIR_PIN PD3
-#define Z_ENABLE_PIN PB3
+#define Z_STEP_PIN PD6
+#define Z_DIR_PIN PD3
+#define Z_ENABLE_PIN PB3
// Extruder stepper pins
// NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
// That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
// stick that drives the EXT0 output on the board.
//
-#define E0_STEP_PIN PC14
-#define E0_DIR_PIN PC13
-#define E0_ENABLE_PIN PC15
+#define E0_STEP_PIN PC14
+#define E0_DIR_PIN PC13
+#define E0_ENABLE_PIN PC15
-#define E1_STEP_PIN PA0
-#define E1_DIR_PIN PB6
-#define E1_ENABLE_PIN PA1
+#define E1_STEP_PIN PA0
+#define E1_DIR_PIN PB6
+#define E1_ENABLE_PIN PA1
-#define E2_STEP_PIN PB2
-#define E2_DIR_PIN PB11
-#define E2_ENABLE_PIN PC4
+#define E2_STEP_PIN PB2
+#define E2_DIR_PIN PB11
+#define E2_ENABLE_PIN PC4
//
// Heaters / Fans - INFO: Extruders ports are in reverse order. Pin numbers here differ from schematic. Original firmware assumes heater, fan and temp sensor on port EXT0 PB0, PB9, PC2.
//
-#define HEATER_0_PIN PB0 // EXT0 port.
-#define HEATER_1_PIN PB5 // EXT1 port
-#define HEATER_2_PIN PB4 // EXT2 port
-#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
+#define HEATER_0_PIN PB0 // EXT0 port.
+#define HEATER_1_PIN PB5 // EXT1 port
+#define HEATER_2_PIN PB4 // EXT2 port
+#define HEATER_BED_PIN PB1 // CON2X3 hotbed port
//
// These are FAN PWM pins on EXT0..EXT2 connectors.
//
-//#define FAN_PIN PB9 // EXT0 port
-#define FAN1_PIN PB8 // EXT1 port
-#define FAN2_PIN PB7 // EXT2 port
-#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
+//#define FAN_PIN PB9 // EXT0 port
+#define FAN1_PIN PB8 // EXT1 port
+#define FAN2_PIN PB7 // EXT2 port
+#define ORIG_E0_AUTO_FAN_PIN PB9 // EXT0 port, used as main extruder fan
//
// Temperature Sensors
//
-#define TEMP_0_PIN PC2 // EXT0 port
-#define TEMP_1_PIN PC1 // EXT1 port
-#define TEMP_2_PIN PC0 // EXT2 port
-#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
+#define TEMP_0_PIN PC2 // EXT0 port
+#define TEMP_1_PIN PC1 // EXT1 port
+#define TEMP_2_PIN PC0 // EXT2 port
+#define TEMP_BED_PIN PC3 // CON2X3 hotbed port
//
// Misc. Functions
//
-#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
+#define LED_PWM PD12 // External LED, pin 2 on LED labeled connector
//
// LCD / Controller
@@ -140,16 +140,16 @@
// RepRapDiscount Smart Controller, but adds an FFC40 connector
// connected with a flat wire to J2 connector on the board.
//
- #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE PE14 // SID (MOSI)
- #define LCD_PINS_D4 PD8 // SCK (CLK) clock
- #define LCD_PINS_D5 PD9
- #define LCD_PINS_D6 PD10
- #define LCD_PINS_D7 PE15
+ #define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE PE14 // SID (MOSI)
+ #define LCD_PINS_D4 PD8 // SCK (CLK) clock
+ #define LCD_PINS_D5 PD9
+ #define LCD_PINS_D6 PD10
+ #define LCD_PINS_D7 PE15
- #define BTN_EN1 PE8
- #define BTN_EN2 PE9
- #define BTN_ENC PE13
+ #define BTN_EN1 PE8
+ #define BTN_EN2 PE9
+ #define BTN_ENC PE13
//#define GTM32_PRO_VB_USE_LCD_BEEPER
#define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -158,19 +158,19 @@
//
// Serial LCDs can be implemented in ExtUI
//
- //#define LCD_UART_TX PD8
- //#define LCD_UART_RX PD9
+ //#define LCD_UART_TX PD8
+ //#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
+ #define ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
+ #define ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(715)
+ #define ST7920_DELAY_3 DELAY_NS(715)
#endif
#endif
@@ -183,10 +183,10 @@
// This is pin 32 on J2 FFC40 and pin, goes to the beeper
// on Geeetech's version of RepRapDiscount Smart Controller
// (e.g. on Rostock 301)
- #define BEEPER_PIN PE12
+ #define BEEPER_PIN PE12
#else
// This is the beeper on the board itself
- #define BEEPER_PIN PB10
+ #define BEEPER_PIN PB10
#endif
/**
@@ -204,29 +204,29 @@
//
// SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
//
- #define SS_PIN PB12 // PC11
- #define SCK_PIN PB13 // PC12 // PC1
- #define MOSI_PIN PB15 // PD2 // PD2
- #define MISO_PIN PB14 // PC8
- #define SD_DETECT_PIN PC7
+ #define SS_PIN PB12 // PC11
+ #define SCK_PIN PB13 // PC12 // PC1
+ #define MOSI_PIN PB15 // PD2 // PD2
+ #define MISO_PIN PB14 // PC8
+ #define SD_DETECT_PIN PC7
#else
//
// Use the on-board card socket labeled TF_CARD_SOCKET
//
- #define SS_PIN PA4
- #define SCK_PIN PA5
- #define MOSI_PIN PA7
- #define MISO_PIN PA6 // PA6
- #define SD_DETECT_PIN -1 // Card detect is not connected
+ #define SS_PIN PA4
+ #define SCK_PIN PA5
+ #define MOSI_PIN PA7
+ #define MISO_PIN PA6 // PA6
+ #define SD_DETECT_PIN -1 // Card detect is not connected
#endif
-#define SDSS SS_PIN
+#define SDSS SS_PIN
//
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
// Must define WIFISUPPORT in Configuration.h for the printer.
//
-#define ESP_WIFI_MODULE_COM 2
-#define ESP_WIFI_MODULE_BAUDRATE 115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN -1
diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
new file mode 100644
index 0000000000..6395f6efc9
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -0,0 +1,130 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+ /**
+ * ╦╔═╗╔═╗┬ ┬┬─┐┌─┐┬─┐┌─┐╔═╗┌─┐┬─┐┬ ┬┌┬┐ ┌─┐┌─┐┌┬┐
+ * ║║ ╦╠═╣│ │├┬┘│ │├┬┘├─┤╠╣ │ │├┬┘│ ││││ │ │ ││││
+ * ╚╝╚═╝╩ ╩└─┘┴└─└─┘┴└─┴ ┴╚ └─┘┴└─└─┘┴ ┴o└─┘└─┘┴ ┴
+ * Pin assignments for 32-bit JGAurora A5S & A1
+ */
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 1 || E_STEPPERS > 1
+ #error "JGAurora 32-bit board only supports 1 hotend / E-stepper. Comment out this line to continue."
+#endif
+#define BOARD_INFO_NAME "JGAurora A5S A1 board"
+
+#ifndef STM32_XL_DENSITY
+ #define STM32_XL_DENSITY
+#endif
+
+// #define MCU_STM32F103ZE // not yet required
+// Enable EEPROM Emulation for this board, so that we don't overwrite factory data
+
+//#define I2C_EEPROM // AT24C64
+//#define E2END 0x7FFF // 64KB
+//#define FLASH_EEPROM_EMULATION
+//#define E2END 0xFFF // 4KB
+//#define E2END uint32(EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE * 2) - 1)
+//#define EEPROM_CHITCHAT
+//#define DEBUG_EEPROM_READWRITE
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PC6
+#define Y_STOP_PIN PG8
+#define Z_STOP_PIN PG7
+//#define X_MAX_PIN PC5
+//#define Y_MAX_PIN PC4
+//#define Z_MAX_PIN PB0
+
+//
+// Steppers
+//
+#define X_STEP_PIN PD6
+#define X_DIR_PIN PD3
+#define X_ENABLE_PIN PG9
+
+#define Y_STEP_PIN PG12
+#define Y_DIR_PIN PG11
+#define Y_ENABLE_PIN PG13
+
+#define Z_STEP_PIN PG15
+#define Z_DIR_PIN PG14
+#define Z_ENABLE_PIN PB8
+
+#define E0_STEP_PIN PE2
+#define E0_DIR_PIN PB9
+#define E0_ENABLE_PIN PE3
+
+#define E1_STEP_PIN PE5
+#define E1_DIR_PIN PE4
+#define E1_ENABLE_PIN PE6
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC2
+#define TEMP_BED_PIN PC1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PA2
+#define HEATER_BED_PIN PA3
+
+#define FAN_PIN PA1
+
+#define FIL_RUNOUT_PIN PC7
+
+//
+// LCD
+//
+#define LCD_BACKLIGHT_PIN PF11
+#define FSMC_CS_PIN PD7
+#define FSMC_RS_PIN PG0
+
+#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV DMA2
+#define FSMC_DMA_CHANNEL DMA_CH5
+
+//
+// SD Card
+//
+#define SD_DETECT_PIN PF10
+
+//
+// Misc.
+//
+#define BEEPER_PIN PC3 // use PB7 to shut up if desired
+#define LED_PIN PC13
+
+//
+// Touch support
+//
+#if ENABLED(TOUCH_BUTTONS)
+ #define TOUCH_CS_PIN PA4
+ #define TOUCH_INT_PIN PC4
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
new file mode 100644
index 0000000000..83881c128d
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -0,0 +1,170 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * Longer3D LK1/LK2 & Alfawise U20/U30 (STM32F103VET6) board pin assignments
+ */
+
+#if !defined(__STM32F1__) && !defined(STM32F1xx)
+ #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 1 || E_STEPPERS > 1
+ #error "Longer3D board only supports 1 hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "Longer3D"
+#define ALFAWISE_UX0 // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
+
+//#define DISABLE_DEBUG // We still want to debug with STLINK...
+#define DISABLE_JTAG // We free the jtag pins (PA15) but keep STLINK
+ // Release PB4 (STEP_X_PIN) from JTAG NRST role.
+//
+// Limit Switches
+//
+#define X_MIN_PIN PC1 // pin 16
+#define X_MAX_PIN PC0 // pin 15 (Filament sensor on Alfawise setup)
+#define Y_MIN_PIN PC15 // pin 9
+#define Y_MAX_PIN PC14 // pin 8 (Unused in stock Alfawise setup)
+#define Z_MIN_PIN PE6 // pin 5 Standard Endstop or Z_Probe endstop function
+#define Z_MAX_PIN PE5 // pin 4 (Unused in stock Alfawise setup)
+ // May be used for BLTouch Servo function on older variants (<= V08)
+#define ONBOARD_ENDSTOPPULLUPS
+
+//
+// Filament Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PC0 // XMAX plug on PCB used as filament runout sensor on Alfawise boards (inverting true)
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN PB5 // pin 91
+#define X_STEP_PIN PB4 // pin 90
+#define X_DIR_PIN PB3 // pin 89
+
+#define Y_ENABLE_PIN PB8 // pin 95
+#define Y_STEP_PIN PB7 // pin 93
+#define Y_DIR_PIN PB6 // pin 92
+
+#define Z_ENABLE_PIN PE1 // pin 98
+#define Z_STEP_PIN PE0 // pin 97
+#define Z_DIR_PIN PB9 // pin 96
+
+#define E0_ENABLE_PIN PE4 // pin 3
+#define E0_STEP_PIN PE3 // pin 2
+#define E0_DIR_PIN PE2 // pin 1
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PA0 // pin 23 (Nozzle 100K/3950 thermistor)
+#define TEMP_BED_PIN PA1 // pin 24 (Hot Bed 100K/3950 thermistor)
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PD3 // pin 84 (Nozzle Heat Mosfet)
+#define HEATER_BED_PIN PA8 // pin 67 (Hot Bed Mosfet)
+
+#define FAN_PIN PA15 // pin 77 (4cm Fan)
+#define FAN_SOFT_PWM // Required to avoid issues with heating or STLink
+#define FAN_MIN_PWM 35 // Fan will not start in 1-30 range
+#define FAN_MAX_PWM 255
+
+//#define BEEPER_PIN PD13 // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor
+ // Can drive a PC Buzzer, if connected between PWM and 5V pins
+
+#define LED_PIN PC2 // pin 17
+
+//
+// PWM for a servo probe
+// Other servo devices are not supported on this board!
+//
+#if HAS_Z_SERVO_PROBE
+ #define SERVO0_PIN PD13 // Open drain PWM pin on the V0G (GND or floating 5V)
+ #define SERVO0_PWM_OD // Comment this if using PE5
+
+ //#define SERVO0_PIN PE5 // Pulled up PWM pin on the V08 (3.3V or 0)
+ //#undef Z_MAX_PIN // Uncomment if using ZMAX connector (PE5)
+#endif
+
+/**
+ * Note: Alfawise screens use various TFT controllers. Supported screens
+ * are based on the ILI9341, ILI9328 and ST7798V. Define init sequences for
+ * other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
+ *
+ * If the screen stays white, disable 'LCD_RESET_PIN' to let the bootloader
+ * init the screen.
+ *
+ * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
+ * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
+ */
+
+#define LCD_RESET_PIN PC4 // pin 33
+#define LCD_BACKLIGHT_PIN PD12 // pin 59
+#define FSMC_CS_PIN PD7 // pin 88 = FSMC_NE1
+#define FSMC_RS_PIN PD11 // pin 58 A16 Register. Only one address needed
+
+#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV DMA2
+#define FSMC_DMA_CHANNEL DMA_CH5
+
+#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
+#define DOGLCD_SCK -1
+
+/**
+ * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
+ * mixed up MOSI and MISO pins. SPI is managed in SW, and needs pins
+ * declared below.
+ */
+#if ENABLED(TOUCH_BUTTONS)
+ #define TOUCH_CS_PIN PB12 // pin 51 SPI2_NSS
+ #define TOUCH_SCK_PIN PB13 // pin 52
+ #define TOUCH_MOSI_PIN PB14 // pin 53
+ #define TOUCH_MISO_PIN PB15 // pin 54
+ #define TOUCH_INT_PIN PC6 // pin 63 (PenIRQ coming from ADS7843)
+#endif
+
+//
+// Persistent Storage
+// If no option is selected below the SD Card will be used
+//
+//#define SPI_EEPROM
+#define FLASH_EEPROM_EMULATION
+
+#undef E2END
+#if ENABLED(SPI_EEPROM)
+ // SPI1 EEPROM Winbond W25Q64 (8MB/64Mbits)
+ #define SPI_CHAN_EEPROM1 1
+ #define SPI_EEPROM1_CS PC5 // pin 34
+ #define EEPROM_SCK BOARD_SPI1_SCK_PIN // PA5 pin 30
+ #define EEPROM_MISO BOARD_SPI1_MISO_PIN // PA6 pin 31
+ #define EEPROM_MOSI BOARD_SPI1_MOSI_PIN // PA7 pin 32
+ #define EEPROM_PAGE_SIZE 0x1000U // 4KB (from datasheet)
+ #define E2END ((16 * EEPROM_PAGE_SIZE)-1) // Limit to 64KB for now...
+#elif ENABLED(FLASH_EEPROM_EMULATION)
+ // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
+ #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
+ #define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
+ #define E2END (EEPROM_PAGE_SIZE - 1)
+#else
+ #define E2END (0x7FFU) // On SD, Limit to 2KB, require this amount of RAM
+#endif
diff --git a/Marlin/src/pins/stm32/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
similarity index 54%
rename from Marlin/src/pins/stm32/pins_MALYAN_M200.h
rename to Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
index 87337c72b6..9829018d8d 100644
--- a/Marlin/src/pins/stm32/pins_MALYAN_M200.h
+++ b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,7 +36,7 @@
// but it is literally the only board which uses it.
#define FLASH_EEPROM_EMULATION
-#define SDSS SS_PIN
+#define SDSS SS_PIN
// Based on PWM timer usage, we have to use these timers and soft PWM for the fans
// On STM32F103:
@@ -50,43 +50,43 @@
//
// Limit Switches
//
-#define X_MIN_PIN PB4
-#define Y_MIN_PIN PA15
-#define Z_MIN_PIN PB5
+#define X_MIN_PIN PB4
+#define Y_MIN_PIN PA15
+#define Z_MIN_PIN PB5
//
// Steppers
//
// X & Y enable are the same
-#define X_STEP_PIN PB14
-#define X_DIR_PIN PB15
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PB14
+#define X_DIR_PIN PB15
+#define X_ENABLE_PIN PA8
-#define Y_STEP_PIN PB12
-#define Y_DIR_PIN PB13
-#define Y_ENABLE_PIN PA8
+#define Y_STEP_PIN PB12
+#define Y_DIR_PIN PB13
+#define Y_ENABLE_PIN PA8
-#define Z_STEP_PIN PB10
-#define Z_DIR_PIN PB2
-#define Z_ENABLE_PIN PB11
+#define Z_STEP_PIN PB10
+#define Z_DIR_PIN PB2
+#define Z_ENABLE_PIN PB11
-#define E0_STEP_PIN PB0
-#define E0_DIR_PIN PC13
-#define E0_ENABLE_PIN PB1
+#define E0_STEP_PIN PB0
+#define E0_DIR_PIN PC13
+#define E0_ENABLE_PIN PB1
//
// Temperature Sensors
//
-#define TEMP_0_PIN PA0 // Analog Input (HOTEND0 thermistor)
-#define TEMP_BED_PIN PA1 // Analog Input (BED thermistor)
+#define TEMP_0_PIN PA0 // Analog Input (HOTEND0 thermistor)
+#define TEMP_BED_PIN PA1 // Analog Input (BED thermistor)
//
// Heaters / Fans
//
-#define HEATER_0_PIN PB6 // HOTEND0 MOSFET
-#define HEATER_BED_PIN PB7 // BED MOSFET
+#define HEATER_0_PIN PB6 // HOTEND0 MOSFET
+#define HEATER_BED_PIN PB7 // BED MOSFET
-#define MALYAN_FAN1_PIN PB8 // FAN1 header on board - PRINT FAN
-#define MALYAN_FAN2_PIN PB3 // FAN2 header on board - CONTROLLER FAN
+#define MALYAN_FAN1_PIN PB8 // FAN1 header on board - PRINT FAN
+#define MALYAN_FAN2_PIN PB3 // FAN2 header on board - CONTROLLER FAN
-#define FAN1_PIN MALYAN_FAN2_PIN
+#define FAN1_PIN MALYAN_FAN2_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
new file mode 100644
index 0000000000..a8c6d30eb4
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -0,0 +1,194 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin (STM32F130ZET6) board pin assignments
+ *
+ * https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin/Hardware
+ */
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS Robin"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_JTAG
+
+//
+// Servos
+//
+#define SERVO0_PIN PC3 // XS1 - 5
+#define SERVO1_PIN PA1 // XS1 - 6
+#define SERVO2_PIN PF9 // XS2 - 5
+#define SERVO3_PIN PF8 // XS2 - 6
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PB12
+#define X_MAX_PIN PB0
+#define Y_MIN_PIN PC5
+#define Y_MAX_PIN PC4
+#define Z_MIN_PIN PA4
+#define Z_MAX_PIN PF7
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN PB9
+#define X_STEP_PIN PB8
+#define X_DIR_PIN PB5
+
+#define Y_ENABLE_PIN PB4
+#define Y_STEP_PIN PG15
+#define Y_DIR_PIN PG10
+
+#define Z_ENABLE_PIN PD7
+#define Z_STEP_PIN PD3
+#define Z_DIR_PIN PG14
+
+#define E0_ENABLE_PIN PG13
+#define E0_STEP_PIN PG8
+#define E0_DIR_PIN PA15
+
+#define E1_ENABLE_PIN PA12
+#define E1_STEP_PIN PA11
+#define E1_DIR_PIN PA8
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC1 // TH1
+#define TEMP_1_PIN PC2 // TH2
+#define TEMP_BED_PIN PC0 // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PC7 // HEATER1
+#define HEATER_1_PIN PA6 // HEATER2
+#define HEATER_BED_PIN PC6 // HOT BED
+
+#define FAN_PIN PA7 // FAN
+
+/**
+ * Note: MKS Robin board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
+ */
+//#define MAX6675_SS_PIN PE5 // TC1 - CS1
+//#define MAX6675_SS_PIN PE6 // TC2 - CS2
+
+#define POWER_LOSS_PIN PA2 // PW_DET
+#define PS_ON_PIN PA3 // PW_OFF
+#define FIL_RUNOUT_PIN PF11 // MT_DET
+
+#define BEEPER_PIN PC13
+#define LED_PIN PB2
+
+/**
+ * Note: MKS Robin TFT screens use various TFT controllers
+ * Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
+ * ILI9488 is not supported
+ * Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
+ *
+ * If the screen stays white, disable 'LCD_RESET_PIN'
+ * to let the bootloader init the screen.
+ *
+ * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
+ * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
+ */
+//#define LCD_RESET_PIN PF6
+#define LCD_BACKLIGHT_PIN PG11
+#define FSMC_CS_PIN PG12 // NE4
+#define FSMC_RS_PIN PF0 // A0
+
+#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV DMA2
+#define FSMC_DMA_CHANNEL DMA_CH5
+
+#if ENABLED(TOUCH_BUTTONS)
+ #define TOUCH_CS_PIN PB1 // SPI2_NSS
+ #define TOUCH_SCK_PIN PB13 // SPI2_SCK
+ #define TOUCH_MISO_PIN PB14 // SPI2_MISO
+ #define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
+#endif
+
+// SPI1(PA7) & SPI3(PB5) not available
+#define ENABLE_SPI2
+
+#if ENABLED(SDIO_SUPPORT)
+ #define SCK_PIN PB13 // SPI2
+ #define MISO_PIN PB14 // SPI2
+ #define MOSI_PIN PB15 // SPI2
+ #define SS_PIN -1 // PB12 is X-
+ #define SD_DETECT_PIN PF12 // SD_CD
+#else
+ // SD as custom software SPI (SDIO pins)
+ #define SCK_PIN PC12
+ #define MISO_PIN PC8
+ #define MOSI_PIN PD2
+ #define SS_PIN -1
+ #define ONBOARD_SD_CS_PIN PC11
+ #define SDSS PD2
+ #define SD_DETECT_PIN -1
+#endif
+
+#if HAS_TMC_UART
+ /**
+ * TMC2208/TMC2209 stepper drivers
+ *
+ * Hardware serial communication ports.
+ * If undefined software serial is used according to the pins below
+ */
+ //#define X_HARDWARE_SERIAL Serial1
+ //#define X2_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
+ //#define Y2_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
+ //#define Z2_HARDWARE_SERIAL Serial1
+ //#define E0_HARDWARE_SERIAL Serial1
+ //#define E1_HARDWARE_SERIAL Serial1
+ //#define E2_HARDWARE_SERIAL Serial1
+ //#define E3_HARDWARE_SERIAL Serial1
+ //#define E4_HARDWARE_SERIAL Serial1
+
+ // Unused servo pins may be repurposed with SoftwareSerialM
+ //#define X_SERIAL_TX_PIN PF8 // SERVO3_PIN
+ //#define Y_SERIAL_TX_PIN PF9 // SERVO2_PIN
+ //#define Z_SERIAL_TX_PIN PA1 // SERVO1_PIN
+ //#define E0_SERIAL_TX_PIN PC3 // SERVO0_PIN
+ //#define X_SERIAL_RX_PIN X_SERIAL_TX_PIN
+ //#define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN
+ //#define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN
+ //#define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN
+
+ // Reduce baud rate for software serial reliability
+ #if HAS_TMC_SW_SERIAL
+ #define TMC_BAUD_RATE 19200
+ #endif
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
new file mode 100644
index 0000000000..4c10a310bf
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -0,0 +1,137 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 1 || E_STEPPERS > 1
+ #error "MKS Robin Lite supports only 1 hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "MKS Robin Lite"
+#endif
+#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
+
+//#define DISABLE_DEBUG
+#define DISABLE_JTAG
+#define ENABLE_SPI2
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PC13
+#define Y_STOP_PIN PC0
+#define Z_MIN_PIN PC12
+#define Z_MAX_PIN PB9
+
+//
+// Steppers
+//
+#define X_STEP_PIN PC6
+#define X_DIR_PIN PB12
+#define X_ENABLE_PIN PB10
+
+#define Y_STEP_PIN PB11
+#define Y_DIR_PIN PB2
+#define Y_ENABLE_PIN PB10
+
+#define Z_STEP_PIN PB1
+#define Z_DIR_PIN PC5
+#define Z_ENABLE_PIN PB10
+
+#define E0_STEP_PIN PC4
+#define E0_DIR_PIN PA5
+#define E0_ENABLE_PIN PA4
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PC9
+#define FAN_PIN PA8
+#define HEATER_BED_PIN PC8
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN PA1
+#define TEMP_0_PIN PA0
+
+#define FIL_RUNOUT_PIN PB8 // MT_DET
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+ #define BEEPER_PIN PD2
+ #define BTN_ENC PB3
+ #define LCD_PINS_RS PC3
+
+ #define BTN_EN1 PB5
+ #define BTN_EN2 PB4
+
+ #define LCD_PINS_ENABLE PC2
+
+ #if ENABLED(MKS_MINI_12864)
+
+ #define LCD_BACKLIGHT_PIN -1
+ #define LCD_RESET_PIN -1
+ #define DOGLCD_A0 PC1
+ #define DOGLCD_CS PC2
+ #define DOGLCD_SCK PB13
+ #define DOGLCD_MOSI PB15
+
+ #else // !MKS_MINI_12864
+
+ #define LCD_PINS_D4 PC1
+ #if ENABLED(ULTIPANEL)
+ #define LCD_PINS_D5 -1
+ #define LCD_PINS_D6 -1
+ #define LCD_PINS_D7 -1
+ #endif
+
+ #endif // !MKS_MINI_12864
+
+#endif // HAS_SPI_LCD
+
+// Motor current PWM pins
+#define MOTOR_CURRENT_PWM_XY_PIN PB0
+#define MOTOR_CURRENT_PWM_Z_PIN PA7
+#define MOTOR_CURRENT_PWM_E_PIN PA6
+#define MOTOR_CURRENT_PWM_RANGE (65535/10/3.3) // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
+#define DEFAULT_PWM_MOTOR_CURRENT { 1000, 1000, 1000 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
+
+//
+// SD Card
+//
+#define ENABLE_SPI2
+#define SD_DETECT_PIN PC10
+#define SCK_PIN PB13
+#define MISO_PIN P1B4
+#define MOSI_PIN P1B5
+#define SS_PIN PA15
+
+#if HAS_GRAPHICAL_LCD
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
new file mode 100644
index 0000000000..466bdecc81
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -0,0 +1,153 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin Lite 3 (STM32F103RCT6) board pin assignments
+ */
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "MKS Robin Lite3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "MKS Robin Lite3"
+#endif
+#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
+
+//#define DISABLE_DEBUG
+#define DISABLE_JTAG
+#define ENABLE_SPI2
+
+//
+// Servos
+//
+#define SERVO0_PIN PA3
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PA12
+#define Y_STOP_PIN PA11
+#define Z_MIN_PIN PC6
+#define Z_MAX_PIN PB1
+
+//
+// Steppers
+//
+#define X_STEP_PIN PC0
+#define X_DIR_PIN PB2
+#define X_ENABLE_PIN PC13
+
+#define Y_STEP_PIN PC2
+#define Y_DIR_PIN PB9
+#define Y_ENABLE_PIN PB12
+
+#define Z_STEP_PIN PB7
+#define Z_DIR_PIN PB6
+#define Z_ENABLE_PIN PB8
+
+#define E0_STEP_PIN PB4
+#define E0_DIR_PIN PB3
+#define E0_ENABLE_PIN PB5
+
+#define E1_STEP_PIN PC12
+#define E1_DIR_PIN PC11
+#define E1_ENABLE_PIN PD2
+
+//
+// Heaters 0,1 / Fans / Bed
+//
+#define HEATER_0_PIN PC9
+#define HEATER_1_PIN PC7
+#define FAN_PIN PA8
+#define HEATER_BED_PIN PC8
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN PA1 //TB
+#define TEMP_0_PIN PA0 //TH1
+#define TEMP_1_PIN PA2 //TH2
+
+#define FIL_RUNOUT_PIN PB10 // MT_DET
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+ #define BEEPER_PIN PC1
+ #define BTN_ENC PC3
+ #define LCD_PINS_ENABLE PA4
+ #define LCD_PINS_RS PA5
+ #define BTN_EN1 PB11
+ #define BTN_EN2 PB0
+
+ // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
+ #if ENABLED(MKS_MINI_12864)
+
+ #define LCD_BACKLIGHT_PIN -1
+ #define LCD_RESET_PIN -1
+ #define DOGLCD_A0 PC4
+ #define DOGLCD_CS PA7
+ #define DOGLCD_SCK PB13
+ #define DOGLCD_MOSI PB15
+
+ // Required for MKS_MINI_12864 with this board
+ #define MKS_LCD12864B
+ #undef SHOW_BOOTSCREEN
+
+ #else // !MKS_MINI_12864
+
+ #define LCD_PINS_D4 PA6
+ #if ENABLED(ULTIPANEL)
+ #define LCD_PINS_D5 PA7
+ #define LCD_PINS_D6 PC4
+ #define LCD_PINS_D7 PC5
+ #endif
+
+ #endif // !MKS_MINI_12864
+
+#endif // HAS_SPI_LCD
+
+//
+// SD Card
+//
+#define ENABLE_SPI2
+#define SD_DETECT_PIN PC10
+#define SCK_PIN PB13
+#define MISO_PIN PB14
+#define MOSI_PIN PB15
+#define SS_PIN PA15
+
+#ifndef ST7920_DELAY_1
+ #define ST7920_DELAY_1 DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_2
+ #define ST7920_DELAY_2 DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_3
+ #define ST7920_DELAY_3 DELAY_NS(125)
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
new file mode 100644
index 0000000000..50babad274
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -0,0 +1,154 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin MINI (STM32F130VET6) board pin assignments
+ */
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 1 || E_STEPPERS > 1
+ #error "MKS Robin mini supports up to 1 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS Robin mini"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
+#define FLASH_EEPROM_EMULATION
+// 2K in a AT24C16N
+#define EEPROM_PAGE_SIZE (uint16)0x800 // 2048
+#define EEPROM_START_ADDRESS ((uint32)(0x8000000 + 512 * 1024 - 2 * EEPROM_PAGE_SIZE))
+#define E2END (EEPROM_PAGE_SIZE - 1)
+
+//
+// Note: MKS Robin mini board is using SPI2 interface.
+//
+#define SPI_MODULE 2
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PA15
+#define Y_STOP_PIN PA12
+#define Z_MIN_PIN PA11
+#define Z_MAX_PIN PC4
+
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PA4 // MT_DET
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN PE4
+#define X_STEP_PIN PE3
+#define X_DIR_PIN PE2
+
+#define Y_ENABLE_PIN PE1
+#define Y_STEP_PIN PE0
+#define Y_DIR_PIN PB9
+
+#define Z_ENABLE_PIN PB8
+#define Z_STEP_PIN PB5
+#define Z_DIR_PIN PB4
+
+#define E0_ENABLE_PIN PB3
+#define E0_STEP_PIN PD6
+#define E0_DIR_PIN PD3
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC1 // TH1
+#define TEMP_BED_PIN PC0 // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PC3 // HEATER1
+#define HEATER_BED_PIN PA0 // HOT BED
+
+#define FAN_PIN PB1 // FAN
+
+//
+// Thermocouples
+//
+//#define MAX6675_SS_PIN PE5 // TC1 - CS1
+//#define MAX6675_SS_PIN PE6 // TC2 - CS2
+
+//
+// Misc. Functions
+//
+#define POWER_LOSS_PIN PA2 // PW_DET
+#define PS_ON_PIN PA3 // PW_OFF
+
+//#define LED_PIN PB2
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN PC5
+#define SD_DETECT_PIN PD12
+
+/**
+ * Note: MKS Robin TFT screens use various TFT controllers.
+ * If the screen stays white, disable 'LCD_RESET_PIN'
+ * to let the bootloader init the screen.
+ */
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define FSMC_CS_PIN PD7 // NE4
+ #define FSMC_RS_PIN PD11 // A0
+
+ #define LCD_RESET_PIN PC6
+ #define NO_LCD_REINIT // Suppress LCD re-initialization
+
+ #define LCD_BACKLIGHT_PIN PD13
+
+ #if ENABLED(TOUCH_BUTTONS)
+ #define TOUCH_CS_PIN PC2
+ #define TOUCH_SCK_PIN PB13
+ #define TOUCH_MOSI_PIN PB15
+ #define TOUCH_MISO_PIN PB14
+ #endif
+#endif
+
+// Motor current PWM pins
+#define MOTOR_CURRENT_PWM_XY_PIN PA6
+#define MOTOR_CURRENT_PWM_Z_PIN PA7
+#define MOTOR_CURRENT_PWM_E_PIN PB0
+#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
+#define DEFAULT_PWM_MOTOR_CURRENT { 1030, 1030, 1030 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
+
+// This is a kind of workaround in case native marlin "digipot" interface won't work.
+// Required to enable related code in STM32F1/HAL.cpp
+//#ifndef MKS_ROBIN_MINI_VREF_PWM
+// #define MKS_ROBIN_MINI_VREF_PWM
+//#endif
+
+//#define VREF_XY_PIN PA6
+//#define VREF_Z_PIN PA7
+//#define VREF_E1_PIN PB0
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
new file mode 100644
index 0000000000..ae9118e6d0
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -0,0 +1,137 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin nano (STM32F130VET6) board pin assignments
+ */
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS Robin nano"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PA15
+#define Y_STOP_PIN PA12
+#define Z_MIN_PIN PA11
+#define Z_MAX_PIN PC4
+
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PA4 // MT_DET
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN PE4
+#define X_STEP_PIN PE3
+#define X_DIR_PIN PE2
+
+#define Y_ENABLE_PIN PE1
+#define Y_STEP_PIN PE0
+#define Y_DIR_PIN PB9
+
+#define Z_ENABLE_PIN PB8
+#define Z_STEP_PIN PB5
+#define Z_DIR_PIN PB4
+
+#define E0_ENABLE_PIN PB3
+#define E0_STEP_PIN PD6
+#define E0_DIR_PIN PD3
+
+#define E1_ENABLE_PIN PA3
+#define E1_STEP_PIN PA6
+#define E1_DIR_PIN PA1
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC1 // TH1
+#define TEMP_1_PIN PC2 // TH2
+#define TEMP_BED_PIN PC0 // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PC3 // HEATER1
+#define HEATER_1_PIN PB0 // HEATER2
+#define HEATER_BED_PIN PA0 // HOT BED
+
+#define FAN_PIN PB1 // FAN
+
+//
+// Thermocouples
+//
+//#define MAX6675_SS_PIN PE5 // TC1 - CS1
+//#define MAX6675_SS_PIN PE6 // TC2 - CS2
+
+//
+// Misc. Functions
+//
+#define POWER_LOSS_PIN PA2 // PW_DET
+#define PS_ON_PIN PA3 // PW_OFF
+
+#define LED_PIN PB2
+
+//
+// SD Card
+//
+#define SDIO_SUPPORT
+#define SD_DETECT_PIN PD12
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN PC5
+
+/**
+ * Note: MKS Robin TFT screens use various TFT controllers.
+ * If the screen stays white, disable 'LCD_RESET_PIN'
+ * to let the bootloader init the screen.
+ */
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define FSMC_CS_PIN PD7 // NE4
+ #define FSMC_RS_PIN PD11 // A0
+
+ #define LCD_RESET_PIN PC6 // FSMC_RST
+ #define NO_LCD_REINIT // Suppress LCD re-initialization
+
+ #define LCD_BACKLIGHT_PIN PD13
+
+ #if ENABLED(TOUCH_BUTTONS)
+ #define TOUCH_CS_PIN PA7 // SPI2_NSS
+ #define TOUCH_SCK_PIN PB13 // SPI2_SCK
+ #define TOUCH_MISO_PIN PB14 // SPI2_MISO
+ #define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
+ #endif
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
new file mode 100644
index 0000000000..b42856721d
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -0,0 +1,274 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin pro (STM32F103ZET6) board pin assignments
+ */
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+ #error "MKS Robin pro supports up to 3 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS Robin pro"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
+//
+// Note: MKS Robin board is using SPI2 interface.
+//
+//#define SPI_MODULE 2
+#define ENABLE_SPI2
+
+//
+// Servos
+//
+#define SERVO0_PIN PA8 // BLTOUCH
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PA15
+#define X_MAX_PIN PG7
+#define Y_MIN_PIN PA12
+#define Y_MAX_PIN PG8
+#define Z_MIN_PIN PA11
+#define Z_MAX_PIN PC4
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN PE4
+#define X_STEP_PIN PE3
+#define X_DIR_PIN PE2
+#ifndef X_CS_PIN
+ #define X_CS_PIN PF8
+#endif
+
+#define Y_ENABLE_PIN PE1
+#define Y_STEP_PIN PE0
+#define Y_DIR_PIN PB9
+#ifndef Y_CS_PIN
+ #define Y_CS_PIN PF3
+#endif
+
+#define Z_ENABLE_PIN PB8
+#define Z_STEP_PIN PB5
+#define Z_DIR_PIN PB4
+#ifndef Z_CS_PIN
+ #define Z_CS_PIN PF6
+#endif
+
+#define E0_ENABLE_PIN PB3
+#define E0_STEP_PIN PD6
+#define E0_DIR_PIN PD3
+#ifndef E0_CS_PIN
+ #define E0_CS_PIN PG15
+#endif
+
+#define E1_ENABLE_PIN PA3
+#define E1_STEP_PIN PA6
+#define E1_DIR_PIN PA1
+#ifndef E1_CS_PIN
+ #define E1_CS_PIN PG10
+#endif
+
+#define E2_ENABLE_PIN PF0
+#define E2_STEP_PIN PF2
+#define E2_DIR_PIN PF1
+#ifndef E2_CS_PIN
+ #define E2_CS_PIN PG9
+#endif
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+ #ifndef TMC_SW_MOSI
+ #define TMC_SW_MOSI PB15
+ #endif
+ #ifndef TMC_SW_MISO
+ #define TMC_SW_MISO PB14
+ #endif
+ #ifndef TMC_SW_SCK
+ #define TMC_SW_SCK PB13
+ #endif
+#endif
+
+#if HAS_TMC_UART
+ /**
+ * TMC2208/TMC2209 stepper drivers
+ *
+ * Hardware serial communication ports.
+ * If undefined software serial is used according to the pins below
+ */
+ //#define X_HARDWARE_SERIAL Serial
+ //#define X2_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
+ //#define Y2_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
+ //#define Z2_HARDWARE_SERIAL Serial1
+ //#define E0_HARDWARE_SERIAL Serial1
+ //#define E1_HARDWARE_SERIAL Serial1
+ //#define E2_HARDWARE_SERIAL Serial1
+ //#define E3_HARDWARE_SERIAL Serial1
+ //#define E4_HARDWARE_SERIAL Serial1
+
+ //
+ // Software serial
+ //
+ #define X_SERIAL_TX_PIN PF7
+ #define X_SERIAL_RX_PIN PF8
+
+ #define Y_SERIAL_TX_PIN PF4
+ #define Y_SERIAL_RX_PIN PF3
+
+ #define Z_SERIAL_TX_PIN PF5
+ #define Z_SERIAL_RX_PIN PF6
+
+ #define E0_SERIAL_TX_PIN PG13
+ #define E0_SERIAL_RX_PIN PG15
+
+ #define E1_SERIAL_TX_PIN PG12
+ #define E1_SERIAL_RX_PIN PG10
+
+ #define E2_SERIAL_TX_PIN PC13
+ #define E2_SERIAL_RX_PIN PG9
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC1 // TH1
+#define TEMP_1_PIN PC2 // TH2
+#define TEMP_2_PIN PC3 // TH3
+#define TEMP_BED_PIN PC0 // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PF10 // +HE0-
+#define HEATER_1_PIN PB0 // +HE1-
+#define HEATER_2_PIN PF9 // +HE2-
+#define HEATER_BED_PIN PA0 // +HOT-BED-
+#define FAN_PIN PB1 // +FAN-
+
+/**
+ * Note: MKS Robin Pro board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
+ */
+//#define MAX6675_SS_PIN PE5 // TC1 - CS1
+//#define MAX6675_SS_PIN PF11 // TC2 - CS2
+
+#define POWER_LOSS_PIN PA2 // PW_DET
+#define PS_ON_PIN PG11 // PW_OFF
+#define FIL_RUNOUT_PIN PA4 // MT_DET1
+//#define FIL_RUNOUT_PIN PE6 // MT_DET2
+//#define FIL_RUNOUT_PIN PG14 // MT_DET3
+
+//
+// SD Card
+//
+#ifndef SDCARD_CONNECTION
+ #define SDCARD_CONNECTION ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(LCD)
+ #define ENABLE_SPI2
+ #define SD_DETECT_PIN PG3
+ #define SCK_PIN PB13
+ #define MISO_PIN PB14
+ #define MOSI_PIN PB15
+ #define SS_PIN PG6
+#elif SD_CONNECTION_IS(ONBOARD)
+ #define SDIO_SUPPORT
+ #define SD_DETECT_PIN PD12
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+ #error "No custom SD drive cable defined for this board."
+#endif
+
+/**
+ * Note: MKS Robin TFT screens use various TFT controllers.
+ * If the screen stays white, disable 'LCD_RESET_PIN'
+ * to let the bootloader init the screen.
+ */
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define FSMC_CS_PIN PD7 // NE4
+ #define FSMC_RS_PIN PD11 // A0
+
+ #define LCD_RESET_PIN PF6
+ #define NO_LCD_REINIT // Suppress LCD re-initialization
+
+ #define LCD_BACKLIGHT_PIN PD13
+
+ #if ENABLED(TOUCH_BUTTONS)
+ #define TOUCH_CS_PIN PA7
+ #else
+ #define BEEPER_PIN PC5
+ #define BTN_ENC PG2
+ #define BTN_EN1 PG5
+ #define BTN_EN2 PG4
+ #endif
+
+#elif HAS_SPI_LCD
+
+ #define BEEPER_PIN PC5
+ #define BTN_ENC PG2
+ #define LCD_PINS_ENABLE PG0
+ #define LCD_PINS_RS PG1
+ #define BTN_EN1 PG5
+ #define BTN_EN2 PG4
+
+ // MKS MINI12864 and MKS LCD12864B. If using MKS LCD12864A (Need to remove RPK2 resistor)
+ #if ENABLED(MKS_MINI_12864)
+
+ #define LCD_BACKLIGHT_PIN -1
+ #define LCD_RESET_PIN -1
+ #define DOGLCD_A0 PF12
+ #define DOGLCD_CS PF15
+ #define DOGLCD_SCK PB13
+ #define DOGLCD_MOSI PB15
+
+ #else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
+
+ #define LCD_PINS_D4 PF14
+ #if ENABLED(ULTIPANEL)
+ #define LCD_PINS_D5 PF15
+ #define LCD_PINS_D6 PF12
+ #define LCD_PINS_D7 PF13
+ #endif
+
+ #endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
+#endif
+
+#ifndef ST7920_DELAY_1
+ #define ST7920_DELAY_1 DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_2
+ #define ST7920_DELAY_2 DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_3
+ #define ST7920_DELAY_3 DELAY_NS(125)
+#endif
diff --git a/Marlin/src/pins/stm32/pins_MORPHEUS.h b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
similarity index 50%
rename from Marlin/src/pins/stm32/pins_MORPHEUS.h
rename to Marlin/src/pins/stm32f1/pins_MORPHEUS.h
index fd4da1ab7d..7311d91a80 100644
--- a/Marlin/src/pins/stm32/pins_MORPHEUS.h
+++ b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -39,53 +39,53 @@
//
// Limit Switches
//
-#define X_MIN_PIN PB14
-#define Y_MIN_PIN PB13
-#define Z_MIN_PIN PB12
+#define X_MIN_PIN PB14
+#define Y_MIN_PIN PB13
+#define Z_MIN_PIN PB12
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN PB9
+ #define Z_MIN_PROBE_PIN PB9
#endif
//
// Steppers
//
// X & Y enable are the same
-#define X_STEP_PIN PB7
-#define X_DIR_PIN PB6
-#define X_ENABLE_PIN PB8
+#define X_STEP_PIN PB7
+#define X_DIR_PIN PB6
+#define X_ENABLE_PIN PB8
-#define Y_STEP_PIN PB5
-#define Y_DIR_PIN PB4
-#define Y_ENABLE_PIN PB8
+#define Y_STEP_PIN PB5
+#define Y_DIR_PIN PB4
+#define Y_ENABLE_PIN PB8
-#define Z_STEP_PIN PA15
-#define Z_DIR_PIN PA10
-#define Z_ENABLE_PIN PB3
+#define Z_STEP_PIN PA15
+#define Z_DIR_PIN PA10
+#define Z_ENABLE_PIN PB3
-#define E0_STEP_PIN PA8
-#define E0_DIR_PIN PB15
-#define E0_ENABLE_PIN PA9
+#define E0_STEP_PIN PA8
+#define E0_DIR_PIN PB15
+#define E0_ENABLE_PIN PA9
//
// Temperature Sensors
//
-#define TEMP_0_PIN PB1 // Analog Input (HOTEND thermistor)
-#define TEMP_BED_PIN PB0 // Analog Input (BED thermistor)
+#define TEMP_0_PIN PB1 // Analog Input (HOTEND thermistor)
+#define TEMP_BED_PIN PB0 // Analog Input (BED thermistor)
//
// Heaters / Fans
//
-#define HEATER_0_PIN PA2 // HOTEND MOSFET
-#define HEATER_BED_PIN PA0 // BED MOSFET
+#define HEATER_0_PIN PA2 // HOTEND MOSFET
+#define HEATER_BED_PIN PA0 // BED MOSFET
-#define FAN_PIN PA1 // FAN1 header on board - PRINT FAN
+#define FAN_PIN PA1 // FAN1 header on board - PRINT FAN
//
// Misc.
//
-#define LED_PIN PC13
-#define SDSS PA3
+#define LED_PIN PC13
+#define SDSS PA3
diff --git a/Marlin/src/pins/stm32f1/pins_STM32F1R.h b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
new file mode 100644
index 0000000000..d144c0e692
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
@@ -0,0 +1,261 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef __STM32F1__
+ #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 21017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME "Misc. STM32F1R"
+#define DEFAULT_MACHINE_NAME "STM32F103RET6"
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PB3
+#define Y_STOP_PIN PB4
+#define Z_STOP_PIN PB5
+
+//
+// Steppers
+//
+#define X_STEP_PIN PC0
+#define X_DIR_PIN PC1
+#define X_ENABLE_PIN PA8
+
+#define Y_STEP_PIN PC2
+#define Y_DIR_PIN PC3
+#define Y_ENABLE_PIN PA8
+
+#define Z_STEP_PIN PC4
+#define Z_DIR_PIN PC5
+#define Z_ENABLE_PIN PA8
+
+#define E0_STEP_PIN PC6
+#define E0_DIR_PIN PC7
+#define E0_ENABLE_PIN PA8
+
+/**
+ * TODO: Currently using same Enable pin to all steppers.
+ */
+
+#define E1_STEP_PIN PC8
+#define E1_DIR_PIN PC9
+#define E1_ENABLE_PIN PA8
+
+#define E2_STEP_PIN PC10
+#define E2_DIR_PIN PC11
+#define E2_ENABLE_PIN PA8
+
+//
+// Misc. Functions
+//
+#define SDSS PA4
+#define LED_PIN PD2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PB0 // EXTRUDER 1
+#define HEATER_1_PIN PB1
+
+#define HEATER_BED_PIN PA3 // BED
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN PA0 // Analog Input
+#define TEMP_0_PIN PA1 // Analog Input
+#define TEMP_1_PIN PA2 // Analog Input
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+ #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #elif BOTH(NEWPANEL, PANEL_ONE)
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #else
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #if DISABLED(NEWPANEL)
+ #define BEEPER_PIN 33
+ // Buttons attached to a shift register
+ // Not wired yet
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
+ #endif
+ #endif
+
+ #if ENABLED(NEWPANEL)
+
+ #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+ #define BEEPER_PIN 37
+
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
+
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
+
+ #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+ #define LCD_BACKLIGHT_PIN 39
+ #endif
+
+ #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SD_DETECT_PIN 42
+
+ #elif ENABLED(LCD_I2C_PANELOLU2)
+
+ #define BTN_EN1 47
+ #define BTN_EN2 43
+ #define BTN_ENC 32
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN -1
+ #define KILL_PIN 41
+
+ #elif ENABLED(LCD_I2C_VIKI)
+
+ #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+ #define BTN_ENC -1
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN 49
+
+ #elif ANY(VIKI2, miniVIKI)
+
+ #define BEEPER_PIN 33
+
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 45
+ #define LCD_SCREEN_ROT_180
+
+ #define BTN_EN1 22
+ #define BTN_EN2 7
+ #define BTN_ENC 39
+
+ #define SDSS 53
+ #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
+
+ #define KILL_PIN 31
+
+ #define STAT_LED_RED_PIN 32
+ #define STAT_LED_BLUE_PIN 35
+
+ #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+ #define BTN_EN1 35
+ #define BTN_EN2 37
+ #define BTN_ENC 31
+ #define SD_DETECT_PIN 49
+ #define LCD_SDSS 53
+ #define KILL_PIN 41
+ #define BEEPER_PIN 23
+ #define DOGLCD_CS 29
+ #define DOGLCD_A0 27
+ #define LCD_BACKLIGHT_PIN 33
+
+ #elif ENABLED(MINIPANEL)
+
+ #define BEEPER_PIN 42
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 66
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define SDSS 53
+
+ #define KILL_PIN 64
+ // GLCD features
+ // Uncomment screen orientation
+ //#define LCD_SCREEN_ROT_90
+ //#define LCD_SCREEN_ROT_180
+ //#define LCD_SCREEN_ROT_270
+ // The encoder and click button
+ #define BTN_EN1 40
+ #define BTN_EN2 63
+ #define BTN_ENC 59
+ // not connected to a pin
+ #define SD_DETECT_PIN 49
+
+ #else
+
+ // Beeper on AUX-4
+ #define BEEPER_PIN 33
+
+ // Buttons directly attached to AUX-2
+ #if ENABLED(REPRAPWORLD_KEYPAD)
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
+ #elif ENABLED(PANEL_ONE)
+ #define BTN_EN1 59 // AUX2 PIN 3
+ #define BTN_EN2 63 // AUX2 PIN 4
+ #define BTN_ENC 49 // AUX3 PIN 7
+ #else
+ #define BTN_EN1 37
+ #define BTN_EN2 35
+ #define BTN_ENC 31
+ #endif
+
+ #if ENABLED(G3D_PANEL)
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
+ #else
+ //#define SD_DETECT_PIN -1 // Ramps doesn't use this
+ #endif
+
+ #endif
+ #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
new file mode 100644
index 0000000000..58b13b90df
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
@@ -0,0 +1,285 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if !defined(__STM32F1__) && !defined(__STM32F4__)
+ #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 21017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME "STM3R Mini"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+// Enable I2C_EEPROM for testing
+#define I2C_EEPROM
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PD0
+#define Y_STOP_PIN PD1
+#define Z_STOP_PIN PD4
+
+//
+// Steppers
+//
+#define X_STEP_PIN PE1
+#define X_DIR_PIN PE0
+#define X_ENABLE_PIN PC0
+
+#define Y_STEP_PIN PE3
+#define Y_DIR_PIN PE2
+#define Y_ENABLE_PIN PC1
+
+#define Z_STEP_PIN PE5
+#define Z_DIR_PIN PE4
+#define Z_ENABLE_PIN PC2
+
+#define E0_STEP_PIN PE7
+#define E0_DIR_PIN PE6
+#define E0_ENABLE_PIN PC3
+
+#define E1_STEP_PIN PE9
+#define E1_DIR_PIN PE8
+#define E1_ENABLE_PIN PC4
+
+#define E2_STEP_PIN PE11
+#define E2_DIR_PIN PE10
+#define E2_ENABLE_PIN PC5
+
+//
+// Misc. Functions
+//
+#define SDSS PA15
+#define LED_PIN PB2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PD12 // EXTRUDER 1
+//#define HEATER_1_PIN PD13
+
+#define HEATER_BED_PIN PB9 // BED
+//#define HEATER_BED2_PIN -1 // BED2
+//#define HEATER_BED3_PIN -1 // BED3
+
+#ifndef FAN_PIN
+ #define FAN_PIN PD14
+#endif
+#define FAN1_PIN PD13
+
+#define FAN_SOFT_PWM
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN PA0
+#define TEMP_0_PIN PA1
+#define TEMP_1_PIN PA2
+#define TEMP_2_PIN PA3
+
+// Laser control
+#if HAS_CUTTER
+ #define SPINDLE_LASER_PWM_PIN PB8
+ #define SPINDLE_LASER_ENA_PIN PD5
+#endif
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+ #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #elif BOTH(NEWPANEL, PANEL_ONE)
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #else
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #if DISABLED(NEWPANEL)
+ #define BEEPER_PIN 33
+ // Buttons attached to a shift register
+ // Not wired yet
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
+ #endif
+ #endif
+
+ #if ENABLED(TOUCH_BUTTONS)
+
+ #define TOUCH_CS_PIN PB12 // SPI2_NSS
+ #define TOUCH_SCK_PIN PB13
+ #define TOUCH_MOSI_PIN PB14
+ #define TOUCH_MISO_PIN PB15
+ #define TOUCH_INT_PIN PC6 // (PenIRQ coming from ADS7843)
+
+ #elif ENABLED(NEWPANEL)
+
+ #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+ #define BEEPER_PIN 37
+
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
+
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
+
+ #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+ #define LCD_BACKLIGHT_PIN 39
+ #endif
+
+ #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SD_DETECT_PIN 42
+
+ #elif ENABLED(LCD_I2C_PANELOLU2)
+
+ #define BTN_EN1 47
+ #define BTN_EN2 43
+ #define BTN_ENC 32
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN -1
+ #define KILL_PIN 41
+
+ #elif ENABLED(LCD_I2C_VIKI)
+
+ #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+ #define BTN_ENC -1
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN 49
+
+ #elif ANY(VIKI2, miniVIKI)
+
+ #define BEEPER_PIN 33
+
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 45
+ #define LCD_SCREEN_ROT_180
+
+ #define BTN_EN1 22
+ #define BTN_EN2 7
+ #define BTN_ENC 39
+
+ #define SDSS 53
+ #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
+
+ #define KILL_PIN 31
+
+ #define STAT_LED_RED_PIN 32
+ #define STAT_LED_BLUE_PIN 35
+
+ #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+
+ #define BTN_EN1 35
+ #define BTN_EN2 37
+ #define BTN_ENC 31
+ #define SD_DETECT_PIN 49
+ #define LCD_SDSS 53
+ #define KILL_PIN 41
+ #define BEEPER_PIN 23
+ #define DOGLCD_CS 29
+ #define DOGLCD_A0 27
+ #define LCD_BACKLIGHT_PIN 33
+
+ #elif ENABLED(MINIPANEL)
+
+ #define BEEPER_PIN 42
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 66
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define SDSS 53
+
+ #define KILL_PIN 64
+ // GLCD features
+ // Uncomment screen orientation
+ //#define LCD_SCREEN_ROT_90
+ //#define LCD_SCREEN_ROT_180
+ //#define LCD_SCREEN_ROT_270
+ // The encoder and click button
+ #define BTN_EN1 40
+ #define BTN_EN2 63
+ #define BTN_ENC 59
+ // not connected to a pin
+ #define SD_DETECT_PIN 49
+
+ #else
+
+ // Beeper on AUX-4
+ #define BEEPER_PIN 33
+
+ // Buttons directly attached to AUX-2
+ #if ENABLED(REPRAPWORLD_KEYPAD)
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
+ #elif ENABLED(PANEL_ONE)
+ #define BTN_EN1 59 // AUX2 PIN 3
+ #define BTN_EN2 63 // AUX2 PIN 4
+ #define BTN_ENC 49 // AUX3 PIN 7
+ #else
+ #define BTN_EN1 37
+ #define BTN_EN2 35
+ #define BTN_ENC 31
+ #endif
+
+ #if ENABLED(G3D_PANEL)
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
+ #else
+ //#define SD_DETECT_PIN -1 // Ramps doesn't use this
+ #endif
+
+ #endif
+ #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
new file mode 100644
index 0000000000..ddbe09c355
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -0,0 +1,231 @@
+/**
+ * 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://github.com/ktand/Armed
+
+#pragma once
+
+#ifndef STM32F4
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "Arm'ed supports up to 2 hotends / E-steppers."
+#endif
+
+#ifndef ARMED_V1_0
+ #define ARMED_V1_1
+#endif
+
+#undef BOARD_INFO_NAME // Defined on the command line by Arduino Core STM32
+#define BOARD_INFO_NAME "Arm'ed"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#define I2C_EEPROM
+
+#undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
+#define E2END 0xFFF // 4KB
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PE0
+#define Y_STOP_PIN PE1
+#define Z_STOP_PIN PE14
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+//#ifndef Z_MIN_PROBE_PIN
+// #define Z_MIN_PROBE_PIN PA4
+//#endif
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PA3
+#endif
+
+//
+// Steppers
+//
+
+#ifdef ARMED_SWAP_X_E1
+ #define X_STEP_PIN PE4
+ #define X_DIR_PIN PE2
+ #define X_ENABLE_PIN PE3
+ #define X_CS_PIN PE5
+#else
+ #define X_STEP_PIN PD3
+ #define X_DIR_PIN PD2
+ #define X_ENABLE_PIN PD0
+ #define X_CS_PIN PD1
+#endif
+
+#define Y_STEP_PIN PE11
+#define Y_DIR_PIN PE10
+#define Y_ENABLE_PIN PE13
+#define Y_CS_PIN PE12
+
+#define Z_STEP_PIN PD6
+#define Z_DIR_PIN PD7
+#define Z_ENABLE_PIN PD4
+#define Z_CS_PIN PD5
+
+#define E0_STEP_PIN PB5
+#define E0_DIR_PIN PB6
+#ifdef ARMED_V1_1
+ #define E0_ENABLE_PIN PC12
+#else
+ #define E0_ENABLE_PIN PB3
+#endif
+#define E0_CS_PIN PB4
+
+#ifdef ARMED_SWAP_X_E1
+ #define E1_STEP_PIN PD3
+ #define E1_DIR_PIN PD2
+ #define E1_ENABLE_PIN PD0
+ #define E1_CS_PIN PD1
+#else
+ #define E1_STEP_PIN PE4
+ #define E1_DIR_PIN PE2
+ #define E1_ENABLE_PIN PE3
+ #define E1_CS_PIN PE5
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC0 // Analog Input
+#define TEMP_1_PIN PC1 // Analog Input
+#define TEMP_BED_PIN PC2 // Analog Input
+
+#if HOTENDS == 1 && TEMP_SENSOR_PROBE
+ #define TEMP_PROBE_PIN PC1
+#endif
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PA1 // Hardware PWM
+#define HEATER_1_PIN PA2 // Hardware PWM
+#define HEATER_BED_PIN PA0 // Hardware PWM
+
+#define FAN_PIN PC6 // Hardware PWM, Part cooling fan
+#define FAN1_PIN PC7 // Hardware PWM, Extruder fan
+#define FAN2_PIN PC8 // Hardware PWM, Controller fan
+
+//
+// Misc functions
+//
+#define SDSS PE7
+#define LED_PIN PB7 // Heart beat
+#define PS_ON_PIN PA10
+#define KILL_PIN PA8
+#define PWR_LOSS PA4 // Power loss / nAC_FAULT
+
+//
+// LCD / Controller
+//
+#define SD_DETECT_PIN PA15
+#define BEEPER_PIN PC9
+
+#if ENABLED(FYSETC_MINI_12864)
+ //
+ // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+ //
+ #define DOGLCD_A0 PE9
+ #define DOGLCD_CS PE8
+
+ #define LCD_BACKLIGHT_PIN -1
+
+ #define LCD_RESET_PIN PB12 // Must be high or open for LCD to operate normally.
+
+ #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+ #ifndef RGB_LED_R_PIN
+ #define RGB_LED_R_PIN PB13
+ #endif
+ #ifndef RGB_LED_G_PIN
+ #define RGB_LED_G_PIN PB14
+ #endif
+ #ifndef RGB_LED_B_PIN
+ #define RGB_LED_B_PIN PB15
+ #endif
+ #elif ENABLED(FYSETC_MINI_12864_2_1)
+ #define NEOPIXEL_PIN PB13
+ #endif
+#else
+ #define LCD_PINS_RS PE9
+ #define LCD_PINS_ENABLE PE8
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+
+ #if ENABLED(MKS_MINI_12864)
+ #define DOGLCD_CS PB13
+ #define DOGLCD_A0 PB14
+ #endif
+#endif
+
+#define BTN_EN1 PC4
+#define BTN_EN2 PC5
+#define BTN_ENC PC3
+
+//
+// Extension pins
+//
+#define EXT0_PIN PB0
+#define EXT1_PIN PB1
+#define EXT2_PIN PB2
+#define EXT3_PIN PD8
+#define EXT4_PIN PD9
+#define EXT5_PIN PD10
+#define EXT6_PIN PD11
+#define EXT7_PIN PD12
+#define EXT8_PIN PB10
+#define EXT9_PIN PB11
+
+#if HAS_TMC_UART
+ // TMC2208/TMC2209 stepper drivers
+ //
+ // Software serial
+ //
+ #define X_SERIAL_TX_PIN EXT0_PIN
+ #define X_SERIAL_RX_PIN EXT0_PIN
+
+ #define Y_SERIAL_TX_PIN EXT1_PIN
+ #define Y_SERIAL_RX_PIN EXT1_PIN
+
+ #define Z_SERIAL_TX_PIN EXT2_PIN
+ #define Z_SERIAL_RX_PIN EXT2_PIN
+
+ #define E0_SERIAL_TX_PIN EXT3_PIN
+ #define E0_SERIAL_RX_PIN EXT3_PIN
+
+ #define E1_SERIAL_RX_PIN EXT4_PIN
+ #define E1_SERIAL_TX_PIN EXT4_PIN
+
+ #define Z2_SERIAL_RX_PIN EXT4_PIN
+ #define Z2_SERIAL_TX_PIN EXT4_PIN
+
+ #define TMC_BAUD_RATE 19200
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_BEAST.h b/Marlin/src/pins/stm32f4/pins_BEAST.h
new file mode 100644
index 0000000000..5be4368789
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BEAST.h
@@ -0,0 +1,285 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if !defined(__STM32F1__) && !defined(__STM32F4__)
+ #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 21017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME "Beast STM32"
+#define DEFAULT_MACHINE_NAME "STM32F103RET6"
+
+// Enable I2C_EEPROM for testing
+#define I2C_EEPROM
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Steppers
+//
+#define X_STEP_PIN PE0
+#define X_DIR_PIN PE1
+#define X_ENABLE_PIN PC0
+#define X_MIN_PIN PD5
+#define X_MAX_PIN -1
+
+#define Y_STEP_PIN PE2
+#define Y_DIR_PIN PE3
+#define Y_ENABLE_PIN PC1
+#define Y_MIN_PIN PD6
+#define Y_MAX_PIN
+
+#define Z_STEP_PIN PE4
+#define Z_DIR_PIN PE5
+#define Z_ENABLE_PIN PC2
+#define Z_MIN_PIN PD7
+#define Z_MAX_PIN -1
+
+#define Y2_STEP_PIN -1
+#define Y2_DIR_PIN -1
+#define Y2_ENABLE_PIN -1
+
+#define Z2_STEP_PIN -1
+#define Z2_DIR_PIN -1
+#define Z2_ENABLE_PIN -1
+
+#define E0_STEP_PIN PE6
+#define E0_DIR_PIN PE7
+#define E0_ENABLE_PIN PC3
+
+/**
+ * TODO: Currently using same Enable pin to all steppers.
+ */
+
+#define E1_STEP_PIN PE8
+#define E1_DIR_PIN PE9
+#define E1_ENABLE_PIN PC4
+
+#define E2_STEP_PIN PE10
+#define E2_DIR_PIN PE11
+#define E2_ENABLE_PIN PC5
+
+//
+// Misc. Functions
+//
+#define SDSS PA15
+#define LED_PIN PB2
+
+#define PS_ON_PIN -1
+#define KILL_PIN -1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PD12 // EXTRUDER 1
+#define HEATER_1_PIN PD13
+#define HEATER_2_PIN PD14
+
+#define HEATER_BED_PIN PB9 // BED
+#define HEATER_BED2_PIN -1 // BED2
+#define HEATER_BED3_PIN -1 // BED3
+
+#ifndef FAN_PIN
+ #define FAN_PIN PB10
+#endif
+
+#define FAN_SOFT_PWM
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN PA0 // Analog Input
+#define TEMP_0_PIN PA1 // Analog Input
+#define TEMP_1_PIN PA2 // Analog Input
+#define TEMP_2_PIN PA3 // Analog Input
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+ #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #elif BOTH(NEWPANEL, PANEL_ONE)
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #else
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
+ #if DISABLED(NEWPANEL)
+ #define BEEPER_PIN 33
+ // Buttons attached to a shift register
+ // Not wired yet
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
+ #endif
+ #endif
+
+ #if ENABLED(NEWPANEL)
+
+ #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+ #define BEEPER_PIN 37
+
+ #define BTN_EN1 31
+ #define BTN_EN2 33
+ #define BTN_ENC 35
+
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
+
+ #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+ #define LCD_BACKLIGHT_PIN 39
+ #endif
+
+ #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SD_DETECT_PIN 42
+
+ #elif ENABLED(LCD_I2C_PANELOLU2)
+
+ #define BTN_EN1 47
+ #define BTN_EN2 43
+ #define BTN_ENC 32
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN -1
+ #define KILL_PIN 41
+
+ #elif ENABLED(LCD_I2C_VIKI)
+
+ #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+ #define BTN_ENC -1
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN 49
+
+ #elif ANY(VIKI2, miniVIKI)
+
+ #define BEEPER_PIN 33
+
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 45
+ #define LCD_SCREEN_ROT_180
+
+ #define BTN_EN1 22
+ #define BTN_EN2 7
+ #define BTN_ENC 39
+
+ #define SDSS 53
+ #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
+
+ #define KILL_PIN 31
+
+ #define STAT_LED_RED_PIN 32
+ #define STAT_LED_BLUE_PIN 35
+
+ #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+
+ #define BTN_EN1 35
+ #define BTN_EN2 37
+ #define BTN_ENC 31
+ #define SD_DETECT_PIN 49
+ #define LCD_SDSS 53
+ #define KILL_PIN 41
+ #define BEEPER_PIN 23
+ #define DOGLCD_CS 29
+ #define DOGLCD_A0 27
+ #define LCD_BACKLIGHT_PIN 33
+
+ #elif ENABLED(MINIPANEL)
+
+ #define BEEPER_PIN 42
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 66
+ #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+ #define SDSS 53
+
+ #define KILL_PIN 64
+ // GLCD features
+ // Uncomment screen orientation
+ //#define LCD_SCREEN_ROT_90
+ //#define LCD_SCREEN_ROT_180
+ //#define LCD_SCREEN_ROT_270
+ // The encoder and click button
+ #define BTN_EN1 40
+ #define BTN_EN2 63
+ #define BTN_ENC 59
+ // not connected to a pin
+ #define SD_DETECT_PIN 49
+
+ #else
+
+ // Beeper on AUX-4
+ #define BEEPER_PIN 33
+
+ // Buttons directly attached to AUX-2
+ #if ENABLED(REPRAPWORLD_KEYPAD)
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
+ #elif ENABLED(PANEL_ONE)
+ #define BTN_EN1 59 // AUX2 PIN 3
+ #define BTN_EN2 63 // AUX2 PIN 4
+ #define BTN_ENC 49 // AUX3 PIN 7
+ #else
+ #define BTN_EN1 37
+ #define BTN_EN2 35
+ #define BTN_ENC 31
+ #endif
+
+ #if ENABLED(G3D_PANEL)
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
+ #else
+ //#define SD_DETECT_PIN -1 // Ramps doesn't use this
+ #endif
+
+ #endif
+ #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
new file mode 100644
index 0000000000..170b90368b
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@@ -0,0 +1,155 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * STM32F407VET6 with RAMPS-like shield
+ * 'Black' STM32F407VET6 board - http://wiki.stm32duino.com/index.php?title=STM32F407
+ * Shield - https://github.com/jmz52/Hardware
+ */
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
+#endif
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "Black STM32F4VET6"
+#endif
+
+#define DEFAULT_MACHINE_NAME "STM32F407VET6"
+
+//#define I2C_EEPROM
+//#define E2END 0x1FFF // 8KB
+#define SRAM_EEPROM_EMULATION
+
+//
+// Servos
+//
+#define SERVO0_PIN PC6
+#define SERVO1_PIN PC7
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PC13
+#define X_MAX_PIN PA15
+#define Y_MIN_PIN PA5
+#define Y_MAX_PIN PD12
+#define Z_MIN_PIN PD14
+#define Z_MAX_PIN PD15
+
+//
+// Steppers
+//
+#define X_STEP_PIN PC4
+#define X_DIR_PIN PA4
+#define X_ENABLE_PIN PE7
+
+#define Y_STEP_PIN PE5
+#define Y_DIR_PIN PE2
+#define Y_ENABLE_PIN PE6
+
+#define Z_STEP_PIN PD5
+#define Z_DIR_PIN PD3
+#define Z_ENABLE_PIN PD6
+
+#define E0_STEP_PIN PD7
+#define E0_DIR_PIN PD0
+#define E0_ENABLE_PIN PB9
+
+#define E1_STEP_PIN PE0
+#define E1_DIR_PIN PE1
+#define E1_ENABLE_PIN PB8
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC0 // T0
+#define TEMP_1_PIN PC1 // T1
+#define TEMP_BED_PIN PC2 // TB
+
+#ifndef TEMP_CHAMBER_PIN
+ #define TEMP_CHAMBER_PIN PC3 // TC
+#endif
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PA2 // Heater0
+#define HEATER_1_PIN PA3 // Heater1
+#define HEATER_BED_PIN PA1 // Hotbed
+
+#define FAN_PIN PE9 // Fan0
+#define FAN1_PIN PE11 // Fan1
+#define FAN2_PIN PE13 // Fan2
+#define FAN3_PIN PE14 // Fan3
+
+//
+// Misc. Functions
+//
+#define LED_PIN PA6
+//#define LED_PIN PA7
+#define KILL_PIN PB1
+
+//
+// LCD / Controller
+//
+//#define SD_DETECT_PIN PC5
+//#define SD_DETECT_PIN PA8 // SDIO SD_DETECT_PIN, external SDIO card reader only
+
+#define BEEPER_PIN PD10
+#define LCD_PINS_RS PE15
+#define LCD_PINS_ENABLE PD8
+#define LCD_PINS_D4 PE10
+#define LCD_PINS_D5 PE12
+#define LCD_PINS_D6 PD1
+#define LCD_PINS_D7 PE8
+#define BTN_ENC PD9
+#define BTN_EN1 PD4
+#define BTN_EN2 PD13
+
+#define DOGLCD_CS LCD_PINS_D5
+#define DOGLCD_A0 LCD_PINS_D6
+
+//
+// Onboard SD support
+//
+#define SDIO_D0_PIN PC8
+#define SDIO_D1_PIN PC9
+#define SDIO_D2_PIN PC10
+#define SDIO_D3_PIN PC11
+#define SDIO_CK_PIN PC12
+#define SDIO_CMD_PIN PD2
+
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+ #define SDIO_SUPPORT // Use SDIO for onboard SD
+
+ #ifndef SDIO_SUPPORT
+ #define SOFTWARE_SPI // Use soft SPI for onboard SD
+ #define SDSS SDIO_D3_PIN
+ #define SCK_PIN SDIO_CK_PIN
+ #define MISO_PIN SDIO_D0_PIN
+ #define MOSI_PIN SDIO_CMD_PIN
+ #endif
+#endif
diff --git a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
similarity index 52%
rename from Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
rename to Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
index 6b8d64dd67..ee5c4da1fe 100644
--- a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -30,8 +30,8 @@
#define BOARD_INFO_NAME "BIGTREE Btt002 1.0"
// Use one of these or SDCard-based Emulation will be used
-//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
-#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
+//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
+#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
// Ignore temp readings during development.
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
@@ -39,60 +39,60 @@
//
// Limit Switches
//
-#define X_STOP_PIN PD3
-#define Y_STOP_PIN PD2
-#define Z_STOP_PIN PD1 // Shares J4 connector with PC3
+#define X_STOP_PIN PD3
+#define Y_STOP_PIN PD2
+#define Z_STOP_PIN PD1 // Shares J4 connector with PC3
//
// Z Probe must be this pin
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN PD1
+ #define Z_MIN_PROBE_PIN PD1
#endif
//
// Filament Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PA15
+ #define FIL_RUNOUT_PIN PA15
#endif
//
// Power Loss Detection
//
#ifndef POWER_LOSS_PIN
- #define POWER_LOSS_PIN PD4
+ #define POWER_LOSS_PIN PD4
#endif
//
// Steppers
//
-#define X_STEP_PIN PA9
-#define X_DIR_PIN PA10
-#define X_ENABLE_PIN PA8
+#define X_STEP_PIN PA9
+#define X_DIR_PIN PA10
+#define X_ENABLE_PIN PA8
#ifndef X_CS_PIN
- #define X_CS_PIN PE2
+ #define X_CS_PIN PE2
#endif
-#define Y_STEP_PIN PC8
-#define Y_DIR_PIN PC9
-#define Y_ENABLE_PIN PC7
+#define Y_STEP_PIN PC8
+#define Y_DIR_PIN PC9
+#define Y_ENABLE_PIN PC7
#ifndef Y_CS_PIN
- #define Y_CS_PIN PE3
+ #define Y_CS_PIN PE3
#endif
-#define Z_STEP_PIN PD15
-#define Z_DIR_PIN PC6
-#define Z_ENABLE_PIN PD14
+#define Z_STEP_PIN PD15
+#define Z_DIR_PIN PC6
+#define Z_ENABLE_PIN PD14
#ifndef Z_CS_PIN
- #define Z_CS_PIN PE4
+ #define Z_CS_PIN PE4
#endif
-#define E0_STEP_PIN PD12
-#define E0_DIR_PIN PD13
-#define E0_ENABLE_PIN PD11
+#define E0_STEP_PIN PD12
+#define E0_DIR_PIN PD13
+#define E0_ENABLE_PIN PD11
#ifndef E0_CS_PIN
- #define E0_CS_PIN PD7
+ #define E0_CS_PIN PD7
#endif
//
@@ -100,17 +100,17 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PB15
+ #define TMC_SW_MOSI PB15
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO PB14
+ #define TMC_SW_MISO PB14
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK PB13
+ #define TMC_SW_SCK PB13
#endif
#endif
-#if HAS_TMC220x
+#if HAS_TMC_UART
/**
* TMC2208/TMC2209 stepper drivers
*
@@ -132,17 +132,17 @@
//
// Software serial ##
//
- #define X_SERIAL_TX_PIN PE2
- #define X_SERIAL_RX_PIN PE2
+ #define X_SERIAL_TX_PIN PE2
+ #define X_SERIAL_RX_PIN PE2
- #define Y_SERIAL_TX_PIN PE3
- #define Y_SERIAL_RX_PIN PE3
+ #define Y_SERIAL_TX_PIN PE3
+ #define Y_SERIAL_RX_PIN PE3
- #define Z_SERIAL_TX_PIN PE4
- #define Z_SERIAL_RX_PIN PE4
+ #define Z_SERIAL_TX_PIN PE4
+ #define Z_SERIAL_RX_PIN PE4
- #define E0_SERIAL_TX_PIN PD7
- #define E0_SERIAL_RX_PIN PD7
+ #define E0_SERIAL_TX_PIN PD7
+ #define E0_SERIAL_RX_PIN PD7
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
@@ -151,32 +151,32 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN PA2 // T0 <-> E0
-#define TEMP_1_PIN PA0 // T1 <-> E1
-#define TEMP_BED_PIN PA1 // T2 <-> Bed
-#define TEMP_PROBE_PIN PC3 // Shares J4 connector with PD1
+#define TEMP_0_PIN PA2 // T0 <-> E0
+#define TEMP_1_PIN PA0 // T1 <-> E1
+#define TEMP_BED_PIN PA1 // T2 <-> Bed
+#define TEMP_PROBE_PIN PC3 // Shares J4 connector with PD1
//
// Heaters / Fans
//
-#define HEATER_0_PIN PE6 // Heater0
-#define HEATER_BED_PIN PE5 // Hotbed
-#define FAN_PIN PB8 // Fan1
-#define FAN1_PIN PB9 // Fan0
+#define HEATER_0_PIN PE6 // Heater0
+#define HEATER_BED_PIN PE5 // Hotbed
+#define FAN_PIN PB8 // Fan1
+#define FAN1_PIN PB9 // Fan0
// HAL SPI1 pins
#define CUSTOM_SPI_PINS
#if ENABLED(CUSTOM_SPI_PINS)
- #define SCK_PIN PA5 // SPI1 SCLK
- #define SS_PIN PA4 // SPI1 SSEL
- #define MISO_PIN PA6 // SPI1 MISO
- #define MOSI_PIN PA7 // SPI1 MOSI
+ #define SCK_PIN PA5 // SPI1 SCLK
+ #define SS_PIN PA4 // SPI1 SSEL
+ #define MISO_PIN PA6 // SPI1 MISO
+ #define MOSI_PIN PA7 // SPI1 MOSI
#endif
//
// Misc. Functions
//
-#define SDSS PA4
+#define SDSS PA4
/**
* -------------------------------------BTT002 V1.0-----------------------------------------------
@@ -194,35 +194,35 @@
// LCDs and Controllers
//
#if HAS_SPI_LCD
- #define BEEPER_PIN PE7
- #define BTN_ENC PB1
+ #define BEEPER_PIN PE7
+ #define BTN_ENC PB1
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS PE12
+ #define LCD_PINS_RS PE12
- #define BTN_EN1 PE9
- #define BTN_EN2 PE10
+ #define BTN_EN1 PE9
+ #define BTN_EN2 PE10
- #define LCD_PINS_ENABLE PE13
- #define LCD_PINS_D4 PE11
+ #define LCD_PINS_ENABLE PE13
+ #define LCD_PINS_D4 PE11
#else
- #define LCD_PINS_RS PE8
+ #define LCD_PINS_RS PE8
- #define BTN_EN1 PC5
- #define BTN_EN2 PB0
- #define SD_DETECT_PIN PC4
+ #define BTN_EN1 PC5
+ #define BTN_EN2 PB0
+ #define SD_DETECT_PIN PC4
- #define LCD_SDSS PA4
+ #define LCD_SDSS PA4
- #define LCD_PINS_ENABLE PE9
- #define LCD_PINS_D4 PE10
+ #define LCD_PINS_ENABLE PE9
+ #define LCD_PINS_D4 PE10
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PE11
- #define LCD_PINS_D6 PE12
- #define LCD_PINS_D7 PE13
+ #define LCD_PINS_D5 PE11
+ #define LCD_PINS_D6 PE12
+ #define LCD_PINS_D7 PE13
#endif
#endif
@@ -240,14 +240,14 @@
// RGB LEDs
//
#ifndef RGB_LED_R_PIN
- #define RGB_LED_R_PIN PB5
+ #define RGB_LED_R_PIN PB5
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN PB4
+ #define RGB_LED_G_PIN PB4
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN PB3
+ #define RGB_LED_B_PIN PB3
#endif
#ifndef RGB_LED_W_PIN
- #define RGB_LED_W_PIN -1
+ #define RGB_LED_W_PIN -1
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
new file mode 100644
index 0000000000..ac8b731aae
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -0,0 +1,391 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef TARGET_STM32F4
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 8 || E_STEPPERS > 8
+ #error "BIGTREE GTR V1.0 supports up to 8 hotends / E-steppers."
+#elif HOTENDS > MAX_EXTRUDERS || E_STEPPERS > MAX_EXTRUDERS
+ #error "Marlin extruder/hotends limit! Increase MAX_EXTRUDERS to continue."
+#endif
+
+#define BOARD_INFO_NAME "BIGTREE GTR 1.0"
+
+// Use one of these or SDCard-based Emulation will be used
+//#define I2C_EEPROM
+//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
+//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
+
+#define TP // Enable to define servo and probe pins
+
+//
+// Servos
+//
+#if ENABLED(TP)
+ #define SERVO0_PIN PB11
+#endif
+
+#define PS_ON_PIN PH6
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PF2
+#define X_MAX_PIN PG14
+#define Y_MIN_PIN PC13
+#define Y_MAX_PIN PG9
+#define Z_MIN_PIN PE0
+#define Z_MAX_PIN PD3
+
+//
+// Pins on the extender
+//
+//#define X_MIN_PIN PI4
+//#define X2_MIN_PIN PF12
+//#define Y_MIN_PIN PF4
+//#define Y2_MIN_PIN PI7
+//#define Z_MIN_PIN PF6
+
+#if ENABLED(TP) && !defined(Z_MIN_PROBE_PIN)
+ #define Z_MIN_PROBE_PIN PH11 // Z Probe must be PH11
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN PC15
+#define X_DIR_PIN PF0
+#define X_ENABLE_PIN PF1
+#ifndef X_CS_PIN
+ #define X_CS_PIN PC14
+#endif
+
+#define Y_STEP_PIN PE3
+#define Y_DIR_PIN PE2
+#define Y_ENABLE_PIN PE4
+#ifndef Y_CS_PIN
+ #define Y_CS_PIN PE1
+#endif
+
+#define Z_STEP_PIN PB8
+#define Z_DIR_PIN PB7 // PB7
+#define Z_ENABLE_PIN PB9
+#ifndef Z_CS_PIN
+ #define Z_CS_PIN PB5
+#endif
+
+#define E0_STEP_PIN PG12
+#define E0_DIR_PIN PG11
+#define E0_ENABLE_PIN PG13
+#ifndef E0_CS_PIN
+ #define E0_CS_PIN PG10
+#endif
+
+#define E1_STEP_PIN PD6
+#define E1_DIR_PIN PD5
+#define E1_ENABLE_PIN PD7
+#ifndef E1_CS_PIN
+ #define E1_CS_PIN PD4
+#endif
+
+#define E2_STEP_PIN PD1
+#define E2_DIR_PIN PD0
+#define E2_ENABLE_PIN PD2
+#ifndef E2_CS_PIN
+ #define E2_CS_PIN PC12
+#endif
+
+#define E3_STEP_PIN PF3
+#define E3_DIR_PIN PG3
+#define E3_ENABLE_PIN PF8
+#ifndef E3_CS_PIN
+ #define E3_CS_PIN PG4
+#endif
+
+#define E4_STEP_PIN PD14
+#define E4_DIR_PIN PD11
+#define E4_ENABLE_PIN PG2
+#ifndef E4_CS_PIN
+ #define E4_CS_PIN PE15
+#endif
+
+#define E5_STEP_PIN PE12
+#define E5_DIR_PIN PE10
+#define E5_ENABLE_PIN PF14
+#ifndef E5_CS_PIN
+ #define E5_CS_PIN PE7
+#endif
+
+#define E6_STEP_PIN PG0
+#define E6_DIR_PIN PG1
+#define E6_ENABLE_PIN PE8
+#ifndef E6_CS_PIN
+ #define E6_CS_PIN PF15
+#endif
+
+#define E7_STEP_PIN PH12
+#define E7_DIR_PIN PH15
+#define E7_ENABLE_PIN PI0
+#ifndef E7_CS_PIN
+ #define E7_CS_PIN PH14
+#endif
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+ #ifndef TMC_SW_MOSI
+ #define TMC_SW_MOSI PG15
+ #endif
+ #ifndef TMC_SW_MISO
+ #define TMC_SW_MISO PB6
+ #endif
+ #ifndef TMC_SW_SCK
+ #define TMC_SW_SCK PB3
+ #endif
+#endif
+
+#if HAS_TMC_UART
+ /**
+ * TMC2208/TMC2209 stepper drivers
+ *
+ * Hardware serial communication ports.
+ * If undefined software serial is used according to the pins below
+ */
+ //#define X_HARDWARE_SERIAL Serial
+ //#define X2_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
+ //#define Y2_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
+ //#define Z2_HARDWARE_SERIAL Serial1
+ //#define E0_HARDWARE_SERIAL Serial1
+ //#define E1_HARDWARE_SERIAL Serial1
+ //#define E2_HARDWARE_SERIAL Serial1
+ //#define E3_HARDWARE_SERIAL Serial1
+ //#define E4_HARDWARE_SERIAL Serial1
+ //#define E5_HARDWARE_SERIAL Serial1
+ //#define E6_HARDWARE_SERIAL Serial1
+ //#define E7_HARDWARE_SERIAL Serial1
+
+ //
+ // Software serial
+ //
+ #define X_SERIAL_TX_PIN PC14
+ #define X_SERIAL_RX_PIN PC14
+
+ #define Y_SERIAL_TX_PIN PE1
+ #define Y_SERIAL_RX_PIN PE1
+
+ #define Z_SERIAL_TX_PIN PB5
+ #define Z_SERIAL_RX_PIN PB5
+
+ #define E0_SERIAL_TX_PIN PG10
+ #define E0_SERIAL_RX_PIN PG10
+
+ #define E1_SERIAL_TX_PIN PD4
+ #define E1_SERIAL_RX_PIN PD4
+
+ #define E2_SERIAL_TX_PIN PC12
+ #define E2_SERIAL_RX_PIN PC12
+
+ #define E3_SERIAL_TX_PIN PG4
+ #define E3_SERIAL_RX_PIN PG4
+
+ #define E4_SERIAL_TX_PIN PE15
+ #define E4_SERIAL_RX_PIN PE15
+
+ #define E5_SERIAL_TX_PIN PE7
+ #define E5_SERIAL_RX_PIN PE7
+
+ #define E6_SERIAL_TX_PIN PF15
+ #define E6_SERIAL_RX_PIN PF15
+
+ #define E7_SERIAL_TX_PIN PH14
+ #define E7_SERIAL_RX_PIN PH14
+
+ // Reduce baud rate to improve software serial reliability
+ #define TMC_BAUD_RATE 19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC1 // T1 <-> E0
+#define TEMP_1_PIN PC2 // T2 <-> E1
+#define TEMP_2_PIN PC3 // T3 <-> E2
+
+#define TEMP_3_PIN PA3 // T4 <-> E3
+#define TEMP_4_PIN PF9 // T5 <-> E4
+#define TEMP_5_PIN PF10 // T6 <-> E5
+#define TEMP_6_PIN PF7 // T7 <-> E6
+#define TEMP_7_PIN PF5 // T8 <-> E7
+
+#define TEMP_BED_PIN PC0 // T0 <-> Bed
+
+// SPI for Max6675 or Max31855 Thermocouple
+// Uses a separate SPI bus
+// If you have a two-way thermocouple, you can customize two THERMO_CSx_PIN pins (x:1~2)
+
+#define THERMO_SCK_PIN PI1 // SCK
+#define THERMO_DO_PIN PI2 // MISO
+#define THERMO_CS1_PIN PH9 // CS1
+#define THERMO_CS2_PIN PH2 // CS2
+
+#define MAX6675_SS_PIN THERMO_CS1_PIN
+#define MAX6675_SS2_PIN THERMO_CS2_PIN
+#define MAX6675_SCK_PIN THERMO_SCK_PIN
+#define MAX6675_DO_PIN THERMO_DO_PIN
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PB1 // Heater0
+#define HEATER_1_PIN PA1 // Heater1
+#define HEATER_2_PIN PB0 // Heater2
+
+#define HEATER_3_PIN PD15 // Heater3
+#define HEATER_4_PIN PD13 // Heater4
+#define HEATER_5_PIN PD12 // Heater5
+#define HEATER_6_PIN PE13 // Heater6
+#define HEATER_7_PIN PI6 // Heater7
+
+#define HEATER_BED_PIN PA2 // Hotbed
+
+#define FAN_PIN PE5 // Fan0
+#define FAN1_PIN PE6 // Fan1
+#define FAN2_PIN PC8 // Fan2
+
+#define FAN3_PIN PI5 // Fan3
+#define FAN4_PIN PE9 // Fan4
+#define FAN5_PIN PE11 // Fan5
+//#define FAN6_PIN PC9 // Fan6
+//#define FAN7_PIN PE14 // Fan7
+
+//
+// By default the onboard SD (SPI1) is enabled
+//
+#define CUSTOM_SPI_PINS
+#if DISABLED(CUSTOM_SPI_PINS)
+ #define SDSS PB12
+#endif
+
+// HAL SPI1 pins group
+#if ENABLED(CUSTOM_SPI_PINS)
+ #define SDSS PA4
+ #define SD_DETECT_PIN PC4
+ #define LCD_SDSS PA4
+
+ #define SCK_PIN PA5
+ #define MISO_PIN PA6
+ #define MOSI_PIN PA7
+ #define SS_PIN PA4 // Chip select for SD card used by Marlin
+#endif
+
+/**
+ * _____ _____
+ * NC | · · | GND 5V | · · | GND
+ * RESET | · · | PB10(SD_DETECT) (LCD_D7) PG5 | · · | PG6 (LCD_D6)
+ * (MOSI)PB15 | · · | PH10(BTN_EN2) (LCD_D5) PG7 | · · | PG8 (LCD_D4)
+ * (SD_SS)PB12 | · · | PD10(BTN_EN1) (LCD_RS) PA8 | · · | PC10 (LCD_EN)
+ * (SCK)PB13 | · · | PB14(MISO) (BTN_ENC) PA15 | · · | PC11 (BEEPER)
+ * ￣￣ ￣￣
+ * EXP2 EXP1
+ */
+
+//
+// LCDs and Controllers
+//
+#if HAS_SPI_LCD
+ #define BEEPER_PIN PC11
+ #define BTN_ENC PA15
+
+ #if ENABLED(CR10_STOCKDISPLAY)
+
+ #define LCD_PINS_RS PA8
+
+ #define BTN_EN1 PD10
+ #define BTN_EN2 PH10
+
+ #define LCD_PINS_ENABLE PG7
+ #define LCD_PINS_D4 PG8
+
+ //#undef ST7920_DELAY_1
+ //#undef ST7920_DELAY_2
+ //#undef ST7920_DELAY_3
+
+ #else
+
+ #define LCD_PINS_RS PA8
+
+ #define BTN_EN1 PD10
+ #define BTN_EN2 PH10
+
+ #if DISABLED(CUSTOM_SPI_PINS)
+ #define SD_DETECT_PIN PB10
+ #define LCD_SDSS PB12
+ #endif
+
+ #define LCD_PINS_ENABLE PC10
+ #define LCD_PINS_D4 PG8
+
+ #if ENABLED(FYSETC_MINI_12864)
+ #define DOGLCD_CS PC10
+ #define DOGLCD_A0 PA8
+ //#define LCD_BACKLIGHT_PIN -1
+ #define LCD_RESET_PIN PG8 // Must be high or open for LCD to operate normally.
+ #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+ #ifndef RGB_LED_R_PIN
+ #define RGB_LED_R_PIN PG7
+ #endif
+ #ifndef RGB_LED_G_PIN
+ #define RGB_LED_G_PIN PG6
+ #endif
+ #ifndef RGB_LED_B_PIN
+ #define RGB_LED_B_PIN PG5
+ #endif
+ #elif ENABLED(FYSETC_MINI_12864_2_1)
+ #define NEOPIXEL_PIN PF13
+ #endif
+ #endif // !FYSETC_MINI_12864
+
+ #if ENABLED(ULTIPANEL)
+ #define LCD_PINS_D5 PG7
+ #define LCD_PINS_D6 PG6
+ #define LCD_PINS_D7 PG5
+ #endif
+
+ #endif
+
+ // Alter timing for graphical display
+ #if HAS_GRAPHICAL_LCD
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+ #endif
+
+ //#define DOGLCD_CS PB12
+ //#define DOGLCD_A0 PA8
+ //#define LCD_PINS_DC PB14
+ //#define DOGLCD_MOSI PB15
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
new file mode 100644
index 0000000000..4dbdf0e77f
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
@@ -0,0 +1,284 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef TARGET_STM32F4
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+ #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "BIGTREE SKR Pro 1.1" // redefined?
+
+// Use one of these or SDCard-based Emulation will be used
+//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
+//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
+
+//
+// Servos
+//
+#define SERVO0_PIN PA1
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PB10
+#define X_MAX_PIN PE15
+#define Y_MIN_PIN PE12
+#define Y_MAX_PIN PE10
+#define Z_MIN_PIN PG8
+#define Z_MAX_PIN PG5
+
+//
+// Z Probe must be this pins
+//
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN PA2
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN PE9
+#define X_DIR_PIN PF1
+#define X_ENABLE_PIN PF2
+#ifndef X_CS_PIN
+ #define X_CS_PIN PA15
+#endif
+
+#define Y_STEP_PIN PE11
+#define Y_DIR_PIN PE8
+#define Y_ENABLE_PIN PD7
+ #ifndef Y_CS_PIN
+ #define Y_CS_PIN PB8
+#endif
+
+#define Z_STEP_PIN PE13
+#define Z_DIR_PIN PC2
+#define Z_ENABLE_PIN PC0
+#ifndef Z_CS_PIN
+ #define Z_CS_PIN PB9
+#endif
+
+#define E0_STEP_PIN PE14
+#define E0_DIR_PIN PA0
+#define E0_ENABLE_PIN PC3
+#ifndef E0_CS_PIN
+ #define E0_CS_PIN PB3
+#endif
+
+#define E1_STEP_PIN PD15
+#define E1_DIR_PIN PE7
+#define E1_ENABLE_PIN PA3
+#ifndef E1_CS_PIN
+ #define E1_CS_PIN PG15
+#endif
+
+#define E2_STEP_PIN PD13
+#define E2_DIR_PIN PG9
+#define E2_ENABLE_PIN PF0
+#ifndef E2_CS_PIN
+ #define E2_CS_PIN PG12
+#endif
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+ #ifndef TMC_SW_MOSI
+ #define TMC_SW_MOSI PC12
+ #endif
+ #ifndef TMC_SW_MISO
+ #define TMC_SW_MISO PC11
+ #endif
+ #ifndef TMC_SW_SCK
+ #define TMC_SW_SCK PC10
+ #endif
+#endif
+
+#if HAS_TMC_UART
+ /**
+ * TMC2208/TMC2209 stepper drivers
+ *
+ * Hardware serial communication ports.
+ * If undefined software serial is used according to the pins below
+ */
+ //#define X_HARDWARE_SERIAL Serial
+ //#define X2_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
+ //#define Y2_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
+ //#define Z2_HARDWARE_SERIAL Serial1
+ //#define E0_HARDWARE_SERIAL Serial1
+ //#define E1_HARDWARE_SERIAL Serial1
+ //#define E2_HARDWARE_SERIAL Serial1
+ //#define E3_HARDWARE_SERIAL Serial1
+ //#define E4_HARDWARE_SERIAL Serial1
+
+ //
+ // Software serial
+ //
+ #define X_SERIAL_TX_PIN PC13
+ #define X_SERIAL_RX_PIN PC13
+
+ #define Y_SERIAL_TX_PIN PE3
+ #define Y_SERIAL_RX_PIN PE3
+
+ #define Z_SERIAL_TX_PIN PE1
+ #define Z_SERIAL_RX_PIN PE1
+
+ #define E0_SERIAL_TX_PIN PD4
+ #define E0_SERIAL_RX_PIN PD4
+
+ #define E1_SERIAL_TX_PIN PD1
+ #define E1_SERIAL_RX_PIN PD1
+
+ #define E2_SERIAL_TX_PIN PD6
+ #define E2_SERIAL_RX_PIN PD6
+
+ // Reduce baud rate to improve software serial reliability
+ #define TMC_BAUD_RATE 19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PF4 // T1 <-> E0
+#define TEMP_1_PIN PF5 // T2 <-> E1
+#define TEMP_2_PIN PF6 // T3 <-> E2
+#define TEMP_BED_PIN PF3 // T0 <-> Bed
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PB1 // Heater0
+#define HEATER_1_PIN PD14 // Heater1
+#define HEATER_2_PIN PB0 // Heater1
+#define HEATER_BED_PIN PD12 // Hotbed
+#define FAN_PIN PC8 // Fan0
+#define FAN1_PIN PE5 // Fan1
+#define FAN2_PIN PE6 // Fan2
+
+//
+// Misc. Functions
+//
+
+#ifndef SDCARD_CONNECTION
+ #define SDCARD_CONNECTION LCD
+#endif
+
+//
+// Onboard SD card
+// NOT compatible with LCD
+//
+#if SDCARD_CONNECTION == ONBOARD && !HAS_SPI_LCD
+ #define SOFTWARE_SPI // Use soft SPI for onboard SD
+ #define SDSS PA4
+ #define SCK_PIN PA5
+ #define MISO_PIN PA6
+ #define MOSI_PIN PB5
+#else
+ #define SDSS PB12
+#endif
+
+/**
+ * _____ _____
+ * NC | · · | GND 5V | · · | GND
+ * RESET | · · | PF12(SD_DETECT) (LCD_D7) PG7 | · · | PG6 (LCD_D6)
+ * (MOSI)PB15 | · · | PF11(BTN_EN2) (LCD_D5) PG3 | · · | PG2 (LCD_D4)
+ * (SD_SS)PB12 | · · | PG10(BTN_EN1) (LCD_RS) PD10 | · · | PD11 (LCD_EN)
+ * (SCK)PB13 | · · | PB14(MISO) (BTN_ENC) PA8 | · · | PG4 (BEEPER)
+ * ￣￣ ￣￣
+ * EXP2 EXP1
+ */
+
+//
+// LCDs and Controllers
+//
+#if HAS_SPI_LCD
+ #define BEEPER_PIN PG4
+ #define BTN_ENC PA8
+
+ #if ENABLED(CR10_STOCKDISPLAY)
+ #define LCD_PINS_RS PG6
+
+ #define BTN_EN1 PD11
+ #define BTN_EN2 PG2
+
+ #define LCD_PINS_ENABLE PG7
+ #define LCD_PINS_D4 PG3
+
+ // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
+ // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
+ #undef ST7920_DELAY_1
+ #undef ST7920_DELAY_2
+ #undef ST7920_DELAY_3
+
+ #else
+
+ #define LCD_PINS_RS PD10
+
+ #define BTN_EN1 PG10
+ #define BTN_EN2 PF11
+ #define SD_DETECT_PIN PF12
+
+ #define LCD_SDSS PB12
+
+ #define LCD_PINS_ENABLE PD11
+ #define LCD_PINS_D4 PG2
+
+ #if ENABLED(FYSETC_MINI_12864)
+ #define DOGLCD_CS PD11
+ #define DOGLCD_A0 PD10
+ //#define LCD_BACKLIGHT_PIN -1
+ #define LCD_RESET_PIN PG2 // Must be high or open for LCD to operate normally.
+ #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+ #ifndef RGB_LED_R_PIN
+ #define RGB_LED_R_PIN PG3
+ #endif
+ #ifndef RGB_LED_G_PIN
+ #define RGB_LED_G_PIN PG6
+ #endif
+ #ifndef RGB_LED_B_PIN
+ #define RGB_LED_B_PIN PG7
+ #endif
+ #elif ENABLED(FYSETC_MINI_12864_2_1)
+ #define NEOPIXEL_PIN PG3
+ #endif
+ #endif // !FYSETC_MINI_12864
+
+ #if ENABLED(ULTIPANEL)
+ #define LCD_PINS_D5 PG3
+ #define LCD_PINS_D6 PG6
+ #define LCD_PINS_D7 PG7
+ #endif
+
+ #endif
+
+ // Alter timing for graphical display
+ #if HAS_GRAPHICAL_LCD
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+ #endif
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
new file mode 100644
index 0000000000..8205cd9f4d
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -0,0 +1,265 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 6 || E_STEPPERS > 6
+ #error "FLYF407ZG supports up to 6 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "FLYF407ZG"
+#define BOARD_WEBSITE_URL "github.com/FLYmaker/FLYF407ZG"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#undef E2END
+#define E2END 0xFFF // 4KB
+
+//
+// Servos
+//
+#define SERVO0_PIN PE11
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PC3
+#define X_MAX_PIN PC2
+#define Y_MIN_PIN PF2
+#define Y_MAX_PIN PF1
+#define Z_MIN_PIN PF0
+#define Z_MAX_PIN PC15
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#define Z_MIN_PROBE_PIN PC14 // Z3_PIN
+
+//
+// Steppers
+//
+
+#define X_STEP_PIN PB9
+#define X_DIR_PIN PE0
+#define X_ENABLE_PIN PE1
+#ifndef X_CS_PIN
+ #define X_CS_PIN PG13
+#endif
+
+#define Y_STEP_PIN PB8
+#define Y_DIR_PIN PG11
+#define Y_ENABLE_PIN PG12
+#ifndef Y_CS_PIN
+ #define Y_CS_PIN PG10
+#endif
+
+#define Z_STEP_PIN PA8
+#define Z_DIR_PIN PD6
+#define Z_ENABLE_PIN PD7
+#ifndef Z_CS_PIN
+ #define Z_CS_PIN PD5
+#endif
+
+#define E0_STEP_PIN PC7
+#define E0_DIR_PIN PD3
+#define E0_ENABLE_PIN PD4
+#ifndef E0_CS_PIN
+ #define E0_CS_PIN PD1
+#endif
+
+#define E1_STEP_PIN PC6
+#define E1_DIR_PIN PA15
+#define E1_ENABLE_PIN PD0
+#ifndef E1_CS_PIN
+ #define E1_CS_PIN PA14
+#endif
+
+#define E2_STEP_PIN PD15
+#define E2_DIR_PIN PG7
+#define E2_ENABLE_PIN PG8
+#ifndef E2_CS_PIN
+ #define E2_CS_PIN PG6
+#endif
+
+#define E3_STEP_PIN PD14
+#define E3_DIR_PIN PG4
+#define E3_ENABLE_PIN PG5
+#ifndef E3_CS_PIN
+ #define E3_CS_PIN PG3
+#endif
+
+#define E4_STEP_PIN PD13
+#define E4_DIR_PIN PD11
+#define E4_ENABLE_PIN PG2
+#ifndef E4_CS_PIN
+ #define E4_CS_PIN PD10
+#endif
+
+#define E5_STEP_PIN PD12
+#define E5_DIR_PIN PD8
+#define E5_ENABLE_PIN PD9
+#ifndef E5_CS_PIN
+ #define E5_CS_PIN PB12
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PA0 // Analog Input
+#define TEMP_1_PIN PC1 // Analog Input
+#define TEMP_2_PIN PC0 // Analog Input
+#define TEMP_3_PIN PF10 // Analog Input
+#define TEMP_4_PIN PF5 // Analog Input
+#define TEMP_5_PIN PF4 // Analog Input
+#define TEMP_BED_PIN PF3 // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PF7
+#define HEATER_1_PIN PF6
+#define HEATER_2_PIN PE6
+#define HEATER_3_PIN PE5
+#define HEATER_4_PIN PE4
+#define HEATER_5_PIN PA2
+#define HEATER_BED_PIN PE2
+
+#ifndef FAN_PIN
+ #define FAN_PIN PF8
+#endif
+#define FAN1_PIN PF9
+#define FAN2_PIN PE3
+#define FAN3_PIN PA1
+#define FAN4_PIN PE13
+#define FAN5_PIN PB11
+
+//
+// Onboard SD support
+//
+
+#define SDIO_D0_PIN PC8
+#define SDIO_D1_PIN PC9
+//#define SD_CARD_DETECT_PIN PC13
+#define SDIO_D2_PIN PC10
+#define SDIO_D3_PIN PC11
+#define SDIO_CK_PIN PC12
+#define SDIO_CMD_PIN PD2
+
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+ #define SDIO_SUPPORT // Use SDIO for onboard SD
+
+ #ifndef SDIO_SUPPORT
+ #define SOFTWARE_SPI // Use soft SPI for onboard SD
+ #define SDSS SDIO_D3_PIN
+ #define SCK_PIN SDIO_CK_PIN
+ #define MISO_PIN SDIO_D0_PIN
+ #define MOSI_PIN SDIO_CMD_PIN
+ #endif
+#endif
+
+//
+// Trinamic Software SPI
+//
+
+#if ENABLED(TMC_USE_SW_SPI)
+ #ifndef TMC_SW_MOSI
+ #define TMC_SW_MOSI PB15
+ #endif
+ #ifndef TMC_SW_MISO
+ #define TMC_SW_MISO PB14
+ #endif
+ #ifndef TMC_SW_SCK
+ #define TMC_SW_SCK PB13
+ #endif
+#endif
+
+//
+// Trinamic Software Serial
+//
+
+#if HAS_TMC_UART
+ #define X_SERIAL_TX_PIN PG13
+ #define X_SERIAL_RX_PIN PG13
+
+ #define Y_SERIAL_TX_PIN PG10
+ #define Y_SERIAL_RX_PIN PG10
+
+ #define Z_SERIAL_TX_PIN PD5
+ #define Z_SERIAL_RX_PIN PD5
+
+ #define E0_SERIAL_TX_PIN PD1
+ #define E0_SERIAL_RX_PIN PD1
+
+ #define E1_SERIAL_TX_PIN PA14
+ #define E1_SERIAL_RX_PIN PA14
+
+ #define E2_SERIAL_TX_PIN PG6
+ #define E2_SERIAL_RX_PIN PG6
+
+ #define E3_SERIAL_TX_PIN PG3
+ #define E3_SERIAL_RX_PIN PG3
+
+ #define E4_SERIAL_TX_PIN PD10
+ #define E4_SERIAL_RX_PIN PD10
+
+ #define E5_SERIAL_TX_PIN PB12
+ #define E5_SERIAL_RX_PIN PB12
+
+#endif
+
+//
+// LCD / Controller
+//
+#define SCK_PIN PB13
+#define MISO_PIN PB14
+#define MOSI_PIN PB15
+#define SDSS PF11
+#define SD_DETECT_PIN PB2
+#define BEEPER_PIN PB10
+#define LCD_PINS_RS PE12
+#define LCD_PINS_ENABLE PE14
+#define LCD_PINS_D4 PE10
+#define LCD_PINS_D5 PE9
+#define LCD_PINS_D6 PE8
+#define LCD_PINS_D7 PE7
+#define BTN_EN1 PC4
+#define BTN_EN2 PC5
+#define BTN_ENC PE15
+
+//
+// Filament runout
+//
+
+#define FIL_RUNOUT_PIN PA3
+
+//
+// ST7920 Delays
+//
+#ifndef ST7920_DELAY_1
+ #define ST7920_DELAY_1 DELAY_NS(96)
+#endif
+#ifndef ST7920_DELAY_2
+ #define ST7920_DELAY_2 DELAY_NS(48)
+#endif
+#ifndef ST7920_DELAY_3
+ #define ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
new file mode 100644
index 0000000000..bdadbe36c2
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -0,0 +1,266 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef STM32F4
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+ #error "RUMBA32 supports up to 3 hotends / E-steppers."
+#endif
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "FYSETC_S6"
+#endif
+#ifndef DEFAULT_MACHINE_NAME
+ #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+#endif
+
+// change the prio to 3 , 2 is for software serial
+//#define TEMP_TIMER_IRQ_PRIO 3
+
+//
+// EEPROM Emulation
+//
+#define FLASH_EEPROM_EMULATION
+#if ENABLED(FLASH_EEPROM_EMULATION)
+ #define FLASH_EEPROM_LEVELING
+#endif
+//#define SRAM_EEPROM_EMULATION
+//#define I2C_EEPROM
+#ifdef I2C_EEPROM
+ #undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
+ #define E2END 0xFFF // 4KB
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN PA3
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PB14
+#define X_MAX_PIN PA1
+#define Y_MIN_PIN PB13
+#define Y_MAX_PIN PA2
+#define Z_MIN_PIN PA0
+#define Z_MAX_PIN PA3
+
+//
+// Filament Sensor
+// share with X_MAX_PIN
+//
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PA1
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN PE11
+#define X_DIR_PIN PE10
+#define X_ENABLE_PIN PE12
+#define X_CS_PIN PE7
+
+#define Y_STEP_PIN PD8
+#define Y_DIR_PIN PB12
+#define Y_ENABLE_PIN PD9
+#define Y_CS_PIN PE15
+
+#define Z_STEP_PIN PD14
+#define Z_DIR_PIN PD13
+#define Z_ENABLE_PIN PD15
+#define Z_CS_PIN PD10
+
+#define E0_STEP_PIN PD5
+#define E0_DIR_PIN PD6
+#define E0_ENABLE_PIN PD4
+#define E0_CS_PIN PD7
+
+#define E1_STEP_PIN PE6
+#define E1_DIR_PIN PC13
+#define E1_ENABLE_PIN PE5
+#define E1_CS_PIN PC14
+
+#define E2_STEP_PIN PE2
+#define E2_DIR_PIN PE4
+#define E2_ENABLE_PIN PE3
+#define E2_CS_PIN PC15
+
+#if HAS_TMC_UART
+ //
+ // TMC2208/TMC2209 stepper drivers
+ //
+
+ //
+ // Software serial
+ //
+ #define X_SERIAL_TX_PIN PE9
+ #define X_SERIAL_RX_PIN PE8
+
+ #define Y_SERIAL_TX_PIN PE14
+ #define Y_SERIAL_RX_PIN PE13
+
+ #define Z_SERIAL_TX_PIN PD11
+ #define Z_SERIAL_RX_PIN PD12
+
+ #define E0_SERIAL_TX_PIN PD3
+ #define E0_SERIAL_RX_PIN PA15
+
+ #define E1_SERIAL_TX_PIN PC4
+ #define E1_SERIAL_RX_PIN PC5
+
+ #define E2_SERIAL_TX_PIN PE1
+ #define E2_SERIAL_RX_PIN PE0
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC0
+#define TEMP_1_PIN PC1
+#define TEMP_2_PIN PC2
+#define TEMP_BED_PIN PC3
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PB3
+#define HEATER_1_PIN PB4
+#define HEATER_2_PIN PB15
+#define HEATER_BED_PIN PC8
+
+#define FAN_PIN PB0
+#define FAN1_PIN PB1
+#define FAN2_PIN PB2
+
+//
+// SPI
+//
+#define SCK_PIN PA5
+#define MISO_PIN PA6
+#define MOSI_PIN PA7
+
+//
+// Misc. Functions
+//
+//#define LED_PIN PB14
+//#define BTN_PIN PC10
+//#define PS_ON_PIN PE11
+//#define KILL_PIN PC5
+
+#define SDSS PA4
+#define SD_DETECT_PIN PB10
+
+//
+// LCD / Controller
+//
+#if HAS_SPI_LCD
+ #define BEEPER_PIN PC9
+ #define BTN_ENC PA8
+
+ #if ENABLED(CR10_STOCKDISPLAY)
+ #define LCD_PINS_RS PD0
+
+ #define BTN_EN1 PC11
+ #define BTN_EN2 PC10
+
+ #define LCD_PINS_ENABLE PD1
+ #define LCD_PINS_D4 PC12
+
+ // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
+ // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
+ #undef ST7920_DELAY_1
+ #undef ST7920_DELAY_2
+ #undef ST7920_DELAY_3
+
+ #else
+
+ #define LCD_PINS_RS PD2
+
+ #define BTN_EN1 PC6
+ #define BTN_EN2 PC7
+
+ #define LCD_SDSS PA4
+
+ #define LCD_PINS_ENABLE PC11
+ #define LCD_PINS_D4 PC10
+
+ #if ENABLED(FYSETC_MINI_12864)
+ // See https://wiki.fysetc.com/Mini12864_Panel
+ #define DOGLCD_CS PC11
+ #define DOGLCD_A0 PD2
+ #if ENABLED(FYSETC_GENERIC_12864_1_1)
+ #define LCD_BACKLIGHT_PIN PD0
+ #endif
+ #define LCD_RESET_PIN PC10 // Must be high or open for LCD to operate normally.
+ #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+ #ifndef RGB_LED_R_PIN
+ #define RGB_LED_R_PIN PC12
+ #endif
+ #ifndef RGB_LED_G_PIN
+ #define RGB_LED_G_PIN PD0
+ #endif
+ #ifndef RGB_LED_B_PIN
+ #define RGB_LED_B_PIN PD1
+ #endif
+ #elif ENABLED(FYSETC_MINI_12864_2_1)
+ #define NEOPIXEL_PIN PC12
+ #endif
+ #endif // !FYSETC_MINI_12864
+
+ #if ENABLED(ULTIPANEL)
+ #define LCD_PINS_D5 PC12
+ #define LCD_PINS_D6 PD0
+ #define LCD_PINS_D7 PD1
+ #endif
+
+ #endif
+
+ // Alter timing for graphical display
+ #if HAS_GRAPHICAL_LCD
+ #ifndef ST7920_DELAY_1
+ #define ST7920_DELAY_1 DELAY_NS(96)
+ #endif
+ #ifndef ST7920_DELAY_2
+ #define ST7920_DELAY_2 DELAY_NS(48)
+ #endif
+ #ifndef ST7920_DELAY_3
+ #define ST7920_DELAY_3 DELAY_NS(600)
+ #endif
+ #endif
+
+#endif // HAS_SPI_LCD
+
+#ifndef RGB_LED_R_PIN
+ #define RGB_LED_R_PIN PB6
+#endif
+#ifndef RGB_LED_G_PIN
+ #define RGB_LED_G_PIN PB5
+#endif
+#ifndef RGB_LED_B_PIN
+ #define RGB_LED_B_PIN PB7
+#endif
+#ifndef RGB_LED_W_PIN
+ #define RGB_LED_W_PIN -1
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
new file mode 100644
index 0000000000..924b94c4f1
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
@@ -0,0 +1,189 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * To build with Arduino IDE use "Discovery F407VG"
+ * To build with PlatformIO use environment "STM32F4"
+ */
+#if !defined(STM32F4) && !defined(STM32F4xx)
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "STM32F4 supports up to 2 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "Misc. STM32F4"
+#define DEFAULT_MACHINE_NAME "STM32F407VET6"
+
+//#define I2C_EEPROM
+
+#ifndef E2END
+ #define E2END 0xFFF // 4KB
+#endif
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PE0
+#define X_MAX_PIN -1
+#define Y_MIN_PIN PE1
+#define Y_MAX_PIN -1
+#define Z_MIN_PIN PE14
+#define Z_MAX_PIN -1
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+
+//#ifndef Z_MIN_PROBE_PIN
+// #define Z_MIN_PROBE_PIN PA4
+//#endif
+
+//
+// Steppers
+//
+
+#define X_STEP_PIN PD3
+#define X_DIR_PIN PD2
+#define X_ENABLE_PIN PD0
+//#ifndef X_CS_PIN
+// #define X_CS_PIN PD1
+//#endif
+
+#define Y_STEP_PIN PE11
+#define Y_DIR_PIN PE10
+#define Y_ENABLE_PIN PE13
+//#ifndef Y_CS_PIN
+// #define Y_CS_PIN PE12
+//#endif
+
+#define Z_STEP_PIN PD6
+#define Z_DIR_PIN PD7
+#define Z_ENABLE_PIN PD4
+//#ifndef Z_CS_PIN
+// #define Z_CS_PIN PD5
+//#endif
+
+#define E0_STEP_PIN PB5
+#define E0_DIR_PIN PB6
+#define E0_ENABLE_PIN PB3
+//#ifndef E0_CS_PIN
+// #define E0_CS_PIN PB4
+//#endif
+
+#define E1_STEP_PIN PE4
+#define E1_DIR_PIN PE2
+#define E1_ENABLE_PIN PE3
+//#ifndef E1_CS_PIN
+// #define E1_CS_PIN PE5
+//#endif
+
+#define SCK_PIN PA5
+#define MISO_PIN PA6
+#define MOSI_PIN PA7
+
+//
+// Temperature Sensors
+//
+
+#define TEMP_0_PIN PC0 // Analog Input
+#define TEMP_1_PIN PC1 // Analog Input
+#define TEMP_BED_PIN PC2 // Analog Input
+
+//
+// Heaters / Fans
+//
+
+#define HEATER_0_PIN PA1
+#define HEATER_1_PIN PA2
+#define HEATER_BED_PIN PA0
+
+#ifndef FAN_PIN
+ #define FAN_PIN PC6
+#endif
+#define FAN1_PIN PC7
+#define FAN2_PIN PC8
+
+#define ORIG_E0_AUTO_FAN_PIN FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Misc. Functions
+//
+
+//#define CASE_LIGHT_PIN_CI PF13
+//#define CASE_LIGHT_PIN_DO PF14
+//#define NEOPIXEL_PIN PF13
+
+//
+// Průša i3 MK2 Multi Material Multiplexer Support
+//
+
+//#define E_MUX0_PIN PG3
+//#define E_MUX1_PIN PG4
+
+//
+// Servos
+//
+
+//#define SERVO0_PIN PE13
+//#define SERVO1_PIN PE14
+
+#define SDSS PE7
+#define SS_PIN PE7
+#define LED_PIN PB7 //Alive
+#define PS_ON_PIN PA10
+#define KILL_PIN PA8
+#define PWR_LOSS PA4 //Power loss / nAC_FAULT
+
+//
+// LCD / Controller
+//
+
+#define SD_DETECT_PIN PA15
+#define BEEPER_PIN PC9
+#define LCD_PINS_RS PE9
+#define LCD_PINS_ENABLE PE8
+#define LCD_PINS_D4 PB12
+#define LCD_PINS_D5 PB13
+#define LCD_PINS_D6 PB14
+#define LCD_PINS_D7 PB15
+#define BTN_EN1 PC4
+#define BTN_EN2 PC5
+#define BTN_ENC PC3
+
+//
+// Filament runout
+//
+
+#define FIL_RUNOUT_PIN PA3
+
+//
+// ST7920 Delays
+//
+#if HAS_GRAPHICAL_LCD
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
new file mode 100644
index 0000000000..d21cdd0958
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -0,0 +1,177 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * 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 .
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "LERDGE K supports up to 2 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "Lerdge K"
+#define DEFAULT_MACHINE_NAME "LERDGE"
+
+#define I2C_EEPROM
+
+// Ignore temp readings during develpment.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Servos
+//
+//#define SERVO0_PIN PD12
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PG3
+#define Y_STOP_PIN PG4
+#define Z_STOP_PIN PG5
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+//#ifndef Z_MIN_PROBE_PIN
+// #define Z_MIN_PROBE_PIN PB15
+//#endif
+
+//
+// Filament runout
+//
+#define FIL_RUNOUT_PIN PE6
+#define FIL_RUNOUT2_PIN PE7
+
+//
+// Steppers
+//
+#define X_STEP_PIN PG1
+#define X_DIR_PIN PB10
+#define X_ENABLE_PIN PG0
+//#ifndef X_CS_PIN
+// #define X_CS_PIN PE0
+//#endif
+
+#define Y_STEP_PIN PF14
+#define Y_DIR_PIN PF15
+#define Y_ENABLE_PIN PF13
+//#ifndef Y_CS_PIN
+// #define Y_CS_PIN PE1
+//#endif
+
+#define Z_STEP_PIN PF11
+#define Z_DIR_PIN PF12
+#define Z_ENABLE_PIN PC5
+//#ifndef Z_CS_PIN
+// #define Z_CS_PIN PE2
+//#endif
+
+#define E0_STEP_PIN PC14
+#define E0_DIR_PIN PC13
+#define E0_ENABLE_PIN PC15
+//#ifndef E0_CS_PIN
+// #define E0_CS_PIN PE3
+//#endif
+
+#define E1_STEP_PIN PF1
+#define E1_DIR_PIN PF0
+#define E1_ENABLE_PIN PF2
+//#ifndef E1_CS_PIN
+// #define E1_CS_PIN PE4
+//#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC1 // Analog Input
+#define TEMP_1_PIN PC2 // Analog Input
+#define TEMP_BED_PIN PC0 // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PA1
+#define HEATER_1_PIN PA0
+#define HEATER_BED_PIN PA2
+
+#ifndef FAN_PIN
+ #define FAN_PIN PC15
+#endif
+#define FAN1_PIN PF6
+#define FAN2_PIN PF7
+
+#define ORIG_E0_AUTO_FAN_PIN FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// LED / Lighting
+//
+//#define CASE_LIGHT_PIN_CI -1
+//#define CASE_LIGHT_PIN_DO -1
+//#define NEOPIXEL_PIN -1
+
+//
+// Prusa i3 MK2 Multi-Material Multiplexer Support
+//
+//#define E_MUX0_PIN -1
+//#define E_MUX1_PIN -1
+
+//
+// SD support
+//
+#define SDIO_SUPPORT
+
+//
+// Misc. Functions
+//
+#define SDSS PC11
+#define LED_PIN PC7 // Alive
+#define PS_ON_PIN -1
+#define KILL_PIN -1
+#define POWER_LOSS_PIN -1 // Power-loss / nAC_FAULT
+
+#define SCK_PIN PC12
+#define MISO_PIN PC8
+#define MOSI_PIN PD2
+#define SS_PIN PC11
+
+//
+// LCD / Controller
+//
+
+// TODO: Replace these with the correct FSMC pins, once known
+#define SD_DETECT_PIN -1
+#define BEEPER_PIN PD12
+#define LCD_PINS_RS -1
+#define LCD_PINS_ENABLE -1
+#define LCD_PINS_D4 -1
+#define LCD_PINS_D5 -1
+#define LCD_PINS_D6 -1
+#define LCD_PINS_D7 -1
+
+#define BTN_EN1 PE3
+#define BTN_EN2 PE4
+#define BTN_ENC PE2
+
+//
+// ST7920 Delays
+//
+#if HAS_GRAPHICAL_LCD
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
new file mode 100644
index 0000000000..c54c5c1806
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -0,0 +1,174 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * 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 .
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "LERDGE X supports up to 2 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "Lerdge X"
+#define DEFAULT_MACHINE_NAME "LERDGE"
+
+//#define I2C_EEPROM
+
+//
+// Servos
+//
+//#define SERVO0_PIN PD12
+//#define SERVO1_PIN -1
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PB12
+#define Y_STOP_PIN PB13
+#define Z_STOP_PIN PB14
+
+//
+// Filament runout
+//
+#define FIL_RUNOUT_PIN PE1
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+//#ifndef Z_MIN_PROBE_PIN
+// #define Z_MIN_PROBE_PIN PB15
+//#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN PB10
+#define X_DIR_PIN PB2
+#define X_ENABLE_PIN PB11
+//#ifndef X_CS_PIN
+// #define X_CS_PIN PD1
+//#endif
+
+#define Y_STEP_PIN PB0
+#define Y_DIR_PIN PC5
+#define Y_ENABLE_PIN PB1
+//#ifndef Y_CS_PIN
+// #define Y_CS_PIN PE12
+//#endif
+
+#define Z_STEP_PIN PA7
+#define Z_DIR_PIN PA6
+#define Z_ENABLE_PIN PC4
+//#ifndef Z_CS_PIN
+// #define Z_CS_PIN PD5
+//#endif
+
+#define E0_STEP_PIN PA4
+#define E0_DIR_PIN PA3
+#define E0_ENABLE_PIN PA5
+//#ifndef E0_CS_PIN
+// #define E0_CS_PIN PB4
+//#endif
+
+#define E1_STEP_PIN -1
+#define E1_DIR_PIN -1
+#define E1_ENABLE_PIN -1
+//#ifndef E1_CS_PIN
+// #define E1_CS_PIN PE5
+//#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC0 // Analog Input
+#define TEMP_1_PIN -1 // Analog Input
+#define TEMP_BED_PIN PC1 // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PA1
+#define HEATER_1_PIN -1
+#define HEATER_BED_PIN PA2
+
+#ifndef FAN_PIN
+// #define FAN_PIN PC15
+#endif
+#define FAN1_PIN PC15
+#define FAN2_PIN PA0
+
+#define ORIG_E0_AUTO_FAN_PIN PC15 // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Prusa i3 MK2 Multi Material Multiplexer Support
+//
+//#define E_MUX0_PIN -1
+//#define E_MUX1_PIN -1
+
+//
+// LED / Lighting
+//
+//#define CASE_LIGHT_PIN_CI -1
+//#define CASE_LIGHT_PIN_DO -1
+//#define NEOPIXEL_PIN -1
+
+//
+// Misc. Functions
+//
+#define SDSS PC11
+#define LED_PIN PC7 // Alive
+#define PS_ON_PIN -1
+#define KILL_PIN -1
+#define POWER_LOSS_PIN -1 // Power-loss / nAC_FAULT
+
+#define SCK_PIN PC12
+#define MISO_PIN PC8
+#define MOSI_PIN PD2
+#define SS_PIN PC11
+
+//
+// SD support
+//
+#define SDIO_SUPPORT
+
+//
+// LCD / Controller
+//
+
+// The LCD is initialized in FSMC mode
+#define SD_DETECT_PIN -1
+#define BEEPER_PIN PD12
+
+#define BTN_EN1 PE3
+#define BTN_EN2 PE4
+#define BTN_ENC PE2
+
+#define LCD_RESET_PIN PD6
+#define LCD_BACKLIGHT_PIN PD3
+#define FSMC_CS_PIN PD4
+#define FSMC_RS_PIN PD11
+#define TOUCH_CS PB6
+
+//
+// ST7920 Delays
+//
+#if HAS_GRAPHICAL_LCD
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
new file mode 100644
index 0000000000..36298d05f5
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
@@ -0,0 +1,101 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef STM32F4
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "MKS_ROBIN2 supports up to 2 hotends / E-steppers."
+#endif
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_NAME "MKS_ROBIN2"
+#endif
+
+#ifndef DEFAULT_MACHINE_NAME
+ #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+#endif
+
+#define SRAM_EEPROM_EMULATION
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PG8
+#define X_MAX_PIN PG7
+#define Y_MIN_PIN PG6
+#define Y_MAX_PIN PG5
+#define Z_MIN_PIN PG4
+#define Z_MAX_PIN PG3
+
+//
+// Servos
+//
+#define SERVO0_PIN PB0 // XS2-5
+#define SERVO1_PIN PF7 // XS1-5
+#define SERVO2_PIN PF8 // XS1-6
+
+//
+// Steppers
+//
+#define X_STEP_PIN PE6
+#define X_DIR_PIN PE5
+#define X_ENABLE_PIN PC13
+
+#define Y_STEP_PIN PE3
+#define Y_DIR_PIN PE2
+#define Y_ENABLE_PIN PE4
+
+#define Z_STEP_PIN PE0
+#define Z_DIR_PIN PB9
+#define Z_ENABLE_PIN PE1
+
+#define E0_STEP_PIN PG10
+#define E0_DIR_PIN PG9
+#define E0_ENABLE_PIN PB8
+
+#define E1_STEP_PIN PD3
+#define E1_DIR_PIN PA15
+#define E1_ENABLE_PIN PD6
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC1 // T1 <-> E0
+#define TEMP_1_PIN PC2 // T2 <-> E1
+#define TEMP_BED_PIN PC0 // T0 <-> Bed
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PF3 // Heater0
+#define HEATER_1_PIN PF2 // Heater1
+#define HEATER_BED_PIN PF4 // Hotbed
+#define FAN_PIN PA7 // Fan0
+
+//
+// Misc. Functions
+//
+#define SDSS -1 // PB12
+
+#define SD_DETECT_PIN PF9
+#define BEEPER_PIN PG2
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
new file mode 100644
index 0000000000..cff34a2d86
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
@@ -0,0 +1,42 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * Pin assignments for the MKS RUMBA32
+ *
+ * https://aus3d.com.au/rumba32
+ * https://github.com/Aus3D/RUMBA32
+ *
+ * The MKS and Aus3D versions have the same pinout but the MKS version
+ * has some added resistors and LEDs. The resistors needed for the
+ * TMC2208/9 UART interface are among the additions. Also added were
+ * connectors and resistors dedicated to the TMC2130 sensorless homing
+ * interface.
+ */
+
+#define BOARD_INFO_NAME "Aus3D RUMBA32"
+
+#define RUMBA32_V1_0
+//#define I2C_EEPROM
+
+#include "pins_RUMBA32_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
new file mode 100644
index 0000000000..9fcd5a1474
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
@@ -0,0 +1,109 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * Pin assignments for the MKS RUMBA32
+ *
+ * https://github.com/makerbase-mks/MKS-RUMBA32
+ *
+ * The MKS and Aus3D versions have the same pinout but the MKS version
+ * has some added resistors and LEDs. The resistors needed for the
+ * TMC2208/9 UART interface are among the additions. Also added were
+ * connectors and resistors dedicated to the TMC2130 sensorless homing
+ * interface.
+ */
+
+#define BOARD_INFO_NAME "MKS RUMBA32"
+
+#define RUMBA32_V1_0
+#define ENABLE_SPI1
+//#define I2C_EEPROM
+
+#include "pins_RUMBA32_common.h"
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+ #ifndef TMC_SW_MOSI
+ #define TMC_SW_MOSI PA7
+ #endif
+ #ifndef TMC_SW_MISO
+ #define TMC_SW_MISO PA6
+ #endif
+ #ifndef TMC_SW_SCK
+ #define TMC_SW_SCK PA5
+ #endif
+#endif
+
+#if HAS_TMC_UART
+ /**
+ * TMC2208/TMC2209 stepper drivers
+ *
+ * Hardware serial communication ports.
+ * If undefined software serial is used according to the pins below
+ */
+ //#define X_HARDWARE_SERIAL Serial
+ //#define X2_HARDWARE_SERIAL Serial1
+ //#define Y_HARDWARE_SERIAL Serial1
+ //#define Y2_HARDWARE_SERIAL Serial1
+ //#define Z_HARDWARE_SERIAL Serial1
+ //#define Z2_HARDWARE_SERIAL Serial1
+ //#define E0_HARDWARE_SERIAL Serial1
+ //#define E1_HARDWARE_SERIAL Serial1
+ //#define E2_HARDWARE_SERIAL Serial1
+ //#define E3_HARDWARE_SERIAL Serial1
+ //#define E4_HARDWARE_SERIAL Serial1
+
+ //
+ // Software serial
+ //
+ #define X_SERIAL_TX_PIN PA3
+ #define X_SERIAL_RX_PIN PC14
+
+ #define Y_SERIAL_TX_PIN PA4
+ #define Y_SERIAL_RX_PIN PE4
+
+ #define Z_SERIAL_TX_PIN PD13
+ #define Z_SERIAL_RX_PIN PE0
+
+ #define E0_SERIAL_TX_PIN PD14
+ #define E0_SERIAL_RX_PIN PC13
+
+ #define E1_SERIAL_TX_PIN PD15
+ #define E1_SERIAL_RX_PIN PD5
+
+ #define E2_SERIAL_TX_PIN PD12
+ #define E2_SERIAL_RX_PIN PD1
+#endif
+
+//
+// LCD / Controller
+//
+
+// Alter timing for graphical display
+#if HAS_GRAPHICAL_LCD
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
new file mode 100644
index 0000000000..19853a78fe
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -0,0 +1,149 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+/**
+ * Common pin assignments for all RUMBA32 boards
+ */
+
+#ifndef STM32F4
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+ #error "RUMBA32 boards support up to 3 hotends / E-steppers."
+#endif
+
+#define RUMBA32_V1_0
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+//#define I2C_EEPROM
+#ifdef E2END
+ #undef E2END
+#endif
+#define E2END 0xFFF // 4KB
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PB12
+#define X_MAX_PIN PB13
+#define Y_MIN_PIN PB15
+#define Y_MAX_PIN PD8
+#define Z_MIN_PIN PD9
+#define Z_MAX_PIN PD10
+
+//
+// Steppers
+//
+#define X_STEP_PIN PA0
+#define X_DIR_PIN PC15
+#define X_ENABLE_PIN PC11
+#define X_CS_PIN PC14
+
+#define Y_STEP_PIN PE5
+#define Y_DIR_PIN PE6
+#define Y_ENABLE_PIN PE3
+#define Y_CS_PIN PE4
+
+#define Z_STEP_PIN PE1
+#define Z_DIR_PIN PE2
+#define Z_ENABLE_PIN PB7
+#define Z_CS_PIN PE0
+
+#define E0_STEP_PIN PB5
+#define E0_DIR_PIN PB6
+#define E0_ENABLE_PIN PC12
+#define E0_CS_PIN PC13
+
+#define E1_STEP_PIN PD6
+#define E1_DIR_PIN PD7
+#define E1_ENABLE_PIN PD4
+#define E1_CS_PIN PD5
+
+#define E2_STEP_PIN PD2
+#define E2_DIR_PIN PD3
+#define E2_ENABLE_PIN PD0
+#define E2_CS_PIN PD1
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN PC4
+#define TEMP_1_PIN PC3
+#define TEMP_2_PIN PC2
+#define TEMP_3_PIN PC1
+#define TEMP_BED_PIN PC0
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PC6
+#define HEATER_1_PIN PC7
+#define HEATER_2_PIN PC8
+#define HEATER_BED_PIN PA1
+
+#define FAN_PIN PC9
+#define FAN1_PIN PA8
+
+//
+// I2C
+//
+#define SCK_PIN PA5
+#define MISO_PIN PA6
+#define MOSI_PIN PA7
+
+//
+// Misc. Functions
+//
+#define LED_PIN PB14
+#define BTN_PIN PC10
+#define PS_ON_PIN PE11
+#define KILL_PIN PC5
+
+#define SDSS PA2
+#define SD_DETECT_PIN PB0
+#define BEEPER_PIN PE8
+
+//
+// LCD / Controller
+//
+#if HAS_SPI_LCD
+
+ #define BTN_EN1 PB2
+ #define BTN_EN2 PB1
+ #define BTN_ENC PE7
+
+ #define LCD_PINS_RS PE10
+ #define LCD_PINS_ENABLE PE9
+ #define LCD_PINS_D4 PE12
+
+ #if ENABLED(MKS_MINI_12864)
+ #define DOGLCD_CS PE13
+ #define DOGLCD_A0 PE14
+ #endif
+
+ #if ENABLED(ULTIPANEL)
+ #define LCD_PINS_D5 PE13
+ #define LCD_PINS_D6 PE14
+ #define LCD_PINS_D7 PE15
+ #endif
+
+#endif
diff --git a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
similarity index 52%
rename from Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
rename to Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 02c1c66c5a..1a008cd4ae 100644
--- a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -51,13 +51,13 @@
//
// Limit Switches
//
-#define X_MIN_PIN 39 // PD8 X_STOP
-#define Y_MIN_PIN 40 // PD9 Y_STOP
-#define Z_MIN_PIN 41 // PD10 Z_STOP
+#define X_MIN_PIN 39 // PD8 X_STOP
+#define Y_MIN_PIN 40 // PD9 Y_STOP
+#define Z_MIN_PIN 41 // PD10 Z_STOP
-#define X_MAX_PIN 44 // PD0 W_STOP
-#define Y_MAX_PIN 43 // PA8 V_STOP
-#define Z_MAX_PIN 42 // PD11 U_STOP
+#define X_MAX_PIN 44 // PD0 W_STOP
+#define Y_MAX_PIN 43 // PA8 V_STOP
+#define Z_MAX_PIN 42 // PD11 U_STOP
//
// Z Probe (when not Z_MIN_PIN)
@@ -69,64 +69,64 @@
//
// Filament runout
//
-//#define FIL_RUNOUT_PIN 53 // PA3 BED_THE
+//#define FIL_RUNOUT_PIN 53 // PA3 BED_THE
//
// Steppers
//
-#define X_STEP_PIN 61 // PE14 X_PWM
-#define X_DIR_PIN 62 // PE15 X_DIR
-#define X_ENABLE_PIN 60 // PE13 X_RES
-#define X_CS_PIN 16 // PA4 SPI_CS
+#define X_STEP_PIN 61 // PE14 X_PWM
+#define X_DIR_PIN 62 // PE15 X_DIR
+#define X_ENABLE_PIN 60 // PE13 X_RES
+#define X_CS_PIN 16 // PA4 SPI_CS
-#define Y_STEP_PIN 64 // PB10 Y_PWM
-#define Y_DIR_PIN 65 // PE9 Y_DIR
-#define Y_ENABLE_PIN 63 // PE10 Y_RES
-#define Y_CS_PIN 16 // PA4 SPI_CS
+#define Y_STEP_PIN 64 // PB10 Y_PWM
+#define Y_DIR_PIN 65 // PE9 Y_DIR
+#define Y_ENABLE_PIN 63 // PE10 Y_RES
+#define Y_CS_PIN 16 // PA4 SPI_CS
-#define Z_STEP_PIN 67 // PC6 Z_PWM
-#define Z_DIR_PIN 68 // PC0 Z_DIR
-#define Z_ENABLE_PIN 66 // PC15 Z_RES
-#define Z_CS_PIN 16 // PA4 SPI_CS
+#define Z_STEP_PIN 67 // PC6 Z_PWM
+#define Z_DIR_PIN 68 // PC0 Z_DIR
+#define Z_ENABLE_PIN 66 // PC15 Z_RES
+#define Z_CS_PIN 16 // PA4 SPI_CS
-#define E0_STEP_PIN 71 // PD12 E1_PW
-#define E0_DIR_PIN 70 // PC13 E1_DIR
-#define E0_ENABLE_PIN 69 // PC14 E1_RE
-#define E0_CS_PIN 16 // PA4 SPI_CS
+#define E0_STEP_PIN 71 // PD12 E1_PW
+#define E0_DIR_PIN 70 // PC13 E1_DIR
+#define E0_ENABLE_PIN 69 // PC14 E1_RE
+#define E0_CS_PIN 16 // PA4 SPI_CS
-#define E1_STEP_PIN 73 // PE5 E2_PWM
-#define E1_DIR_PIN 74 // PE6 E2_DIR
-#define E1_ENABLE_PIN 72 // PE4 E2_RESE
-#define E1_CS_PIN 16 // PA4 SPI_CS
+#define E1_STEP_PIN 73 // PE5 E2_PWM
+#define E1_DIR_PIN 74 // PE6 E2_DIR
+#define E1_ENABLE_PIN 72 // PE4 E2_RESE
+#define E1_CS_PIN 16 // PA4 SPI_CS
-#define E2_STEP_PIN 77 // PB8 E3_PWM
-#define E2_DIR_PIN 76 // PE2 E3_DIR
-#define E2_ENABLE_PIN 75 // PE3 E3_RESE
-#define E2_CS_PIN 16 // PA4 SPI_CS
+#define E2_STEP_PIN 77 // PB8 E3_PWM
+#define E2_DIR_PIN 76 // PE2 E3_DIR
+#define E2_ENABLE_PIN 75 // PE3 E3_RESE
+#define E2_CS_PIN 16 // PA4 SPI_CS
// needed to pass a sanity check
-#define X2_CS_PIN 16 // PA4 SPI_CS
-#define Y2_CS_PIN 16 // PA4 SPI_CS
-#define Z2_CS_PIN 16 // PA4 SPI_CS
-#define Z3_CS_PIN 16 // PA4 SPI_CS
-#define E3_CS_PIN 16 // PA4 SPI_CS
-#define E4_CS_PIN 16 // PA4 SPI_CS
-#define E5_CS_PIN 16 // PA4 SPI_CS
+#define X2_CS_PIN 16 // PA4 SPI_CS
+#define Y2_CS_PIN 16 // PA4 SPI_CS
+#define Z2_CS_PIN 16 // PA4 SPI_CS
+#define Z3_CS_PIN 16 // PA4 SPI_CS
+#define E3_CS_PIN 16 // PA4 SPI_CS
+#define E4_CS_PIN 16 // PA4 SPI_CS
+#define E5_CS_PIN 16 // PA4 SPI_CS
#if HAS_L64XX
- #define L6470_CHAIN_SCK_PIN 17 // PA5
- #define L6470_CHAIN_MISO_PIN 18 // PA6
- #define L6470_CHAIN_MOSI_PIN 19 // PA7
- #define L6470_CHAIN_SS_PIN 16 // PA4
+ #define L6470_CHAIN_SCK_PIN 17 // PA5
+ #define L6470_CHAIN_MISO_PIN 18 // PA6
+ #define L6470_CHAIN_MOSI_PIN 19 // PA7
+ #define L6470_CHAIN_SS_PIN 16 // PA4
- //#define SCK_PIN L6470_CHAIN_SCK_PIN
- //#define MISO_PIN L6470_CHAIN_MISO_PIN
- //#define MOSI_PIN L6470_CHAIN_MOSI_PIN
+ //#define SCK_PIN L6470_CHAIN_SCK_PIN
+ //#define MISO_PIN L6470_CHAIN_MISO_PIN
+ //#define MOSI_PIN L6470_CHAIN_MOSI_PIN
#else
- //#define SCK_PIN 13 // PB13 SPI_S
- //#define MISO_PIN 12 // PB14 SPI_M
- //#define MOSI_PIN 11 // PB15 SPI_M
+ //#define SCK_PIN 13 // PB13 SPI_S
+ //#define MISO_PIN 12 // PB14 SPI_M
+ //#define MOSI_PIN 11 // PB15 SPI_M
#endif
/**
@@ -147,64 +147,64 @@
//
// Temperature Sensors
//
-#define TEMP_0_PIN 3 // Analog input 3, digital pin 54 PA0 E1_THERMISTOR
-#define TEMP_1_PIN 4 // Analog input 4, digital pin 55 PA1 E2_THERMISTOR
-#define TEMP_2_PIN 5 // Analog input 5, digital pin 56 PA2 E3_THERMISTOR
-#define TEMP_BED_PIN 0 // Analog input 0, digital pin 51 PC2 BED_THERMISTOR_1
-#define TEMP_BED_1_PIN 1 // Analog input 1, digital pin 52 PC3 BED_THERMISTOR_2
-#define TEMP_BED_2_PIN 2 // Analog input 2, digital pin 53 PA3 BED_THERMISTOR_3
+#define TEMP_0_PIN 3 // Analog input 3, digital pin 54 PA0 E1_THERMISTOR
+#define TEMP_1_PIN 4 // Analog input 4, digital pin 55 PA1 E2_THERMISTOR
+#define TEMP_2_PIN 5 // Analog input 5, digital pin 56 PA2 E3_THERMISTOR
+#define TEMP_BED_PIN 0 // Analog input 0, digital pin 51 PC2 BED_THERMISTOR_1
+#define TEMP_BED_1_PIN 1 // Analog input 1, digital pin 52 PC3 BED_THERMISTOR_2
+#define TEMP_BED_2_PIN 2 // Analog input 2, digital pin 53 PA3 BED_THERMISTOR_3
//
// Heaters / Fans
//
-#define HEATER_0_PIN 48 // PC7 E1_HEAT_PWM
-#define HEATER_1_PIN 49 // PB0 E2_HEAT_PWM
-#define HEATER_2_PIN 50 // PB1 E3_HEAT_PWM
-#define HEATER_BED_PIN 46 // PD14 (BED_HEAT_1 FET
-#define HEATER_BED_1_PIN 45 // PD13 (BED_HEAT_2 FET
-#define HEATER_BED_2_PIN 47 // PD15 (BED_HEAT_3 FET
+#define HEATER_0_PIN 48 // PC7 E1_HEAT_PWM
+#define HEATER_1_PIN 49 // PB0 E2_HEAT_PWM
+#define HEATER_2_PIN 50 // PB1 E3_HEAT_PWM
+#define HEATER_BED_PIN 46 // PD14 (BED_HEAT_1 FET
+#define HEATER_BED_1_PIN 45 // PD13 (BED_HEAT_2 FET
+#define HEATER_BED_2_PIN 47 // PD15 (BED_HEAT_3 FET
-#define FAN_PIN 57 // PC4 E1_FAN PWM pin, Part cooling fan FET
-#define FAN1_PIN 58 // PC5 E2_FAN PWM pin, Extruder fan FET
-#define ORIG_E0_AUTO_FAN_PIN FAN1_PIN
-#define FAN2_PIN 59 // PE8 E3_FAN PWM pin, Controller fan FET
+#define FAN_PIN 57 // PC4 E1_FAN PWM pin, Part cooling fan FET
+#define FAN1_PIN 58 // PC5 E2_FAN PWM pin, Extruder fan FET
+#define ORIG_E0_AUTO_FAN_PIN FAN1_PIN
+#define FAN2_PIN 59 // PE8 E3_FAN PWM pin, Controller fan FET
//
// Misc functions
//
-#define SDSS 16 // PA4 SPI_CS
-#define LED_PIN -1 // 9 // PE1 green LED Heart beat
-#define PS_ON_PIN -1
-#define KILL_PIN -1
-#define POWER_LOSS_PIN -1 // PWR_LOSS / nAC_FAULT
+#define SDSS 16 // PA4 SPI_CS
+#define LED_PIN -1 // 9 // PE1 green LED Heart beat
+#define PS_ON_PIN -1
+#define KILL_PIN -1
+#define POWER_LOSS_PIN -1 // PWR_LOSS / nAC_FAULT
//
// LCD / Controller
//
-//#define SD_DETECT_PIN 66 // PA15 SD_CA
-//#define BEEPER_PIN 24 // PC9 SDIO_D1
-//#define LCD_PINS_RS 65 // PE9 Y_DIR
-//#define LCD_PINS_ENABLE 59 // PE8 E3_FAN
-//#define LCD_PINS_D4 10 // PB12 SPI_C
-//#define LCD_PINS_D5 13 // PB13 SPI_S
-//#define LCD_PINS_D6 12 // PB14 SPI_M
-//#define LCD_PINS_D7 11 // PB15 SPI_M
-//#define BTN_EN1 57 // PC4 E1_FAN
-//#define BTN_EN2 58 // PC5 E2_FAN
-//#define BTN_ENC 52 // PC3 BED_THE
+//#define SD_DETECT_PIN 66 // PA15 SD_CA
+//#define BEEPER_PIN 24 // PC9 SDIO_D1
+//#define LCD_PINS_RS 65 // PE9 Y_DIR
+//#define LCD_PINS_ENABLE 59 // PE8 E3_FAN
+//#define LCD_PINS_D4 10 // PB12 SPI_C
+//#define LCD_PINS_D5 13 // PB13 SPI_S
+//#define LCD_PINS_D6 12 // PB14 SPI_M
+//#define LCD_PINS_D7 11 // PB15 SPI_M
+//#define BTN_EN1 57 // PC4 E1_FAN
+//#define BTN_EN2 58 // PC5 E2_FAN
+//#define BTN_ENC 52 // PC3 BED_THE
//
// Extension pins
//
-//#define EXT0_PIN 49 // PB0 E2_HEAT
-//#define EXT1_PIN 50 // PB1 E3_HEAT
-//#define EXT2_PIN // PB2 not used (tied to ground
-//#define EXT3_PIN 39 // PD8 X_STOP
-//#define EXT4_PIN 40 // PD9 Y_STOP
-//#define EXT5_PIN 41 // PD10 Z_STOP
-//#define EXT6_PIN 42 // PD11
-//#define EXT7_PIN 71 // PD12 E1_PW
-//#define EXT8_PIN 64 // PB10 Y_PWM
+//#define EXT0_PIN 49 // PB0 E2_HEAT
+//#define EXT1_PIN 50 // PB1 E3_HEAT
+//#define EXT2_PIN // PB2 not used (tied to ground
+//#define EXT3_PIN 39 // PD8 X_STOP
+//#define EXT4_PIN 40 // PD9 Y_STOP
+//#define EXT5_PIN 41 // PD10 Z_STOP
+//#define EXT6_PIN 42 // PD11
+//#define EXT7_PIN 71 // PD12 E1_PW
+//#define EXT8_PIN 64 // PB10 Y_PWM
// WIFI
// 2 // PD3 CTS
@@ -215,7 +215,6 @@
// 7 // PE11 WIFI_RESET
// 8 // PE12 WIFI_BOOT
-
// I2C USER
// 14 // PB7 SDA
// 15 // PB6 SCL
@@ -226,22 +225,31 @@
// 22 // PB3 JTAG_TDO/SWO
//
-// SD support
+// Onboard SD support
//
-//#define SDIO_SUPPORT
-// 23 // PC8 SDIO_D0
-// 24 // PC9 SDIO_D1
-// 25 // PA15 SD_CARD_DETECT
-// 26 // PC10 SDIO_D2
-// 27 // PC11 SDIO_D3
-// 28 // PC12 SDIO_CK
-// 29 // PD2 SDIO_CMD
+#define SDIO_D0_PIN 23 // PC8 SDIO_D0
+#define SDIO_D1_PIN 24 // PC9 SDIO_D1
+//#define SD_CARD_DETECT_PIN 25 // PA15 SD_CARD_DETECT
+#define SDIO_D2_PIN 26 // PC10 SDIO_D2
+#define SDIO_D3_PIN 27 // PC11 SDIO_D3
+#define SDIO_CK_PIN 28 // PC12 SDIO_CK
+#define SDIO_CMD_PIN 29 // PD2 SDIO_CMD
-#define SOFTWARE_SPI // Use soft SPI for onboard SD
-#define SDSS 27 // PC11 SDIO_D3
-#define SCK_PIN 28 // PC12 SDIO_CK
-#define MISO_PIN 23 // PC8 SDIO_D0
-#define MOSI_PIN 29 // PD2 SDIO_CMD
+#ifndef SDCARD_CONNECTION
+ #define SDCARD_CONNECTION ONBOARD
+#endif
+
+#if SDCARD_CONNECTION == ONBOARD
+ #define SDIO_SUPPORT // Use SDIO for onboard SD
+
+ #ifndef SDIO_SUPPORT
+ #define SOFTWARE_SPI // Use soft SPI for onboard SD
+ #define SDSS SDIO_D3_PIN
+ #define SCK_PIN SDIO_CK_PIN
+ #define MISO_PIN SDIO_D0_PIN
+ #define MOSI_PIN SDIO_CMD_PIN
+ #endif
+#endif
// OTG
// 30 // PA11 OTG_DM
@@ -256,16 +264,13 @@
// USERKET
// 38 // PE7 USER_BUTTON
-
// 0 // PA9 TX
// 1 // PA10 RX
-
// IR/PROBE
// 32 // PD1 IR_OUT
// 33 // PC1 IR_ON
-
/**
* Logical pin vs. port/pin cross reference
*
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
new file mode 100644
index 0000000000..7eb95a4f50
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -0,0 +1,194 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+ #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+ #error "STM32F4 supports up to 2 hotends / E-steppers."
+#endif
+
+#define DEFAULT_MACHINE_NAME "STM32F446VET6"
+#define BOARD_NAME "STM32F4 VAkE"
+
+//#define I2C_EEPROM
+
+#define E2END 0xFFF // EEPROM end address (4kB)
+
+//
+// Servos
+//
+//#define SERVO0_PIN PE13
+//#define SERVO1_PIN PE14
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN PE10
+#define Y_STOP_PIN PE9
+#define Z_STOP_PIN PE8
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN PA4
+#endif
+
+//
+// Filament runout
+//
+#define FIL_RUNOUT_PIN PA3
+
+//
+// Steppers
+//
+
+#define STEPPER_ENABLE_PIN PB2
+
+#define X_STEP_PIN PC6 // X_STEP
+#define X_DIR_PIN PC7 // X_DIR
+#define X_ENABLE_PIN PB2 //
+#ifndef X_CS_PIN
+ #define X_CS_PIN PC8 // X_CS
+#endif
+
+#define Y_STEP_PIN PD9 // Y_STEP
+#define Y_DIR_PIN PD10 // Y_DIR
+#define Y_ENABLE_PIN PB2 //
+#ifndef Y_CS_PIN
+ #define Y_CS_PIN PD11 // Y_CS
+#endif
+
+#define Z_STEP_PIN PE15 // Z_STEP
+#define Z_DIR_PIN PB10 // Z_DIR
+#define Z_ENABLE_PIN PB2
+#ifndef Z_CS_PIN
+ #define Z_CS_PIN PD8
+#endif
+
+#define E0_STEP_PIN PB1
+#define E0_DIR_PIN PB13
+#define E0_ENABLE_PIN PB2
+#ifndef E0_CS_PIN
+ #define E0_CS_PIN PE11
+#endif
+
+#define E1_STEP_PIN PC4
+#define E1_DIR_PIN PC5
+#define E1_ENABLE_PIN PB2
+#ifndef E1_CS_PIN
+ #define E1_CS_PIN PB0
+#endif
+
+#define SCK_PIN PE12 // PA5 // SPI1 for SD card
+#define MISO_PIN PE13 // PA6
+#define MOSI_PIN PE14 // PA7
+
+// added for SD card : optional or not ???
+//#define SD_CHIP_SELECT_PIN SDSS // The default chip select pin for the SD card is SS.
+// The following three pins must not be redefined for hardware SPI.
+//#define SPI_MOSI_PIN MOSI_PIN // SPI Master Out Slave In pin
+//#define SPI_MISO_PIN MISO_PIN // SPI Master In Slave Out pin
+//#define SPI_SCK_PIN SCK_PIN // SPI Clock pin
+
+//
+// Temperature Sensors (Analog inputs)
+//
+
+#define TEMP_0_PIN PC0 // Analog Input
+#define TEMP_1_PIN PC1 // Analog Input
+#define TEMP_2_PIN PC2 // Analog Input
+#define TEMP_3_PIN PC3 // Analog Input
+#define TEMP_BED_PIN PC3 // Analog Input
+
+//
+// Heaters / Fans
+//
+
+#define HEATER_0_PIN PD15
+#define HEATER_1_PIN PD14
+#define HEATER_BED_PIN PD12
+
+#ifndef FAN_PIN
+ #define FAN_PIN PD13
+#endif
+#define FAN1_PIN PB5 // PA0
+#define FAN2_PIN PB4 // PA1
+
+#define ORIG_E0_AUTO_FAN_PIN PD13 // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Misc. Functions
+//
+
+//#define CASE_LIGHT_PIN_CI PF13
+//#define CASE_LIGHT_PIN_DO PF14
+//#define NEOPIXEL_PIN PF13
+
+//
+// Prusa i3 MK2 Multi Material Multiplexer Support
+//
+//#define E_MUX0_PIN PG3
+//#define E_MUX1_PIN PG4
+
+#define LED_PIN PB14 // Alive
+#define PS_ON_PIN PE0
+#define KILL_PIN PD5
+#define POWER_LOSS_PIN PA4 // ?? Power loss / nAC_FAULT
+
+#if ENABLED(SDSUPPORT)
+ #define SD_DETECT_PIN PB7
+ #define SS_PIN PB_15 // USD_CS -> CS for onboard SD
+#endif
+
+//
+// LCD / Controller
+//
+#if HAS_SPI_LCD
+ #if ENABLED(SDSUPPORT)
+ #define SDSS PB6 // CS for SD card in LCD
+ #endif
+ #define BEEPER_PIN PC9
+ #define LCD_PINS_RS PC12
+ #define LCD_PINS_ENABLE PD7
+ #define LCD_PINS_D4 PD1
+ #define LCD_PINS_D5 PD2
+ #define LCD_PINS_D6 PD3
+ #define LCD_PINS_D7 PD4
+ #define BTN_EN1 PD6
+ #define BTN_EN2 PD0
+ #define BTN_ENC PB12
+#endif
+
+//
+// ST7920 Delays
+//
+#ifndef ST7920_DELAY_1
+ #define ST7920_DELAY_1 DELAY_NS(96)
+#endif
+#ifndef ST7920_DELAY_2
+ #define ST7920_DELAY_2 DELAY_NS(48)
+#endif
+#ifndef ST7920_DELAY_3
+ #define ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
new file mode 100644
index 0000000000..736445cdab
--- /dev/null
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -0,0 +1,133 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef STM32F7xx
+ #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
+#endif
+
+#define BOARD_INFO_NAME "RemRam v1"
+#define DEFAULT_MACHINE_NAME "RemRam"
+
+#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM
+
+#if HOTENDS > 1 || E_STEPPERS > 1
+ #error "RemRam supports only one hotend / E-stepper."
+#endif
+
+//
+// Limit Switches
+//
+#if DISABLED(SENSORLESS_HOMING)
+ #define X_MIN_PIN 58
+ #define X_MAX_PIN 59
+ #define Y_MIN_PIN 60
+ #define Y_MAX_PIN 61
+ #define Z_MIN_PIN 62
+ #define Z_MAX_PIN 63
+#else
+ #define X_STOP_PIN 36
+ #define Y_STOP_PIN 39
+ #define Z_MIN_PIN 62
+ #define Z_MAX_PIN 42
+#endif
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN 26 // EXT_D1
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN 22
+#define X_DIR_PIN 35
+#define X_ENABLE_PIN 34
+#define X_CS_PIN 14
+
+#define Y_STEP_PIN 23
+#define Y_DIR_PIN 38
+#define Y_ENABLE_PIN 37
+#define Y_CS_PIN 15
+
+#define Z_STEP_PIN 24
+#define Z_DIR_PIN 41
+#define Z_ENABLE_PIN 40
+#define Z_CS_PIN 16
+
+#define E0_STEP_PIN 25
+#define E0_DIR_PIN 44
+#define E0_ENABLE_PIN 43
+#define E0_CS_PIN 10
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN 64 // THERM_1
+#define TEMP_1_PIN 65 // THERM_2
+#define TEMP_BED_PIN 66 // THERM_3
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN 33
+#define HEATER_BED_PIN 31
+
+#ifndef FAN_PIN
+ #define FAN_PIN 30 // "FAN1"
+#endif
+#define FAN1_PIN 32 // "FAN2"
+
+#define ORIG_E0_AUTO_FAN_PIN 32 // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Servos
+//
+#define SERVO0_PIN 26 // PWM_EXT1
+#define SERVO1_PIN 27 // PWM_EXT2
+
+#define SDSS 57 // Onboard SD card reader
+//#define SDSS 9 // LCD SD card reader
+#define LED_PIN 21 // STATUS_LED
+
+//
+// LCD / Controller
+//
+#define SD_DETECT_PIN 56 // SD_CARD_DET
+#define BEEPER_PIN 46 // LCD_BEEPER
+#define LCD_PINS_RS 49 // LCD_RS
+#define LCD_PINS_ENABLE 48 // LCD_EN
+#define LCD_PINS_D4 50 // LCD_D4
+#define LCD_PINS_D5 51 // LCD_D5
+#define LCD_PINS_D6 52 // LCD_D6
+#define LCD_PINS_D7 53 // LCD_D7
+#define BTN_EN1 54 // BTN_EN1
+#define BTN_EN2 55 // BTN_EN2
+#define BTN_ENC 47 // BTN_ENC
+
+//
+// Timers
+//
+
+#define STEP_TIMER 2
diff --git a/Marlin/src/pins/stm32f7/pins_THE_BORG.h b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
new file mode 100644
index 0000000000..9968d9d1f1
--- /dev/null
+++ b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
@@ -0,0 +1,181 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifndef STM32F7
+ #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+ #error "The-Borg supports up to 3 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "The-Borge"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#ifndef E2END
+ #define E2END 0xFFF // EEPROM end address
+#endif
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN PE9
+#define X_MAX_PIN PE10
+#define Y_MIN_PIN PE7
+#define Y_MAX_PIN PE8
+#define Z_MIN_PIN PF15
+#define Z_MAX_PIN PG0
+#define E_MIN_PIN PE2
+#define E_MAX_PIN PE3
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+ #define Z_MIN_PROBE_PIN PA4
+#endif
+
+//
+// Steppers
+//
+#define STEPPER_ENABLE_PIN PE0
+
+#define X_STEP_PIN PC6 // 96, 39 in Arduino
+#define X_DIR_PIN PC7
+#define X_ENABLE_PIN PC8
+
+#define Y_STEP_PIN PD9
+#define Y_DIR_PIN PD10
+#define Y_ENABLE_PIN PD11
+
+#define Z_STEP_PIN PE15
+#define Z_DIR_PIN PG1
+#define Z_ENABLE_PIN PD8
+
+#define E0_STEP_PIN PB1
+#define E0_DIR_PIN PB2
+#define E0_ENABLE_PIN PE11
+
+#define E1_STEP_PIN PC4
+#define E1_DIR_PIN PC5
+#define E1_ENABLE_PIN PB0
+
+#define E2_STEP_PIN PC13
+#define E2_DIR_PIN PC14
+#define E2_ENABLE_PIN PC15
+
+#define Z2_STEP_PIN PC13
+#define Z2_DIR_PIN PC14
+#define Z2_ENABLE_PIN PC15
+
+#define SCK_PIN PA5
+#define MISO_PIN PA6
+#define MOSI_PIN PA7
+
+#define SPI1_SCK_PIN PA5
+#define SPI1_MISO_PIN PA6
+#define SPI1_MOSI_PIN PA7
+
+#define SPI6_SCK_PIN PG13
+#define SPI6_MISO_PIN PG12
+#define SPI6_MOSI_PIN PG14
+
+//
+// Temperature Sensors
+//
+
+#define TEMP_0_PIN PC3 // Analog Input
+#define TEMP_1_PIN PC2 // Analog Input
+#define TEMP_2_PIN PC1 // Analog Input
+#define TEMP_3_PIN PC0 // Analog Input
+
+#define TEMP_BED_PIN PF10 // Analog Input
+
+#define TEMP_5_PIN PE12 // Analog Input, Probe temp
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN PD15
+#define HEATER_1_PIN PD14
+#define HEATER_BED_PIN PF6
+
+#ifndef FAN_PIN
+ #define FAN_PIN PD13
+#endif
+#define FAN1_PIN PA0
+#define FAN2_PIN PA1
+
+#define ORIG_E0_AUTO_FAN_PIN PA1 // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Misc. Functions
+//
+
+//#define CASE_LIGHT_PIN_CI PF13
+//#define CASE_LIGHT_PIN_DO PF14
+//#define NEOPIXEL_PIN PF13
+
+//
+// Průša i3 MK2 Multi Material Multiplexer Support
+//
+
+#define E_MUX0_PIN PG3
+#define E_MUX1_PIN PG4
+
+//
+// Servos
+//
+
+#define SERVO0_PIN PE13
+#define SERVO1_PIN PE14
+
+#define SDSS PA8
+#define SS_PIN PA8
+#define LED_PIN PA2 // Alive
+#define PS_ON_PIN PA3
+#define KILL_PIN -1 //PD5 // EXP2-10
+#define PWR_LOSS PG5 // Power loss / nAC_FAULT
+
+//
+// MAX7219_DEBUG
+//
+#define MAX7219_CLK_PIN PG10 // EXP1-1
+#define MAX7219_DIN_PIN PD7 // EXP1-3
+#define MAX7219_LOAD_PIN PD1 // EXP1-5
+
+//
+// LCD / Controller
+//
+//#define SD_DETECT_PIN -1 //PB6) // EXP2-4
+#define BEEPER_PIN PG10 // EXP1-1
+#define LCD_PINS_RS PG9 // EXP1-4
+#define LCD_PINS_ENABLE PD7 // EXP1-3
+#define LCD_PINS_D4 PD1 // EXP1-5
+#define LCD_PINS_D5 PF0 // EXP1-6
+#define LCD_PINS_D6 PD3 // EXP1-7
+#define LCD_PINS_D7 PD4 // EXP1-8
+#define BTN_EN1 PD6 // EXP2-5
+#define BTN_EN2 PD0 // EXP2-3
+#define BTN_ENC PG11 // EXP1-2
diff --git a/Marlin/src/pins/teensy2/pins_5DPRINT.h b/Marlin/src/pins/teensy2/pins_5DPRINT.h
index 80c6975279..4ee74660ea 100644
--- a/Marlin/src/pins/teensy2/pins_5DPRINT.h
+++ b/Marlin/src/pins/teensy2/pins_5DPRINT.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -78,71 +78,71 @@
//
// Servos
//
-#define SERVO0_PIN 41
-#define SERVO1_PIN 42
-#define SERVO2_PIN 43
-#define SERVO3_PIN 44
+#define SERVO0_PIN 41
+#define SERVO1_PIN 42
+#define SERVO2_PIN 43
+#define SERVO3_PIN 44
//
// Limit Switches
//
-#define X_STOP_PIN 37 // E5
-#define Y_STOP_PIN 36 // E4
-#define Z_STOP_PIN 19 // E7
+#define X_STOP_PIN 37 // E5
+#define Y_STOP_PIN 36 // E4
+#define Z_STOP_PIN 19 // E7
//
// Steppers
//
-#define X_STEP_PIN 28 // A0
-#define X_DIR_PIN 29 // A1
-#define X_ENABLE_PIN 17 // C7
+#define X_STEP_PIN 28 // A0
+#define X_DIR_PIN 29 // A1
+#define X_ENABLE_PIN 17 // C7
-#define Y_STEP_PIN 30 // A2
-#define Y_DIR_PIN 31 // A3
-#define Y_ENABLE_PIN 13 // C3
+#define Y_STEP_PIN 30 // A2
+#define Y_DIR_PIN 31 // A3
+#define Y_ENABLE_PIN 13 // C3
-#define Z_STEP_PIN 32 // A4
-#define Z_DIR_PIN 33 // A5
-#define Z_ENABLE_PIN 12 // C2
+#define Z_STEP_PIN 32 // A4
+#define Z_DIR_PIN 33 // A5
+#define Z_ENABLE_PIN 12 // C2
-#define E0_STEP_PIN 34 // A6
-#define E0_DIR_PIN 35 // A7
-#define E0_ENABLE_PIN 11 // C1
+#define E0_STEP_PIN 34 // A6
+#define E0_DIR_PIN 35 // A7
+#define E0_ENABLE_PIN 11 // C1
//
// Digital Microstepping
//
-#define X_MS1_PIN 25 // B5
-#define X_MS2_PIN 26 // B6
-#define Y_MS1_PIN 9 // E1
-#define Y_MS2_PIN 8 // E0
-#define Z_MS1_PIN 7 // D7
-#define Z_MS2_PIN 6 // D6
-#define E0_MS1_PIN 5 // D5
-#define E0_MS2_PIN 4 // D4
+#define X_MS1_PIN 25 // B5
+#define X_MS2_PIN 26 // B6
+#define Y_MS1_PIN 9 // E1
+#define Y_MS2_PIN 8 // E0
+#define Z_MS1_PIN 7 // D7
+#define Z_MS2_PIN 6 // D6
+#define E0_MS1_PIN 5 // D5
+#define E0_MS2_PIN 4 // D4
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // F1 Analog Input
-#define TEMP_BED_PIN 0 // F0 Analog Input
+#define TEMP_0_PIN 1 // F1 Analog Input
+#define TEMP_BED_PIN 0 // F0 Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 15 // C5
-#define HEATER_BED_PIN 14 // C4
+#define HEATER_0_PIN 15 // C5
+#define HEATER_BED_PIN 14 // C4
#ifndef FAN_PIN
- #define FAN_PIN 16 // C6 PWM3A
+ #define FAN_PIN 16 // C6 PWM3A
#endif
//
// Misc. Functions
//
-#define SDSS 20 // B0
+#define SDSS 20 // B0
//DIGIPOTS slave addresses
#ifndef DIGIPOT_I2C_ADDRESS_A
- #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+ #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
#endif
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
index 3c38ad0b01..f7597dbbae 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -77,50 +77,50 @@
//
// Limit Switches
//
-#define X_STOP_PIN 35 // A7
-#define Y_STOP_PIN 34 // A6
-#define Z_STOP_PIN 33 // A5
+#define X_STOP_PIN 35 // A7
+#define Y_STOP_PIN 34 // A6
+#define Z_STOP_PIN 33 // A5
//
// Steppers
//
-#define X_STEP_PIN 3 // D3
-#define X_DIR_PIN 5 // D5
-#define X_ENABLE_PIN 4 // D4
-#define X_ATT_PIN 2 // D2
+#define X_STEP_PIN 3 // D3
+#define X_DIR_PIN 5 // D5
+#define X_ENABLE_PIN 4 // D4
+#define X_ATT_PIN 2 // D2
-#define Y_STEP_PIN 7 // D7
-#define Y_DIR_PIN 9 // E1
-#define Y_ENABLE_PIN 8 // E0
-#define Y_ATT_PIN 6 // D6
+#define Y_STEP_PIN 7 // D7
+#define Y_DIR_PIN 9 // E1
+#define Y_ENABLE_PIN 8 // E0
+#define Y_ATT_PIN 6 // D6
-#define Z_STEP_PIN 11 // C1
-#define Z_DIR_PIN 13 // C3
-#define Z_ENABLE_PIN 12 // C2
-#define Z_ATT_PIN 10 // C0
+#define Z_STEP_PIN 11 // C1
+#define Z_DIR_PIN 13 // C3
+#define Z_ENABLE_PIN 12 // C2
+#define Z_ATT_PIN 10 // C0
-#define E0_STEP_PIN 15 // C5
-#define E0_DIR_PIN 17 // C7
-#define E0_ENABLE_PIN 16 // C6
-#define E0_ATT_PIN 14 // C4
+#define E0_STEP_PIN 15 // C5
+#define E0_DIR_PIN 17 // C7
+#define E0_ENABLE_PIN 16 // C6
+#define E0_ATT_PIN 14 // C4
//
// Temperature Sensors
//
-#define TEMP_0_PIN 7 // F7 Analog Input
-#define TEMP_BED_PIN 6 // F6 Analog Input
+#define TEMP_0_PIN 7 // F7 Analog Input
+#define TEMP_BED_PIN 6 // F6 Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 32 // A4 Extruder
-#define HEATER_BED_PIN 18 // E6 Bed
+#define HEATER_0_PIN 32 // A4 Extruder
+#define HEATER_BED_PIN 18 // E6 Bed
#ifndef FAN_PIN
- #define FAN_PIN 31 // A3 Fan
+ #define FAN_PIN 31 // A3 Fan
#endif
//
// Misc. Functions
//
-#define LED_PIN 19 // E7
+#define LED_PIN 19 // E7
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
index cd4dd33695..575428f097 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -84,55 +84,55 @@
//
// Limit Switches
//
-#define X_STOP_PIN 45 // F7
-#define Y_STOP_PIN 12 // C2
-#define Z_STOP_PIN 36 // E4
+#define X_STOP_PIN 45 // F7
+#define Y_STOP_PIN 12 // C2
+#define Z_STOP_PIN 36 // E4
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
- #define Z_MIN_PROBE_PIN 11 // C1
+ #define Z_MIN_PROBE_PIN 11 // C1
#endif
//
// Steppers
//
-#define X_STEP_PIN 9 // E1
-#define X_DIR_PIN 8 // E0
-#define X_ENABLE_PIN 23 // B3
+#define X_STEP_PIN 9 // E1
+#define X_DIR_PIN 8 // E0
+#define X_ENABLE_PIN 23 // B3
-#define Y_STEP_PIN 7 // D7
-#define Y_DIR_PIN 6 // D6
-#define Y_ENABLE_PIN 20 // B0
+#define Y_STEP_PIN 7 // D7
+#define Y_DIR_PIN 6 // D6
+#define Y_ENABLE_PIN 20 // B0
-#define Z_STEP_PIN 5 // D5
-#define Z_DIR_PIN 4 // D4
-#define Z_ENABLE_PIN 37 // E5
+#define Z_STEP_PIN 5 // D5
+#define Z_DIR_PIN 4 // D4
+#define Z_ENABLE_PIN 37 // E5
-#define E0_STEP_PIN 47 // E3
-#define E0_DIR_PIN 46 // E2
-#define E0_ENABLE_PIN 25 // B5
+#define E0_STEP_PIN 47 // E3
+#define E0_DIR_PIN 46 // E2
+#define E0_ENABLE_PIN 25 // B5
//
// Temperature Sensors
//
-#define TEMP_0_PIN 2 // F2 Analog Input
-#define TEMP_1_PIN 1 // F1 Analog Input
-#define TEMP_BED_PIN 0 // F0 Analog Input
+#define TEMP_0_PIN 2 // F2 Analog Input
+#define TEMP_1_PIN 1 // F1 Analog Input
+#define TEMP_BED_PIN 0 // F0 Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 27 // B7
-#define HEATER_BED_PIN 26 // B6 Bed
+#define HEATER_0_PIN 27 // B7
+#define HEATER_BED_PIN 26 // B6 Bed
#ifndef FAN_PIN
- #define FAN_PIN 16 // C6 Fan, PWM3A
+ #define FAN_PIN 16 // C6 Fan, PWM3A
#endif
//
// Misc. Functions
//
-#define SDSS 20 // B0
-#define SD_DETECT_PIN 24 // B4
-#define LED_PIN 13 // C3
+#define SDSS 20 // B0
+#define SD_DETECT_PIN 24 // B4
+#define LED_PIN 13 // C3
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index 6f6ba5b8c1..68c548f833 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -74,95 +74,95 @@
//
// Limit Switches
//
-#define X_STOP_PIN 47 // E3
-#define Y_STOP_PIN 20 // B0 SS
-#define Z_STOP_PIN 36 // E4
+#define X_STOP_PIN 47 // E3
+#define Y_STOP_PIN 20 // B0 SS
+#define Z_STOP_PIN 36 // E4
//
// Steppers
//
-#define X_STEP_PIN 28 // A0
-#define X_DIR_PIN 29 // A1
-#define X_ENABLE_PIN 19 // E7
+#define X_STEP_PIN 28 // A0
+#define X_DIR_PIN 29 // A1
+#define X_ENABLE_PIN 19 // E7
-#define Y_STEP_PIN 30 // A2
-#define Y_DIR_PIN 31 // A3
-#define Y_ENABLE_PIN 18 // E6
+#define Y_STEP_PIN 30 // A2
+#define Y_DIR_PIN 31 // A3
+#define Y_ENABLE_PIN 18 // E6
-#define Z_STEP_PIN 32 // A4
-#define Z_DIR_PIN 33 // A5
-#define Z_ENABLE_PIN 17 // C7
+#define Z_STEP_PIN 32 // A4
+#define Z_DIR_PIN 33 // A5
+#define Z_ENABLE_PIN 17 // C7
-#define E0_STEP_PIN 34 // A6
-#define E0_DIR_PIN 35 // A7
-#define E0_ENABLE_PIN 13 // C3
+#define E0_STEP_PIN 34 // A6
+#define E0_DIR_PIN 35 // A7
+#define E0_ENABLE_PIN 13 // C3
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // Analog Input
-#define TEMP_BED_PIN 0 // Analog Input
+#define TEMP_0_PIN 1 // Analog Input
+#define TEMP_BED_PIN 0 // Analog Input
//
// Heaters / Fans
//
-#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
-#define HEATER_1_PIN 44 // F6
-#define HEATER_2_PIN 45 // F7
-#define HEATER_BED_PIN 14 // C4 PWM3C
+#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
+#define HEATER_1_PIN 44 // F6
+#define HEATER_2_PIN 45 // F7
+#define HEATER_BED_PIN 14 // C4 PWM3C
#ifndef FAN_PIN
- #define FAN_PIN 16 // C6 PWM3A
+ #define FAN_PIN 16 // C6 PWM3A
#endif
//
// Misc. Functions
//
-#define SDSS 26 // B6 SDCS
-#define FILWIDTH_PIN 2 // Analog Input
+#define SDSS 26 // B6 SDCS
+#define FILWIDTH_PIN 2 // Analog Input
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
- #define LCD_PINS_RS 9 // E1 JP11-11
- #define LCD_PINS_ENABLE 8 // E0 JP11-10
- #define LCD_PINS_D4 7 // D7 JP11-8
- #define LCD_PINS_D5 6 // D6 JP11-7
- #define LCD_PINS_D6 5 // D5 JP11-6
- #define LCD_PINS_D7 4 // D4 JP11-5
+ #define LCD_PINS_RS 9 // E1 JP11-11
+ #define LCD_PINS_ENABLE 8 // E0 JP11-10
+ #define LCD_PINS_D4 7 // D7 JP11-8
+ #define LCD_PINS_D5 6 // D6 JP11-7
+ #define LCD_PINS_D6 5 // D5 JP11-6
+ #define LCD_PINS_D7 4 // D4 JP11-5
#if ANY(VIKI2, miniVIKI)
- #define BEEPER_PIN 8 // E0 JP11-10
+ #define BEEPER_PIN 8 // E0 JP11-10
- #define DOGLCD_A0 40 // F2 JP2-2
- #define DOGLCD_CS 41 // F3 JP2-4
+ #define DOGLCD_A0 40 // F2 JP2-2
+ #define DOGLCD_CS 41 // F3 JP2-4
#define LCD_SCREEN_ROT_180
- #define BTN_EN1 2 // D2 TX1 JP2-5
- #define BTN_EN2 3 // D3 RX1 JP2-7
- #define BTN_ENC 45 // F7 TDI JP2-12
+ #define BTN_EN1 2 // D2 TX1 JP2-5
+ #define BTN_EN2 3 // D3 RX1 JP2-7
+ #define BTN_ENC 45 // F7 TDI JP2-12
#undef SDSS
- #define SDSS 43 // F5 TMS JP2-8
+ #define SDSS 43 // F5 TMS JP2-8
- #define STAT_LED_RED_PIN 12 // C2 JP11-14
- #define STAT_LED_BLUE_PIN 10 // C0 JP11-12
+ #define STAT_LED_RED_PIN 12 // C2 JP11-14
+ #define STAT_LED_BLUE_PIN 10 // C0 JP11-12
#elif ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 3 // D3 RX1 JP2-7
- #define BTN_EN2 2 // D2 TX1 JP2-5
- #define BTN_ENC 41 // F3 JP2-4
+ #define BTN_EN1 3 // D3 RX1 JP2-7
+ #define BTN_EN2 2 // D2 TX1 JP2-5
+ #define BTN_ENC 41 // F3 JP2-4
#undef SDSS
- #define SDSS 38 // F0 B-THERM connector - use SD card on Panelolu2
+ #define SDSS 38 // F0 B-THERM connector - use SD card on Panelolu2
#else
- #define BTN_EN1 10 // C0 JP11-12
- #define BTN_EN2 11 // C1 JP11-13
- #define BTN_ENC 12 // C2 JP11-14
+ #define BTN_EN1 10 // C0 JP11-12
+ #define BTN_EN2 11 // C1 JP11-13
+ #define BTN_ENC 12 // C2 JP11-14
#endif
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 6aaa037d25..f5f05ddeaf 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -99,46 +99,46 @@
//
// Limit Switches
//
-#define X_STOP_PIN 47 // E3
-#define Y_STOP_PIN 24 // B4 PWM2A
-#define Z_STOP_PIN 36 // E4
+#define X_STOP_PIN 47 // E3
+#define Y_STOP_PIN 24 // B4 PWM2A
+#define Z_STOP_PIN 36 // E4
//
// Steppers
//
-#define X_STEP_PIN 28 // A0
-#define X_DIR_PIN 29 // A1
-#define X_ENABLE_PIN 19 // E7
+#define X_STEP_PIN 28 // A0
+#define X_DIR_PIN 29 // A1
+#define X_ENABLE_PIN 19 // E7
-#define Y_STEP_PIN 30 // A2
-#define Y_DIR_PIN 31 // A3
-#define Y_ENABLE_PIN 18 // E6
+#define Y_STEP_PIN 30 // A2
+#define Y_DIR_PIN 31 // A3
+#define Y_ENABLE_PIN 18 // E6
-#define Z_STEP_PIN 32 // A4
-#define Z_DIR_PIN 33 // A5
-#define Z_ENABLE_PIN 17 // C7
+#define Z_STEP_PIN 32 // A4
+#define Z_DIR_PIN 33 // A5
+#define Z_ENABLE_PIN 17 // C7
-#define E0_STEP_PIN 34 // A6
-#define E0_DIR_PIN 35 // A7
-#define E0_ENABLE_PIN 13 // C3
+#define E0_STEP_PIN 34 // A6
+#define E0_DIR_PIN 35 // A7
+#define E0_ENABLE_PIN 13 // C3
#if DISABLED(NO_EXTRUDRBOARD)
#if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
- #define E1_STEP_PIN 25 // B5
- #define E1_DIR_PIN 37 // E5
- #define E1_ENABLE_PIN 42 // F4
+ #define E1_STEP_PIN 25 // B5
+ #define E1_DIR_PIN 37 // E5
+ #define E1_ENABLE_PIN 42 // F4
- #define E2_STEP_PIN 2 // D2
- #define E2_DIR_PIN 3 // D3
- #define E2_ENABLE_PIN 43 // F5
+ #define E2_STEP_PIN 2 // D2
+ #define E2_DIR_PIN 3 // D3
+ #define E2_ENABLE_PIN 43 // F5
#else
- #define E1_STEP_PIN 2 // D2
- #define E1_DIR_PIN 3 // D3
- #define E1_ENABLE_PIN 43 // F5
+ #define E1_STEP_PIN 2 // D2
+ #define E1_DIR_PIN 3 // D3
+ #define E1_ENABLE_PIN 43 // F5
- #define E2_STEP_PIN 25 // B5
- #define E2_DIR_PIN 37 // E5
- #define E2_ENABLE_PIN 42 // F4
+ #define E2_STEP_PIN 25 // B5
+ #define E2_DIR_PIN 37 // E5
+ #define E2_ENABLE_PIN 42 // F4
#endif
#endif // NO_EXTRUDRBOARD
@@ -154,46 +154,46 @@
#define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
#define DAC_STEPPER_SENSE 0.11
-#define DAC_STEPPER_ADDRESS 0
-#define DAC_STEPPER_MAX 3520
-#define DAC_STEPPER_VREF 1 // internal Vref, gain 1x = 2.048V
-#define DAC_STEPPER_GAIN 0
-#define DAC_OR_ADDRESS 0x00
+#define DAC_STEPPER_ADDRESS 0
+#define DAC_STEPPER_MAX 3520
+#define DAC_STEPPER_VREF 1 // internal Vref, gain 1x = 2.048V
+#define DAC_STEPPER_GAIN 0
+#define DAC_OR_ADDRESS 0x00
//
// Temperature Sensors
//
-#define TEMP_0_PIN 1 // Analog Input (Extruder)
-#define TEMP_BED_PIN 0 // Analog Input (Bed)
+#define TEMP_0_PIN 1 // Analog Input (Extruder)
+#define TEMP_BED_PIN 0 // Analog Input (Bed)
#if DISABLED(NO_EXTRUDRBOARD)
#if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
- #define TEMP_1_PIN 2 // Analog Input (Extrudrboard A THERM)
- #define TEMP_2_PIN 3 // Analog Input (Extrudrboard B THERM)
+ #define TEMP_1_PIN 2 // Analog Input (Extrudrboard A THERM)
+ #define TEMP_2_PIN 3 // Analog Input (Extrudrboard B THERM)
#else
- #define TEMP_1_PIN 3 // Analog Input (Extrudrboard B THERM)
- #define TEMP_2_PIN 2 // Analog Input (Extrudrboard A THERM)
+ #define TEMP_1_PIN 3 // Analog Input (Extrudrboard B THERM)
+ #define TEMP_2_PIN 2 // Analog Input (Extrudrboard A THERM)
#endif
#endif
//
// Heaters / Fans
//
-#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
-#define HEATER_BED_PIN 14 // C4 PWM3C
+#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
+#define HEATER_BED_PIN 14 // C4 PWM3C
#if DISABLED(NO_EXTRUDRBOARD)
#if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
- #define HEATER_1_PIN 44 // F6 - Extrudrboard A HOTEND
- #define HEATER_2_PIN 45 // F7 - Extrudrboard B HOTEND
+ #define HEATER_1_PIN 44 // F6 - Extrudrboard A HOTEND
+ #define HEATER_2_PIN 45 // F7 - Extrudrboard B HOTEND
#else
- #define HEATER_1_PIN 45 // F7 - Extrudrboard B HOTEND
- #define HEATER_2_PIN 44 // F6 - Extrudrboard A HOTEND
+ #define HEATER_1_PIN 45 // F7 - Extrudrboard B HOTEND
+ #define HEATER_2_PIN 44 // F6 - Extrudrboard A HOTEND
#endif
#endif
#ifndef FAN_PIN
- #define FAN_PIN 16 // C6 PWM3A
+ #define FAN_PIN 16 // C6 PWM3A
#endif
//
@@ -202,49 +202,49 @@
//#define USE_INTERNAL_SD
#if HAS_SPI_LCD
- #define LCD_PINS_RS 9 // E1 JP11-11
- #define LCD_PINS_ENABLE 8 // E0 JP11-10
- #define LCD_PINS_D4 7 // D7 JP11-8
- #define LCD_PINS_D5 6 // D6 JP11-7
- #define LCD_PINS_D6 5 // D5 JP11-6
- #define LCD_PINS_D7 4 // D4 JP11-5
+ #define LCD_PINS_RS 9 // E1 JP11-11
+ #define LCD_PINS_ENABLE 8 // E0 JP11-10
+ #define LCD_PINS_D4 7 // D7 JP11-8
+ #define LCD_PINS_D5 6 // D6 JP11-7
+ #define LCD_PINS_D6 5 // D5 JP11-6
+ #define LCD_PINS_D7 4 // D4 JP11-5
#if ANY(VIKI2, miniVIKI)
- #define BEEPER_PIN 8 // E0 JP11-10
- #define DOGLCD_A0 40 // F2 JP2-2
- #define DOGLCD_CS 41 // F3 JP2-4
+ #define BEEPER_PIN 8 // E0 JP11-10
+ #define DOGLCD_A0 40 // F2 JP2-2
+ #define DOGLCD_CS 41 // F3 JP2-4
#define LCD_SCREEN_ROT_180
- #define BTN_EN1 2 // D2 TX1 JP2-5
- #define BTN_EN2 3 // D3 RX1 JP2-7
- #define BTN_ENC 45 // F7 TDI JP2-12
+ #define BTN_EN1 2 // D2 TX1 JP2-5
+ #define BTN_EN2 3 // D3 RX1 JP2-7
+ #define BTN_ENC 45 // F7 TDI JP2-12
- #define SDSS 3 // F5 TMS JP2-8
+ #define SDSS 3 // F5 TMS JP2-8
- #define STAT_LED_RED_PIN 12 // C2 JP11-14
- #define STAT_LED_BLUE_PIN 10 // C0 JP11-12
+ #define STAT_LED_RED_PIN 12 // C2 JP11-14
+ #define STAT_LED_BLUE_PIN 10 // C0 JP11-12
#elif ENABLED(MINIPANEL)
#if DISABLED(USE_INTERNAL_SD)
// PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. MKSLCD12864 PIN#
- #define SDSS 11 // 36 C1 EXP2-13 EXP2-07
- #define SD_DETECT_PIN 9 // 34 E1 EXP2-11 EXP2-04
+ #define SDSS 11 // 36 C1 EXP2-13 EXP2-07
+ #define SD_DETECT_PIN 9 // 34 E1 EXP2-11 EXP2-04
#endif
// PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. MKSLCD12864 PIN#
- #define DOGLCD_A0 4 // 29 D4 EXP2-05 EXP1-04
- #define DOGLCD_CS 5 // 30 D5 EXP2-06 EXP1-05
- #define BTN_ENC 6 // 31 D6 EXP2-07 EXP1-09
- #define BEEPER_PIN 7 // 32 D7 EXP2-08 EXP1-10
- #define KILL_PIN 8 // 33 E0 EXP2-10 EXP2-03
- #define BTN_EN1 10 // 35 C0 EXP2-12 EXP2-06
- #define BTN_EN2 12 // 37 C2 EXP2-14 EXP2-08
- //#define LCD_BACKLIGHT_PIN 43 // 56 F5 EXP1-12 Not Implemented
- //#define SCK 21 // 11 B1 ICSP-04 EXP2-09
- //#define MOSI 22 // 12 B2 ICSP-03 EXP2-05
- //#define MISO 23 // 13 B3 ICSP-06 EXP2-05
+ #define DOGLCD_A0 4 // 29 D4 EXP2-05 EXP1-04
+ #define DOGLCD_CS 5 // 30 D5 EXP2-06 EXP1-05
+ #define BTN_ENC 6 // 31 D6 EXP2-07 EXP1-09
+ #define BEEPER_PIN 7 // 32 D7 EXP2-08 EXP1-10
+ #define KILL_PIN 8 // 33 E0 EXP2-10 EXP2-03
+ #define BTN_EN1 10 // 35 C0 EXP2-12 EXP2-06
+ #define BTN_EN2 12 // 37 C2 EXP2-14 EXP2-08
+ //#define LCD_BACKLIGHT_PIN 43 // 56 F5 EXP1-12 Not Implemented
+ //#define SCK 21 // 11 B1 ICSP-04 EXP2-09
+ //#define MOSI 22 // 12 B2 ICSP-03 EXP2-05
+ //#define MISO 23 // 13 B3 ICSP-06 EXP2-05
// increase delays
#define BOARD_ST7920_DELAY_1 DELAY_NS(313)
@@ -253,9 +253,9 @@
#else
- #define BTN_EN1 10 // C0 JP11-12
- #define BTN_EN2 11 // C1 JP11-13
- #define BTN_ENC 12 // C2 JP11-14
+ #define BTN_EN1 10 // C0 JP11-12
+ #define BTN_EN2 11 // C1 JP11-13
+ #define BTN_ENC 12 // C2 JP11-14
#endif
@@ -266,7 +266,7 @@
//
// PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn.
#ifndef SDSS
- #define SDSS 20 // 10 B0
+ #define SDSS 20 // 10 B0
#endif
/**
@@ -277,5 +277,5 @@
* which will let you use Channel B on the Extrudrboard as E1.
*/
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 2 // Analog Input
+ #define FILWIDTH_PIN 2 // Analog Input
#endif
diff --git a/Marlin/src/pins/teensy2/pins_SAV_MKI.h b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
index 1ae186ab59..01003b056d 100644
--- a/Marlin/src/pins/teensy2/pins_SAV_MKI.h
+++ b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -73,56 +73,56 @@
//
// Servos
//
-#define SERVO0_PIN 39 // F1 In teensy's pin definition for pinMode (in servo.cpp)
+#define SERVO0_PIN 39 // F1 In teensy's pin definition for pinMode (in servo.cpp)
//
// Limit Switches
//
-#define X_STOP_PIN 25 // B5
-#define Y_STOP_PIN 26 // B6
-//#define Z_STOP_PIN 27 // B7
-#define Z_STOP_PIN 36 // E4 For inductive sensor.
-//#define E_STOP_PIN 36 // E4
+#define X_STOP_PIN 25 // B5
+#define Y_STOP_PIN 26 // B6
+//#define Z_STOP_PIN 27 // B7
+#define Z_STOP_PIN 36 // E4 For inductive sensor.
+//#define E_STOP_PIN 36 // E4
//
// Steppers
//
-#define X_STEP_PIN 28 // A0
-#define X_DIR_PIN 29 // A1
-#define X_ENABLE_PIN 19 // E7
+#define X_STEP_PIN 28 // A0
+#define X_DIR_PIN 29 // A1
+#define X_ENABLE_PIN 19 // E7
-#define Y_STEP_PIN 30 // A2
-#define Y_DIR_PIN 31 // A3
-#define Y_ENABLE_PIN 18 // E6
+#define Y_STEP_PIN 30 // A2
+#define Y_DIR_PIN 31 // A3
+#define Y_ENABLE_PIN 18 // E6
-#define Z_STEP_PIN 32 // A4
-#define Z_DIR_PIN 33 // A5
-#define Z_ENABLE_PIN 17 // C7
+#define Z_STEP_PIN 32 // A4
+#define Z_DIR_PIN 33 // A5
+#define Z_ENABLE_PIN 17 // C7
-#define E0_STEP_PIN 34 // A6
-#define E0_DIR_PIN 35 // A7
-#define E0_ENABLE_PIN 13 // C3
+#define E0_STEP_PIN 34 // A6
+#define E0_DIR_PIN 35 // A7
+#define E0_ENABLE_PIN 13 // C3
//
// Temperature Sensors
//
-#define TEMP_0_PIN 7 // F7 Analog Input (Extruder)
-#define TEMP_BED_PIN 6 // F6 Analog Input (Bed)
+#define TEMP_0_PIN 7 // F7 Analog Input (Extruder)
+#define TEMP_BED_PIN 6 // F6 Analog Input (Bed)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
-#define HEATER_BED_PIN 14 // C4 PWM3C - Bed
+#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
+#define HEATER_BED_PIN 14 // C4 PWM3C - Bed
#ifndef FAN_PIN
- #define FAN_PIN 16 // C6 PWM3A
+ #define FAN_PIN 16 // C6 PWM3A
#endif
//
// Misc. Functions
//
-#define SDSS 20 // B0
+#define SDSS 20 // B0
// Extension header pin mapping
// ----------------------------
@@ -133,53 +133,53 @@
// PWM-D24 A4 (An), IO
// 5V GND
// 12V GND
-#define EXT_AUX_SCL_D0 0 // D0 PWM0B
-#define EXT_AUX_SDA_D1 1 // D1
-#define EXT_AUX_RX1_D2 2 // D2
-#define EXT_AUX_TX1_D3 3 // D3
-#define EXT_AUX_PWM_D24 24 // B4 PWM2A
-#define EXT_AUX_A0 0 // F0 Analog Input
-#define EXT_AUX_A0_IO 38 // F0 Digital IO
-#define EXT_AUX_A1 1 // F1 Analog Input
-#define EXT_AUX_A1_IO 39 // F1 Digital IO
-#define EXT_AUX_A2 2 // F2 Analog Input
-#define EXT_AUX_A2_IO 40 // F2 Digital IO
-#define EXT_AUX_A3 3 // F3 Analog Input
-#define EXT_AUX_A3_IO 41 // F3 Digital IO
-#define EXT_AUX_A4 4 // F4 Analog Input
-#define EXT_AUX_A4_IO 42 // F4 Digital IO
+#define EXT_AUX_SCL_D0 0 // D0 PWM0B
+#define EXT_AUX_SDA_D1 1 // D1
+#define EXT_AUX_RX1_D2 2 // D2
+#define EXT_AUX_TX1_D3 3 // D3
+#define EXT_AUX_PWM_D24 24 // B4 PWM2A
+#define EXT_AUX_A0 0 // F0 Analog Input
+#define EXT_AUX_A0_IO 38 // F0 Digital IO
+#define EXT_AUX_A1 1 // F1 Analog Input
+#define EXT_AUX_A1_IO 39 // F1 Digital IO
+#define EXT_AUX_A2 2 // F2 Analog Input
+#define EXT_AUX_A2_IO 40 // F2 Digital IO
+#define EXT_AUX_A3 3 // F3 Analog Input
+#define EXT_AUX_A3_IO 41 // F3 Digital IO
+#define EXT_AUX_A4 4 // F4 Analog Input
+#define EXT_AUX_A4_IO 42 // F4 Digital IO
//
// LCD / Controller
//
-#define BEEPER_PIN -1
-#define LCD_PINS_RS -1
-#define LCD_PINS_ENABLE -1
+#define BEEPER_PIN -1
+#define LCD_PINS_RS -1
+#define LCD_PINS_ENABLE -1
#if ENABLED(SAV_3DLCD)
// For LCD SHIFT register LCD
- #define SR_DATA_PIN EXT_AUX_SDA_D1
- #define SR_CLK_PIN EXT_AUX_SCL_D0
+ #define SR_DATA_PIN EXT_AUX_SDA_D1
+ #define SR_CLK_PIN EXT_AUX_SCL_D0
#endif
#if EITHER(SAV_3DLCD, SAV_3DGLCD)
- #define BTN_EN1 EXT_AUX_A1_IO
- #define BTN_EN2 EXT_AUX_A0_IO
- #define BTN_ENC EXT_AUX_PWM_D24
+ #define BTN_EN1 EXT_AUX_A1_IO
+ #define BTN_EN2 EXT_AUX_A0_IO
+ #define BTN_ENC EXT_AUX_PWM_D24
- #define KILL_PIN EXT_AUX_A2_IO
- #define HOME_PIN EXT_AUX_A4_IO
+ #define KILL_PIN EXT_AUX_A2_IO
+ #define HOME_PIN EXT_AUX_A4_IO
-#else // Use the expansion header for spindle control
+#else // Use the expansion header for spindle control
//
// M3/M4/M5 - Spindle/Laser Control
//
- #define SPINDLE_LASER_PWM_PIN 24 // B4 PWM2A
- #define SPINDLE_LASER_ENA_PIN 39 // F1 Pin should have a pullup!
- #define SPINDLE_DIR_PIN 40 // F2
+ #define SPINDLE_LASER_PWM_PIN 24 // B4 PWM2A
+ #define SPINDLE_LASER_ENA_PIN 39 // F1 Pin should have a pullup!
+ #define SPINDLE_DIR_PIN 40 // F2
- #define CASE_LIGHT_PIN 0 // D0 PWM0B
+ #define CASE_LIGHT_PIN 0 // D0 PWM0B
#endif
diff --git a/Marlin/src/pins/teensy2/pins_TEENSY2.h b/Marlin/src/pins/teensy2/pins_TEENSY2.h
index a91a019121..eb116ee3e8 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSY2.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSY2.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -116,70 +116,70 @@
//
// Limit Switches
//
-#define X_STOP_PIN 2 // D2
-#define Y_STOP_PIN 3 // D3
-#define Z_STOP_PIN 4 // D4
+#define X_STOP_PIN 2 // D2
+#define Y_STOP_PIN 3 // D3
+#define Z_STOP_PIN 4 // D4
//
// Steppers
//
-#define X_STEP_PIN 28 // A0 Marlin
-#define X_DIR_PIN 29 // A1 Marlin
-#define X_ENABLE_PIN 26 // B6
+#define X_STEP_PIN 28 // A0 Marlin
+#define X_DIR_PIN 29 // A1 Marlin
+#define X_ENABLE_PIN 26 // B6
-#define Y_STEP_PIN 30 // A2 Marlin
-#define Y_DIR_PIN 31 // A3
-#define Y_ENABLE_PIN 26 // B6 Shared w/x
+#define Y_STEP_PIN 30 // A2 Marlin
+#define Y_DIR_PIN 31 // A3
+#define Y_ENABLE_PIN 26 // B6 Shared w/x
-#define Z_STEP_PIN 32 // A4
-#define Z_DIR_PIN 33 // A5
-#define Z_ENABLE_PIN 26 // B6 Shared w/x
+#define Z_STEP_PIN 32 // A4
+#define Z_DIR_PIN 33 // A5
+#define Z_ENABLE_PIN 26 // B6 Shared w/x
-#define E0_STEP_PIN 34 // A6
-#define E0_DIR_PIN 35 // A7
-#define E0_ENABLE_PIN 26 // B6 Shared w/x
+#define E0_STEP_PIN 34 // A6
+#define E0_DIR_PIN 35 // A7
+#define E0_ENABLE_PIN 26 // B6 Shared w/x
//
// Temperature Sensors
//
-#define TEMP_0_PIN 7 // F7 Analog Input (Extruder)
-#define TEMP_BED_PIN 6 // F6 Analog Input (Bed)
+#define TEMP_0_PIN 7 // F7 Analog Input (Extruder)
+#define TEMP_BED_PIN 6 // F6 Analog Input (Bed)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 15 // C5 PWM3B Extruder
-#define HEATER_BED_PIN 14 // C4 PWM3C
+#define HEATER_0_PIN 15 // C5 PWM3B Extruder
+#define HEATER_BED_PIN 14 // C4 PWM3C
#ifndef FAN_PIN
- #define FAN_PIN 16 // C6 PWM3A Fan
+ #define FAN_PIN 16 // C6 PWM3A Fan
#endif
//
// Misc. Functions
//
-#define SDSS 20 // B0
-#define LED_PIN 6 // D6
-#define PS_ON_PIN 27 // B7
-#define CASE_LIGHT_PIN 1 // D1 PWM2B MUST BE HARDWARE PWM
+#define SDSS 20 // B0
+#define LED_PIN 6 // D6
+#define PS_ON_PIN 27 // B7
+#define CASE_LIGHT_PIN 1 // D1 PWM2B MUST BE HARDWARE PWM
//
// LCD / Controller
//
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_RS 8 // E0
- #define LCD_PINS_ENABLE 9 // E1
- #define LCD_PINS_D4 10 // C0
- #define LCD_PINS_D5 11 // C1
- #define LCD_PINS_D6 12 // C2
- #define LCD_PINS_D7 13 // C3
- #define BTN_EN1 38 // F0
- #define BTN_EN2 39 // F1
- #define BTN_ENC 40 // F2
+ #define LCD_PINS_RS 8 // E0
+ #define LCD_PINS_ENABLE 9 // E1
+ #define LCD_PINS_D4 10 // C0
+ #define LCD_PINS_D5 11 // C1
+ #define LCD_PINS_D6 12 // C2
+ #define LCD_PINS_D7 13 // C3
+ #define BTN_EN1 38 // F0
+ #define BTN_EN2 39 // F1
+ #define BTN_ENC 40 // F2
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_ENA_PIN 5 // D5 Pin should have a pullup!
-#define SPINDLE_LASER_PWM_PIN 0 // D0 PWM0B MUST BE HARDWARE PWM
-#define SPINDLE_DIR_PIN 7 // D7
+#define SPINDLE_LASER_ENA_PIN 5 // D5 Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN 0 // D0 PWM0B MUST BE HARDWARE PWM
+#define SPINDLE_DIR_PIN 7 // D7
diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
index 5fde57180b..05f433cb89 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -82,82 +82,81 @@
//
// Limit Switch definitions that match the SCHEMATIC
//
-//#define X_STOP_PIN 25 // B5
-//#define Y_STOP_PIN 26 // B6
-//#define Z_STOP_PIN 27 // B7
-//#define E_STOP_PIN 36 // E4
-
+//#define X_STOP_PIN 25 // B5
+//#define Y_STOP_PIN 26 // B6
+//#define Z_STOP_PIN 27 // B7
+//#define E_STOP_PIN 36 // E4
//
// Limit Switch definitions that match the SILKSCREEN
//
-#define X_STOP_PIN 26 // B6
-#define Y_STOP_PIN 27 // B7
-#define Z_STOP_PIN 36 // E4
-//#define E_STOP_PIN 25 // B5
+#define X_STOP_PIN 26 // B6
+#define Y_STOP_PIN 27 // B7
+#define Z_STOP_PIN 36 // E4
+//#define E_STOP_PIN 25 // B5
//
// Steppers
//
-#define X_STEP_PIN 28 // A0
-#define X_DIR_PIN 29 // A1
-#define X_ENABLE_PIN 19 // E7
+#define X_STEP_PIN 28 // A0
+#define X_DIR_PIN 29 // A1
+#define X_ENABLE_PIN 19 // E7
-#define Y_STEP_PIN 30 // A2
-#define Y_DIR_PIN 31 // A3
-#define Y_ENABLE_PIN 18 // E6
+#define Y_STEP_PIN 30 // A2
+#define Y_DIR_PIN 31 // A3
+#define Y_ENABLE_PIN 18 // E6
-#define Z_STEP_PIN 32 // A4
-#define Z_DIR_PIN 33 // A5
-#define Z_ENABLE_PIN 17 // C7
+#define Z_STEP_PIN 32 // A4
+#define Z_DIR_PIN 33 // A5
+#define Z_ENABLE_PIN 17 // C7
-#define E0_STEP_PIN 34 // A6
-#define E0_DIR_PIN 35 // A7
-#define E0_ENABLE_PIN 13 // C3
+#define E0_STEP_PIN 34 // A6
+#define E0_DIR_PIN 35 // A7
+#define E0_ENABLE_PIN 13 // C3
//
// Temperature Sensors
//
-#define TEMP_0_PIN 7 // Analog Input (Extruder)
-#define TEMP_BED_PIN 6 // Analog Input (Bed)
+#define TEMP_0_PIN 7 // Analog Input (Extruder)
+#define TEMP_BED_PIN 6 // Analog Input (Bed)
//
// Heaters / Fans
//
-#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
-#define HEATER_BED_PIN 14 // C4 PWM3C
+#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
+#define HEATER_BED_PIN 14 // C4 PWM3C
#ifndef FAN_PIN
- #define FAN_PIN 16 // C6 PWM3A
+ #define FAN_PIN 16 // C6 PWM3A
#endif
//
// Misc. Functions
//
-#define SDSS 20 // B0 JP31-6
-#define CASE_LIGHT_PIN 0 // D0 IO-14 PWM0B
+#define SDSS 20 // B0 JP31-6
+#define CASE_LIGHT_PIN 0 // D0 IO-14 PWM0B
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
- #define BEEPER_PIN -1
+ #define BEEPER_PIN -1
#if ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 3 // D3 IO-8
- #define BTN_EN2 2 // D2 IO-10
- #define BTN_ENC 41 // F3 IO-7
- #define SDSS 38 // F0 IO-13 use SD card on Panelolu2
+ #define BTN_EN1 3 // D3 IO-8
+ #define BTN_EN2 2 // D2 IO-10
+ #define BTN_ENC 41 // F3 IO-7
+ #define SDSS 38 // F0 IO-13 use SD card on Panelolu2
#endif
- #define SD_DETECT_PIN -1
+ #define SD_DETECT_PIN -1
#endif // HAS_SPI_LCD && NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control
//
-#define SPINDLE_LASER_PWM_PIN 24 // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENA_PIN 39 // F1 IO-11 - Pin should have a pullup!
-#define SPINDLE_DIR_PIN 40 // F2 IO-9
+#define SPINDLE_LASER_PWM_PIN 24 // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENA_PIN 39 // F1 IO-11 - Pin should have a pullup!
+#define SPINDLE_DIR_PIN 40 // F2 IO-9
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
index a68b9e31c4..0f895c9e6b 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -35,87 +35,87 @@
#define BOARD_INFO_NAME "Teensy3.2"
#endif
-#define AT90USB 1286 // Disable MarlinSerial etc.
+#define AT90USB 1286 // Disable MarlinSerial etc.
#define USBCON //1286 // Disable MarlinSerial etc.
//
// Limit Switches
//
-#define X_STOP_PIN 3
-#define Y_STOP_PIN 4
-#define Z_STOP_PIN 5
+#define X_STOP_PIN 3
+#define Y_STOP_PIN 4
+#define Z_STOP_PIN 5
//
// Steppers
//
-#define X_STEP_PIN 5
-#define X_DIR_PIN 6
-#define X_ENABLE_PIN 2
+#define X_STEP_PIN 5
+#define X_DIR_PIN 6
+#define X_ENABLE_PIN 2
-#define Y_STEP_PIN 7
-#define Y_DIR_PIN 8
-#define Y_ENABLE_PIN 2
+#define Y_STEP_PIN 7
+#define Y_DIR_PIN 8
+#define Y_ENABLE_PIN 2
-#define Z_STEP_PIN 9
-#define Z_DIR_PIN 10
-#define Z_ENABLE_PIN 2
+#define Z_STEP_PIN 9
+#define Z_DIR_PIN 10
+#define Z_ENABLE_PIN 2
-#define E0_STEP_PIN 11
-#define E0_DIR_PIN 12
-#define E0_ENABLE_PIN 2
+#define E0_STEP_PIN 11
+#define E0_DIR_PIN 12
+#define E0_ENABLE_PIN 2
-//#define E1_STEP_PIN 33
-//#define E1_DIR_PIN 34
-//#define E1_ENABLE_PIN 35
+//#define E1_STEP_PIN 33
+//#define E1_DIR_PIN 34
+//#define E1_ENABLE_PIN 35
//
// Heaters / Fans
//
-#define HEATER_0_PIN 20
+#define HEATER_0_PIN 20
// #define HEATER_1_PIN 36
-#define HEATER_BED_PIN 21
+#define HEATER_BED_PIN 21
#ifndef FAN_PIN
- #define FAN_PIN 22
+ #define FAN_PIN 22
#endif
//
// Temperature Sensors
//
-#define TEMP_0_PIN 14 // Analog Input - Extruder 2 => A2
-//#define TEMP_1_PIN 0 // Analog Input
-#define TEMP_BED_PIN 15 // Analog Input - Bed
+#define TEMP_0_PIN 14 // Analog Input - Extruder 2 => A2
+//#define TEMP_1_PIN 0 // Analog Input
+#define TEMP_BED_PIN 15 // Analog Input - Bed
#ifndef FILWIDTH_PIN
- #define FILWIDTH_PIN 6 // Analog Input
+ #define FILWIDTH_PIN 6 // Analog Input
#endif
//
// Misc. Functions
//
-//#define SDSS 16 // 8
-#define LED_PIN 13
+//#define SDSS 16 // 8
+#define LED_PIN 13
-//#define SOL1_PIN 28
+//#define SOL1_PIN 28
//
// LCD / Controller
//
-//#define SCK_PIN 13
-//#define MISO_PIN 12
-//#define MOSI_PIN 11
+//#define SCK_PIN 13
+//#define MISO_PIN 12
+//#define MOSI_PIN 11
/*
#if HAS_SPI_LCD
- #define LCD_PINS_RS 40
- #define LCD_PINS_ENABLE 41
- #define LCD_PINS_D4 42
- #define LCD_PINS_D5 43
- #define LCD_PINS_D6 44
- #define LCD_PINS_D7 45
- #define BTN_EN1 46
- #define BTN_EN2 47
- #define BTN_ENC 48
+ #define LCD_PINS_RS 40
+ #define LCD_PINS_ENABLE 41
+ #define LCD_PINS_D4 42
+ #define LCD_PINS_D5 43
+ #define LCD_PINS_D6 44
+ #define LCD_PINS_D7 45
+ #define BTN_EN1 46
+ #define BTN_EN2 47
+ #define BTN_ENC 48
#endif
*/
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
index b0f0e4d474..8528533d7b 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -37,7 +37,7 @@
#define BOARD_INFO_NAME "Teensy3.6"
#endif
-#define AT90USB 1286 // Disable MarlinSerial etc.
+#define AT90USB 1286 // Disable MarlinSerial etc.
#define USBCON //1286 // Disable MarlinSerial etc.
/*
@@ -83,80 +83,80 @@ D8 HEATER_BED_PIN CS1 RX4 A12 31 | 46 * * 47 | 34 A15 PWM
//
// Limit Switches
//
-#define X_STOP_PIN 24
-#define Y_STOP_PIN 26
-#define Z_STOP_PIN 28
+#define X_STOP_PIN 24
+#define Y_STOP_PIN 26
+#define Z_STOP_PIN 28
//
// Steppers
//
-#define X_STEP_PIN 22
-#define X_DIR_PIN 21
-#define X_ENABLE_PIN 39
+#define X_STEP_PIN 22
+#define X_DIR_PIN 21
+#define X_ENABLE_PIN 39
-#define Y_STEP_PIN 19
-#define Y_DIR_PIN 18
-#define Y_ENABLE_PIN 20
+#define Y_STEP_PIN 19
+#define Y_DIR_PIN 18
+#define Y_ENABLE_PIN 20
-#define Z_STEP_PIN 38
-#define Z_DIR_PIN 37
-#define Z_ENABLE_PIN 17
+#define Z_STEP_PIN 38
+#define Z_DIR_PIN 37
+#define Z_ENABLE_PIN 17
-#define E0_STEP_PIN 31
-#define E0_DIR_PIN 30
-#define E0_ENABLE_PIN 32
+#define E0_STEP_PIN 31
+#define E0_DIR_PIN 30
+#define E0_ENABLE_PIN 32
-#define E1_STEP_PIN 33
-#define E1_DIR_PIN 34
-#define E1_ENABLE_PIN 35
+#define E1_STEP_PIN 33
+#define E1_DIR_PIN 34
+#define E1_ENABLE_PIN 35
-#define HEATER_0_PIN 30
-#define HEATER_1_PIN 36
-#define HEATER_BED_PIN 31
+#define HEATER_0_PIN 30
+#define HEATER_1_PIN 36
+#define HEATER_BED_PIN 31
#ifndef FAN_PIN
- #define FAN_PIN 2
+ #define FAN_PIN 2
#endif
-#define TEMP_0_PIN 2 // Extruder / Analog pin numbering: 2 => A2
-#define TEMP_1_PIN 0
-#define TEMP_BED_PIN 1 // Bed / Analog pin numbering
+#define TEMP_0_PIN 2 // Extruder / Analog pin numbering: 2 => A2
+#define TEMP_1_PIN 0
+#define TEMP_BED_PIN 1 // Bed / Analog pin numbering
-#define SDSS 39 // 8
-#define LED_PIN 13
-#define PS_ON_PIN 1
-#define ALARM_PIN -1
+#define SDSS 39 // 8
+#define LED_PIN 13
+#define PS_ON_PIN 1
+#define ALARM_PIN -1
-#define FILWIDTH_PIN 6
-#define SOL1_PIN 28
+#define FILWIDTH_PIN 6
+#define SOL1_PIN 28
#if 0
// Pretty sure this is obsolete!
// Please use Marlin 1.1.x pins files as reference for new pins files.
#ifndef SDSUPPORT
// these are defined in the SD library if building with SD support
- #define SCK_PIN 13
- #define MISO_PIN 12
- #define MOSI_PIN 11
+ #define SCK_PIN 13
+ #define MISO_PIN 12
+ #define MOSI_PIN 11
#endif
#endif
#if HAS_SPI_LCD
- #define LCD_PINS_RS 40
- #define LCD_PINS_ENABLE 41
- #define LCD_PINS_D4 42
- #define LCD_PINS_D5 43
- #define LCD_PINS_D6 44
- #define LCD_PINS_D7 45
+ #define LCD_PINS_RS 40
+ #define LCD_PINS_ENABLE 41
+ #define LCD_PINS_D4 42
+ #define LCD_PINS_D5 43
+ #define LCD_PINS_D6 44
+ #define LCD_PINS_D7 45
#endif
#if ENABLED(NEWPANEL)
- #define BTN_EN1 46
- #define BTN_EN2 47
- #define BTN_ENC 48
+ #define BTN_EN1 46
+ #define BTN_EN2 47
+ #define BTN_ENC 48
#endif
#if ENABLED(REPRAPWORLD_KEYPAD)
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
#endif
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index 01cb5ec1b8..ba233d36f6 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -74,7 +74,7 @@
#else
static uint8_t CRC7(const uint8_t* data, uint8_t n) {
uint8_t crc = 0;
- for (uint8_t i = 0; i < n; i++) {
+ LOOP_L_N(i, n) {
uint8_t d = data[i];
d ^= crc << 1;
if (d & 0x80) d ^= 9;
@@ -106,7 +106,7 @@ uint8_t Sd2Card::cardCommand(const uint8_t cmd, const uint32_t arg) {
d[5] = CRC7(d, 5);
// Send message
- for (uint8_t k = 0; k < 6; k++) spiSend(d[k]);
+ LOOP_L_N(k, 6) spiSend(d[k]);
#else
// Send command
@@ -246,7 +246,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
spiInit(spiRate_);
// Must supply min of 74 clock cycles with CS high.
- for (uint8_t i = 0; i < 10; i++) spiSend(0xFF);
+ LOOP_L_N(i, 10) spiSend(0xFF);
watchdog_refresh(); // In case init takes too long
@@ -272,7 +272,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
}
// Get the last byte of r7 response
- for (uint8_t i = 0; i < 4; i++) status_ = spiRec();
+ LOOP_L_N(i, 4) status_ = spiRec();
if (status_ == 0xAA) {
type(SD_CARD_TYPE_SD2);
break;
@@ -303,7 +303,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
}
if ((spiRec() & 0xC0) == 0xC0) type(SD_CARD_TYPE_SDHC);
// Discard rest of ocr - contains allowed voltage range
- for (uint8_t i = 0; i < 3; i++) spiRec();
+ LOOP_L_N(i, 3) spiRec();
}
chipDeselect();
diff --git a/Marlin/src/sd/Sd2Card.h b/Marlin/src/sd/Sd2Card.h
index f44dbb3124..72590451bc 100644
--- a/Marlin/src/sd/Sd2Card.h
+++ b/Marlin/src/sd/Sd2Card.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/Sd2Card_sdio.h b/Marlin/src/sd/Sd2Card_sdio.h
index 2aa2e86c03..50399a3af9 100644
--- a/Marlin/src/sd/Sd2Card_sdio.h
+++ b/Marlin/src/sd/Sd2Card_sdio.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index 5e3e57f0e0..27c191a6a6 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,6 +20,12 @@
*
*/
+#if __GNUC__ > 8
+ // The NXP platform updated GCC from 7.2.1 to 9.2.1
+ // and this new warning apparently can be ignored.
+ #pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#endif
+
/**
* Arduino SdFat Library
* Copyright (c) 2009 by William Greiman
@@ -198,7 +204,7 @@ bool SdBaseFile::dirEntry(dir_t* dir) {
*/
void SdBaseFile::dirName(const dir_t& dir, char* name) {
uint8_t j = 0;
- for (uint8_t i = 0; i < 11; i++) {
+ LOOP_L_N(i, 11) {
if (dir.name[i] == ' ')continue;
if (i == 8) name[j++] = '.';
name[j++] = dir.name[i];
@@ -339,10 +345,10 @@ int8_t SdBaseFile::lsPrintNext(uint8_t flags, uint8_t indent) {
&& DIR_IS_FILE_OR_SUBDIR(&dir)) break;
}
// indent for dir level
- for (uint8_t i = 0; i < indent; i++) SERIAL_CHAR(' ');
+ LOOP_L_N(i, indent) SERIAL_CHAR(' ');
// print name
- for (uint8_t i = 0; i < 11; i++) {
+ LOOP_L_N(i, 11) {
if (dir.name[i] == ' ')continue;
if (i == 8) {
SERIAL_CHAR('.');
@@ -472,7 +478,7 @@ bool SdBaseFile::mkdir(SdBaseFile* parent, const uint8_t dname[11]) {
// make entry for '.'
memcpy(&d, p, sizeof(d));
d.name[0] = '.';
- for (uint8_t i = 1; i < 11; i++) d.name[i] = ' ';
+ LOOP_S_L_N(i, 1, 11) d.name[i] = ' ';
// cache block for '.' and '..'
block = vol_->clusterStartBlock(firstCluster_);
@@ -1082,7 +1088,7 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
if (WITHIN(seq, 1, MAX_VFAT_ENTRIES)) {
// TODO: Store the filename checksum to verify if a long-filename-unaware system modified the file table.
n = (seq - 1) * (FILENAME_LENGTH);
- for (uint8_t i = 0; i < FILENAME_LENGTH; i++)
+ LOOP_L_N(i, FILENAME_LENGTH)
longFilename[n + i] = (i < 5) ? VFAT->name1[i] : (i < 11) ? VFAT->name2[i - 5] : VFAT->name3[i - 11];
// If this VFAT entry is the last one, add a NUL terminator at the end of the string
if (VFAT->sequenceNumber & 0x40) longFilename[n + FILENAME_LENGTH] = '\0';
diff --git a/Marlin/src/sd/SdBaseFile.h b/Marlin/src/sd/SdBaseFile.h
index 4d4062b1cd..dbdcf0b582 100644
--- a/Marlin/src/sd/SdBaseFile.h
+++ b/Marlin/src/sd/SdBaseFile.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatConfig.h b/Marlin/src/sd/SdFatConfig.h
index 8ab6aef1c6..5057d16a8d 100644
--- a/Marlin/src/sd/SdFatConfig.h
+++ b/Marlin/src/sd/SdFatConfig.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatStructs.h b/Marlin/src/sd/SdFatStructs.h
index ddf6546a0c..0412852cdd 100644
--- a/Marlin/src/sd/SdFatStructs.h
+++ b/Marlin/src/sd/SdFatStructs.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatUtil.cpp b/Marlin/src/sd/SdFatUtil.cpp
index 428ed219af..08b21e5f35 100644
--- a/Marlin/src/sd/SdFatUtil.cpp
+++ b/Marlin/src/sd/SdFatUtil.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatUtil.h b/Marlin/src/sd/SdFatUtil.h
index ff31a10a10..d820d3cb4d 100644
--- a/Marlin/src/sd/SdFatUtil.h
+++ b/Marlin/src/sd/SdFatUtil.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFile.cpp b/Marlin/src/sd/SdFile.cpp
index aa9c192e93..cc0e7fc347 100644
--- a/Marlin/src/sd/SdFile.cpp
+++ b/Marlin/src/sd/SdFile.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFile.h b/Marlin/src/sd/SdFile.h
index ff33d8715b..4f235f4976 100644
--- a/Marlin/src/sd/SdFile.h
+++ b/Marlin/src/sd/SdFile.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdInfo.h b/Marlin/src/sd/SdInfo.h
index ecb517ae9a..9d6674dfa1 100644
--- a/Marlin/src/sd/SdInfo.h
+++ b/Marlin/src/sd/SdInfo.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdVolume.cpp b/Marlin/src/sd/SdVolume.cpp
index 926dd1c7d4..1d4c56a344 100644
--- a/Marlin/src/sd/SdVolume.cpp
+++ b/Marlin/src/sd/SdVolume.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -291,6 +291,16 @@ int32_t SdVolume::freeClusterCount() {
for (uint16_t i = 0; i < n; i++)
if (cacheBuffer_.fat32[i] == 0) free++;
}
+ #ifdef ESP32
+ // Needed to reset the idle task watchdog timer on ESP32 as reading the complete FAT may easily
+ // block for 10+ seconds. yield() is insufficient since it blocks lower prio tasks (e.g., idle).
+ static millis_t nextTaskTime = 0;
+ const millis_t ms = millis();
+ if (ELAPSED(ms, nextTaskTime)) {
+ vTaskDelay(1); // delay 1 tick (Minimum. Usually 10 or 1 ms depending on skdconfig.h)
+ nextTaskTime = ms + 1000; // tickle the task manager again in 1 second
+ }
+ #endif // ESP32
}
return free;
}
diff --git a/Marlin/src/sd/SdVolume.h b/Marlin/src/sd/SdVolume.h
index b5282bdce3..1912b7adf6 100644
--- a/Marlin/src/sd/SdVolume.h
+++ b/Marlin/src/sd/SdVolume.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index cb8310f179..80e94b88b5 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -28,18 +28,18 @@
#include "../MarlinCore.h"
#include "../lcd/ultralcd.h"
-#include "../module/planner.h"
+#include "../module/planner.h" // for synchronize
#include "../module/printcounter.h"
#include "../core/language.h"
#include "../gcode/queue.h"
#include "../module/configuration_store.h"
#if ENABLED(EMERGENCY_PARSER)
- #include "../feature/emergency_parser.h"
+ #include "../feature/e_parser.h"
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
- #include "../feature/power_loss_recovery.h"
+ #include "../feature/powerloss.h"
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -142,7 +142,7 @@ CardReader::CardReader() {
//
char *createFilename(char * const buffer, const dir_t &p) {
char *pos = buffer;
- for (uint8_t i = 0; i < 11; i++) {
+ LOOP_L_N(i, 11) {
if (p.name[i] == ' ') continue;
if (i == 8) *pos++ = '.';
*pos++ = p.name[i];
@@ -247,7 +247,7 @@ void CardReader::printListing(SdFile parent, const char * const prepend/*=nullpt
SdFile child;
if (!child.open(&parent, dosFilename, O_READ)) {
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_SD_CANT_OPEN_SUBDIR, dosFilename);
+ SERIAL_ECHOLNPAIR(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
}
printListing(child, path);
// close() is done automatically by destructor of SdFile
@@ -317,7 +317,7 @@ void CardReader::ls() {
if (!dir.open(&diveDir, segment, O_READ)) {
SERIAL_EOL();
SERIAL_ECHO_START();
- SERIAL_ECHOPAIR(MSG_SD_CANT_OPEN_SUBDIR, segment);
+ SERIAL_ECHOPAIR(STR_SD_CANT_OPEN_SUBDIR, segment);
break;
}
@@ -361,15 +361,15 @@ void CardReader::mount() {
#if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
&& !sd2card.init(SPI_SPEED, LCD_SDSS)
#endif
- ) SERIAL_ECHO_MSG(MSG_SD_INIT_FAIL);
+ ) SERIAL_ECHO_MSG(STR_SD_INIT_FAIL);
else if (!volume.init(&sd2card))
- SERIAL_ERROR_MSG(MSG_SD_VOL_INIT_FAIL);
+ SERIAL_ERROR_MSG(STR_SD_VOL_INIT_FAIL);
else if (!root.openRoot(&volume))
- SERIAL_ERROR_MSG(MSG_SD_OPENROOT_FAIL);
+ SERIAL_ERROR_MSG(STR_SD_OPENROOT_FAIL);
else {
flag.mounted = true;
- SERIAL_ECHO_MSG(MSG_SD_CARD_OK);
- #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+ SERIAL_ECHO_MSG(STR_SD_CARD_OK);
+ #if ENABLED(SDCARD_EEPROM_EMULATION)
settings.first_load();
#endif
}
@@ -379,7 +379,7 @@ void CardReader::mount() {
}
void CardReader::release() {
- stopSDPrint();
+ endFilePrint();
flag.mounted = false;
}
@@ -401,7 +401,7 @@ void CardReader::startFileprint() {
}
}
-void CardReader::stopSDPrint(
+void CardReader::endFilePrint(
#if SD_RESORT
const bool re_sort/*=false*/
#endif
@@ -434,7 +434,7 @@ void CardReader::getAbsFilename(char *dst) {
if (cnt < MAXPATHNAMELENGTH) { *dst = '/'; dst++; cnt++; }
};
- for (uint8_t i = 0; i < workDirDepth; i++) // Loop down to current work dir
+ LOOP_L_N(i, workDirDepth) // Loop down to current work dir
appendAtom(workDirParents[i]);
if (cnt < MAXPATHNAMELENGTH - (FILENAME_LENGTH) - 1) { // Leave room for filename and nul
@@ -445,15 +445,17 @@ void CardReader::getAbsFilename(char *dst) {
}
void openFailed(const char * const fname) {
- SERIAL_ECHOLNPAIR(MSG_SD_OPEN_FILE_FAIL, fname, ".");
+ SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, fname, ".");
}
void announceOpen(const uint8_t doing, const char * const path) {
if (doing) {
+ PORT_REDIRECT(SERIAL_BOTH);
SERIAL_ECHO_START();
SERIAL_ECHOPGM("Now ");
serialprintPGM(doing == 1 ? PSTR("doing") : PSTR("fresh"));
SERIAL_ECHOLNPAIR(" file: ", path);
+ PORT_RESTORE();
}
}
@@ -501,17 +503,20 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
break;
}
- stopSDPrint();
+ endFilePrint();
SdFile *curDir;
- const char * const fname = diveToFile(curDir, path);
+ const char * const fname = diveToFile(true, curDir, path);
if (!fname) return;
if (file.open(curDir, fname, O_READ)) {
filesize = file.fileSize();
sdpos = 0;
- SERIAL_ECHOLNPAIR(MSG_SD_FILE_OPENED, fname, MSG_SD_SIZE, filesize);
- SERIAL_ECHOLNPGM(MSG_SD_FILE_SELECTED);
+
+ PORT_REDIRECT(SERIAL_BOTH);
+ SERIAL_ECHOLNPAIR(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
+ SERIAL_ECHOLNPGM(STR_SD_FILE_SELECTED);
+ PORT_RESTORE();
selectFileByName(fname);
ui.set_status(longFilename[0] ? longFilename : fname);
@@ -520,6 +525,10 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
openFailed(fname);
}
+inline void echo_write_to_file(const char * const fname) {
+ SERIAL_ECHOLNPAIR(STR_SD_WRITE_TO_FILE, fname);
+}
+
//
// Open a file by DOS path for write
//
@@ -529,10 +538,10 @@ void CardReader::openFileWrite(char * const path) {
announceOpen(2, path);
file_subcall_ctr = 0;
- stopSDPrint();
+ endFilePrint();
SdFile *curDir;
- const char * const fname = diveToFile(curDir, path);
+ const char * const fname = diveToFile(false, curDir, path);
if (!fname) return;
if (file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
@@ -541,7 +550,7 @@ void CardReader::openFileWrite(char * const path) {
#if ENABLED(EMERGENCY_PARSER)
emergency_parser.disable();
#endif
- SERIAL_ECHOLNPAIR(MSG_SD_WRITE_TO_FILE, fname);
+ echo_write_to_file(fname);
ui.set_status(fname);
}
else
@@ -554,10 +563,10 @@ void CardReader::openFileWrite(char * const path) {
void CardReader::removeFile(const char * const name) {
if (!isMounted()) return;
- //stopSDPrint();
+ //endFilePrint();
SdFile *curDir;
- const char * const fname = diveToFile(curDir, name);
+ const char * const fname = diveToFile(false, curDir, name);
if (!fname) return;
if (file.remove(curDir, fname)) {
@@ -573,13 +582,13 @@ void CardReader::removeFile(const char * const name) {
void CardReader::report_status() {
if (isPrinting()) {
- SERIAL_ECHOPGM(MSG_SD_PRINTING_BYTE);
+ SERIAL_ECHOPGM(STR_SD_PRINTING_BYTE);
SERIAL_ECHO(sdpos);
SERIAL_CHAR('/');
SERIAL_ECHOLN(filesize);
}
else
- SERIAL_ECHOLNPGM(MSG_SD_NOT_PRINTING);
+ SERIAL_ECHOLNPGM(STR_SD_NOT_PRINTING);
}
void CardReader::write_command(char * const buf) {
@@ -597,7 +606,7 @@ void CardReader::write_command(char * const buf) {
end[3] = '\0';
file.write(begin);
- if (file.writeError) SERIAL_ERROR_MSG(MSG_SD_ERR_WRITE_TO_FILE);
+ if (file.writeError) SERIAL_ERROR_MSG(STR_SD_ERR_WRITE_TO_FILE);
}
//
@@ -612,7 +621,7 @@ void CardReader::checkautostart() {
if (autostart_index < 0 || flag.sdprinting) return;
if (!isMounted()) mount();
- #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+ #if ENABLED(SDCARD_EEPROM_EMULATION)
else settings.first_load();
#endif
@@ -704,26 +713,28 @@ uint16_t CardReader::countFilesInWorkDir() {
*
* A nullptr result indicates an unrecoverable error.
*/
-const char* CardReader::diveToFile(SdFile*& curDir, const char * const path, const bool echo/*=false*/) {
+const char* CardReader::diveToFile(const bool update_cwd, SdFile*& curDir, const char * const path, const bool echo/*=false*/) {
// Track both parent and subfolder
static SdFile newDir1, newDir2;
SdFile *sub = &newDir1, *startDir;
+ // Parsing the path string
const char *item_name_adr = path;
- if (path[0] == '/') {
+
+ if (path[0] == '/') { // Starting at the root directory?
curDir = &root;
- workDirDepth = 0;
+ if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
item_name_adr++;
}
else
- curDir = &workDir;
+ curDir = &workDir; // Dive from workDir (as set by the UI)
startDir = curDir;
-
- // Start dive
while (item_name_adr) {
- // Find next sub
+ // Find next subdirectory delimiter
char * const name_end = strchr(item_name_adr, '/');
+
+ // Last atom in the path? Item found.
if (name_end <= item_name_adr) break;
// Set subDirName
@@ -736,7 +747,7 @@ const char* CardReader::diveToFile(SdFile*& curDir, const char * const path, con
// Open curDir
if (!sub->open(curDir, dosSubdirname, O_READ)) {
- SERIAL_ECHOLNPAIR(MSG_SD_OPEN_FILE_FAIL, dosSubdirname, ".");
+ SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, dosSubdirname, ".");
return nullptr;
}
@@ -746,13 +757,16 @@ const char* CardReader::diveToFile(SdFile*& curDir, const char * const path, con
// curDir now subDir
curDir = sub;
- // Update workDirParents and workDirDepth
- if (workDirDepth < MAX_DIR_DEPTH) workDirParents[workDirDepth++] = *curDir;
+ // Update workDirParents, workDirDepth, and workDir
+ if (update_cwd) {
+ if (workDirDepth < MAX_DIR_DEPTH) workDirParents[workDirDepth++] = *curDir;
+ workDir = *curDir;
+ }
- // Point sub pointer to unused newDir
+ // Point sub at the other scratch object
sub = (curDir != &newDir1) ? &newDir1 : &newDir2;
- // item_name_adr point to next sub
+ // Next path atom address
item_name_adr = name_end + 1;
}
return item_name_adr;
@@ -773,7 +787,7 @@ void CardReader::cd(const char * relpath) {
}
else {
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_SD_CANT_ENTER_SUBDIR, relpath);
+ SERIAL_ECHOLNPAIR(STR_SD_CANT_ENTER_SUBDIR, relpath);
}
}
@@ -932,7 +946,7 @@ void CardReader::cdroot() {
bool didSwap = false;
uint8_t o1 = sort_order[0];
#if DISABLED(SDSORT_USES_RAM)
- selectFileByIndex(o1); // Pre-fetch the first entry and save it
+ selectFileByIndex(o1); // Pre-fetch the first entry and save it
strcpy(name1, longest_filename()); // so the loop only needs one fetch
#if HAS_FOLDER_SORTING
bool dir1 = flag.filenameIsDir;
@@ -1031,7 +1045,7 @@ void CardReader::cdroot() {
#if ENABLED(SDSORT_DYNAMIC_RAM)
delete sort_order;
#if ENABLED(SDSORT_CACHE_NAMES)
- for (uint8_t i = 0; i < sort_count; ++i) {
+ LOOP_L_N(i, sort_count) {
free(sortshort[i]); // strdup
free(sortnames[i]); // strdup
}
@@ -1058,7 +1072,7 @@ uint16_t CardReader::get_num_Files() {
//
// Return from procedure or close out the Print Job
//
-void CardReader::printingHasFinished() {
+void CardReader::fileHasFinished() {
planner.synchronize();
file.close();
if (file_subcall_ctr > 0) { // Resume calling file after closing procedure
@@ -1068,30 +1082,13 @@ void CardReader::printingHasFinished() {
startFileprint();
}
else {
- stopSDPrint();
-
- #if ENABLED(POWER_LOSS_RECOVERY)
- recovery.purge();
- #endif
-
- #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
- planner.finish_and_disable();
- #endif
-
- print_job_timer.stop();
- queue.enqueue_now_P(print_job_timer.duration() > 60 ? PSTR("M31") : PSTR("M117"));
+ endFilePrint();
#if ENABLED(SDCARD_SORT_ALPHA)
presort();
#endif
- #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
- ui.set_progress_done();
- #endif
-
- #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
- ui.reselect_last_file();
- #endif
+ marlin_state = MF_SD_COMPLETE;
}
}
@@ -1124,9 +1121,9 @@ void CardReader::printingHasFinished() {
if (!isMounted()) return;
if (recovery.file.isOpen()) return;
if (!recovery.file.open(&root, recovery.filename, read ? O_READ : O_CREAT | O_WRITE | O_TRUNC | O_SYNC))
- SERIAL_ECHOLNPAIR(MSG_SD_OPEN_FILE_FAIL, recovery.filename, ".");
+ SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, recovery.filename, ".");
else if (!read)
- SERIAL_ECHOLNPAIR(MSG_SD_WRITE_TO_FILE, recovery.filename);
+ echo_write_to_file(recovery.filename);
}
// Removing the job recovery file currently requires closing
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index f7081b95b3..955a8b69b3 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -106,11 +106,11 @@ public:
// Print job
static void openAndPrintFile(const char *name); // (working directory)
- static void printingHasFinished();
+ static void fileHasFinished();
static void getAbsFilename(char *dst);
- static void startFileprint();
static void printFilename();
- static void stopSDPrint(
+ static void startFileprint();
+ static void endFilePrint(
#if SD_RESORT
const bool re_sort=false
#endif
@@ -125,7 +125,7 @@ public:
static inline uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; }
// Helper for open and remove
- static const char* diveToFile(SdFile*& curDir, const char * const path, const bool echo=false);
+ static const char* diveToFile(const bool update_cwd, SdFile*& curDir, const char * const path, const bool echo=false);
#if ENABLED(SDCARD_SORT_ALPHA)
static void presort();
@@ -275,11 +275,7 @@ private:
#if ENABLED(USB_FLASH_DRIVE_SUPPORT)
#define IS_SD_INSERTED() Sd2Card::isInserted()
#elif PIN_EXISTS(SD_DETECT)
- #if ENABLED(SD_DETECT_INVERTED)
- #define IS_SD_INSERTED() READ(SD_DETECT_PIN)
- #else
- #define IS_SD_INSERTED() !READ(SD_DETECT_PIN)
- #endif
+ #define IS_SD_INSERTED() (READ(SD_DETECT_PIN) == SD_DETECT_STATE)
#else
// No card detect line? Assume the card is inserted.
#define IS_SD_INSERTED() true
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index 2d75e75d4c..c132b4a3b6 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h
index a429bfd28f..f7e59a282a 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/README.md b/README.md
index ace9ded6ea..d8eb88b6e5 100644
--- a/README.md
+++ b/README.md
@@ -1,98 +1,113 @@
-## Formbot Vivedino Trex 2+ and Trex3
+# Marlin 3D Printer Firmware
-This branch is intended specifically for the IDEX Trex machines. Please pay special attention to the driver selection in te top of configuration.h as several configurations left the factory. Since this machine does not use UART, the distinction between 2208 and 2209 is irrelevant so simply leave 2208 selected.
+
+
+
+[](https://github.com/MarlinFirmware/Marlin/actions)
-## About Our Branches
+
-The firmware branches maintained here are made possible by the support of sponsors like [Tiny Machines 3D](https://www.tinymachines3d.com/?rfsn=3419592.cc302fe) as well as our customer base through our 3D printing Services. Maintaining and developing these branches takes a significant investment, made up of time and machines. To support continued development, please consider your next 3D Printer related purchase from Tiny Machines 3D and thank them for supporting open source development. Or, consider us for printing services outside of your machine’s capabilities. Print service requests can be sent to d.menzel@insanityautomation.com and we will respond typically within 1 working day. If you do not need anything printed or a 3D Printer but still want to contribute, you can support us through [Patreon](https://www.patreon.com/InsanityAutomation).
+Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
+Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
-## Setup
+## Marlin 2.0 Bugfix Branch
-All configuration options intended to be adjusted by end users have been placed in the top section of Configuration.h and have been documented there. There is typically a break line to segregate the standard configuration below. Anything aside from the upper options is intended for advanced users only.
+__Not for production use. Use with caution!__
-## Known Issues
- - Marlin 2.0 had exhibited layer shifting issues with IDEX and other high stepper count systems early on. While we are confident the majority of cases have been addressed at this point, we would like wider feedback in order to confirm.
+Marlin 2.0 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below.
-## Support
+This branch is for patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.x release.
-This firmware is provided to the public as-is with no warranty or guarantee. It's based on a large open source project and there is no entitlement to support. That said, Tiny Machines 3D customers may obtain support through their normal support queue. I will provide support to Patreons as I am able. If you require more immediate support and are not a Tiny Machines customer, you may contact them at support@tinymachines3d.com about purchasing support hours. Aside from this, we are active many Facebook groups as well as several discord channels and typically help anyone we can when we come across them.
-
-3D Printing Discord - https://discord.gg/MZrsgVU
-Marlin Discord - https://discord.gg/n5NJ59y
-
-## Future Goals
-
-For this branch, we still have some active goals open that we plan to continue working on provided there is continued interest in the project.
-- Slice Engineering Mosquito toggles
-- M425 / G425 automatic offset and backlash calibration
-
-If there is any interest in re-implementing the Chinese language screens, that's definitely possible at this point. In order to put the effort in however I would need to see a notable amount of interest in this.
-
-
-## Firmware Branches
- - 1.1.9 Firmware (Stable, EOL) [TM_CR10](https://github.com/InsanityAutomation/Marlin/tree/TM_CR10)
- - 2.0 Firmware [Creality_Marlin2.0.x](https://github.com/InsanityAutomation/Marlin/tree/Creality_Marlin2.0.x)
- - 2.0 Development Branch (Beta, but well tested) [Creality_2.0_Devel](https://github.com/InsanityAutomation/Marlin/tree/Creality_2.0_Devel)
- - 2.0 Bleeding edge Branch (Here there be dragons!) [Creality_2.0_Bleeding](https://github.com/InsanityAutomation/Marlin/tree/Creality_2.0_Bleeding)
- - Touchscreen Firmware (10SPro and CR-X 1.1.9 Stable) [Creality_DWINTest](https://github.com/InsanityAutomation/Marlin/tree/Creality_DWINTest)
- - Touchscreen Firmware (10SPro and CR-X 2.0 Active Development) [CrealityDwin_2.0](https://github.com/InsanityAutomation/Marlin/tree/CrealityDwin_2.0)
-## Formbot / Vivedino Firmware Branches
- - Raptor 1 1.1.9 Firmware [TM_Raptor](https://github.com/InsanityAutomation/Marlin/tree/TM_Raptor)
- - Raptor 1/2 2.0 Firmware [Raptor_2.0.X](https://github.com/InsanityAutomation/Marlin/tree/Raptor_2.0.X)
- - Trex 2+/3 1.1.9 Firmware [Trex3_1.1.9](https://github.com/InsanityAutomation/Marlin/tree/Trex3_1.1.9)
- - Trex 2+/3 2.0 Firmware (Be warned of layer shift issue below!) [TM_Trex2+_2.0.x](https://github.com/InsanityAutomation/Marlin/tree/TM_Trex2+_2.0.x)
-## Mamorubot / HieHa Firmware Branches
- - SX4 1.1.9 Firmware (Stable, EOL) [Mamorubot_SX4]( https://github.com/InsanityAutomation/Marlin/tree/Mamorubot_SX4)
- - SX4 2.0 Firmware (Beta, but well tested) [TM_SX4_2.0](https://github.com/InsanityAutomation/Marlin/tree/TM_SX4_2.0)
- - SX4 Development Branch [TM_SX4_2.0_Devel](https://github.com/InsanityAutomation/Marlin/tree/TM_SX4_2.0_Devel)
-## Other Firmware
- - Raise 3D N2+ (Dual) 2.0 [Raise3D-N2+-Dual](https://github.com/InsanityAutomation/Marlin/tree/Raise3D-N2+-Dual)
- - Evnovo Artillery Sidewinder X1 2.0 [Evnovo X1](https://github.com/InsanityAutomation/Marlin/tree/ArtilleryX1_2.0_Devel)
-
-[Marlin Commit History](https://github.com/MarlinFirmware/Marlin/pulls?q=is%3Apr+is%3Aclosed+author%3AInsanityAutomation)
-
-## Active Projects
- - [Tracing Marlin 2.0 Planner bug causing layer Shifting](https://github.com/MarlinFirmware/Marlin/issues/12403)
- - Creality Dwin Touchscreen rewrite to ExtUI - DONE
- - [IDEX drifting z offset on tool change with UBL](https://github.com/MarlinFirmware/Marlin/issues/13817)
- - [Multiple touch homing](https://github.com/MarlinFirmware/Marlin/issues/9802)
- - [Tool change offset changes](https://github.com/MarlinFirmware/Marlin/issues/12568)
- - [Hotend offset adjustment clamping](https://github.com/MarlinFirmware/Marlin/pull/13669)
- - [Filament width sensor hang on 32 bit](https://github.com/MarlinFirmware/Marlin/issues/13701)
- - Probe point output for all leveling types matching incomplete ubl implementation - DONE
- - SKR1.1 Pro integration to Trex2 with TMC2209 Drivers - Mostly done, blew an output...
- - SKR1.3 Integration to Mamorubot SX4 - DONE
- - Mosquito BMG-M integration to Raptor
- - Porting Chithu Touchscreen board to Marlin 2.0 with ExtUI
- - Anet A10 Delta STM32F103 board analysis
- - Smoothing integration and vendor components of Marlin 2.0 (Revision to version.h handling, limit clamping, usability enhancements ect)
- - Consolidate more probing functions, improve G33/4 and G28/29 handling
- - G34 Z stepper reordering and automatic detection / adjustment of reversed stepper connections
- - Video documentation of firmware branch configuration options and flashing with platformio
-## Planned Projects
- - Implement Virtual Tools
- - Port Duet2 Wifi with Duex5 to Marlin 2.0
- - Further Gcode Parity with RRF
- - Extend Host Prompt Support for Power Loss Recovery
- - Improve native ESP32 web support
- - Port M425 Auto backlash and offset calibration to IDEX
- - Integrate 12 stepper LPC1778 PCB to configure ideXY quad head system as well as integrate 3 extruder mixing to IDEX
- - Video walkthrough of each bed leveling system usage and all functions
-
-## Marlin
-This is just one of many forks of Marlin. We don't try to bury that behind fancy marmarketingketting or anything else. As you can see from the links above, most of the work done here is submitted back to the mainstream Marlin branches. The end goal of every project is to get it to the point where it is merged and maintained there. See marlin resources, including how to contribute to the Marlin Project as well, down below.
+Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
## Building Marlin 2.0
To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](http://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](http://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](http://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards).
+## Hardware Abstraction Layer (HAL)
-## The current Marlin dev team consists of:
+Marlin 2.0 introduces a layer of abstraction so that all the existing high-level code can be built for 32-bit platforms while still retaining full 8-bit AVR compatibility. Retaining AVR compatibility and a single code-base is important to us, because we want to make sure that features and patches get as much testing and attention as possible, and that all platforms always benefit from the latest improvements.
- - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA [](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
+### Current HALs
+
+ #### AVR (8-bit)
+
+ board|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Arduino AVR](https://www.arduino.cc/)|ATmega, ATTiny, etc.|16-20MHz|64-256k|2-16k|5V|no
+
+ #### DUE
+
+ boards|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue), [RAMPS-FD](http://www.reprap.org/wiki/RAMPS-FD), etc.|[SAM3X8E ARM-Cortex M3](http://www.microchip.com/wwwproducts/en/ATsam3x8e)|84MHz|512k|64+32k|3.3V|no
+
+ #### ESP32
+
+ board|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [ESP32](https://www.espressif.com/en/products/hardware/esp32/overview)|Tensilica Xtensa LX6|320MHz|---|---|3.3V|---
+
+ #### LPC1768 / LPC1769
+
+ boards|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Re-ARM](https://www.kickstarter.com/projects/1245051645/re-arm-for-ramps-simple-32-bit-upgrade)|[LPC1768 ARM-Cortex M3](http://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|100MHz|512k|32+16+16k|3.3-5V|no
+ [MKS SBASE](http://forums.reprap.org/read.php?13,499322)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
+ [Selena Compact](https://github.com/Ales2-k/Selena)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
+ [Azteeg X5 GT](https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm)|LPC1769 ARM-Cortex M3|120MHz|512k|32+16+16k|3.3-5V|no
+ [Smoothieboard](http://reprap.org/wiki/Smoothieboard)|LPC1769 ARM-Cortex M3|120MHz|512k|64k|3.3-5V|no
+
+ #### SAMD51
+
+ boards|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Adafruit Grand Central M4](https://www.adafruit.com/product/4064)|[SAMD51P20A ARM-Cortex M4](https://www.microchip.com/wwwproducts/en/ATSAMD51P20A)|120MHz|1M|256k|3.3V|yes
+
+ #### STM32F1
+
+ boards|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Arduino STM32](https://github.com/rogerclarkmelbourne/Arduino_STM32)|[STM32F1](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html) ARM-Cortex M3|72MHz|256-512k|48-64k|3.3V|no
+ [STEVAL-3DP001V1](http://www.st.com/en/evaluation-tools/steval-3dp001v1.html)|[STM32F401VE Arm-Cortex M4](http://www.st.com/en/microcontrollers/stm32f401ve.html)|84MHz|512k|64+32k|3.3-5V|yes
+
+ #### Teensy++ 2.0
+
+ boards|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|[AT90USB1286](http://www.microchip.com/wwwproducts/en/AT90USB1286)|16MHz|128k|8k|5V|no
+
+ #### Teensy 3.1 / 3.2
+
+ boards|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Teensy 3.2](https://www.pjrc.com/store/teensy32.html)|[MK20DX256VLH7](https://www.mouser.com/ProductDetail/NXP-Freescale/MK20DX256VLH7) ARM-Cortex M4|72MHz|256k|32k|3.3V-5V|yes
+
+ #### Teensy 3.5 / 3.6
+
+ boards|processor|speed|flash|sram|logic|fpu
+ ----|---------|-----|-----|----|-----|---
+ [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|[MK64FX512VMD12](https://www.mouser.com/ProductDetail/NXP-Freescale/MK64FX512VMD12) ARM-Cortex M4|120MHz|512k|192k|3.3-5V|yes
+ [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|[MK66FX1M0VMD18](https://www.mouser.com/ProductDetail/NXP-Freescale/MK66FX1M0VMD18) ARM-Cortex M4|180MHz|1M|256k|3.3V|yes
+
+## Submitting Patches
+
+Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch.
+
+- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
+- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
+- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues).
+
+### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
+
+## Credits
+
+The current Marlin dev team consists of:
+
+ - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA [Donate](http://www.thinkyhead.com/donate-to-marlin) / Flattr: [](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
- - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
- Chris Pepper [[@p3p](https://github.com/p3p)] - UK
+ - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portugal
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands [](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
diff --git a/buildroot/bin/generate_version b/buildroot/bin/generate_version
index c2bcbdc758..70efe824a7 100644
--- a/buildroot/bin/generate_version
+++ b/buildroot/bin/generate_version
@@ -47,7 +47,7 @@ WEBSITE_URL=$(awk -F'"' \
cat > "${DIR}/Version.h" <&2 && exit 9)
+eval "echo '#define ${@}' >>Marlin/Configuration_adv.h" ||
+(echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index 410091cbd5..4510f689f2 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -2,7 +2,7 @@
restore_configs
-EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/examples"
+EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.0.x/config/examples"
cd Marlin
diff --git a/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c b/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
index 3f639f092c..7f5ca78356 100644
--- a/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
@@ -323,7 +323,7 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
{PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
#else
- #error "USB in HS mode isn't supported by the board"
+ #error "USB in HS mode isn't supported by the board"
{PA_3, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
{PB_0, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1
{PB_1, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2
@@ -334,7 +334,8 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
{PC_0, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP
{PC_2, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_DIR
{PC_3, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_NXT
- #endif /* USE_USB_HS_IN_FS */
+ #endif // USE_USB_HS_IN_FS
+ */
{NC, NP, 0}
};
#endif
diff --git a/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
index fd1f296459..a772f64fb7 100644
--- a/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
@@ -355,7 +355,7 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
{PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
#else
- #error "USB in HS mode isn't supported by the board"
+ #error "USB in HS mode isn't supported by the board"
{PA_3, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
{PB_0, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1
{PB_1, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2
@@ -366,7 +366,8 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
{PC_0, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP
{PC_2, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_DIR
{PC_3, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_NXT
- #endif /* USE_USB_HS_IN_FS */
+ #endif // USE_USB_HS_IN_FS
+ */
{NC, NP, 0}
};
#endif
diff --git a/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h b/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
index be04ef6b86..de34697fb3 100644
--- a/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
+++ b/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
@@ -115,7 +115,7 @@ extern "C" {
#define NUM_ANALOG_FIRST 80
// PWM resolution
-#define PWM_RESOLUTION 8
+#define PWM_RESOLUTION 12
#define PWM_FREQUENCY 20000 // >= 20 Khz => inaudible noise for fans
#define PWM_MAX_DUTY_CYCLE 255
diff --git a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
index 5cee7888b9..ffdb81a636 100644
--- a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
@@ -195,7 +195,7 @@ extern "C" {
#define PIN_SERIAL2_RX PD6
#define PIN_SERIAL2_TX PD5
#else
- #error'Invaqlid setting for SERIAL_UART_INSTANCE'
+ #error'Invalid setting for SERIAL_UART_INSTANCE'
#endif
// Timer Definitions
diff --git a/buildroot/share/fonts/genallfont.sh b/buildroot/share/fonts/genallfont.sh
index d95d203b5a..7d4b551776 100644
--- a/buildroot/share/fonts/genallfont.sh
+++ b/buildroot/share/fonts/genallfont.sh
@@ -103,7 +103,7 @@ if [ 1 = 1 ]; then
cat <src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
diff --git a/buildroot/share/git/mfadd b/buildroot/share/git/mfadd
index 92b2e0063e..30be1ec0f7 100755
--- a/buildroot/share/git/mfadd
+++ b/buildroot/share/git/mfadd
@@ -1,20 +1,24 @@
#!/usr/bin/env bash
#
-# mfadd (user|ref) [copyname]
+# mfadd user[:branch] [copyname]
#
# Add a remote and fetch it. Optionally copy a branch.
#
-# Example: mfadd myfork:patch-1 copy_of_patch-1
+# Examples:
+# mfadd thefork
+# mfadd thefork:patch-1
+# mfadd thefork:patch-1 the_patch_12345
#
-[[ $# > 0 && $# < 3 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` (user|ref) [copyname]" 1>&2 ; exit 1; }
+[[ $# > 0 && $# < 3 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` user[:branch] [copyname]" 1>&2 ; exit 1; }
-# If a colon is included, split the parts
-if [[ $1 =~ ":" ]]; then
- IFS=':' read -a DATA <<< "$1"
+# If a colon or slash is included, split the parts
+if [[ $1 =~ ":" || $1 =~ "/" ]]; then
+ [[ $1 =~ ":" ]] && IFS=':' || IFS="/"
+ read -a DATA <<< "$1"
USER=${DATA[0]}
BRANCH=${DATA[1]}
- NAME=$2
+ NAME=${2:-$BRANCH}
else
USER=$1
fi
@@ -29,4 +33,4 @@ echo "Adding and fetching $USER..."
git remote add "$USER" "git@github.com:$USER/$REPO.git" >/dev/null 2>&1 || echo "Remote exists."
git fetch "$USER"
-[[ ! -z "$BRANCH" && ! -z "$NAME" ]] && git checkout $USER/$BRANCH -b $NAME
+[[ ! -z "$BRANCH" && ! -z "$NAME" ]] && git checkout -b "$NAME" --track "$USER/$BRANCH"
diff --git a/buildroot/share/git/mfqp b/buildroot/share/git/mfqp
index 59f0699773..5650d08252 100755
--- a/buildroot/share/git/mfqp
+++ b/buildroot/share/git/mfqp
@@ -1,8 +1,10 @@
#!/usr/bin/env bash
#
-# mfqp [-q|--quick] [1|2|3]
+# mfqp [1|2|3]
#
-# Add all changed files, commit as "patch", do `mfrb` and `git push -f`
+# - git add .
+# - git commit --amend
+# - ghpc
#
MFINFO=$(mfinfo "$@") || exit 1
@@ -15,26 +17,14 @@ IND=6
while [ $IND -lt ${#INFO[@]} ]; do
ARG=${INFO[$IND]}
case "$ARG" in
- -q|--quick ) QUICK="-q" ;;
-h|--help ) USAGE=1 ;;
* ) USAGE=1 ; echo "unknown option: $ARG" ;;
esac
let IND+=1
done
-[[ ${INFO[4]} =~ [0-9] ]] && USAGE=1
+[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }
-[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [-hq] [1|2|3]" 1>&2 ; exit 1 ; }
+[[ $CURR == $TARG && $REPO != "MarlinDocumentation" ]] && { echo "Don't alter the PR Target branch."; exit 1 ; }
-git add .
-git commit -m "patch"
-
-if [[ $CURR == $TARG ]]; then
- if [[ $REPO == "MarlinDocumentation" ]]; then
- git rebase -i HEAD~2 && git push -f
- else
- echo "Don't alter the PR Target branch."; exit 1
- fi
-else
- mfrb $QUICK "$@" && git push -f
-fi
+git add . && git commit --amend && git push -f
diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index d80b9ed810..62186a5f82 100644
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -1,10 +1,9 @@
#!/usr/bin/env bash
#
-# mftest [name] [index]
-#
-# Set configuration options based on a test
-# By default it will do megaatmega2560
-# Use 'mftest -' to pick from the list.
+# mftest Select a test to apply and build
+# mftest -b [#] Build the auto-detected environment
+# mftest -u [#] Upload the auto-detected environment
+# mftest [name] [index] [-y] Set config options and optionally build a test
#
MFINFO=$(mfinfo) || exit 1
@@ -12,53 +11,123 @@ MFINFO=$(mfinfo) || exit 1
TESTPATH=buildroot/share/tests
STATE_FILE=$( echo ./.pio/.mftestrc )
+SED=$(which gsed || which sed)
shopt -s extglob nocasematch
-# Get the environment and test number from the command
-TESTENV=${1:-'-'}
-CHOICE=${2:-0}
-
-# Allow shorthand for test name
-case $TESTENV in
- tree) platformio run --project-dir . -e include_tree ; exit 1 ;;
- due) TESTENV='DUE' ;;
- esp) TESTENV='esp32' ;;
- lin*) TESTENV='linux_native' ;;
- lpc?(8)) TESTENV='LPC1768' ;;
- lpc9) TESTENV='LPC1769' ;;
- m128) TESTENV='megaatmega1280' ;;
- m256) TESTENV='megaatmega2560' ;;
- mega) TESTENV='megaatmega2560' ;;
- stm) TESTENV='STM32F103RE' ;;
- f1) TESTENV='STM32F103RE' ;;
- f4) TESTENV='STM32F4' ;;
- f7) TESTENV='STM32F7' ;;
- s6) TESTENV='FYSETC_S6' ;;
- teensy) TESTENV='teensy31' ;;
- t31) TESTENV='teensy31' ;;
- t32) TESTENV='teensy31' ;;
- t35) TESTENV='teensy35' ;;
- t36) TESTENV='teensy35' ;;
- # Build with the last-built env
- -r) [[ -f "$STATE_FILE" ]] || { echo "No previous (-r) build state found." ; exit 1 ; }
- read TESTENV <"$STATE_FILE"
- platformio run --project-dir . -e $TESTENV
- exit
- ;;
- # A -y may come first
- -y) TESTENV=${2:-'-'} ; CHOICE=${3:-0} ;;
- -[a-z]) echo "Unknown flag $TESTENV" ; exit 1 ;;
- -) ;;
-esac
-
# Matching patterns
ISNUM='^[0-9]+$'
ISCMD='^(restore|opt|exec|use|pins|env)_'
ISEXEC='^exec_'
ISCONT='\\ *$'
+# Get the environment and test number from the command
+TESTENV=${1:-'-'}
+CHOICE=${2:-0}
+AUTOENV=0
+
+# Allow shorthand for test name
+case $TESTENV in
+ tree) pio run -d . -e include_tree ; exit 1 ;;
+ due) TESTENV='DUE' ;;
+ esp) TESTENV='esp32' ;;
+ lin*) TESTENV='linux_native' ;;
+ lpc?(8)) TESTENV='LPC1768' ;;
+ lpc9) TESTENV='LPC1769' ;;
+ m128) TESTENV='mega1280' ;;
+ m256) TESTENV='mega2560' ;;
+ mega) TESTENV='mega2560' ;;
+ stm) TESTENV='STM32F103RE' ;;
+ f1) TESTENV='STM32F103RE' ;;
+ f4) TESTENV='STM32F4' ;;
+ f7) TESTENV='STM32F7' ;;
+ s6) TESTENV='FYSETC_S6' ;;
+ teensy) TESTENV='teensy31' ;;
+ t31) TESTENV='teensy31' ;;
+ t32) TESTENV='teensy31' ;;
+ t35) TESTENV='teensy35' ;;
+ t36) TESTENV='teensy35' ;;
+
+-h|--help) echo -e "$(basename $0) : Marlin Firmware test, build, and upload\n"
+ echo "Usage: $(basename $0) ................. Select env and test to apply / run"
+ echo " $(basename $0) [-y] env ........ Select a test for env to apply / run"
+ echo " $(basename $0) [-y] env test ... Apply / run the specified env test"
+ echo " $(basename $0) -b [variant] .... Auto-build the specified variant"
+ echo " $(basename $0) -u [variant] .... Auto-build and upload the specified variant"
+ echo
+ echo "env shortcuts: tree due esp lin lpc|lpc8 lpc9 m128 m256|mega stm|f1 f4 f7 s6 teensy|t31|t32 t35|t36"
+ exit
+ ;;
+
+ # Build with the last-built env
+ -r) [[ -f "$STATE_FILE" ]] || { echo "No previous (-r) build state found." ; exit 1 ; }
+ read TESTENV <"$STATE_FILE"
+ pio run -d . -e $TESTENV
+ exit
+ ;;
+
+ -[bu]) MB=$( grep -E "^\s*#define MOTHERBOARD" Marlin/Configuration.h | awk '{ print $3 }' | $SED 's/BOARD_//' )
+ [[ -z $MB ]] && { echo "Error - Can't read MOTHERBOARD setting." ; exit 1 ; }
+ BLINE=$( grep -E "define\s+BOARD_$MB\b" Marlin/src/core/boards.h )
+ BNUM=$( $SED -E 's/^.+BOARD_[^ ]+ +([0-9]+).+$/\1/' <<<"$BLINE" )
+ BDESC=$( $SED -E 's/^.+\/\/ *(.+)$/\1/' <<<"$BLINE" )
+ [[ -z $BNUM ]] && { echo "Error - Can't find $MB in boards list." ; exit 1 ; }
+ readarray -t ENVS <<< $( grep -EA1 "MB\(.*\b$MB\b.*\)" Marlin/src/pins/pins.h | grep -E '#include.+//.+env:.+' | grep -oE 'env:[^ ]+' | $SED -E 's/env://' )
+ [[ -z $ENVS ]] && { echo "Error - Can't find target(s) for $MB ($BNUM)." ; exit 1 ; }
+ ECOUNT=${#ENVS[*]}
+
+ if [[ $ECOUNT == 1 ]]; then
+ TARGET=$ENVS
+ else
+ if [[ $CHOICE == 0 ]]; then
+ #
+ # List env names and numbers. Get selection.
+ #
+ echo "Available targets for \"$BDESC\" | $MB ($BNUM):"
+
+ IND=0 ; for ENV in "${ENVS[@]}"; do let IND++ ; echo " $IND) $ENV" ; done
+
+ if [[ $ECOUNT > 1 ]]; then
+ for (( ; ; ))
+ do
+ read -p "Select a target for '$MB' (1-$ECOUNT) : " CHOICE
+ [[ -z "$CHOICE" ]] && { echo '(canceled)' ; exit 1 ; }
+ [[ $CHOICE =~ $ISNUM ]] && ((CHOICE >= 1 && CHOICE <= ECOUNT)) && break
+ echo ">>> Invalid environment choice '$CHOICE'."
+ done
+ echo
+ fi
+ else
+ echo "Detected \"$BDESC\" | $MB ($BNUM)."
+ [[ $CHOICE > $ECOUNT ]] && { echo "Environment selection out of range." ; exit 1 ; }
+ fi
+ TARGET="${ENVS[$CHOICE-1]}"
+ echo "Selected $TARGET"
+ fi
+
+ echo "$TARGET" >"$STATE_FILE"
+
+ if [[ $TESTENV == "-u" ]]; then
+ echo "Build/Uploading environment $TARGET for board $MB ($BNUM)..." ; echo
+ pio run -t upload -e $TARGET
+ else
+ echo "Building environment $TARGET for board $MB ($BNUM)..." ; echo
+ pio run -e $TARGET
+ fi
+ exit
+ ;;
+
+ # The -y flag may come first
+ -y) TESTENV=${2:-'-'} ; CHOICE=${3:-0} ;;
+
+ -[a-z]) echo "Unknown flag $TESTENV" ; exit 1 ;;
+ -) ;;
+esac
+
+#
# List available tests and ask for selection
+#
+
if [[ $TESTENV == '-' ]]; then
IND=0
NAMES=()
@@ -86,17 +155,17 @@ fi
OUT=$( cat $TESTPATH/$TESTENV-tests 2>/dev/null ) || { echo "Can't find test '$TESTENV'." ; exit 1 ; }
# Count up the number of tests
-# TODO: List test descriptions with numbers
TESTCOUNT=$( awk "/$ISEXEC/{a++}END{print a}" <<<"$OUT" )
# User entered a number?
-(( CHOICE && CHOICE > TESTCOUNT )) && { echo "Invalid test index '$CHOICE' (1-$TESTCOUNT)." ; exit 1 ; }
+(( CHOICE && CHOICE > TESTCOUNT )) && { echo "Invalid test selection '$CHOICE' (1-$TESTCOUNT)." ; exit 1 ; }
if [[ $CHOICE == 0 ]]; then
- # List test descriptions with numbers
+ #
+ # List test descriptions with numbers and get selection
+ #
echo "Available '$TESTENV' tests:" ; echo "$OUT" | {
IND=0
- SED=$(which gsed || which sed)
while IFS= read -r LINE
do
if [[ $LINE =~ $ISEXEC ]]; then
@@ -113,12 +182,14 @@ if [[ $CHOICE == 0 ]]; then
read -p "Select a '$TESTENV' test (1-$TESTCOUNT) : " CHOICE
[[ -z "$CHOICE" ]] && { echo '(canceled)' ; exit 1 ; }
[[ $CHOICE =~ $ISNUM ]] && ((CHOICE >= 1 && CHOICE <= TESTCOUNT)) && break
- echo ">>> Invalid test index '$CHOICE'."
+ echo ">>> Invalid test selection '$CHOICE'."
done
fi
fi
-# Finally, run the specified test lines
+#
+# Run the specified test lines
+#
echo "$OUT" | {
IND=0
GOTX=0
@@ -136,7 +207,7 @@ echo "$OUT" | {
}
((IND == CHOICE)) && {
GOTX=1
- [[ $CMD == "" ]] && CMD="$LINE" || CMD=$( echo -e "$CMD$LINE" | sed -e 's/\\//g' )
+ [[ $CMD == "" ]] && CMD="$LINE" || CMD=$( echo -e "$CMD$LINE" | $SED -e 's/\\//g' )
[[ $LINE =~ $ISCONT ]] || { echo $CMD ; eval "$CMD" ; CMD="" ; }
}
fi
@@ -144,6 +215,9 @@ echo "$OUT" | {
done
}
+# Make clear it's a TEST
+opt_set CUSTOM_MACHINE_NAME "\"$TESTENV-tests ($CHOICE)\""
+
# Get a -y parameter the lazy way
[[ "$2" == "-y" || "$3" == "-y" ]] && BUILD_YES='Y'
@@ -154,6 +228,6 @@ if [[ $BUILD_YES != 'Y' ]]; then
fi
[[ $BUILD_YES == 'Y' || $BUILD_YES == 'Yes' ]] && {
- platformio run --project-dir . -e $TESTENV
+ pio run -d . -e $TESTENV
echo "$TESTENV" >"$STATE_FILE"
}
diff --git a/buildroot/share/scripts/MarlinMesh.scad b/buildroot/share/scripts/MarlinMesh.scad
index 7616ded699..6d78bb9649 100644
--- a/buildroot/share/scripts/MarlinMesh.scad
+++ b/buildroot/share/scripts/MarlinMesh.scad
@@ -10,17 +10,13 @@
* *
\**************************************/
-//$t = 0.15; // comment out during animation
+$t = 0.15; // comment out during animation!
+X = 0; Y = 1;
+L = 0; R = 1; F = 2; B = 3;
//
-// Mesh info and points
+// Sample Mesh - Replace with your own
//
-
-mesh_width = 200; // X Size in mm of the probed area
-mesh_height = 200; // Y Size...
-zprobe_offset = 0; // Added to the points
-NAN = 0; // Z to use for un-measured points
-
measured_z = [
[ -1.20, -1.13, -1.09, -1.03, -1.19 ],
[ -1.16, -1.25, -1.27, -1.25, -1.08 ],
@@ -29,6 +25,28 @@ measured_z = [
[ -1.13, -0.99, -1.03, -1.06, -1.32 ]
];
+//
+// An offset to add to all points in the mesh
+//
+zadjust = 0;
+
+//
+// Mesh characteristics
+//
+bed_size = [ 200, 200 ];
+
+mesh_inset = [ 10, 10, 10, 10 ]; // L, F, R, B
+
+mesh_bounds = [
+ [ mesh_inset[L], mesh_inset[F] ],
+ [ bed_size[X] - mesh_inset[R], bed_size[Y] - mesh_inset[B] ]
+];
+
+mesh_size = mesh_bounds[1] - mesh_bounds[0];
+
+ // NOTE: Marlin meshes already subtract the probe offset
+NAN = 0; // Z to use for un-measured points
+
//
// Geometry
//
@@ -45,6 +63,7 @@ alternation = 2; // direction change modulus (try it)
show_plane = true;
show_labels = true;
+show_coords = true;
arrow_length = 5;
label_font_lg = "Arial";
@@ -62,8 +81,8 @@ mean_value = (big_z + lil_z) / 2.0;
mesh_points_y = len(measured_z);
mesh_points_x = len(measured_z[0]);
-xspace = mesh_width / (mesh_points_x - 1);
-yspace = mesh_height / (mesh_points_y - 1);
+xspace = mesh_size[X] / (mesh_points_x - 1);
+yspace = mesh_size[Y] / (mesh_points_y - 1);
// At $t=0 and $t=1 scale will be 100%
z_scale_factor = min_z_scale + (($t > 0.5) ? 1.0 - $t : $t) * (max_z_scale - min_z_scale) * 2;
@@ -72,6 +91,8 @@ z_scale_factor = min_z_scale + (($t > 0.5) ? 1.0 - $t : $t) * (max_z_scale - min
// Min and max recursive functions for 1D and 2D arrays
// Return the smallest or largest value in the array
//
+function some_1D(b,i) = (i - - +
@@ -26,7 +26,7 @@ extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
lib_deps =
LiquidCrystal
- TMCStepper@>=0.6.1,<1.0.0
+ TMCStepper@>=0.6.2,<1.0.0
Adafruit NeoPixel
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip
@@ -57,24 +57,24 @@ monitor_speed = 250000
#
# ATmega2560
#
-[env:megaatmega2560]
+[env:mega2560]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter = ${common.default_src_filter} +
+src_filter = ${common.default_src_filter} +
#
# ATmega1280
#
-[env:megaatmega1280]
+[env:mega1280]
platform = atmelavr
board = megaatmega1280
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter = ${common.default_src_filter} +
+src_filter = ${common.default_src_filter} +
#
# RAMBo
@@ -85,7 +85,7 @@ board = reprap_rambo
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter = ${common.default_src_filter} +
+src_filter = ${common.default_src_filter} +
#
# FYSETC F6 V1.3
@@ -96,7 +96,7 @@ board = fysetc_f6_13
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter = ${common.default_src_filter} +
+src_filter = ${common.default_src_filter} +
#
# FYSETC F6 V1.4
@@ -107,27 +107,27 @@ board = fysetc_f6_14
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter = ${common.default_src_filter} +
+src_filter = ${common.default_src_filter} +
#
# Sanguinololu (ATmega644p)
#
-[env:sanguino_atmega644p]
+[env:sanguino644p]
platform = atmelavr
board = sanguino_atmega644p
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter = ${common.default_src_filter} +
+src_filter = ${common.default_src_filter} +