From aa0f7afbe67e95541134878b9520aec329492cc0 Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Mon, 15 Apr 2019 16:57:34 -0400 Subject: [PATCH 01/20] Fix call to uninitialized PWM pin, heater 2 overlap (#13674) --- Marlin/src/gcode/control/M3-M5.cpp | 4 +++- Marlin/src/pins/pins_FORMBOT_TREX3.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp index 8612e0c03..132f7bb39 100644 --- a/Marlin/src/gcode/control/M3-M5.cpp +++ b/Marlin/src/gcode/control/M3-M5.cpp @@ -74,7 +74,9 @@ inline void delay_for_power_down() { safe_delay(SPINDLE_LASER_POWERDOWN_DELAY); inline void set_spindle_laser_ocr(const uint8_t ocr) { WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ENABLE_INVERT); // turn spindle on (active low) - analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr); + #if ENABLED(SPINDLE_LASER_PWM) + analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr); + #endif } #if ENABLED(SPINDLE_LASER_PWM) diff --git a/Marlin/src/pins/pins_FORMBOT_TREX3.h b/Marlin/src/pins/pins_FORMBOT_TREX3.h index 3615ca742..5b4bd8b53 100644 --- a/Marlin/src/pins/pins_FORMBOT_TREX3.h +++ b/Marlin/src/pins/pins_FORMBOT_TREX3.h @@ -143,7 +143,7 @@ #define LED_PIN 13 #endif -#define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM +#define SPINDLE_LASER_PWM_PIN -1 // MUST BE HARDWARE PWM #define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup! // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector From 6fe90f0324556216898b89a957d30aea9e324424 Mon Sep 17 00:00:00 2001 From: Kajetan Rzepecki Date: Mon, 15 Apr 2019 23:13:59 +0200 Subject: [PATCH 02/20] Define I2S pins for ESP32 (#13714) --- Marlin/src/HAL/HAL_ESP32/i2s.cpp | 6 +++--- Marlin/src/HAL/HAL_ESP32/i2s.h | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/HAL_ESP32/i2s.cpp index c503a24bf..42e65eacd 100644 --- a/Marlin/src/HAL/HAL_ESP32/i2s.cpp +++ b/Marlin/src/HAL/HAL_ESP32/i2s.cpp @@ -303,9 +303,9 @@ int i2s_init() { xTaskCreate(stepperTask, "StepperTask", 10000, NULL, 1, NULL); // Route the i2s pins to the appropriate GPIO - gpio_matrix_out_check(22, I2S0O_DATA_OUT23_IDX, 0, 0); - gpio_matrix_out_check(25, I2S0O_WS_OUT_IDX, 0, 0); - gpio_matrix_out_check(26, I2S0O_BCK_OUT_IDX, 0, 0); + gpio_matrix_out_check(I2S_DATA, I2S0O_DATA_OUT23_IDX, 0, 0); + gpio_matrix_out_check(I2S_BCK, I2S0O_BCK_OUT_IDX, 0, 0); + gpio_matrix_out_check(I2S_WS, I2S0O_WS_OUT_IDX, 0, 0); // Start the I2S peripheral return i2s_start(I2S_NUM_0); diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.h b/Marlin/src/HAL/HAL_ESP32/i2s.h index 32999f712..337d91b20 100644 --- a/Marlin/src/HAL/HAL_ESP32/i2s.h +++ b/Marlin/src/HAL/HAL_ESP32/i2s.h @@ -29,3 +29,9 @@ int i2s_init(); void i2s_write(uint8_t pin, uint8_t val); void i2s_push_sample(); + +// pin definitions + +#define I2S_WS 25 +#define I2S_BCK 26 +#define I2S_DATA 27 From db373f130c329ed326bfbc9c4074f16f61f582ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= Date: Mon, 15 Apr 2019 23:14:49 +0200 Subject: [PATCH 03/20] Update Slovak language (#13692) --- Marlin/src/lcd/language/language_sk.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 965ae2231..c069c780e 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -40,6 +40,8 @@ #define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("äÄáÁčČďĎéÉíÍĺĹľĽňŇóÓôÔŕŔšŠťŤúÚýÝžŽ³") #define WELCOME_MSG MACHINE_NAME _UxGT(" pripravená.") +#define MSG_YES _UxGT("ÁNO") +#define MSG_NO _UxGT("NIE") #define MSG_BACK _UxGT("Naspäť") #define MSG_SD_INSERTED _UxGT("Karta vložená") #define MSG_SD_REMOVED _UxGT("Karta vybraná") @@ -104,6 +106,7 @@ #define MSG_UBL_TOOLS _UxGT("Nástroje UBL") #define MSG_UBL_LEVEL_BED _UxGT("UBL rovnanie") #define MSG_IDEX_MENU _UxGT("IDEX režim") +#define MSG_OFFSETS_MENU _UxGT("Offset nástrojov") #define MSG_IDEX_MODE_AUTOPARK _UxGT("Auto-parkovanie") #define MSG_IDEX_MODE_DUPLICATE _UxGT("Duplikácia") #define MSG_IDEX_MODE_MIRRORED_COPY _UxGT("Zrkadlená kópia") @@ -276,6 +279,9 @@ #define MSG_WATCH _UxGT("Info. obrazovka") #define MSG_PREPARE _UxGT("Príprava tlače") #define MSG_TUNE _UxGT("Doladenie tlače") +#define MSG_START_PRINT _UxGT("Spustiť tlač") +#define MSG_BUTTON_PRINT _UxGT("Tlačiť") +#define MSG_BUTTON_CANCEL _UxGT("Zrušiť") #define MSG_PAUSE_PRINT _UxGT("Pozastaviť tlač") #define MSG_RESUME_PRINT _UxGT("Obnoviť tlač") #define MSG_STOP_PRINT _UxGT("Zastaviť tlač") @@ -330,6 +336,7 @@ #define MSG_BABYSTEP_X _UxGT("Babystep X") #define MSG_BABYSTEP_Y _UxGT("Babystep Y") #define MSG_BABYSTEP_Z _UxGT("Babystep Z") +#define MSG_BABYSTEP_TOTAL _UxGT("Celkom") #define MSG_ENDSTOP_ABORT _UxGT("Zastavenie Endstop") #define MSG_HEATING_FAILED_LCD _UxGT("Chyba ohrevu") #define MSG_HEATING_FAILED_LCD_BED _UxGT("Chyba ohrevu podl.") @@ -461,6 +468,10 @@ #define MSG_VTOOLS_RESET _UxGT("V-tools resetované") #define MSG_START_Z _UxGT("Počiat.Z") #define MSG_END_Z _UxGT("Konečn.Z") +#define MSG_BRICKOUT _UxGT("Brickout") +#define MSG_INVADERS _UxGT("Nájazdníci") +#define MSG_SNAKE _UxGT("Had") +#define MSG_MAZE _UxGT("Bludisko") // // Filament Change screens show up to 3 lines on a 4-line display @@ -515,3 +526,6 @@ #define MSG_SERVICE_RESET _UxGT("Vynulovať") #define MSG_SERVICE_IN _UxGT(" za:") +#define MSG_BACKLASH _UxGT("Kompenz. vôle") +#define MSG_BACKLASH_CORRECTION _UxGT("Korekcia") +#define MSG_BACKLASH_SMOOTHING _UxGT("Vyhladzovanie") From 20dc45bca7bd660444083a971b4e20c9bc0a8a99 Mon Sep 17 00:00:00 2001 From: Kajetan Rzepecki Date: Mon, 15 Apr 2019 23:32:20 +0200 Subject: [PATCH 04/20] Refactor, fix ESP32 WebSocketSerial (#13689) --- Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp | 255 +++++++------------ Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h | 89 +++---- 2 files changed, 124 insertions(+), 220 deletions(-) diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp index 014e9757f..bdc804dac 100644 --- a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp +++ b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp @@ -21,213 +21,132 @@ */ #ifdef ARDUINO_ARCH_ESP32 -#include "../../inc/MarlinConfig.h" +#include "../../inc/MarlinConfigPre.h" #if ENABLED(WIFISUPPORT) #include "WebSocketSerial.h" - -extern WebSocketSerial webSocketSerial; - #include "wifi.h" -#include #include -struct ring_buffer_r { - unsigned char buffer[RX_BUFFER_SIZE]; - volatile ring_buffer_pos_t head, tail; -}; - -struct ring_buffer_t { - unsigned char buffer[256]; - volatile uint8_t head, tail; -}; - -ring_buffer_r rx_buffer = { { 0 }, 0, 0 }; -ring_buffer_t tx_buffer = { { 0 }, 0, 0 }; - -static bool _written; +WebSocketSerial webSocketSerial; +AsyncWebSocket ws("/ws"); // TODO Move inside the class. -#if ENABLED(EMERGENCY_PARSER) - static EmergencyParser::State emergency_state; // = EP_RESET -#endif +// RingBuffer impl -AsyncWebSocket ws("/ws"); // access at ws://[esp ip]/ws +#define NEXT_INDEX(I, SIZE) ((I + 1) & (ring_buffer_pos_t)(SIZE - 1)) -FORCE_INLINE int next_rx_index(const int i) { return (ring_buffer_pos_t)(i + 1) & (ring_buffer_pos_t)(RX_BUFFER_SIZE - 1); } -FORCE_INLINE int next_tx_index(const int i) { return (ring_buffer_pos_t)(i + 1) & (ring_buffer_pos_t)(TX_BUFFER_SIZE - 1); } +RingBuffer::RingBuffer(ring_buffer_pos_t size) + : data(new uint8_t[size]), + read_index(0), + write_index(0), + size(size) +{} -static void addToBuffer(uint8_t * const data, const size_t len) { - for (size_t i = 0; i < len; i++) { - ring_buffer_pos_t h = rx_buffer.head; - const ring_buffer_pos_t t = rx_buffer.tail, n = next_rx_index(h); +RingBuffer::~RingBuffer() { delete[] data; } - if (n != t) { rx_buffer.buffer[h] = data[i]; h = n; } - - // TODO: buffer is full, handle? - - rx_buffer.head = h; - } -} +ring_buffer_pos_t RingBuffer::write(const uint8_t c) { + const ring_buffer_pos_t n = NEXT_INDEX(write_index, size); -// Handle WebSocket event -static void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len) { - switch (type) { - case WS_EVT_CONNECT: client->ping(); break; // client connected - case WS_EVT_DISCONNECT: // client disconnected - case WS_EVT_ERROR: // error was received from the other end - case WS_EVT_PONG: break; // pong message was received (in response to a ping request maybe) - case WS_EVT_DATA: { // data packet - AwsFrameInfo * info = (AwsFrameInfo*)arg; - if (info->opcode == WS_TEXT || info->message_opcode == WS_TEXT) - addToBuffer(data, len); - } + if (n != read_index) { + this->data[write_index] = c; + write_index = n; + return 1; } -} -// Public Methods -void WebSocketSerial::begin(const long baud_setting) { - ws.onEvent(onEvent); - server.addHandler(&ws); // attach AsyncWebSocket + // TODO: buffer is full, handle? + return 0; } -void WebSocketSerial::end() { } - -int WebSocketSerial::peek(void) { - const int v = rx_buffer.head == rx_buffer.tail ? -1 : rx_buffer.buffer[rx_buffer.tail]; - return v; +ring_buffer_pos_t RingBuffer::write(const uint8_t *buffer, ring_buffer_pos_t size) { + ring_buffer_pos_t written = 0; + for (ring_buffer_pos_t i = 0; i < size; i++) { + written += write(buffer[i]); + } + return written; } -int WebSocketSerial::read(void) { - const ring_buffer_pos_t h = rx_buffer.head, t = rx_buffer.tail; - if (h == t) return -1; // Nothing to read? Return now - - const int v = rx_buffer.buffer[t]; - - rx_buffer.tail = (ring_buffer_pos_t)(t + 1) & (RX_BUFFER_SIZE - 1); // Advance tail - - return v; +int RingBuffer::available(void) { + return (size - read_index + write_index) & (size - 1); } -bool WebSocketSerial::available(void) { - const ring_buffer_pos_t h = rx_buffer.head, t = rx_buffer.tail; - return (ring_buffer_pos_t)(RX_BUFFER_SIZE + h - t) & (RX_BUFFER_SIZE - 1); +int RingBuffer::peek(void) { + return available() ? data[read_index] : -1; } -void WebSocketSerial::flush(void) { - ws.textAll("flush"); - rx_buffer.tail = rx_buffer.head; +int RingBuffer::read(void) { + if (available()) { + const int ret = data[read_index]; + read_index = NEXT_INDEX(read_index, size); + return ret; + } + return -1; } -#if TX_BUFFER_SIZE - - void WebSocketSerial::write(const uint8_t c) { - _written = true; - - const uint8_t i = (tx_buffer.head + 1) & (TX_BUFFER_SIZE - 1); +ring_buffer_pos_t RingBuffer::read(uint8_t *buffer) { + ring_buffer_pos_t len = available(); - // Store new char. head is always safe to move - tx_buffer.buffer[tx_buffer.head] = c; - tx_buffer.head = i; - - if (c == '\n') { - ws.textAll(tx_buffer.buffer, tx_buffer.head); - tx_buffer.head = 0; - } + for(ring_buffer_pos_t i = 0; read_index != write_index; i++) { + buffer[i] = data[read_index]; + read_index = NEXT_INDEX(read_index, size); } - void WebSocketSerial::flushTx(void) { - ws.textAll("flushTx"); - if (!_written) return; - } - -#else + return len; +} - //void WebSocketSerial::write(const uint8_t c) { _written = true; } - //void WebSocketSerial::flushTx(void) { if (!_written) return; } +void RingBuffer::flush(void) { read_index = write_index; } -#endif +// WebSocketSerial impl +WebSocketSerial::WebSocketSerial() + : rx_buffer(RingBuffer(RX_BUFFER_SIZE)), + tx_buffer(RingBuffer(TX_BUFFER_SIZE)) +{} -/** - * Imports from print.h - */ +void WebSocketSerial::begin(const long baud_setting) { + ws.onEvent([this](AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) { + switch (type) { + case WS_EVT_CONNECT: client->ping(); break; // client connected + case WS_EVT_DISCONNECT: // client disconnected + case WS_EVT_ERROR: // error was received from the other end + case WS_EVT_PONG: break; // pong message was received (in response to a ping request maybe) + case WS_EVT_DATA: { // data packet + AwsFrameInfo * info = (AwsFrameInfo*)arg; + if (info->opcode == WS_TEXT || info->message_opcode == WS_TEXT) + this->rx_buffer.write(data, len); + } + } + }); + server.addHandler(&ws); +} -void WebSocketSerial::print(char c, int base) { print((long)c, base); } -void WebSocketSerial::print(unsigned char b, int base) { print((unsigned long)b, base); } -void WebSocketSerial::print(int n, int base) { print((long)n, base); } -void WebSocketSerial::print(unsigned int n, int base) { print((unsigned long)n, base); } -void WebSocketSerial::print(long n, int base) { - if (base == 0) - write(n); - else if (base == 10) { - if (n < 0) { print('-'); n = -n; } - printNumber(n, 10); +void WebSocketSerial::end() { } +int WebSocketSerial::peek(void) { return rx_buffer.peek(); } +int WebSocketSerial::read(void) { return rx_buffer.read(); } +int WebSocketSerial::available(void) { return rx_buffer.available(); } +void WebSocketSerial::flush(void) { rx_buffer.flush(); } + +size_t WebSocketSerial::write(const uint8_t c) { + size_t ret = tx_buffer.write(c); + + if (ret && c == '\n') { + uint8_t tmp[TX_BUFFER_SIZE]; + ring_buffer_pos_t size = tx_buffer.read(tmp); + ws.textAll(tmp, size); } - else - printNumber(n, base); -} -void WebSocketSerial::print(unsigned long n, int base) { - if (base == 0) write(n); else printNumber(n, base); + return ret; } -void WebSocketSerial::print(double n, int digits) { printFloat(n, digits); } - -void WebSocketSerial::println(void) { print('\r'); print('\n'); } -void WebSocketSerial::println(const String& s) { print(s); println(); } -void WebSocketSerial::println(const char c[]) { print(c); println(); } -void WebSocketSerial::println(char c, int base) { print(c, base); println(); } -void WebSocketSerial::println(unsigned char b, int base) { print(b, base); println(); } -void WebSocketSerial::println(int n, int base) { print(n, base); println(); } -void WebSocketSerial::println(unsigned int n, int base) { print(n, base); println(); } -void WebSocketSerial::println(long n, int base) { print(n, base); println(); } -void WebSocketSerial::println(unsigned long n, int base) { print(n, base); println(); } -void WebSocketSerial::println(double n, int digits) { print(n, digits); println(); } - -// Private Methods - -void WebSocketSerial::printNumber(unsigned long n, uint8_t base) { - if (n) { - unsigned char buf[8 * sizeof(long)]; // Enough space for base 2 - int8_t i = 0; - while (n) { - buf[i++] = n % base; - n /= base; - } - while (i--) - print((char)(buf[i] + (buf[i] < 10 ? '0' : 'A' - 10))); +size_t WebSocketSerial::write(const uint8_t* buffer, size_t size) { + size_t written = 0; + for(size_t i = 0; i < size; i++) { + written += write(buffer[i]); } - else - print('0'); + return written; } -void WebSocketSerial::printFloat(double number, uint8_t digits) { - // Handle negative numbers - if (number < 0.0) { print('-'); number = -number; } - - // Round correctly so that print(1.999, 2) prints as "2.00" - // Use a lookup table for performance - constexpr double rounds[] = { 0.5, 0.05, 0.005, 0.0005, 0.00005, 0.000005, 0.0000005, 0.00000005 }; - number += rounds[digits]; - - //number += pow(10, -(digits + 1)); // slower single-line equivalent - - // Extract the integer part of the number and print it - unsigned long int_part = (unsigned long)number; - print(int_part); - - // Print the decimal point, but only if there are digits beyond - double remainder = number - (double)int_part; - if (digits) { - print('.'); - // Extract digits from the remainder one at a time - while (digits--) { - remainder *= 10.0; - const int toPrint = int(remainder); - print(toPrint); - remainder -= toPrint; - } - } +void WebSocketSerial::flushTX(void) { + // No need to do anything as there's no benefit to sending partial lines over the websocket connection. } #endif // WIFISUPPORT diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h index a3296b280..610058755 100644 --- a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h +++ b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h @@ -23,12 +23,7 @@ #include "../../inc/MarlinConfig.h" -#include - -#define DEC 10 -#define HEX 16 -#define OCT 8 -#define BIN 2 +#include "Stream.h" #ifndef RX_BUFFER_SIZE #define RX_BUFFER_SIZE 128 @@ -40,60 +35,50 @@ #error "TX_BUFFER_SIZE is required for the WebSocket." #endif -#if RX_BUFFER_SIZE > 256 - typedef uint16_t ring_buffer_pos_t; -#else - typedef uint8_t ring_buffer_pos_t; -#endif +typedef uint16_t ring_buffer_pos_t; -class WebSocketSerial { -public: - WebSocketSerial() {}; - static void begin(const long); - static void end(); - static int peek(void); - static int read(void); - static void flush(void); - static void flushTx(void); - static bool available(void); - static void write(const uint8_t c); +class RingBuffer { + uint8_t *data; + ring_buffer_pos_t size, read_index, write_index; - #if ENABLED(SERIAL_STATS_DROPPED_RX) - FORCE_INLINE static uint32_t dropped() { return 0; } - #endif +public: + RingBuffer(ring_buffer_pos_t size); + ~RingBuffer(); - #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) - FORCE_INLINE static int rxMaxEnqueued() { return 0; } - #endif + int available(void); + int peek(void); + int read(void); + ring_buffer_pos_t read(uint8_t *buffer); + void flush(void); + ring_buffer_pos_t write(const uint8_t c); + ring_buffer_pos_t write(const uint8_t* buffer, ring_buffer_pos_t size); +}; - FORCE_INLINE static void write(const char* str) { while (*str) write(*str++); } - FORCE_INLINE static void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); } - FORCE_INLINE static void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); } - FORCE_INLINE static void print(const char* str) { write(str); } +class WebSocketSerial: public Stream { + RingBuffer rx_buffer; + RingBuffer tx_buffer; - static void print(char, int = 0); - static void print(unsigned char, int = 0); - static void print(int, int = DEC); - static void print(unsigned int, int = DEC); - static void print(long, int = DEC); - static void print(unsigned long, int = DEC); - static void print(double, int = 2); +public: + WebSocketSerial(); + void begin(const long); + void end(); + int available(void); + int peek(void); + int read(void); + void flush(void); + void flushTX(void); + size_t write(const uint8_t c); + size_t write(const uint8_t* buffer, size_t size); - static void println(const String& s); - static void println(const char[]); - static void println(char, int = 0); - static void println(unsigned char, int = 0); - static void println(int, int = DEC); - static void println(unsigned int, int = DEC); - static void println(long, int = DEC); - static void println(unsigned long, int = DEC); - static void println(double, int = 2); - static void println(void); operator bool() { return true; } -private: - static void printNumber(unsigned long, const uint8_t); - static void printFloat(double, uint8_t); + #if ENABLED(SERIAL_STATS_DROPPED_RX) + FORCE_INLINE uint32_t dropped() { return 0; } + #endif + + #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) + FORCE_INLINE int rxMaxEnqueued() { return 0; } + #endif }; extern WebSocketSerial webSocketSerial; From df75a606ffa6a6a63644114de24f3c649144fd83 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 16 Apr 2019 00:03:10 +0200 Subject: [PATCH 05/20] Support MKS SGen board (#13694) --- Marlin/src/core/boards.h | 1 + Marlin/src/pins/pins.h | 2 ++ Marlin/src/pins/pins_MKS_SBASE.h | 10 ++++-- Marlin/src/pins/pins_MKS_SGEN.h | 60 ++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 Marlin/src/pins/pins_MKS_SGEN.h diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index ee9da1fd1..4a7fb642b 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -194,6 +194,7 @@ #define BOARD_BIQU_B300_V1_0 1760 // BIQU B300_V1.0 (Power outputs: Hotend0, Fan, Bed, SPI Driver) #define BOARD_BIGTREE_SKR_V1_3 1761 // BIGTREE SKR_V1.3 (Power outputs: Hotend0, Hotend1, Fan, Bed) #define BOARD_AZTEEG_X5_MINI 1762 // Azteeg X5 Mini (Power outputs: Hotend0, Bed, Fan) +#define BOARD_MKS_SGEN 1763 // MKS-SGen (Power outputs: Hotend0, Hotend1, Bed, Fan) // // SAM3X8E ARM Cortex M3 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 68de292c0..bb7a10108 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -316,6 +316,8 @@ #include "pins_RAMPS_RE_ARM.h" // LPC1768 env:LPC1768 #elif MB(MKS_SBASE) #include "pins_MKS_SBASE.h" // LPC1768 env:LPC1768 +#elif MB(MKS_SGEN) + #include "pins_MKS_SGEN.h" // LPC1769 env:LPC1769 #elif MB(AZSMZ_MINI) #include "pins_AZSMZ_MINI.h" // LPC1768 env:LPC1768 #elif MB(AZTEEG_X5_GT) diff --git a/Marlin/src/pins/pins_MKS_SBASE.h b/Marlin/src/pins/pins_MKS_SBASE.h index 19f9e5acf..39667507d 100644 --- a/Marlin/src/pins/pins_MKS_SBASE.h +++ b/Marlin/src/pins/pins_MKS_SBASE.h @@ -28,8 +28,12 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#define BOARD_NAME "MKS SBASE" -#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE" +#ifndef BOARD_NAME + #define BOARD_NAME "MKS SBASE" +#endif +#ifndef BOARD_WEBSITE_URL + #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE" +#endif #define LED_PIN P1_18 // Used as a status indicator #define LED2_PIN P1_19 @@ -281,7 +285,7 @@ #endif #endif -#if HAS_DRIVER(TMC2208) +#if MB(MKS_SBASE) && HAS_DRIVER(TMC2208) // The shortage of pins becomes apparent. // Worst case you may have to give up the LCD // RX pins need to be interrupt capable diff --git a/Marlin/src/pins/pins_MKS_SGEN.h b/Marlin/src/pins/pins_MKS_SGEN.h new file mode 100644 index 000000000..2aa6bcc55 --- /dev/null +++ b/Marlin/src/pins/pins_MKS_SGEN.h @@ -0,0 +1,60 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * Copyright (C) 2017 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 . + * + */ + +/** + * MKS SGen pin assignments + */ + +#ifndef LPC1769 + #error "Oops! Make sure you have the LPC1769 environment selected in your IDE." +#endif + +#define BOARD_NAME "MKS SGEN" +#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN" + +#include "pins_MKS_SBASE.h" + +#undef E1_STEP_PIN +#undef E1_DIR_PIN +#undef E1_ENABLE_PIN + +//#undef BTN_EN1 +//#undef BTN_EN2 +//#define BTN_EN1 P1_23 // EXP2.5 +//#define BTN_EN2 P1_22 // EXP2.3 + +#if HAS_DRIVER(TMC2208) + // The shortage of pins becomes apparent. + // 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 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 +#endif From 455ee23499042b17132405934d3aa932d9713ab3 Mon Sep 17 00:00:00 2001 From: Msq001 <760675063@qq.com> Date: Tue, 16 Apr 2019 07:53:39 +0800 Subject: [PATCH 06/20] Fix, improve Power Loss Recovery (#13703) - Save and restore workspace offsets - Add retract and purge (hidden) options - Always restore axis relative modes - Use added `G92.9` to do position restores --- Marlin/src/feature/power_loss_recovery.cpp | 85 ++++++++++++++++----- Marlin/src/feature/power_loss_recovery.h | 9 +++ Marlin/src/gcode/geometry/G92.cpp | 88 ++++++++++++---------- Marlin/src/gcode/sdcard/M23.cpp | 3 - Marlin/src/sd/cardreader.cpp | 1 + 5 files changed, 127 insertions(+), 59 deletions(-) diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/power_loss_recovery.cpp index 17ba4a101..5e3ef6fb5 100644 --- a/Marlin/src/feature/power_loss_recovery.cpp +++ b/Marlin/src/feature/power_loss_recovery.cpp @@ -151,6 +151,12 @@ void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*= // Machine state COPY(info.current_position, current_position); + #if HAS_HOME_OFFSET + COPY(info.home_offset, home_offset); + #endif + #if HAS_POSITION_SHIFT + COPY(info.position_shift, position_shift); + #endif info.feedrate = uint16_t(feedrate_mm_s * 60.0f); #if HOTENDS > 1 @@ -187,7 +193,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*= info.retract_hop = fwretract.current_hop; #endif - //relative mode + // Relative mode info.relative_mode = relative_mode; info.relative_modes_e = gcode.axis_relative_modes[E_AXIS]; @@ -239,9 +245,9 @@ void PrintJobRecovery::resume() { gcode.process_subcommands_now_P(PSTR("M420 S0 Z0")); #endif - // Set Z to 0, raise Z by 2mm, and Home (XY only for Cartesian) with no raise - // (Only do simulated homing in Marlin Dev Mode.) - gcode.process_subcommands_now_P(PSTR("G92.0 Z0\nG1 Z" STRINGIFY(RECOVERY_ZRAISE) "\nG28 R0" + // Set Z to 0, raise Z by RECOVERY_ZRAISE, and Home (XY only for Cartesian) + // with no raise. (Only do simulated homing in Marlin Dev Mode.) + gcode.process_subcommands_now_P(PSTR("G92.9 E0 Z0\nG1 Z" STRINGIFY(RECOVERY_ZRAISE) "\nG28 R0" #if ENABLED(MARLIN_DEV_MODE) " S" #elif !IS_KINEMATIC @@ -252,7 +258,7 @@ void PrintJobRecovery::resume() { // Pretend that all axes are homed axis_homed = axis_known_position = xyz_bits; - char cmd[40], str_1[16], str_2[16]; + char cmd[50], str_1[16], str_2[16]; // Select the previously active tool (with no_move) #if EXTRUDERS > 1 @@ -315,16 +321,16 @@ void PrintJobRecovery::resume() { memcpy(&mixer.gradient, &info.gradient, sizeof(info.gradient)); #endif - // Restore Z (plus raise) and E positions with G92.0 - dtostrf(info.current_position[Z_AXIS] + RECOVERY_ZRAISE, 1, 3, str_1); - dtostrf(info.current_position[E_AXIS] - #if ENABLED(SAVE_EACH_CMD_MODE) - - 5 // Extra extrusion on restart - #endif - , 1, 3, str_2 - ); - sprintf_P(cmd, PSTR("G92.0 Z%s E%s"), str_1, str_2); - gcode.process_subcommands_now(cmd); + // Extrude and retract to clean the nozzle + #if POWER_LOSS_PURGE_LEN + //sprintf_P(cmd, PSTR("G1 E%d F200"), POWER_LOSS_PURGE_LEN); + //gcode.process_subcommands_now(cmd); + gcode.process_subcommands_now_P(PSTR("G1 E" STRINGIFY(POWER_LOSS_PURGE_LEN) " F200")); + #endif + #if POWER_LOSS_RETRACT_LEN + sprintf_P(cmd, PSTR("G1 E%d F3000"), POWER_LOSS_PURGE_LEN - POWER_LOSS_RETRACT_LEN); + gcode.process_subcommands_now(cmd); + #endif // Move back to the saved XY dtostrf(info.current_position[X_AXIS], 1, 3, str_1); @@ -337,13 +343,37 @@ void PrintJobRecovery::resume() { sprintf_P(cmd, PSTR("G1 Z%s F200"), str_1); gcode.process_subcommands_now(cmd); + // Un-retract + #if POWER_LOSS_PURGE_LEN + //sprintf_P(cmd, PSTR("G1 E%d F3000"), POWER_LOSS_PURGE_LEN); + //gcode.process_subcommands_now(cmd); + gcode.process_subcommands_now_P(PSTR("G1 E" STRINGIFY(POWER_LOSS_PURGE_LEN) " F3000")); + #endif + // Restore the feedrate sprintf_P(cmd, PSTR("G1 F%d"), info.feedrate); gcode.process_subcommands_now(cmd); - //relative mode - if (info.relative_mode) relative_mode = true; - if (info.relative_modes_e) gcode.axis_relative_modes[E_AXIS] = true; + // Restore E position with G92.9 + dtostrf(info.current_position[E_AXIS], 1, 3, str_1); + sprintf_P(cmd, PSTR("G92.9 E%s"), str_1); + gcode.process_subcommands_now(cmd); + + // Relative mode + relative_mode = info.relative_mode; + gcode.axis_relative_modes[E_AXIS] = info.relative_modes_e; + + #if HAS_HOME_OFFSET || HAS_POSITION_SHIFT + LOOP_XYZ(i) { + #if HAS_HOME_OFFSET + home_offset[i] = info.home_offset[i]; + #endif + #if HAS_POSITION_SHIFT + position_shift[i] = info.position_shift[i]; + #endif + update_workspace_offset((AxisEnum)i); + } + #endif // Process commands from the old pending queue uint8_t c = info.commands_in_queue, r = info.cmd_queue_index_r; @@ -372,6 +402,25 @@ void PrintJobRecovery::resume() { DEBUG_ECHO(info.current_position[i]); } DEBUG_EOL(); + + #if HAS_HOME_OFFSET + DEBUG_ECHOPGM("home_offset: "); + LOOP_XYZ(i) { + if (i) DEBUG_CHAR(','); + DEBUG_ECHO(info.home_offset[i]); + } + DEBUG_EOL(); + #endif + + #if HAS_POSITION_SHIFT + DEBUG_ECHOPGM("position_shift: "); + LOOP_XYZ(i) { + if (i) DEBUG_CHAR(','); + DEBUG_ECHO(info.position_shift[i]); + } + DEBUG_EOL(); + #endif + DEBUG_ECHOLNPAIR("feedrate: ", info.feedrate); #if HOTENDS > 1 diff --git a/Marlin/src/feature/power_loss_recovery.h b/Marlin/src/feature/power_loss_recovery.h index 45b057e75..68554dc60 100644 --- a/Marlin/src/feature/power_loss_recovery.h +++ b/Marlin/src/feature/power_loss_recovery.h @@ -35,6 +35,8 @@ #define SAVE_INFO_INTERVAL_MS 0 //#define SAVE_EACH_CMD_MODE //#define DEBUG_POWER_LOSS_RECOVERY +#define POWER_LOSS_PURGE_LEN 20 +#define POWER_LOSS_RETRACT_LEN 10 typedef struct { uint8_t valid_head; @@ -42,6 +44,13 @@ typedef struct { // Machine state float current_position[NUM_AXIS]; + #if HAS_HOME_OFFSET + float home_offset[XYZ]; + #endif + #if HAS_POSITION_SHIFT + float position_shift[XYZ]; + #endif + uint16_t feedrate; #if HOTENDS > 1 diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp index b01daf348..75a0c03ae 100644 --- a/Marlin/src/gcode/geometry/G92.cpp +++ b/Marlin/src/gcode/geometry/G92.cpp @@ -33,9 +33,23 @@ */ void GcodeSuite::G92() { - #if ENABLED(CNC_COORDINATE_SYSTEMS) - switch (parser.subcode) { - case 1: + bool didE = false; + #if IS_SCARA || !HAS_POSITION_SHIFT + bool didXYZ = false; + #else + constexpr bool didXYZ = false; + #endif + + #if USE_GCODE_SUBCODES + const uint8_t subcode_G92 = parser.subcode; + #else + constexpr uint8_t subcode_G92 = 0; + #endif + + switch (subcode_G92) { + default: break; + #if ENABLED(CNC_COORDINATE_SYSTEMS) + case 1: { // Zero the G92 values and restore current position #if !IS_SCARA LOOP_XYZ(i) { @@ -46,44 +60,42 @@ void GcodeSuite::G92() { } } #endif // Not SCARA - return; - } - #endif - - #if ENABLED(CNC_COORDINATE_SYSTEMS) - #define IS_G92_0 (parser.subcode == 0) - #else - #define IS_G92_0 true - #endif - - bool didE = false; - #if IS_SCARA || !HAS_POSITION_SHIFT - bool didXYZ = false; - #else - constexpr bool didXYZ = false; - #endif - - if (IS_G92_0) LOOP_XYZE(i) { - if (parser.seenval(axis_codes[i])) { - const float l = parser.value_axis_units((AxisEnum)i), - v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i), - d = v - current_position[i]; - if (!NEAR_ZERO(d)) { - #if IS_SCARA || !HAS_POSITION_SHIFT - if (i == E_AXIS) didE = true; else didXYZ = true; - current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior - #elif HAS_POSITION_SHIFT - if (i == E_AXIS) { - didE = true; - current_position[E_AXIS] = v; // When using coordinate spaces, only E is set directly + } return; + #endif + #if ENABLED(POWER_LOSS_RECOVERY) + case 9: { + LOOP_XYZE(i) { + if (parser.seenval(axis_codes[i])) { + current_position[i] = parser.value_axis_units((AxisEnum)i); + if (i == E_AXIS) didE = true; else didXYZ = true; } - else { - position_shift[i] += d; // Other axes simply offset the coordinate space - update_workspace_offset((AxisEnum)i); + } + } break; + #endif + case 0: { + LOOP_XYZE(i) { + if (parser.seenval(axis_codes[i])) { + const float l = parser.value_axis_units((AxisEnum)i), + v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i), + d = v - current_position[i]; + if (!NEAR_ZERO(d)) { + #if IS_SCARA || !HAS_POSITION_SHIFT + if (i == E_AXIS) didE = true; else didXYZ = true; + current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior + #elif HAS_POSITION_SHIFT + if (i == E_AXIS) { + didE = true; + current_position[E_AXIS] = v; // When using coordinate spaces, only E is set directly + } + else { + position_shift[i] += d; // Other axes simply offset the coordinate space + update_workspace_offset((AxisEnum)i); + } + #endif } - #endif + } } - } + } break; } #if ENABLED(CNC_COORDINATE_SYSTEMS) diff --git a/Marlin/src/gcode/sdcard/M23.cpp b/Marlin/src/gcode/sdcard/M23.cpp index 92899a217..7cdc97669 100644 --- a/Marlin/src/gcode/sdcard/M23.cpp +++ b/Marlin/src/gcode/sdcard/M23.cpp @@ -31,9 +31,6 @@ * M23: Open a file */ void GcodeSuite::M23() { - #if ENABLED(POWER_LOSS_RECOVERY) - card.removeJobRecoveryFile(); - #endif // Simplify3D includes the size, so zero out all spaces (#7227) for (char *fn = parser.string_arg; *fn; ++fn) if (*fn == ' ') *fn = '\0'; card.openFile(parser.string_arg, true); diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 95527a9b8..7ac21b975 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -1030,6 +1030,7 @@ void CardReader::printingHasFinished() { // be zeroed and written instead of deleted. void CardReader::removeJobRecoveryFile() { if (jobRecoverFileExists()) { + recovery.init(); removeFile(job_recovery_file_name); #if ENABLED(DEBUG_POWER_LOSS_RECOVERY) SERIAL_ECHOPGM("Power-loss file delete"); From b1c13bce5856fb8f946967f8f5064c7e3d425709 Mon Sep 17 00:00:00 2001 From: ManuelMcLure Date: Mon, 15 Apr 2019 18:21:26 -0700 Subject: [PATCH 07/20] Fix EEPROM_CHITCHAT (and debug_out.h) (#13716) --- Marlin/src/core/debug_out.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/src/core/debug_out.h b/Marlin/src/core/debug_out.h index e92c5c541..81e1e216b 100644 --- a/Marlin/src/core/debug_out.h +++ b/Marlin/src/core/debug_out.h @@ -19,7 +19,6 @@ * along with this program. If not, see . * */ -#pragma once // // Serial aliases for debugging. From 9992c424f531670749848982753aa185662f47bc Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 15 Apr 2019 20:26:40 -0500 Subject: [PATCH 08/20] Patch G92.9 flags Followup to #13703 --- Marlin/src/gcode/geometry/G92.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp index 75a0c03ae..01d42f7c2 100644 --- a/Marlin/src/gcode/geometry/G92.cpp +++ b/Marlin/src/gcode/geometry/G92.cpp @@ -67,7 +67,11 @@ void GcodeSuite::G92() { LOOP_XYZE(i) { if (parser.seenval(axis_codes[i])) { current_position[i] = parser.value_axis_units((AxisEnum)i); - if (i == E_AXIS) didE = true; else didXYZ = true; + #if IS_SCARA || !HAS_POSITION_SHIFT + if (i == E_AXIS) didE = true; else didXYZ = true; + #elif HAS_POSITION_SHIFT + if (i == E_AXIS) didE = true; + #endif } } } break; From 9b578ca343077db5410221bd59c520db8140314a Mon Sep 17 00:00:00 2001 From: Bob Kuhn Date: Mon, 15 Apr 2019 22:54:11 -0500 Subject: [PATCH 09/20] Support FYSETC_MINI_12864 on Re-ARM, RAMPS_FD, MKS SBASE (#13717) --- .../u8g/u8g_com_HAL_LPC1768_sw_spi.cpp | 68 ++++++++++++++++++- Marlin/src/inc/Conditionals_LCD.h | 2 + Marlin/src/lcd/dogm/ultralcd_DOGM.h | 6 +- Marlin/src/pins/pins_MKS_SBASE.h | 35 ++++++++++ Marlin/src/pins/pins_RAMPS_FD_V1.h | 5 +- Marlin/src/pins/pins_RAMPS_RE_ARM.h | 47 +++++++------ 6 files changed, 140 insertions(+), 23 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp index 1419a74f4..e851284ad 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp @@ -65,10 +65,76 @@ #undef SPI_SPEED #define SPI_SPEED 2 // About 2 MHz +#include +#include +#include + +#include + +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++) { + if (spi_speed == 0) { + gpio_set(mosi_pin, !!(b & 0x80)); + gpio_set(sck_pin, HIGH); + b <<= 1; + if (miso_pin >= 0 && gpio_get(miso_pin)) b |= 1; + gpio_set(sck_pin, LOW); + } + else { + const uint8_t state = (b & 0x80) ? HIGH : LOW; + for (uint8_t j = 0; j < spi_speed; j++) + gpio_set(mosi_pin, state); + + for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++) + gpio_set(sck_pin, HIGH); + + b <<= 1; + if (miso_pin >= 0 && gpio_get(miso_pin)) b |= 1; + + for (uint8_t j = 0; j < spi_speed; j++) + gpio_set(sck_pin, LOW); + } + } + + return b; +} + +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++) { + const uint8_t state = (b & 0x80) ? HIGH : LOW; + if (spi_speed == 0) { + gpio_set(sck_pin, LOW); + gpio_set(mosi_pin, state); + gpio_set(mosi_pin, state); // need some setup time + gpio_set(sck_pin, HIGH); + } + else { + for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++) + gpio_set(sck_pin, LOW); + + for (uint8_t j = 0; j < spi_speed; j++) + gpio_set(mosi_pin, state); + + for (uint8_t j = 0; j < spi_speed; j++) + gpio_set(sck_pin, HIGH); + } + b <<= 1; + if (miso_pin >= 0 && gpio_get(miso_pin)) b |= 1; + } + + return b; +} + static uint8_t SPI_speed = 0; static void u8g_sw_spi_HAL_LPC1768_shift_out(uint8_t dataPin, uint8_t clockPin, uint8_t val) { - swSpiTransfer(val, SPI_speed, clockPin, -1, dataPin); + #if ENABLED(FYSETC_MINI_12864) + swSpiTransfer_mode_3(val, SPI_speed, clockPin, -1, dataPin); + #else + swSpiTransfer_mode_0(val, SPI_speed, clockPin, -1, dataPin); + #endif } uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) { diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 8581f2dd1..320dc00ec 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -143,6 +143,8 @@ #define DOGLCD #define ULTIPANEL + #define LCD_CONTRAST_MIN 0 + #define LCD_CONTRAST_MAX 255 #define DEFAULT_LCD_CONTRAST 255 #define LED_COLORS_REDUCE_GREEN diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h index fe799473f..1f2c90b9d 100644 --- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h +++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h @@ -112,7 +112,11 @@ //#define U8G_CLASS U8GLIB_MINI12864 //#define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 8 stripes #define U8G_CLASS U8GLIB_MINI12864_2X - #define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 4 stripes + #if EITHER(FYSETC_MINI_12864, TARGET_LPC1768) + #define U8G_PARAM DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0 // 4 stripes SW-SPI + #else + #define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 4 stripes HW-SPI + #endif #elif ENABLED(U8GLIB_SH1106_EINSTART) // Connected via motherboard header #define U8G_CLASS U8GLIB_SH1106_128X64 diff --git a/Marlin/src/pins/pins_MKS_SBASE.h b/Marlin/src/pins/pins_MKS_SBASE.h index 39667507d..b99de4886 100644 --- a/Marlin/src/pins/pins_MKS_SBASE.h +++ b/Marlin/src/pins/pins_MKS_SBASE.h @@ -253,6 +253,41 @@ #define DOGLCD_SCK SCK_PIN #define DOGLCD_MOSI MOSI_PIN #endif + + #if ENABLED(FYSETC_MINI_12864) + /** + * The Fysetc display can NOT use the SCK and MOSI pins on EXP2, so a + * special cable is needed to go between EXP2 on the FYSETC and the + * controller board's EXP2 and J8. It also means that a software SPI + * is needed to drive those pins. + * + * The Fysetc requires mode 3 SPI interface. + * + * 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 RGB_LED + //#define RGBW_LED + #if EITHER(RGB_LED, RGBW_LED) + #define RGB_LED_R_PIN P2_12 // J8-4 (LCD_D6 on Fysetc schematic) + #define RGB_LED_G_PIN P1_23 // J8-3 (LCD_D5 on Fysetc schematic) + #define RGB_LED_B_PIN P1_22 // J8-2 (LCD_D7 on Fysetc schematic) + //#define RGB_LED_W_PIN -1 + #endif + + #elif ENABLED(MINIPANEL) + // GLCD features + // Uncomment screen orientation + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 + #endif + #endif /** diff --git a/Marlin/src/pins/pins_RAMPS_FD_V1.h b/Marlin/src/pins/pins_RAMPS_FD_V1.h index 8cee2e7f4..a8bec209e 100644 --- a/Marlin/src/pins/pins_RAMPS_FD_V1.h +++ b/Marlin/src/pins/pins_RAMPS_FD_V1.h @@ -156,7 +156,10 @@ #define LCD_PINS_D7 29 #endif - #if ENABLED(MINIPANEL) + #if ENABLED(FYSETC_MINI_12864) + #define DOGLCD_CS LCD_PINS_ENABLE + #define DOGLCD_A0 LCD_PINS_RS + #elif ENABLED(MINIPANEL) #define DOGLCD_CS 25 #define DOGLCD_A0 27 #endif diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h index 25c85a360..92d91d5c6 100644 --- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h @@ -269,11 +269,21 @@ #elif ENABLED(ULTRA_LCD) - #define BEEPER_PIN P1_30 // (37) not 5V tolerant + //#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 + #else + #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_ENC P2_11 // (35) J3-3 & 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 @@ -296,13 +306,6 @@ #if ANY(VIKI2, miniVIKI) // #define LCD_SCREEN_ROT_180 - #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) J3-1 & AUX-3 (NOT 5V tolerant) - #define KILL_PIN P1_22 // (41) J5-4 & AUX-4 - #define DOGLCD_CS P0_16 // (16) #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2 #define DOGLCD_SCK SCK_PIN @@ -311,8 +314,17 @@ #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 - #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2 - #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2 + + #if ENABLED(FYSETC_MINI_12864) + #define DOGLCD_SCK P0_15 + #define DOGLCD_MOSI P0_18 + #define DOGLCD_CS P1_09 // use Ethernet connector for EXP1 cable signals + #define DOGLCD_A0 P1_14 + #else + #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 @@ -323,11 +335,6 @@ #endif #endif - //#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 SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3 - //#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - #if ENABLED(MINIPANEL) // GLCD features // Uncomment screen orientation @@ -362,10 +369,10 @@ #if ENABLED(LPC_SD_LCD) - #define SCK_PIN P0_15 - #define MISO_PIN P0_17 - #define MOSI_PIN P0_18 - #define SS_PIN P1_23 // Chip select for SD card 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 #define ONBOARD_SD_CS P0_06 // Chip select for "System" SD card #elif ENABLED(LPC_SD_ONBOARD) From 5f49b65c1fc489741c744541636bd2c0a14c0a45 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Mon, 15 Apr 2019 23:55:33 -0400 Subject: [PATCH 10/20] Move LPC SD options to configs, add MKS_MINI_DISPLAY to SKR boards (#13712) --- Marlin/Configuration_adv.h | 11 ++++++++ Marlin/src/HAL/HAL_LPC1768/main.cpp | 21 ++++++++++++++++ Marlin/src/pins/pins_AZTEEG_X5_MINI.h | 10 +++----- Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h | 17 ++++++++++--- Marlin/src/pins/pins_BIQU_SKR_V1.1.h | 25 +++++++++++++------ Marlin/src/pins/pins_MKS_SBASE.h | 22 ++++------------ Marlin/src/pins/pins_RAMPS_RE_ARM.h | 13 ++++++---- config/default/Configuration_adv.h | 11 ++++++++ .../3DFabXYZ/Migbot/Configuration_adv.h | 11 ++++++++ .../AlephObjects/TAZ4/Configuration_adv.h | 11 ++++++++ .../AliExpress/UM2pExt/Configuration_adv.h | 11 ++++++++ config/examples/Anet/A2/Configuration_adv.h | 11 ++++++++ .../examples/Anet/A2plus/Configuration_adv.h | 11 ++++++++ config/examples/Anet/A6/Configuration_adv.h | 11 ++++++++ config/examples/Anet/A8/Configuration_adv.h | 11 ++++++++ .../examples/AnyCubic/i3/Configuration_adv.h | 11 ++++++++ config/examples/ArmEd/Configuration_adv.h | 11 ++++++++ .../BIBO/TouchX/cyclops/Configuration_adv.h | 11 ++++++++ .../BIBO/TouchX/default/Configuration_adv.h | 11 ++++++++ .../examples/BQ/Hephestos/Configuration_adv.h | 11 ++++++++ .../BQ/Hephestos_2/Configuration_adv.h | 11 ++++++++ config/examples/BQ/WITBOX/Configuration_adv.h | 11 ++++++++ config/examples/Cartesio/Configuration_adv.h | 11 ++++++++ .../Creality/CR-10/Configuration_adv.h | 11 ++++++++ .../Creality/CR-10S/Configuration_adv.h | 11 ++++++++ .../Creality/CR-10_5S/Configuration_adv.h | 11 ++++++++ .../Creality/CR-10mini/Configuration_adv.h | 11 ++++++++ .../Creality/CR-8/Configuration_adv.h | 11 ++++++++ .../Creality/Ender-2/Configuration_adv.h | 11 ++++++++ .../Creality/Ender-3/Configuration_adv.h | 11 ++++++++ .../Creality/Ender-4/Configuration_adv.h | 11 ++++++++ .../examples/Einstart-S/Configuration_adv.h | 11 ++++++++ config/examples/Felix/Configuration_adv.h | 11 ++++++++ .../FlashForge/CreatorPro/Configuration_adv.h | 11 ++++++++ .../FolgerTech/i3-2020/Configuration_adv.h | 11 ++++++++ .../Formbot/Raptor/Configuration_adv.h | 11 ++++++++ .../Formbot/T_Rex_2+/Configuration_adv.h | 11 ++++++++ .../Formbot/T_Rex_3/Configuration_adv.h | 11 ++++++++ .../Geeetech/A10M/Configuration_adv.h | 11 ++++++++ .../Geeetech/A20M/Configuration_adv.h | 11 ++++++++ .../Geeetech/MeCreator2/Configuration_adv.h | 11 ++++++++ .../Prusa i3 Pro C/Configuration_adv.h | 11 ++++++++ .../Prusa i3 Pro W/Configuration_adv.h | 11 ++++++++ .../Infitary/i3-M508/Configuration_adv.h | 11 ++++++++ .../examples/JGAurora/A5/Configuration_adv.h | 11 ++++++++ .../examples/MakerParts/Configuration_adv.h | 11 ++++++++ .../examples/Malyan/M150/Configuration_adv.h | 11 ++++++++ .../examples/Malyan/M200/Configuration_adv.h | 11 ++++++++ .../Micromake/C1/enhanced/Configuration_adv.h | 11 ++++++++ config/examples/Mks/Robin/Configuration_adv.h | 11 ++++++++ config/examples/Mks/Sbase/Configuration_adv.h | 11 ++++++++ .../RapideLite/RL200/Configuration_adv.h | 11 ++++++++ config/examples/RigidBot/Configuration_adv.h | 11 ++++++++ config/examples/SCARA/Configuration_adv.h | 11 ++++++++ .../Black_STM32F407VET6/Configuration_adv.h | 11 ++++++++ .../examples/Sanguinololu/Configuration_adv.h | 11 ++++++++ config/examples/TheBorg/Configuration_adv.h | 11 ++++++++ config/examples/TinyBoy2/Configuration_adv.h | 11 ++++++++ .../examples/Tronxy/X3A/Configuration_adv.h | 11 ++++++++ .../Tronxy/X5S-2E/Configuration_adv.h | 11 ++++++++ .../UltiMachine/Archim1/Configuration_adv.h | 11 ++++++++ .../UltiMachine/Archim2/Configuration_adv.h | 11 ++++++++ .../examples/VORONDesign/Configuration_adv.h | 11 ++++++++ .../Velleman/K8200/Configuration_adv.h | 11 ++++++++ .../Velleman/K8400/Configuration_adv.h | 11 ++++++++ .../WASP/PowerWASP/Configuration_adv.h | 11 ++++++++ .../Wanhao/Duplicator 6/Configuration_adv.h | 11 ++++++++ .../delta/Anycubic/Kossel/Configuration_adv.h | 11 ++++++++ .../FLSUN/auto_calibrate/Configuration_adv.h | 11 ++++++++ .../delta/FLSUN/kossel/Configuration_adv.h | 11 ++++++++ .../FLSUN/kossel_mini/Configuration_adv.h | 11 ++++++++ .../Geeetech/Rostock 301/Configuration_adv.h | 11 ++++++++ .../delta/MKS/SBASE/Configuration_adv.h | 11 ++++++++ .../Tevo Little Monster/Configuration_adv.h | 11 ++++++++ .../delta/generic/Configuration_adv.h | 11 ++++++++ .../delta/kossel_mini/Configuration_adv.h | 11 ++++++++ .../delta/kossel_xl/Configuration_adv.h | 11 ++++++++ .../gCreate/gMax1.5+/Configuration_adv.h | 11 ++++++++ config/examples/makibox/Configuration_adv.h | 11 ++++++++ .../tvrrug/Round2/Configuration_adv.h | 11 ++++++++ config/examples/wt150/Configuration_adv.h | 11 ++++++++ 81 files changed, 893 insertions(+), 40 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index e36bfa895..680eb416d 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -905,6 +905,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp index 609c0c7e6..cc74eedc1 100644 --- a/Marlin/src/HAL/HAL_LPC1768/main.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp @@ -1,3 +1,24 @@ +/** + * 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 . + * + */ #ifdef TARGET_LPC1768 #include diff --git a/Marlin/src/pins/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/pins_AZTEEG_X5_MINI.h index 91349c0f6..f3ce5b417 100644 --- a/Marlin/src/pins/pins_AZTEEG_X5_MINI.h +++ b/Marlin/src/pins/pins_AZTEEG_X5_MINI.h @@ -185,13 +185,9 @@ // // SD Support // -//#define USB_SD_DISABLED // Disable host access to SD card as mass storage device through USB -//#define USB_SD_ONBOARD // Enable host access to SD card as mass storage device through USB - -//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD -#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board. There is no SD detect pin - // for the onboard card. Init card from LCD menu or send M21 whenever printer - // is powered on to enable SD access. +#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE) + #define LPC_SD_ONBOARD +#endif #if ENABLED(LPC_SD_LCD) diff --git a/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h b/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h index 2efb410b4..92f7dddfa 100644 --- a/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h +++ b/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h @@ -208,15 +208,24 @@ #define LCD_PINS_D7 P1_23 #endif + #if ENABLED(MKS_MINI_12864) + #define DOGLCD_CS P1_21 + #define DOGLCD_A0 P1_22 + #endif + #endif #endif // ULTRA_LCD -//#define USB_SD_DISABLED -#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device +// +// SD Support +// -#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD -//#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board +#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE) + #undef USB_SD_DISABLED + #define USB_SD_ONBOARD + #define LPC_SD_LCD +#endif #if ENABLED(LPC_SD_LCD) diff --git a/Marlin/src/pins/pins_BIQU_SKR_V1.1.h b/Marlin/src/pins/pins_BIQU_SKR_V1.1.h index 91e76d1b9..17af3c4d0 100644 --- a/Marlin/src/pins/pins_BIQU_SKR_V1.1.h +++ b/Marlin/src/pins/pins_BIQU_SKR_V1.1.h @@ -105,18 +105,29 @@ #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 + #endif #endif // // SD Support // -//#define USB_SD_DISABLED // Disable host access to SD card as mass storage device through USB -#define USB_SD_ONBOARD // Enable host access to SD card as mass storage device through USB - -//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD -#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board. There is no SD detect pin - // for the onboard card. Init card from LCD menu or send M21 whenever printer - // is powered on to enable SD access. +// MKS_MINI_12864 strongly prefers the SD card on the display and +// requires jumpers on the SKR V1.1 board as documented here: +// https://www.facebook.com/groups/505736576548648/permalink/630639874058317/ +#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE) + #if ENABLED(MKS_MINI_12864) + #define LPC_SD_LCD + #undef USB_SD_DISABLED + #define USB_SD_ONBOARD + #else + #define USB_SD_ONBOARD + #define LPC_SD_ONBOARD + #endif +#endif #if ENABLED(LPC_SD_LCD) diff --git a/Marlin/src/pins/pins_MKS_SBASE.h b/Marlin/src/pins/pins_MKS_SBASE.h index b99de4886..a97bcd164 100644 --- a/Marlin/src/pins/pins_MKS_SBASE.h +++ b/Marlin/src/pins/pins_MKS_SBASE.h @@ -158,23 +158,11 @@ #define ENET_TXD0 P1_00 // J12-11 #define ENET_TXD1 P1_01 // J12-12 -/** - * The SBase can share the on-board SD card with a PC via USB the following - * definitions control this feature: - */ -//#define USB_SD_DISABLED -#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device - -/** - * There are a number of configurations available for the SBase SD card reader. - * - A custom cable can be used to allow access to the LCD based SD card. - * - A standard cable can be used for access to the LCD SD card (but no SD detect). - * - The onboard SD card can be used and optionally shared with a PC via USB. - */ - -//#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD -//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD -#define LPC_SD_ONBOARD // Marlin uses the SD drive attached to the control board +#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE) + #undef USB_SD_DISABLED + #define USB_SD_ONBOARD + #define LPC_SD_ONBOARD +#endif #if ENABLED(LPC_SD_CUSTOM_CABLE) diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h index 92d91d5c6..9c7bbf4ee 100644 --- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h @@ -361,11 +361,14 @@ #define ENET_TXD0 P1_00 // (78) J12-11 #define ENET_TXD1 P1_01 // (79) J12-12 -//#define USB_SD_DISABLED -#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device - -//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD -#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board +// +// SD Support +// +#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE) + #undef USB_SD_DISABLED + #define USB_SD_ONBOARD + #define LPC_SD_ONBOARD +#endif #if ENABLED(LPC_SD_LCD) diff --git a/config/default/Configuration_adv.h b/config/default/Configuration_adv.h index 46c2554eb..bc41518a7 100644 --- a/config/default/Configuration_adv.h +++ b/config/default/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h index ba21fd3d2..f616a0b46 100644 --- a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h +++ b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/config/examples/AlephObjects/TAZ4/Configuration_adv.h index eebde4ff3..cc644db4b 100644 --- a/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/AliExpress/UM2pExt/Configuration_adv.h b/config/examples/AliExpress/UM2pExt/Configuration_adv.h index df3b97b2d..5d9e92d45 100644 --- a/config/examples/AliExpress/UM2pExt/Configuration_adv.h +++ b/config/examples/AliExpress/UM2pExt/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Anet/A2/Configuration_adv.h b/config/examples/Anet/A2/Configuration_adv.h index 95c43b74a..e959aeaf8 100644 --- a/config/examples/Anet/A2/Configuration_adv.h +++ b/config/examples/Anet/A2/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Anet/A2plus/Configuration_adv.h b/config/examples/Anet/A2plus/Configuration_adv.h index 95c43b74a..e959aeaf8 100644 --- a/config/examples/Anet/A2plus/Configuration_adv.h +++ b/config/examples/Anet/A2plus/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Anet/A6/Configuration_adv.h b/config/examples/Anet/A6/Configuration_adv.h index c329a3600..0c593f8a7 100644 --- a/config/examples/Anet/A6/Configuration_adv.h +++ b/config/examples/Anet/A6/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Anet/A8/Configuration_adv.h b/config/examples/Anet/A8/Configuration_adv.h index da0757662..19c439674 100644 --- a/config/examples/Anet/A8/Configuration_adv.h +++ b/config/examples/Anet/A8/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/AnyCubic/i3/Configuration_adv.h b/config/examples/AnyCubic/i3/Configuration_adv.h index 675ddd5d4..c1e8a3bf1 100644 --- a/config/examples/AnyCubic/i3/Configuration_adv.h +++ b/config/examples/AnyCubic/i3/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/ArmEd/Configuration_adv.h b/config/examples/ArmEd/Configuration_adv.h index 7f73a21bc..97c1ddcf8 100644 --- a/config/examples/ArmEd/Configuration_adv.h +++ b/config/examples/ArmEd/Configuration_adv.h @@ -911,6 +911,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index 96262317b..fbf90e400 100644 --- a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/BIBO/TouchX/default/Configuration_adv.h b/config/examples/BIBO/TouchX/default/Configuration_adv.h index f6b4ae290..fbb76e029 100644 --- a/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/BQ/Hephestos/Configuration_adv.h b/config/examples/BQ/Hephestos/Configuration_adv.h index 8dc95c14a..7a4c6e561 100644 --- a/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/config/examples/BQ/Hephestos/Configuration_adv.h @@ -904,6 +904,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/BQ/Hephestos_2/Configuration_adv.h b/config/examples/BQ/Hephestos_2/Configuration_adv.h index 3502efcc1..218045c74 100644 --- a/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -912,6 +912,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/BQ/WITBOX/Configuration_adv.h b/config/examples/BQ/WITBOX/Configuration_adv.h index 8dc95c14a..7a4c6e561 100644 --- a/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/config/examples/BQ/WITBOX/Configuration_adv.h @@ -904,6 +904,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Cartesio/Configuration_adv.h b/config/examples/Cartesio/Configuration_adv.h index 86207af41..46c45394b 100644 --- a/config/examples/Cartesio/Configuration_adv.h +++ b/config/examples/Cartesio/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/CR-10/Configuration_adv.h b/config/examples/Creality/CR-10/Configuration_adv.h index 235b59ef7..3f322fbce 100644 --- a/config/examples/Creality/CR-10/Configuration_adv.h +++ b/config/examples/Creality/CR-10/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/CR-10S/Configuration_adv.h b/config/examples/Creality/CR-10S/Configuration_adv.h index 4a52d57ca..f83034b15 100644 --- a/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/config/examples/Creality/CR-10S/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/CR-10_5S/Configuration_adv.h b/config/examples/Creality/CR-10_5S/Configuration_adv.h index 310376637..9db499354 100644 --- a/config/examples/Creality/CR-10_5S/Configuration_adv.h +++ b/config/examples/Creality/CR-10_5S/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/CR-10mini/Configuration_adv.h b/config/examples/Creality/CR-10mini/Configuration_adv.h index 2f1e01aea..1c243a9d8 100644 --- a/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/CR-8/Configuration_adv.h b/config/examples/Creality/CR-8/Configuration_adv.h index 01fb18ad9..0d60cb515 100644 --- a/config/examples/Creality/CR-8/Configuration_adv.h +++ b/config/examples/Creality/CR-8/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/Ender-2/Configuration_adv.h b/config/examples/Creality/Ender-2/Configuration_adv.h index 6d4555b67..b3629a382 100644 --- a/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/config/examples/Creality/Ender-2/Configuration_adv.h @@ -904,6 +904,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/Ender-3/Configuration_adv.h b/config/examples/Creality/Ender-3/Configuration_adv.h index 7d5da09c9..bc7b8ef16 100644 --- a/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/config/examples/Creality/Ender-3/Configuration_adv.h @@ -904,6 +904,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Creality/Ender-4/Configuration_adv.h b/config/examples/Creality/Ender-4/Configuration_adv.h index a7f9a1c6b..e2450ba5b 100644 --- a/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/config/examples/Creality/Ender-4/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Einstart-S/Configuration_adv.h b/config/examples/Einstart-S/Configuration_adv.h index 9e01b476a..e3be6a540 100644 --- a/config/examples/Einstart-S/Configuration_adv.h +++ b/config/examples/Einstart-S/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Felix/Configuration_adv.h b/config/examples/Felix/Configuration_adv.h index 638aef0b4..9bebb34d0 100644 --- a/config/examples/Felix/Configuration_adv.h +++ b/config/examples/Felix/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/config/examples/FlashForge/CreatorPro/Configuration_adv.h index b7db05401..c63fe14c8 100644 --- a/config/examples/FlashForge/CreatorPro/Configuration_adv.h +++ b/config/examples/FlashForge/CreatorPro/Configuration_adv.h @@ -903,6 +903,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/config/examples/FolgerTech/i3-2020/Configuration_adv.h index d6a35f40d..ed5232413 100644 --- a/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Formbot/Raptor/Configuration_adv.h b/config/examples/Formbot/Raptor/Configuration_adv.h index 99fc0f5ee..536922596 100644 --- a/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/config/examples/Formbot/Raptor/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index da1722d84..2180458d0 100644 --- a/config/examples/Formbot/T_Rex_2+/Configuration_adv.h +++ b/config/examples/Formbot/T_Rex_2+/Configuration_adv.h @@ -911,6 +911,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/config/examples/Formbot/T_Rex_3/Configuration_adv.h index ef031bf0a..d8ee58e1a 100644 --- a/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -911,6 +911,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Geeetech/A10M/Configuration_adv.h b/config/examples/Geeetech/A10M/Configuration_adv.h index b7840cc89..01c089ed8 100644 --- a/config/examples/Geeetech/A10M/Configuration_adv.h +++ b/config/examples/Geeetech/A10M/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Geeetech/A20M/Configuration_adv.h b/config/examples/Geeetech/A20M/Configuration_adv.h index 2d868bf34..9f83bacd8 100644 --- a/config/examples/Geeetech/A20M/Configuration_adv.h +++ b/config/examples/Geeetech/A20M/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/config/examples/Geeetech/MeCreator2/Configuration_adv.h index 0cf2dbf96..146c8e849 100644 --- a/config/examples/Geeetech/MeCreator2/Configuration_adv.h +++ b/config/examples/Geeetech/MeCreator2/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index 4481570e4..4b056919c 100644 --- a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index 4481570e4..4b056919c 100644 --- a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Infitary/i3-M508/Configuration_adv.h b/config/examples/Infitary/i3-M508/Configuration_adv.h index 64ff999c4..4f30d9fff 100644 --- a/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/JGAurora/A5/Configuration_adv.h b/config/examples/JGAurora/A5/Configuration_adv.h index 6e42a3752..54a3f8f3e 100644 --- a/config/examples/JGAurora/A5/Configuration_adv.h +++ b/config/examples/JGAurora/A5/Configuration_adv.h @@ -904,6 +904,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/MakerParts/Configuration_adv.h b/config/examples/MakerParts/Configuration_adv.h index 30283f20f..94bcc5e9c 100644 --- a/config/examples/MakerParts/Configuration_adv.h +++ b/config/examples/MakerParts/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Malyan/M150/Configuration_adv.h b/config/examples/Malyan/M150/Configuration_adv.h index 571c7026b..2b0a0134b 100644 --- a/config/examples/Malyan/M150/Configuration_adv.h +++ b/config/examples/Malyan/M150/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Malyan/M200/Configuration_adv.h b/config/examples/Malyan/M200/Configuration_adv.h index 02e5b16e0..b4af89be7 100644 --- a/config/examples/Malyan/M200/Configuration_adv.h +++ b/config/examples/Malyan/M200/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/config/examples/Micromake/C1/enhanced/Configuration_adv.h index a7cf91eec..a752503c1 100644 --- a/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Mks/Robin/Configuration_adv.h b/config/examples/Mks/Robin/Configuration_adv.h index 226d4ad0f..0b804b988 100644 --- a/config/examples/Mks/Robin/Configuration_adv.h +++ b/config/examples/Mks/Robin/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Mks/Sbase/Configuration_adv.h b/config/examples/Mks/Sbase/Configuration_adv.h index a34b066c5..d64657e96 100644 --- a/config/examples/Mks/Sbase/Configuration_adv.h +++ b/config/examples/Mks/Sbase/Configuration_adv.h @@ -908,6 +908,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/RapideLite/RL200/Configuration_adv.h b/config/examples/RapideLite/RL200/Configuration_adv.h index 5889db807..9191b838a 100644 --- a/config/examples/RapideLite/RL200/Configuration_adv.h +++ b/config/examples/RapideLite/RL200/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/RigidBot/Configuration_adv.h b/config/examples/RigidBot/Configuration_adv.h index 2607a276b..896b2400f 100644 --- a/config/examples/RigidBot/Configuration_adv.h +++ b/config/examples/RigidBot/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/SCARA/Configuration_adv.h b/config/examples/SCARA/Configuration_adv.h index ff8768107..3f42ee9d2 100644 --- a/config/examples/SCARA/Configuration_adv.h +++ b/config/examples/SCARA/Configuration_adv.h @@ -904,6 +904,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h index 57d21c1df..e1d82bca2 100644 --- a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h +++ b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h @@ -904,6 +904,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Sanguinololu/Configuration_adv.h b/config/examples/Sanguinololu/Configuration_adv.h index e2f5b592b..31760b84c 100644 --- a/config/examples/Sanguinololu/Configuration_adv.h +++ b/config/examples/Sanguinololu/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/TheBorg/Configuration_adv.h b/config/examples/TheBorg/Configuration_adv.h index f65039a92..fbb3b0cba 100644 --- a/config/examples/TheBorg/Configuration_adv.h +++ b/config/examples/TheBorg/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/TinyBoy2/Configuration_adv.h b/config/examples/TinyBoy2/Configuration_adv.h index e21e8ed5d..229f2aa6a 100644 --- a/config/examples/TinyBoy2/Configuration_adv.h +++ b/config/examples/TinyBoy2/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Tronxy/X3A/Configuration_adv.h b/config/examples/Tronxy/X3A/Configuration_adv.h index ed4be9060..fa44910ac 100644 --- a/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/config/examples/Tronxy/X3A/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Tronxy/X5S-2E/Configuration_adv.h b/config/examples/Tronxy/X5S-2E/Configuration_adv.h index e1b54ab66..25bdc243c 100644 --- a/config/examples/Tronxy/X5S-2E/Configuration_adv.h +++ b/config/examples/Tronxy/X5S-2E/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/UltiMachine/Archim1/Configuration_adv.h b/config/examples/UltiMachine/Archim1/Configuration_adv.h index 0d8c98394..1399b0272 100644 --- a/config/examples/UltiMachine/Archim1/Configuration_adv.h +++ b/config/examples/UltiMachine/Archim1/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/UltiMachine/Archim2/Configuration_adv.h b/config/examples/UltiMachine/Archim2/Configuration_adv.h index 0e03fac07..dbc5eadfe 100644 --- a/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/VORONDesign/Configuration_adv.h b/config/examples/VORONDesign/Configuration_adv.h index 652062c4f..dd44aed40 100644 --- a/config/examples/VORONDesign/Configuration_adv.h +++ b/config/examples/VORONDesign/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Velleman/K8200/Configuration_adv.h b/config/examples/Velleman/K8200/Configuration_adv.h index 8d242aa79..b699e496e 100644 --- a/config/examples/Velleman/K8200/Configuration_adv.h +++ b/config/examples/Velleman/K8200/Configuration_adv.h @@ -920,6 +920,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Velleman/K8400/Configuration_adv.h b/config/examples/Velleman/K8400/Configuration_adv.h index e284a534a..7467f0369 100644 --- a/config/examples/Velleman/K8400/Configuration_adv.h +++ b/config/examples/Velleman/K8400/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/WASP/PowerWASP/Configuration_adv.h b/config/examples/WASP/PowerWASP/Configuration_adv.h index f67863b5c..8bbce438c 100644 --- a/config/examples/WASP/PowerWASP/Configuration_adv.h +++ b/config/examples/WASP/PowerWASP/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index c35865bd9..038622d82 100644 --- a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index a18697673..b383fcb9d 100644 --- a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 1a70a19d1..25a7ddbcd 100644 --- a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 1a70a19d1..25a7ddbcd 100644 --- a/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index d092a4135..5459388b0 100644 --- a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h index d092a4135..5459388b0 100644 --- a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h +++ b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/MKS/SBASE/Configuration_adv.h b/config/examples/delta/MKS/SBASE/Configuration_adv.h index f369a7682..78bc3fbcf 100644 --- a/config/examples/delta/MKS/SBASE/Configuration_adv.h +++ b/config/examples/delta/MKS/SBASE/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/config/examples/delta/Tevo Little Monster/Configuration_adv.h index 161d038aa..f45f30c85 100644 --- a/config/examples/delta/Tevo Little Monster/Configuration_adv.h +++ b/config/examples/delta/Tevo Little Monster/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/generic/Configuration_adv.h b/config/examples/delta/generic/Configuration_adv.h index d092a4135..5459388b0 100644 --- a/config/examples/delta/generic/Configuration_adv.h +++ b/config/examples/delta/generic/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/kossel_mini/Configuration_adv.h b/config/examples/delta/kossel_mini/Configuration_adv.h index 4b078e8d7..f6f63b071 100644 --- a/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/config/examples/delta/kossel_mini/Configuration_adv.h @@ -905,6 +905,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/delta/kossel_xl/Configuration_adv.h b/config/examples/delta/kossel_xl/Configuration_adv.h index 50bf1ab51..87ccbe3ea 100644 --- a/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/config/examples/delta/kossel_xl/Configuration_adv.h @@ -906,6 +906,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 49165c0d4..6704570da 100644 --- a/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/makibox/Configuration_adv.h b/config/examples/makibox/Configuration_adv.h index 31fb062a4..ed75fd316 100644 --- a/config/examples/makibox/Configuration_adv.h +++ b/config/examples/makibox/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/tvrrug/Round2/Configuration_adv.h b/config/examples/tvrrug/Round2/Configuration_adv.h index 26f2fb89b..27236504a 100644 --- a/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/config/examples/tvrrug/Round2/Configuration_adv.h @@ -907,6 +907,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** diff --git a/config/examples/wt150/Configuration_adv.h b/config/examples/wt150/Configuration_adv.h index 22cd224d6..b46bfc929 100644 --- a/config/examples/wt150/Configuration_adv.h +++ b/config/examples/wt150/Configuration_adv.h @@ -908,6 +908,17 @@ // Add an optimized binary file transfer mode, initiated with 'M28 B1' //#define BINARY_FILE_TRANSFER + // LPC-based boards have on-board SD Card options. Override here or defaults apply. + #ifdef TARGET_LPC1768 + //#define LPC_SD_LCD // Use the SD drive in the external LCD controller. + //#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) + //#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file). + //#define USB_SD_DISABLED // Disable SD Card access over USB (for security). + #if ENABLED(LPC_SD_ONBOARD) + //#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device. + #endif + #endif + #endif // SDSUPPORT /** From 92ed9a2bb6d90a969f2ceaf0a73ebe3c0cdc4c16 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 15 Apr 2019 23:46:36 -0500 Subject: [PATCH 11/20] Fix is_M29 Followup for #13013 --- Marlin/src/gcode/queue.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp index f448efb11..817d6bca1 100644 --- a/Marlin/src/gcode/queue.cpp +++ b/Marlin/src/gcode/queue.cpp @@ -526,8 +526,9 @@ void gcode_line_error(PGM_P const err, const int8_t port) { #endif // BINARY_FILE_TRANSFER -FORCE_INLINE bool is_M29(const char * const cmd) { - return cmd[0] == 'M' && cmd[1] == '2' && cmd[2] == '9' && !WITHIN(cmd[3], '0', '9'); +FORCE_INLINE bool is_M29(const char * const cmd) { // matches "M29" & "M29 ", but not "M290", etc + const char * const m29 = strstr_P(cmd, PSTR("M29")); + return m29 && !NUMERIC(m29[3]); } /** From 35160dfb7acbeec901762b52cb19564a6b6b122f Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Tue, 16 Apr 2019 12:17:27 +0700 Subject: [PATCH 12/20] Simplify PLR homing when Z homes to max (#13718) --- Marlin/src/feature/power_loss_recovery.cpp | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/power_loss_recovery.cpp index 5e3ef6fb5..0b9dba43f 100644 --- a/Marlin/src/feature/power_loss_recovery.cpp +++ b/Marlin/src/feature/power_loss_recovery.cpp @@ -245,13 +245,23 @@ void PrintJobRecovery::resume() { gcode.process_subcommands_now_P(PSTR("M420 S0 Z0")); #endif - // Set Z to 0, raise Z by RECOVERY_ZRAISE, and Home (XY only for Cartesian) - // with no raise. (Only do simulated homing in Marlin Dev Mode.) - gcode.process_subcommands_now_P(PSTR("G92.9 E0 Z0\nG1 Z" STRINGIFY(RECOVERY_ZRAISE) "\nG28 R0" - #if ENABLED(MARLIN_DEV_MODE) - " S" - #elif !IS_KINEMATIC - " X Y" + // Reset E, raise Z, home XY... + gcode.process_subcommands_now_P(PSTR("G92.9 E0" + #if Z_HOME_DIR > 0 + // If Z homing goes to max, reset E and home all + "\nG28R0" + #if ENABLED(MARLIN_DEV_MODE) + "S" + #endif + #else + // Set Z to 0, raise Z by RECOVERY_ZRAISE, and Home (XY only for Cartesian) + // with no raise. (Only do simulated homing in Marlin Dev Mode.) + "Z0\nG1Z" STRINGIFY(RECOVERY_ZRAISE) "\nG28R0" + #if ENABLED(MARLIN_DEV_MODE) + "S" + #elif !IS_KINEMATIC + "XY" + #endif #endif )); From 7ca1fea22b531710fa976bfaa527efbc15ebb83f Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Tue, 16 Apr 2019 13:32:43 +0700 Subject: [PATCH 13/20] Option to pause probe deployment only when triggered, for manually-deployed allen-key probe (#13698) --- Marlin/Configuration.h | 3 ++ Marlin/src/module/probe.cpp | 41 ++++++++++++------- config/default/Configuration.h | 3 ++ .../examples/3DFabXYZ/Migbot/Configuration.h | 3 ++ .../AlephObjects/TAZ4/Configuration.h | 3 ++ .../AliExpress/CL-260/Configuration.h | 3 ++ .../AliExpress/UM2pExt/Configuration.h | 3 ++ config/examples/Anet/A2/Configuration.h | 3 ++ config/examples/Anet/A2plus/Configuration.h | 3 ++ config/examples/Anet/A6/Configuration.h | 3 ++ config/examples/Anet/A8/Configuration.h | 3 ++ config/examples/AnyCubic/i3/Configuration.h | 3 ++ config/examples/ArmEd/Configuration.h | 3 ++ config/examples/Azteeg/X5GT/Configuration.h | 3 ++ .../BIBO/TouchX/cyclops/Configuration.h | 3 ++ .../BIBO/TouchX/default/Configuration.h | 3 ++ config/examples/BQ/Hephestos/Configuration.h | 3 ++ .../examples/BQ/Hephestos_2/Configuration.h | 3 ++ config/examples/BQ/WITBOX/Configuration.h | 3 ++ config/examples/Cartesio/Configuration.h | 3 ++ .../examples/Creality/CR-10/Configuration.h | 3 ++ .../examples/Creality/CR-10S/Configuration.h | 3 ++ .../Creality/CR-10_5S/Configuration.h | 3 ++ .../Creality/CR-10mini/Configuration.h | 3 ++ config/examples/Creality/CR-8/Configuration.h | 3 ++ .../examples/Creality/Ender-2/Configuration.h | 3 ++ .../examples/Creality/Ender-3/Configuration.h | 3 ++ .../examples/Creality/Ender-4/Configuration.h | 3 ++ config/examples/Einstart-S/Configuration.h | 3 ++ config/examples/Felix/Configuration.h | 3 ++ config/examples/Felix/DUAL/Configuration.h | 3 ++ .../FlashForge/CreatorPro/Configuration.h | 3 ++ .../FolgerTech/i3-2020/Configuration.h | 3 ++ .../examples/Formbot/Raptor/Configuration.h | 3 ++ .../examples/Formbot/T_Rex_2+/Configuration.h | 3 ++ .../examples/Formbot/T_Rex_3/Configuration.h | 3 ++ config/examples/Geeetech/A10M/Configuration.h | 3 ++ config/examples/Geeetech/A20M/Configuration.h | 3 ++ .../examples/Geeetech/GT2560/Configuration.h | 3 ++ .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 3 ++ .../Geeetech/MeCreator2/Configuration.h | 3 ++ .../Prusa i3 Pro B/bltouch/Configuration.h | 3 ++ .../Prusa i3 Pro B/noprobe/Configuration.h | 3 ++ .../Geeetech/Prusa i3 Pro C/Configuration.h | 3 ++ .../Geeetech/Prusa i3 Pro W/Configuration.h | 3 ++ .../examples/Infitary/i3-M508/Configuration.h | 3 ++ config/examples/JGAurora/A5/Configuration.h | 3 ++ config/examples/MakerParts/Configuration.h | 3 ++ config/examples/Malyan/M150/Configuration.h | 3 ++ config/examples/Malyan/M200/Configuration.h | 3 ++ .../Micromake/C1/basic/Configuration.h | 3 ++ .../Micromake/C1/enhanced/Configuration.h | 3 ++ config/examples/Mks/Robin/Configuration.h | 3 ++ config/examples/Mks/Sbase/Configuration.h | 3 ++ .../Printrbot/PrintrboardG2/Configuration.h | 3 ++ .../examples/RapideLite/RL200/Configuration.h | 3 ++ .../examples/RepRapPro/Huxley/Configuration.h | 3 ++ .../RepRapWorld/Megatronics/Configuration.h | 3 ++ config/examples/RigidBot/Configuration.h | 3 ++ config/examples/SCARA/Configuration.h | 3 ++ .../STM32/Black_STM32F407VET6/Configuration.h | 3 ++ .../examples/STM32/STM32F10/Configuration.h | 3 ++ config/examples/STM32/STM32F4/Configuration.h | 3 ++ .../STM32/stm32f103ret6/Configuration.h | 3 ++ config/examples/Sanguinololu/Configuration.h | 3 ++ config/examples/TheBorg/Configuration.h | 3 ++ config/examples/TinyBoy2/Configuration.h | 3 ++ config/examples/Tronxy/X1/Configuration.h | 3 ++ config/examples/Tronxy/X3A/Configuration.h | 3 ++ config/examples/Tronxy/X5S-2E/Configuration.h | 3 ++ config/examples/Tronxy/X5S/Configuration.h | 3 ++ config/examples/Tronxy/XY100/Configuration.h | 3 ++ .../UltiMachine/Archim1/Configuration.h | 3 ++ .../UltiMachine/Archim2/Configuration.h | 3 ++ config/examples/VORONDesign/Configuration.h | 3 ++ .../examples/Velleman/K8200/Configuration.h | 3 ++ .../examples/Velleman/K8400/Configuration.h | 3 ++ .../Velleman/K8400/Dual-head/Configuration.h | 3 ++ .../examples/WASP/PowerWASP/Configuration.h | 3 ++ .../Wanhao/Duplicator 6/Configuration.h | 3 ++ .../examples/adafruit/ST7565/Configuration.h | 3 ++ .../FLSUN/auto_calibrate/Configuration.h | 3 ++ .../delta/FLSUN/kossel/Configuration.h | 3 ++ .../delta/FLSUN/kossel_mini/Configuration.h | 3 ++ .../Geeetech/Rostock 301/Configuration.h | 3 ++ .../delta/Hatchbox_Alpha/Configuration.h | 3 ++ .../examples/delta/MKS/SBASE/Configuration.h | 3 ++ .../delta/Tevo Little Monster/Configuration.h | 3 ++ config/examples/delta/generic/Configuration.h | 3 ++ .../delta/kossel_mini/Configuration.h | 3 ++ .../examples/delta/kossel_pro/Configuration.h | 3 ++ .../examples/delta/kossel_xl/Configuration.h | 3 ++ .../examples/gCreate/gMax1.5+/Configuration.h | 3 ++ config/examples/makibox/Configuration.h | 3 ++ config/examples/tvrrug/Round2/Configuration.h | 3 ++ config/examples/wt150/Configuration.h | 3 ++ 96 files changed, 311 insertions(+), 15 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5faed3c8b..7ea040803 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index f32b5ae4d..78e8ad8ae 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -310,24 +310,35 @@ inline void do_probe_raise(const float z_raise) { FORCE_INLINE void probe_specific_action(const bool deploy) { #if ENABLED(PAUSE_BEFORE_DEPLOY_STOW) + do { + #if ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED) + if (READ(Z_MIN_PROBE_PIN) == (deploy == bool(Z_MIN_PROBE_ENDSTOP_INVERTING))) break; + #endif - BUZZ(100, 659); - BUZZ(100, 698); + BUZZ(100, 659); + BUZZ(100, 698); - PGM_P const ds_str = deploy ? PSTR(MSG_MANUAL_DEPLOY) : PSTR(MSG_MANUAL_STOW); - ui.return_to_status(); // To display the new status message - ui.set_status_P(ds_str, 99); - serialprintPGM(ds_str); - SERIAL_EOL(); + PGM_P const ds_str = deploy ? PSTR(MSG_MANUAL_DEPLOY) : PSTR(MSG_MANUAL_STOW); + ui.return_to_status(); // To display the new status message + ui.set_status_P(ds_str, 99); + 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"), PSTR("Continue")); - #endif - while (wait_for_user) idle(); - ui.reset_status(); - KEEPALIVE_STATE(IN_HANDLER); + KEEPALIVE_STATE(PAUSED_FOR_USER); + wait_for_user = true; + #if ENABLED(HOST_PROMPT_SUPPORT) + host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), PSTR("Continue")); + #endif + while (wait_for_user) idle(); + ui.reset_status(); + KEEPALIVE_STATE(IN_HANDLER); + } while( + #if ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED) + true + #else + false + #endif + ); #endif // PAUSE_BEFORE_DEPLOY_STOW diff --git a/config/default/Configuration.h b/config/default/Configuration.h index 5faed3c8b..7ea040803 100644 --- a/config/default/Configuration.h +++ b/config/default/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/3DFabXYZ/Migbot/Configuration.h b/config/examples/3DFabXYZ/Migbot/Configuration.h index 143622824..7b459d3c3 100644 --- a/config/examples/3DFabXYZ/Migbot/Configuration.h +++ b/config/examples/3DFabXYZ/Migbot/Configuration.h @@ -933,6 +933,9 @@ // 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. diff --git a/config/examples/AlephObjects/TAZ4/Configuration.h b/config/examples/AlephObjects/TAZ4/Configuration.h index 0720c14f0..60c94e8e0 100644 --- a/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/config/examples/AlephObjects/TAZ4/Configuration.h @@ -947,6 +947,9 @@ // 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. diff --git a/config/examples/AliExpress/CL-260/Configuration.h b/config/examples/AliExpress/CL-260/Configuration.h index 916bb0685..1be8dde59 100644 --- a/config/examples/AliExpress/CL-260/Configuration.h +++ b/config/examples/AliExpress/CL-260/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/AliExpress/UM2pExt/Configuration.h b/config/examples/AliExpress/UM2pExt/Configuration.h index e904da301..f9de2247b 100644 --- a/config/examples/AliExpress/UM2pExt/Configuration.h +++ b/config/examples/AliExpress/UM2pExt/Configuration.h @@ -938,6 +938,9 @@ // 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. diff --git a/config/examples/Anet/A2/Configuration.h b/config/examples/Anet/A2/Configuration.h index 669dee2af..db8914219 100644 --- a/config/examples/Anet/A2/Configuration.h +++ b/config/examples/Anet/A2/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Anet/A2plus/Configuration.h b/config/examples/Anet/A2plus/Configuration.h index 325939564..68190a9ef 100644 --- a/config/examples/Anet/A2plus/Configuration.h +++ b/config/examples/Anet/A2plus/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Anet/A6/Configuration.h b/config/examples/Anet/A6/Configuration.h index 64431b72f..e0b5c1a28 100644 --- a/config/examples/Anet/A6/Configuration.h +++ b/config/examples/Anet/A6/Configuration.h @@ -1003,6 +1003,9 @@ // 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. diff --git a/config/examples/Anet/A8/Configuration.h b/config/examples/Anet/A8/Configuration.h index e60533d09..fee9dad53 100644 --- a/config/examples/Anet/A8/Configuration.h +++ b/config/examples/Anet/A8/Configuration.h @@ -940,6 +940,9 @@ // 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. diff --git a/config/examples/AnyCubic/i3/Configuration.h b/config/examples/AnyCubic/i3/Configuration.h index 3da19a382..af01e1cf4 100644 --- a/config/examples/AnyCubic/i3/Configuration.h +++ b/config/examples/AnyCubic/i3/Configuration.h @@ -937,6 +937,9 @@ // 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. diff --git a/config/examples/ArmEd/Configuration.h b/config/examples/ArmEd/Configuration.h index d658278ec..31a10f05c 100644 --- a/config/examples/ArmEd/Configuration.h +++ b/config/examples/ArmEd/Configuration.h @@ -928,6 +928,9 @@ // 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. diff --git a/config/examples/Azteeg/X5GT/Configuration.h b/config/examples/Azteeg/X5GT/Configuration.h index e8ce57851..1d22e52b7 100644 --- a/config/examples/Azteeg/X5GT/Configuration.h +++ b/config/examples/Azteeg/X5GT/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration.h b/config/examples/BIBO/TouchX/cyclops/Configuration.h index 1c0112e32..7cbe3edd9 100644 --- a/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/BIBO/TouchX/default/Configuration.h b/config/examples/BIBO/TouchX/default/Configuration.h index ba9b96811..5ff9eb893 100644 --- a/config/examples/BIBO/TouchX/default/Configuration.h +++ b/config/examples/BIBO/TouchX/default/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/BQ/Hephestos/Configuration.h b/config/examples/BQ/Hephestos/Configuration.h index efe46bd7f..91d315373 100644 --- a/config/examples/BQ/Hephestos/Configuration.h +++ b/config/examples/BQ/Hephestos/Configuration.h @@ -915,6 +915,9 @@ // 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. diff --git a/config/examples/BQ/Hephestos_2/Configuration.h b/config/examples/BQ/Hephestos_2/Configuration.h index 97b8dba74..64c950f28 100644 --- a/config/examples/BQ/Hephestos_2/Configuration.h +++ b/config/examples/BQ/Hephestos_2/Configuration.h @@ -928,6 +928,9 @@ // 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. diff --git a/config/examples/BQ/WITBOX/Configuration.h b/config/examples/BQ/WITBOX/Configuration.h index 3002eebce..ef5a1ddb8 100644 --- a/config/examples/BQ/WITBOX/Configuration.h +++ b/config/examples/BQ/WITBOX/Configuration.h @@ -915,6 +915,9 @@ // 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. diff --git a/config/examples/Cartesio/Configuration.h b/config/examples/Cartesio/Configuration.h index eba8f376d..09b003c57 100644 --- a/config/examples/Cartesio/Configuration.h +++ b/config/examples/Cartesio/Configuration.h @@ -926,6 +926,9 @@ // 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. diff --git a/config/examples/Creality/CR-10/Configuration.h b/config/examples/Creality/CR-10/Configuration.h index 09130f330..0e0c47688 100644 --- a/config/examples/Creality/CR-10/Configuration.h +++ b/config/examples/Creality/CR-10/Configuration.h @@ -937,6 +937,9 @@ // 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. diff --git a/config/examples/Creality/CR-10S/Configuration.h b/config/examples/Creality/CR-10S/Configuration.h index 8efdab260..bbb5c4114 100644 --- a/config/examples/Creality/CR-10S/Configuration.h +++ b/config/examples/Creality/CR-10S/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Creality/CR-10_5S/Configuration.h b/config/examples/Creality/CR-10_5S/Configuration.h index eecd2a0ca..a8222e3b3 100644 --- a/config/examples/Creality/CR-10_5S/Configuration.h +++ b/config/examples/Creality/CR-10_5S/Configuration.h @@ -928,6 +928,9 @@ // 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. diff --git a/config/examples/Creality/CR-10mini/Configuration.h b/config/examples/Creality/CR-10mini/Configuration.h index df9c556bc..1c6b3d0b8 100644 --- a/config/examples/Creality/CR-10mini/Configuration.h +++ b/config/examples/Creality/CR-10mini/Configuration.h @@ -946,6 +946,9 @@ // 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. diff --git a/config/examples/Creality/CR-8/Configuration.h b/config/examples/Creality/CR-8/Configuration.h index 3893c0fb9..eb2c0bf4d 100644 --- a/config/examples/Creality/CR-8/Configuration.h +++ b/config/examples/Creality/CR-8/Configuration.h @@ -937,6 +937,9 @@ // 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. diff --git a/config/examples/Creality/Ender-2/Configuration.h b/config/examples/Creality/Ender-2/Configuration.h index f693b831a..bd22dd900 100644 --- a/config/examples/Creality/Ender-2/Configuration.h +++ b/config/examples/Creality/Ender-2/Configuration.h @@ -931,6 +931,9 @@ // 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. diff --git a/config/examples/Creality/Ender-3/Configuration.h b/config/examples/Creality/Ender-3/Configuration.h index 201eb2510..377e344e8 100644 --- a/config/examples/Creality/Ender-3/Configuration.h +++ b/config/examples/Creality/Ender-3/Configuration.h @@ -931,6 +931,9 @@ // 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. diff --git a/config/examples/Creality/Ender-4/Configuration.h b/config/examples/Creality/Ender-4/Configuration.h index 669203ec4..608e6dccf 100644 --- a/config/examples/Creality/Ender-4/Configuration.h +++ b/config/examples/Creality/Ender-4/Configuration.h @@ -937,6 +937,9 @@ // 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. diff --git a/config/examples/Einstart-S/Configuration.h b/config/examples/Einstart-S/Configuration.h index 691b1851a..45f0ef3f4 100644 --- a/config/examples/Einstart-S/Configuration.h +++ b/config/examples/Einstart-S/Configuration.h @@ -937,6 +937,9 @@ // 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. diff --git a/config/examples/Felix/Configuration.h b/config/examples/Felix/Configuration.h index b2c5a2ede..f02a9e220 100644 --- a/config/examples/Felix/Configuration.h +++ b/config/examples/Felix/Configuration.h @@ -909,6 +909,9 @@ // 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. diff --git a/config/examples/Felix/DUAL/Configuration.h b/config/examples/Felix/DUAL/Configuration.h index 4c1d96138..530c1e979 100644 --- a/config/examples/Felix/DUAL/Configuration.h +++ b/config/examples/Felix/DUAL/Configuration.h @@ -909,6 +909,9 @@ // 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. diff --git a/config/examples/FlashForge/CreatorPro/Configuration.h b/config/examples/FlashForge/CreatorPro/Configuration.h index f7e3c7119..8978fb3ba 100644 --- a/config/examples/FlashForge/CreatorPro/Configuration.h +++ b/config/examples/FlashForge/CreatorPro/Configuration.h @@ -919,6 +919,9 @@ // 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. diff --git a/config/examples/FolgerTech/i3-2020/Configuration.h b/config/examples/FolgerTech/i3-2020/Configuration.h index 6fb6795d4..f2b962411 100644 --- a/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/config/examples/FolgerTech/i3-2020/Configuration.h @@ -933,6 +933,9 @@ // 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. diff --git a/config/examples/Formbot/Raptor/Configuration.h b/config/examples/Formbot/Raptor/Configuration.h index 1ca7912ad..116014d3c 100644 --- a/config/examples/Formbot/Raptor/Configuration.h +++ b/config/examples/Formbot/Raptor/Configuration.h @@ -1008,6 +1008,9 @@ // 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. diff --git a/config/examples/Formbot/T_Rex_2+/Configuration.h b/config/examples/Formbot/T_Rex_2+/Configuration.h index 864592dfe..82d24eb43 100644 --- a/config/examples/Formbot/T_Rex_2+/Configuration.h +++ b/config/examples/Formbot/T_Rex_2+/Configuration.h @@ -957,6 +957,9 @@ // 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. diff --git a/config/examples/Formbot/T_Rex_3/Configuration.h b/config/examples/Formbot/T_Rex_3/Configuration.h index 4ab2609e1..992d2c0e1 100644 --- a/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/config/examples/Formbot/T_Rex_3/Configuration.h @@ -943,6 +943,9 @@ // 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. diff --git a/config/examples/Geeetech/A10M/Configuration.h b/config/examples/Geeetech/A10M/Configuration.h index 78ae28644..0aa45ee20 100644 --- a/config/examples/Geeetech/A10M/Configuration.h +++ b/config/examples/Geeetech/A10M/Configuration.h @@ -910,6 +910,9 @@ // 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. diff --git a/config/examples/Geeetech/A20M/Configuration.h b/config/examples/Geeetech/A20M/Configuration.h index 41521feba..6c7b93cff 100644 --- a/config/examples/Geeetech/A20M/Configuration.h +++ b/config/examples/Geeetech/A20M/Configuration.h @@ -910,6 +910,9 @@ // 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. diff --git a/config/examples/Geeetech/GT2560/Configuration.h b/config/examples/Geeetech/GT2560/Configuration.h index bc30ce249..bd7800bb7 100644 --- a/config/examples/Geeetech/GT2560/Configuration.h +++ b/config/examples/Geeetech/GT2560/Configuration.h @@ -942,6 +942,9 @@ // 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. diff --git a/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h index 2cbb20cc5..6605797f2 100644 --- a/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h +++ b/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h @@ -916,6 +916,9 @@ // 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. diff --git a/config/examples/Geeetech/MeCreator2/Configuration.h b/config/examples/Geeetech/MeCreator2/Configuration.h index 32bbfb244..d969f9803 100644 --- a/config/examples/Geeetech/MeCreator2/Configuration.h +++ b/config/examples/Geeetech/MeCreator2/Configuration.h @@ -934,6 +934,9 @@ // 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. diff --git a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h index 5930323a6..604ec61f2 100644 --- a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h @@ -943,6 +943,9 @@ // 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. diff --git a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h index 04e22e101..03917da9a 100644 --- a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h @@ -942,6 +942,9 @@ // 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. diff --git a/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h index 55f06bdab..666ce8988 100644 --- a/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h index bddc89233..6edcc7494 100644 --- a/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Infitary/i3-M508/Configuration.h b/config/examples/Infitary/i3-M508/Configuration.h index a3dcedd90..f859c7012 100644 --- a/config/examples/Infitary/i3-M508/Configuration.h +++ b/config/examples/Infitary/i3-M508/Configuration.h @@ -931,6 +931,9 @@ // 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. diff --git a/config/examples/JGAurora/A5/Configuration.h b/config/examples/JGAurora/A5/Configuration.h index 8f3bc49de..4e2e0c7f3 100644 --- a/config/examples/JGAurora/A5/Configuration.h +++ b/config/examples/JGAurora/A5/Configuration.h @@ -939,6 +939,9 @@ // 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. diff --git a/config/examples/MakerParts/Configuration.h b/config/examples/MakerParts/Configuration.h index 9635afe50..e06c95645 100644 --- a/config/examples/MakerParts/Configuration.h +++ b/config/examples/MakerParts/Configuration.h @@ -947,6 +947,9 @@ // 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. diff --git a/config/examples/Malyan/M150/Configuration.h b/config/examples/Malyan/M150/Configuration.h index b75cf688e..e382233f6 100644 --- a/config/examples/Malyan/M150/Configuration.h +++ b/config/examples/Malyan/M150/Configuration.h @@ -951,6 +951,9 @@ // 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. diff --git a/config/examples/Malyan/M200/Configuration.h b/config/examples/Malyan/M200/Configuration.h index fce109b27..c9051fb74 100644 --- a/config/examples/Malyan/M200/Configuration.h +++ b/config/examples/Malyan/M200/Configuration.h @@ -926,6 +926,9 @@ // 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. diff --git a/config/examples/Micromake/C1/basic/Configuration.h b/config/examples/Micromake/C1/basic/Configuration.h index 1b8d4f873..24e930d20 100644 --- a/config/examples/Micromake/C1/basic/Configuration.h +++ b/config/examples/Micromake/C1/basic/Configuration.h @@ -931,6 +931,9 @@ // 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. diff --git a/config/examples/Micromake/C1/enhanced/Configuration.h b/config/examples/Micromake/C1/enhanced/Configuration.h index 04385e406..2b0413b90 100644 --- a/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/config/examples/Micromake/C1/enhanced/Configuration.h @@ -931,6 +931,9 @@ // 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. diff --git a/config/examples/Mks/Robin/Configuration.h b/config/examples/Mks/Robin/Configuration.h index c33b81fe5..97af15a49 100644 --- a/config/examples/Mks/Robin/Configuration.h +++ b/config/examples/Mks/Robin/Configuration.h @@ -928,6 +928,9 @@ // 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. diff --git a/config/examples/Mks/Sbase/Configuration.h b/config/examples/Mks/Sbase/Configuration.h index a0d827853..0bdf95a2c 100644 --- a/config/examples/Mks/Sbase/Configuration.h +++ b/config/examples/Mks/Sbase/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Printrbot/PrintrboardG2/Configuration.h b/config/examples/Printrbot/PrintrboardG2/Configuration.h index 146b60256..e944085fc 100644 --- a/config/examples/Printrbot/PrintrboardG2/Configuration.h +++ b/config/examples/Printrbot/PrintrboardG2/Configuration.h @@ -935,6 +935,9 @@ // 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. diff --git a/config/examples/RapideLite/RL200/Configuration.h b/config/examples/RapideLite/RL200/Configuration.h index 31295a053..d3c2f4cc9 100644 --- a/config/examples/RapideLite/RL200/Configuration.h +++ b/config/examples/RapideLite/RL200/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/RepRapPro/Huxley/Configuration.h b/config/examples/RepRapPro/Huxley/Configuration.h index f700f548f..749afb889 100644 --- a/config/examples/RepRapPro/Huxley/Configuration.h +++ b/config/examples/RepRapPro/Huxley/Configuration.h @@ -967,6 +967,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley // 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. diff --git a/config/examples/RepRapWorld/Megatronics/Configuration.h b/config/examples/RepRapWorld/Megatronics/Configuration.h index 352432591..79fceac73 100644 --- a/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/RigidBot/Configuration.h b/config/examples/RigidBot/Configuration.h index c96050918..3fbd34e9c 100644 --- a/config/examples/RigidBot/Configuration.h +++ b/config/examples/RigidBot/Configuration.h @@ -925,6 +925,9 @@ // 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. diff --git a/config/examples/SCARA/Configuration.h b/config/examples/SCARA/Configuration.h index 808bc90b1..86a0b9e88 100644 --- a/config/examples/SCARA/Configuration.h +++ b/config/examples/SCARA/Configuration.h @@ -940,6 +940,9 @@ // 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. diff --git a/config/examples/STM32/Black_STM32F407VET6/Configuration.h b/config/examples/STM32/Black_STM32F407VET6/Configuration.h index 5939baa23..f34dee19d 100644 --- a/config/examples/STM32/Black_STM32F407VET6/Configuration.h +++ b/config/examples/STM32/Black_STM32F407VET6/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/STM32/STM32F10/Configuration.h b/config/examples/STM32/STM32F10/Configuration.h index 1d8a02a0e..76cbc4575 100644 --- a/config/examples/STM32/STM32F10/Configuration.h +++ b/config/examples/STM32/STM32F10/Configuration.h @@ -929,6 +929,9 @@ // 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. diff --git a/config/examples/STM32/STM32F4/Configuration.h b/config/examples/STM32/STM32F4/Configuration.h index 6055e39f4..3c4a93c81 100644 --- a/config/examples/STM32/STM32F4/Configuration.h +++ b/config/examples/STM32/STM32F4/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/STM32/stm32f103ret6/Configuration.h b/config/examples/STM32/stm32f103ret6/Configuration.h index 5eaaceaf8..6ee6cbbce 100644 --- a/config/examples/STM32/stm32f103ret6/Configuration.h +++ b/config/examples/STM32/stm32f103ret6/Configuration.h @@ -929,6 +929,9 @@ // 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. diff --git a/config/examples/Sanguinololu/Configuration.h b/config/examples/Sanguinololu/Configuration.h index 9648c4ba3..8b8e85259 100644 --- a/config/examples/Sanguinololu/Configuration.h +++ b/config/examples/Sanguinololu/Configuration.h @@ -958,6 +958,9 @@ // 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. diff --git a/config/examples/TheBorg/Configuration.h b/config/examples/TheBorg/Configuration.h index b86c5ad4a..9fb8ed029 100644 --- a/config/examples/TheBorg/Configuration.h +++ b/config/examples/TheBorg/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/TinyBoy2/Configuration.h b/config/examples/TinyBoy2/Configuration.h index a4dd933d3..7f1935c53 100644 --- a/config/examples/TinyBoy2/Configuration.h +++ b/config/examples/TinyBoy2/Configuration.h @@ -978,6 +978,9 @@ // 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. diff --git a/config/examples/Tronxy/X1/Configuration.h b/config/examples/Tronxy/X1/Configuration.h index a78d57d9d..02af26a50 100644 --- a/config/examples/Tronxy/X1/Configuration.h +++ b/config/examples/Tronxy/X1/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Tronxy/X3A/Configuration.h b/config/examples/Tronxy/X3A/Configuration.h index 1513d66ab..549b9a3cc 100644 --- a/config/examples/Tronxy/X3A/Configuration.h +++ b/config/examples/Tronxy/X3A/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Tronxy/X5S-2E/Configuration.h b/config/examples/Tronxy/X5S-2E/Configuration.h index a37161a28..0658378a2 100644 --- a/config/examples/Tronxy/X5S-2E/Configuration.h +++ b/config/examples/Tronxy/X5S-2E/Configuration.h @@ -948,6 +948,9 @@ // 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. diff --git a/config/examples/Tronxy/X5S/Configuration.h b/config/examples/Tronxy/X5S/Configuration.h index 06cde48f7..736f158d9 100644 --- a/config/examples/Tronxy/X5S/Configuration.h +++ b/config/examples/Tronxy/X5S/Configuration.h @@ -926,6 +926,9 @@ // 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. diff --git a/config/examples/Tronxy/XY100/Configuration.h b/config/examples/Tronxy/XY100/Configuration.h index 627f95c50..063464181 100644 --- a/config/examples/Tronxy/XY100/Configuration.h +++ b/config/examples/Tronxy/XY100/Configuration.h @@ -938,6 +938,9 @@ // 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. diff --git a/config/examples/UltiMachine/Archim1/Configuration.h b/config/examples/UltiMachine/Archim1/Configuration.h index a92ad948f..06cd59ad4 100644 --- a/config/examples/UltiMachine/Archim1/Configuration.h +++ b/config/examples/UltiMachine/Archim1/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/UltiMachine/Archim2/Configuration.h b/config/examples/UltiMachine/Archim2/Configuration.h index 041162772..fd4fe1e07 100644 --- a/config/examples/UltiMachine/Archim2/Configuration.h +++ b/config/examples/UltiMachine/Archim2/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/VORONDesign/Configuration.h b/config/examples/VORONDesign/Configuration.h index 93265bf12..f043405d2 100644 --- a/config/examples/VORONDesign/Configuration.h +++ b/config/examples/VORONDesign/Configuration.h @@ -936,6 +936,9 @@ // 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. diff --git a/config/examples/Velleman/K8200/Configuration.h b/config/examples/Velleman/K8200/Configuration.h index b280258ac..fb749e843 100644 --- a/config/examples/Velleman/K8200/Configuration.h +++ b/config/examples/Velleman/K8200/Configuration.h @@ -956,6 +956,9 @@ // 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. diff --git a/config/examples/Velleman/K8400/Configuration.h b/config/examples/Velleman/K8400/Configuration.h index 0860d62a9..24aeab648 100644 --- a/config/examples/Velleman/K8400/Configuration.h +++ b/config/examples/Velleman/K8400/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/Velleman/K8400/Dual-head/Configuration.h b/config/examples/Velleman/K8400/Dual-head/Configuration.h index 0f50541dc..2438b7585 100644 --- a/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/WASP/PowerWASP/Configuration.h b/config/examples/WASP/PowerWASP/Configuration.h index bbe152923..5b234bf0a 100644 --- a/config/examples/WASP/PowerWASP/Configuration.h +++ b/config/examples/WASP/PowerWASP/Configuration.h @@ -946,6 +946,9 @@ // 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. diff --git a/config/examples/Wanhao/Duplicator 6/Configuration.h b/config/examples/Wanhao/Duplicator 6/Configuration.h index ac98dac17..78d8d6bf1 100644 --- a/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -937,6 +937,9 @@ // 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. diff --git a/config/examples/adafruit/ST7565/Configuration.h b/config/examples/adafruit/ST7565/Configuration.h index bd72ff2bc..4ceeb498b 100644 --- a/config/examples/adafruit/ST7565/Configuration.h +++ b/config/examples/adafruit/ST7565/Configuration.h @@ -927,6 +927,9 @@ // 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. diff --git a/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/config/examples/delta/FLSUN/auto_calibrate/Configuration.h index fab7299f5..f83290a9e 100644 --- a/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -1055,6 +1055,9 @@ // 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. diff --git a/config/examples/delta/FLSUN/kossel/Configuration.h b/config/examples/delta/FLSUN/kossel/Configuration.h index 0de887940..d95d6da05 100644 --- a/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/config/examples/delta/FLSUN/kossel/Configuration.h @@ -1054,6 +1054,9 @@ // 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. diff --git a/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/config/examples/delta/FLSUN/kossel_mini/Configuration.h index 056e94b93..22154ab35 100644 --- a/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -1054,6 +1054,9 @@ // 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. diff --git a/config/examples/delta/Geeetech/Rostock 301/Configuration.h b/config/examples/delta/Geeetech/Rostock 301/Configuration.h index 29267ce80..42d183a8e 100644 --- a/config/examples/delta/Geeetech/Rostock 301/Configuration.h +++ b/config/examples/delta/Geeetech/Rostock 301/Configuration.h @@ -1042,6 +1042,9 @@ // 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. diff --git a/config/examples/delta/Hatchbox_Alpha/Configuration.h b/config/examples/delta/Hatchbox_Alpha/Configuration.h index 59b530225..fd9fc95c8 100644 --- a/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -1057,6 +1057,9 @@ // 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. diff --git a/config/examples/delta/MKS/SBASE/Configuration.h b/config/examples/delta/MKS/SBASE/Configuration.h index 7756e40eb..94ddadc04 100644 --- a/config/examples/delta/MKS/SBASE/Configuration.h +++ b/config/examples/delta/MKS/SBASE/Configuration.h @@ -1042,6 +1042,9 @@ // 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. diff --git a/config/examples/delta/Tevo Little Monster/Configuration.h b/config/examples/delta/Tevo Little Monster/Configuration.h index dc9e9f22a..c27c9fd11 100644 --- a/config/examples/delta/Tevo Little Monster/Configuration.h +++ b/config/examples/delta/Tevo Little Monster/Configuration.h @@ -1035,6 +1035,9 @@ // 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. diff --git a/config/examples/delta/generic/Configuration.h b/config/examples/delta/generic/Configuration.h index 470c82c21..685b30bc5 100644 --- a/config/examples/delta/generic/Configuration.h +++ b/config/examples/delta/generic/Configuration.h @@ -1042,6 +1042,9 @@ // 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. diff --git a/config/examples/delta/kossel_mini/Configuration.h b/config/examples/delta/kossel_mini/Configuration.h index 181f699ec..bd668c074 100644 --- a/config/examples/delta/kossel_mini/Configuration.h +++ b/config/examples/delta/kossel_mini/Configuration.h @@ -1044,6 +1044,9 @@ // 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. diff --git a/config/examples/delta/kossel_pro/Configuration.h b/config/examples/delta/kossel_pro/Configuration.h index 75fa32ee6..44cc6a30a 100644 --- a/config/examples/delta/kossel_pro/Configuration.h +++ b/config/examples/delta/kossel_pro/Configuration.h @@ -1045,6 +1045,9 @@ // 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. diff --git a/config/examples/delta/kossel_xl/Configuration.h b/config/examples/delta/kossel_xl/Configuration.h index a21d21d9e..1b18389b4 100644 --- a/config/examples/delta/kossel_xl/Configuration.h +++ b/config/examples/delta/kossel_xl/Configuration.h @@ -1045,6 +1045,9 @@ // 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. diff --git a/config/examples/gCreate/gMax1.5+/Configuration.h b/config/examples/gCreate/gMax1.5+/Configuration.h index b71bf2393..9c372a0ea 100644 --- a/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/config/examples/gCreate/gMax1.5+/Configuration.h @@ -929,6 +929,9 @@ // 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. diff --git a/config/examples/makibox/Configuration.h b/config/examples/makibox/Configuration.h index c19ba37b0..495190c9c 100644 --- a/config/examples/makibox/Configuration.h +++ b/config/examples/makibox/Configuration.h @@ -930,6 +930,9 @@ // 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. diff --git a/config/examples/tvrrug/Round2/Configuration.h b/config/examples/tvrrug/Round2/Configuration.h index 7cd185a3a..d46552e33 100644 --- a/config/examples/tvrrug/Round2/Configuration.h +++ b/config/examples/tvrrug/Round2/Configuration.h @@ -922,6 +922,9 @@ // 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. diff --git a/config/examples/wt150/Configuration.h b/config/examples/wt150/Configuration.h index 8a0b0401c..5c22c426c 100644 --- a/config/examples/wt150/Configuration.h +++ b/config/examples/wt150/Configuration.h @@ -932,6 +932,9 @@ // 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. From e8dc87a2b760b7ddc9e78db070e9afeef2a429e9 Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Wed, 17 Apr 2019 00:35:58 +0700 Subject: [PATCH 14/20] Fix updated Allen Key pause probe logic (#13723) --- Marlin/src/module/probe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 78e8ad8ae..8988b15be 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -312,7 +312,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { #if ENABLED(PAUSE_BEFORE_DEPLOY_STOW) do { #if ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED) - if (READ(Z_MIN_PROBE_PIN) == (deploy == bool(Z_MIN_PROBE_ENDSTOP_INVERTING))) break; + if (deploy == (READ(Z_MIN_PROBE_PIN) == Z_MIN_PROBE_ENDSTOP_INVERTING)) break; #endif BUZZ(100, 659); From 12d340cf2a6241c7997b9dda1953bcef35861cbf Mon Sep 17 00:00:00 2001 From: petrzjunior Date: Tue, 16 Apr 2019 20:53:14 +0200 Subject: [PATCH 15/20] Update Czech language (#13729) --- Marlin/src/lcd/language/language_cz.h | 152 ++++++++++++++++++++++++-- 1 file changed, 143 insertions(+), 9 deletions(-) diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index d53aa5709..d2a9e0811 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -35,15 +35,20 @@ */ #define DISPLAY_CHARSET_ISO10646_CZ +#define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("áÁčČďĎéÉěĚíÍňŇóÓřŘšŠťŤúÚůŮýÝžŽ³") #define CHARSIZE 2 #define WELCOME_MSG MACHINE_NAME _UxGT(" připraven.") +#define MSG_YES _UxGT("ANO") +#define MSG_NO _UxGT("NE") #define MSG_BACK _UxGT("Zpět") #define MSG_SD_INSERTED _UxGT("Karta vložena") #define MSG_SD_REMOVED _UxGT("Karta vyjmuta") #define MSG_LCD_ENDSTOPS _UxGT("Endstopy") // max 8 znaku #define MSG_LCD_SOFT_ENDSTOPS _UxGT("Soft Endstopy") #define MSG_MAIN _UxGT("Hlavní nabídka") +#define MSG_ADVANCED_SETTINGS _UxGT("Další nastavení") +#define MSG_CONFIGURATION _UxGT("Konfigurace") #define MSG_AUTOSTART _UxGT("Autostart") #define MSG_DISABLE_STEPPERS _UxGT("Uvolnit motory") #define MSG_DEBUG_MENU _UxGT("Nabídka ladění") @@ -56,6 +61,7 @@ #define MSG_AUTO_HOME_X _UxGT("Domů osa X") #define MSG_AUTO_HOME_Y _UxGT("Domů osa Y") #define MSG_AUTO_HOME_Z _UxGT("Domů osa Z") +#define MSG_AUTO_Z_ALIGN _UxGT("Auto srovnání Z") #define MSG_LEVEL_BED_HOMING _UxGT("Měření podložky") #define MSG_LEVEL_BED_WAITING _UxGT("Kliknutím spusťte") #define MSG_LEVEL_BED_NEXT_POINT _UxGT("Další bod") @@ -76,7 +82,13 @@ #define MSG_PREHEAT_2_END MSG_PREHEAT_2 _UxGT(" hotend") #define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 _UxGT(" podlož") #define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 _UxGT(" nast") +#define MSG_PREHEAT_CUSTOM _UxGT("Zahřát vlastní") #define MSG_COOLDOWN _UxGT("Zchladit") +#define MSG_LASER_MENU _UxGT("Ovládání laseru") +#define MSG_LASER_OFF _UxGT("Vypnout laser") +#define MSG_LASER_ON _UxGT("Zapnout laser") +#define MSG_LASER_POWER _UxGT("Výkon laseru") +#define MSG_SPINDLE_REVERSE _UxGT("Vřeteno opačně") #define MSG_SWITCH_PS_ON _UxGT("Zapnout napájení") #define MSG_SWITCH_PS_OFF _UxGT("Vypnout napájení") #define MSG_EXTRUDE _UxGT("Vytlačit (extr.)") @@ -88,10 +100,23 @@ #define MSG_NEXT_CORNER _UxGT("Další roh") #define MSG_EDITING_STOPPED _UxGT("Konec úprav sítě") +#define MSG_MESH_X _UxGT("Index X") +#define MSG_MESH_Y _UxGT("Index Y") +#define MSG_MESH_EDIT_Z _UxGT("Hodnota Z") +#define MSG_USER_MENU _UxGT("Vlastní příkazy") #define MSG_UBL_DOING_G29 _UxGT("Provádím G29") #define MSG_UBL_UNHOMED _UxGT("Přejeďte domů") #define MSG_UBL_TOOLS _UxGT("UBL nástroje") #define MSG_UBL_LEVEL_BED _UxGT("Unified Bed Leveling") +#define MSG_IDEX_MENU _UxGT("Režim IDEX") +#define MSG_OFFSETS_MENU _UxGT("Ofsety nástrojů") +#define MSG_IDEX_MODE_AUTOPARK _UxGT("Auto-Park") +#define MSG_IDEX_MODE_DUPLICATE _UxGT("Duplikace") +#define MSG_IDEX_MODE_MIRRORED_COPY _UxGT("Zrcadlení") +#define MSG_IDEX_MODE_FULL_CTRL _UxGT("Plná kontrola") +#define MSG_X_OFFSET _UxGT("2. tryska X") +#define MSG_Y_OFFSET _UxGT("2. tryska Y") +#define MSG_Z_OFFSET _UxGT("2. tryska Z") #define MSG_UBL_MANUAL_MESH _UxGT("Manuální síť bodů") #define MSG_UBL_BC_INSERT _UxGT("Vložte kartu, změřte") #define MSG_UBL_BC_INSERT2 _UxGT("Změřte") @@ -169,7 +194,6 @@ #define MSG_INTENSITY_B _UxGT("Modrá intenzita") #define MSG_INTENSITY_W _UxGT("Bílá intenzita") #define MSG_LED_BRIGHTNESS _UxGT("Jas") -#define MSG_USER_MENU _UxGT("Vlastní příkazy") #define MSG_MOVING _UxGT("Posouvání...") #define MSG_FREE_XY _UxGT("Uvolnit XY") @@ -177,6 +201,7 @@ #define MSG_MOVE_Y _UxGT("Posunout Y") #define MSG_MOVE_Z _UxGT("Posunout Z") #define MSG_MOVE_E _UxGT("Extrudér") +#define MSG_HOTEND_TOO_COLD _UxGT("Hotend je studený") #define MSG_MOVE_01MM _UxGT("Posunout o 0,1mm") #define MSG_MOVE_1MM _UxGT("Posunout o 1mm") #define MSG_MOVE_10MM _UxGT("Posunout o 10mm") @@ -184,6 +209,7 @@ #define MSG_BED_Z _UxGT("Výška podl.") #define MSG_NOZZLE _UxGT("Tryska") #define MSG_BED _UxGT("Podložka") +#define MSG_CHAMBER _UxGT("Komora") #define MSG_FAN_SPEED _UxGT("Rychlost vent.") #define MSG_EXTRA_FAN_SPEED _UxGT("Rychlost ex. vent.") #define MSG_FLOW _UxGT("Průtok") @@ -250,10 +276,15 @@ #define MSG_LOAD_EEPROM _UxGT("Načíst nastavení") #define MSG_RESTORE_FAILSAFE _UxGT("Obnovit výchozí") #define MSG_INIT_EEPROM _UxGT("Inic. EEPROM") +#define MSG_SD_UPDATE _UxGT("Aktualizace z SD") +#define MSG_RESET_PRINTER _UxGT("Reset tiskárny") #define MSG_REFRESH _UxGT("Obnovit") #define MSG_WATCH _UxGT("Info obrazovka") #define MSG_PREPARE _UxGT("Připrava tisku") #define MSG_TUNE _UxGT("Doladění tisku") +#define MSG_START_PRINT _UxGT("Spustit tisk") +#define MSG_BUTTON_PRINT _UxGT("Tisk") +#define MSG_BUTTON_CANCEL _UxGT("Zrušit") #define MSG_PAUSE_PRINT _UxGT("Pozastavit tisk") #define MSG_RESUME_PRINT _UxGT("Obnovit tisk") #define MSG_STOP_PRINT _UxGT("Zastavit tisk") @@ -277,6 +308,12 @@ #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_CONTROL_RETRACT_RECOVER_SWAPF _UxGT("S UnRet V") #define MSG_AUTORETRACT _UxGT("AutoRetr.") +#define MSG_FILAMENT_SWAP_LENGTH _UxGT("Délka retrakce") +#define MSG_TOOL_CHANGE _UxGT("Výměna nástroje") +#define MSG_TOOL_CHANGE_ZLIFT _UxGT("Zdvih Z") +#define MSG_SINGLENOZZLE_PRIME_SPD _UxGT("Rychlost primár.") +#define MSG_SINGLENOZZLE_RETRACT_SPD _UxGT("Rychlost retrak.") +#define MSG_NOZZLE_STANDBY _UxGT("Tryska standby") #define MSG_FILAMENTCHANGE _UxGT("Vyměnit filament") #define MSG_FILAMENTLOAD _UxGT("Zavést filament") #define MSG_FILAMENTUNLOAD _UxGT("Vysunout filament") @@ -287,16 +324,22 @@ #define MSG_ZPROBE_OUT _UxGT("Sonda Z mimo podl") #define MSG_SKEW_FACTOR _UxGT("Faktor zkosení") #define MSG_BLTOUCH _UxGT("BLTouch") -#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test") -#define MSG_BLTOUCH_RESET _UxGT("BLTouch Reset") -#define MSG_BLTOUCH_DEPLOY _UxGT("BLTouch Vysunout") -#define MSG_BLTOUCH_STOW _UxGT("BLTouch Zasunout") +#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch self-test") +#define MSG_BLTOUCH_RESET _UxGT("BLTouch reset") +#define MSG_BLTOUCH_DEPLOY _UxGT("BLTouch vysunout") +#define MSG_BLTOUCH_SW_MODE _UxGT("SW výsun BLTouch") +#define MSG_BLTOUCH_5V_MODE _UxGT("BLTouch 5V režim") +#define MSG_BLTOUCH_OD_MODE _UxGT("BLTouch OD režim") +#define MSG_BLTOUCH_STOW _UxGT("BLTouch zasunout") +#define MSG_MANUAL_DEPLOY _UxGT("Vysunout Z-sondu") +#define MSG_MANUAL_STOW _UxGT("Zasunout Z-sondu") #define MSG_HOME _UxGT("Domů") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST #define MSG_FIRST _UxGT("první") #define MSG_ZPROBE_ZOFFSET _UxGT("Z ofset") #define MSG_BABYSTEP_X _UxGT("Babystep X") #define MSG_BABYSTEP_Y _UxGT("Babystep Y") #define MSG_BABYSTEP_Z _UxGT("Babystep Z") +#define MSG_BABYSTEP_TOTAL _UxGT("Celkem") #define MSG_ENDSTOP_ABORT _UxGT("Endstop abort") #define MSG_HEATING_FAILED_LCD _UxGT("Chyba zahřívání") #define MSG_HEATING_FAILED_LCD_BED _UxGT("Chyba zahř.podl.") @@ -307,6 +350,8 @@ #define MSG_ERR_MINTEMP _UxGT("NÍZKA TEPLOTA") #define MSG_ERR_MAXTEMP_BED _UxGT("VYS. TEPL. PODL.") #define MSG_ERR_MINTEMP_BED _UxGT("NÍZ. TEPL. PODL.") +#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Err: MAXTEMP KOMORA") +#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err: MINTEMP KOMORA") #define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST #define MSG_HALTED _UxGT("TISK. ZASTAVENA") #define MSG_PLEASE_RESET _UxGT("Proveďte reset") @@ -380,18 +425,82 @@ #define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Vytlačit víc") #define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Obnovit tisk") #define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Tryska: ") +#define MSG_RUNOUT_SENSOR _UxGT("Senzor filamentu") #define MSG_ERR_HOMING_FAILED _UxGT("Parkování selhalo") #define MSG_ERR_PROBING_FAILED _UxGT("Kalibrace selhala") #define MSG_M600_TOO_COLD _UxGT("M600: Moc studený") +#define MSG_MMU2_FILAMENT_CHANGE_HEADER _UxGT("VÝMĚNA FILAMENTU") +#define MSG_MMU2_CHOOSE_FILAMENT_HEADER _UxGT("VYBERTE FILAMENT") +#define MSG_MMU2_MENU _UxGT("MMU") +#define MSG_MMU2_WRONG_FIRMWARE _UxGT("Aktual. MMU firmware!") +#define MSG_MMU2_NOT_RESPONDING _UxGT("MMU potř. pozornost.") +#define MSG_MMU2_RESUME _UxGT("Obnovit tisk") +#define MSG_MMU2_RESUMING _UxGT("Obnovování...") +#define MSG_MMU2_LOAD_FILAMENT _UxGT("Zavést filament") +#define MSG_MMU2_LOAD_ALL _UxGT("Zavést všechny") +#define MSG_MMU2_LOAD_TO_NOZZLE _UxGT("Zavést do trysky") +#define MSG_MMU2_EJECT_FILAMENT _UxGT("Vysunout filament") +#define MSG_MMU2_EJECT_FILAMENT0 _UxGT("Vysun. filament 1") +#define MSG_MMU2_EJECT_FILAMENT1 _UxGT("Vysun. filament 2") +#define MSG_MMU2_EJECT_FILAMENT2 _UxGT("Vysun. filament 3") +#define MSG_MMU2_EJECT_FILAMENT3 _UxGT("Vysun. filament 4") +#define MSG_MMU2_EJECT_FILAMENT4 _UxGT("Vysun. filament 5") +#define MSG_MMU2_UNLOAD_FILAMENT _UxGT("Vytáhnout filament") +#define MSG_MMU2_LOADING_FILAMENT _UxGT("Zavádění fil. %i...") +#define MSG_MMU2_EJECTING_FILAMENT _UxGT("Vytahování fil. ...") +#define MSG_MMU2_UNLOADING_FILAMENT _UxGT("Vysouvání fil....") +#define MSG_MMU2_ALL _UxGT("Všechny") +#define MSG_MMU2_FILAMENT0 _UxGT("Filament 1") +#define MSG_MMU2_FILAMENT1 _UxGT("Filament 2") +#define MSG_MMU2_FILAMENT2 _UxGT("Filament 3") +#define MSG_MMU2_FILAMENT3 _UxGT("Filament 4") +#define MSG_MMU2_FILAMENT4 _UxGT("Filament 5") +#define MSG_MMU2_RESET _UxGT("Resetovat MMU") +#define MSG_MMU2_RESETTING _UxGT("Resetování MMU...") +#define MSG_MMU2_EJECT_RECOVER _UxGT("Vytáhněte, klikněte") + +#define MSG_MIX _UxGT("Mix") +#define MSG_MIX_COMPONENT _UxGT("Komponenta") +#define MSG_MIXER _UxGT("Mixér") +#define MSG_GRADIENT _UxGT("Přechod") +#define MSG_FULL_GRADIENT _UxGT("Celý přechod") +#define MSG_TOGGLE_MIX _UxGT("Přepnout mix") +#define MSG_CYCLE_MIX _UxGT("Střídat mix") +#define MSG_GRADIENT_MIX _UxGT("Přechod mix") +#define MSG_REVERSE_GRADIENT _UxGT("Opačný přechod") +#if LCD_WIDTH >= 20 + #define MSG_ACTIVE_VTOOL _UxGT("Aktivní V-nástroj") + #define MSG_START_VTOOL _UxGT("Spustit V-nástroj") + #define MSG_END_VTOOL _UxGT("Ukončit V-nástroj") + #define MSG_GRADIENT_ALIAS _UxGT("Alias V-nástroje") + #define MSG_RESET_VTOOLS _UxGT("Resetovat V-nástroj") + #define MSG_COMMIT_VTOOL _UxGT("Uložit V-nástroj mix") + #define MSG_VTOOLS_RESET _UxGT("V-nástroj resetovat") +#else + #define MSG_ACTIVE_VTOOL _UxGT("Aktivní V-nástr.") + #define MSG_START_VTOOL _UxGT("Spustit V-nástr.") + #define MSG_END_VTOOL _UxGT("Ukončit V-nástr.") + #define MSG_GRADIENT_ALIAS _UxGT("Alias V-nástr.") + #define MSG_RESET_VTOOLS _UxGT("Reset. V-nástr.") + #define MSG_COMMIT_VTOOL _UxGT("Uložit V-nás. mix") + #define MSG_VTOOLS_RESET _UxGT("V-nástr. reset.") +#endif +#define MSG_START_Z _UxGT("Počáteční Z") +#define MSG_END_Z _UxGT(" Koncové Z") +#define MSG_BRICKOUT _UxGT("Brickout") +#define MSG_INVADERS _UxGT("Invaders") +#define MSG_SNAKE _UxGT("Sn4k3") +#define MSG_MAZE _UxGT("Bludiště") + #if LCD_HEIGHT >= 4 // Up to 3 lines allowed + #define MSG_ADVANCED_PAUSE_WAITING_1 _UxGT("Stikněte tlačítko") + #define MSG_ADVANCED_PAUSE_WAITING_2 _UxGT("pro obnovení tisku") + #define MSG_PAUSE_PRINT_INIT_1 _UxGT("Parkování...") #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekejte prosím") #define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("na zahájení") #define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("výměny filamentu") - #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekejte prosím") - #define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("na vysunuti") - #define MSG_FILAMENT_CHANGE_UNLOAD_3 _UxGT("filamentu") #define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Vložte filament") #define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("a stiskněte") #define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("tlačítko...") @@ -399,21 +508,46 @@ #define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("nahřátí trysky") #define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("Čekejte prosím") #define MSG_FILAMENT_CHANGE_HEATING_2 _UxGT("na nahřátí tr.") + #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekejte prosím") + #define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("na vysunuti") + #define MSG_FILAMENT_CHANGE_UNLOAD_3 _UxGT("filamentu") #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Čekejte prosím") #define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("na zavedení") #define MSG_FILAMENT_CHANGE_LOAD_3 _UxGT("filamentu") #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("Vyčkejte na") #define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("vytlačení") + #define MSG_FILAMENT_CHANGE_CONT_PURGE_1 _UxGT("Klikněte pro") + #define MSG_FILAMENT_CHANGE_CONT_PURGE_2 _UxGT("ukončení") + #define MSG_FILAMENT_CHANGE_CONT_PURGE_3 _UxGT("vytlačování") #define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Čekejte prosím") #define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("na pokračování") #define MSG_FILAMENT_CHANGE_RESUME_3 _UxGT("tisku") #else // LCD_HEIGHT < 4 // Up to 2 lines allowed + #define MSG_ADVANCED_PAUSE_WAITING_1 _UxGT("Stikněte tlač.") + #define MSG_ADVANCED_PAUSE_WAITING_2 _UxGT("pro obnovení") + #define MSG_PAUSE_PRINT_INIT_1 _UxGT("Parkování...") #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekejte...") - #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Vysouvání...") #define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Vložte, klikněte") + #define MSG_FILAMENT_CHANGE_HEAT_1 _UxGT("Klikněte pro") + #define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("nahřátí") #define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("Nahřívání...") + #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Vysouvání...") #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Zavádění...") #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("Vytlačování...") + #define MSG_FILAMENT_CHANGE_CONT_PURGE_1 _UxGT("Klikněte pro") + #define MSG_FILAMENT_CHANGE_CONT_PURGE_2 _UxGT("ukončení") #define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Pokračování...") #endif // LCD_HEIGHT < 4 + +#define MSG_TMC_DRIVERS _UxGT("TMC budiče") +#define MSG_TMC_CURRENT _UxGT("Proud budičů") +#define MSG_TMC_HYBRID_THRS _UxGT("Hybridní práh") +#define MSG_TMC_HOMING_THRS _UxGT("Domů bez senzorů") +#define MSG_TMC_STEPPING_MODE _UxGT("Režim kroků") +#define MSG_TMC_STEALTH_ENABLED _UxGT("StealthChop povolen") +#define MSG_SERVICE_RESET _UxGT("Reset") +#define MSG_SERVICE_IN _UxGT(" za:") +#define MSG_BACKLASH _UxGT("Vůle") +#define MSG_BACKLASH_CORRECTION _UxGT("Korekce") +#define MSG_BACKLASH_SMOOTHING _UxGT("Vyhlazení") \ No newline at end of file From ab8052887fb665713fb3e18a41bc39a2110c929c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 16 Apr 2019 13:53:58 -0500 Subject: [PATCH 16/20] Add missing MSG_PAUSE_PRINT_INIT_1 for en --- Marlin/src/lcd/language/language_en.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index dc6c26cf9..c60f8b805 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -1362,6 +1362,9 @@ #ifndef MSG_ADVANCED_PAUSE_WAITING_1 #define MSG_ADVANCED_PAUSE_WAITING_1 _UxGT("Click to continue") #endif + #ifndef MSG_PAUSE_PRINT_INIT_1 + #define MSG_PAUSE_PRINT_INIT_1 _UxGT("Parking...") + #endif #ifndef MSG_FILAMENT_CHANGE_INIT_1 #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Please wait...") #endif From 866e2d41dca277a1913a7e505a3d07d6d10f7ce3 Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Tue, 16 Apr 2019 14:45:31 -0600 Subject: [PATCH 17/20] Correct range of LCD axis step editing (#13727) --- Marlin/src/core/utility.cpp | 14 +++++++------- Marlin/src/core/utility.h | 4 ++-- Marlin/src/lcd/menu/menu.cpp | 4 ++-- Marlin/src/lcd/menu/menu.h | 18 +++++++++++------- Marlin/src/lcd/menu/menu_advanced.cpp | 8 ++++---- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp index e695601ce..cc7d0065e 100644 --- a/Marlin/src/core/utility.cpp +++ b/Marlin/src/core/utility.cpp @@ -264,15 +264,15 @@ void safe_delay(millis_t ms) { return conv; } - // Convert unsigned float to string with 1234.56 format omitting trailing zeros - char* ftostr62rj(const float &f) { - const long i = ((f < 0 ? -f : f) * 1000 + 5) / 10; - conv[0] = RJDIGIT(i, 100000); + // Convert unsigned float to string with 1234.5 format omitting trailing zeros + char* ftostr51rj(const float &f) { + const long i = ((f < 0 ? -f : f) * 100 + 5) / 10; + conv[0] = ' '; conv[1] = RJDIGIT(i, 10000); conv[2] = RJDIGIT(i, 1000); - conv[3] = DIGIMOD(i, 100); - conv[4] = '.'; - conv[5] = DIGIMOD(i, 10); + conv[3] = RJDIGIT(i, 100); + conv[4] = DIGIMOD(i, 10); + conv[5] = '.'; conv[6] = DIGIMOD(i, 1); return conv; } diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h index 48f775b52..c04524f67 100644 --- a/Marlin/src/core/utility.h +++ b/Marlin/src/core/utility.h @@ -106,8 +106,8 @@ inline void serial_delay(const millis_t ms) { // Convert signed float to string with +123.45 format char* ftostr52sign(const float &x); - // Convert unsigned float to string with 1234.56 format omitting trailing zeros - char* ftostr62rj(const float &x); + // Convert unsigned float to string with 1234.5 format omitting trailing zeros + char* ftostr51rj(const float &x); // Convert float to rj string with 123 or -12 format FORCE_INLINE char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); } diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp index 91b1ad448..1a053ad85 100644 --- a/Marlin/src/lcd/menu/menu.cpp +++ b/Marlin/src/lcd/menu/menu.cpp @@ -167,9 +167,9 @@ DEFINE_MENU_EDIT_ITEM(float3); // 123 right-justified DEFINE_MENU_EDIT_ITEM(float52); // 123.45 DEFINE_MENU_EDIT_ITEM(float43); // 1.234 DEFINE_MENU_EDIT_ITEM(float5); // 12345 right-justified -DEFINE_MENU_EDIT_ITEM(float51); // +1234.5 +DEFINE_MENU_EDIT_ITEM(float51); // 1234.5 right-justified +DEFINE_MENU_EDIT_ITEM(float51sign); // +1234.5 DEFINE_MENU_EDIT_ITEM(float52sign); // +123.45 -DEFINE_MENU_EDIT_ITEM(float62); // 1234.56 right-justified DEFINE_MENU_EDIT_ITEM(long5); // 12345 right-justified void MenuItem_bool::action_edit(PGM_P pstr, bool *ptr, screenFunc_t callback) { diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h index 6e8d44b13..ecacc18ae 100644 --- a/Marlin/src/lcd/menu/menu.h +++ b/Marlin/src/lcd/menu/menu.h @@ -24,6 +24,8 @@ #include "../ultralcd.h" #include "../../inc/MarlinConfig.h" +#include "limits.h" + extern int8_t encoderLine, encoderTopLine, screen_items; extern bool screen_changed; @@ -54,9 +56,9 @@ DECLARE_MENU_EDIT_TYPE(float, float3, ftostr3, 1 ); // 123 DECLARE_MENU_EDIT_TYPE(float, float52, ftostr52, 100 ); // 123.45 DECLARE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000 ); // 1.234 DECLARE_MENU_EDIT_TYPE(float, float5, ftostr5rj, 0.01f ); // 12345 right-justified -DECLARE_MENU_EDIT_TYPE(float, float51, ftostr51sign, 10 ); // +1234.5 +DECLARE_MENU_EDIT_TYPE(float, float51, ftostr51rj, 10 ); // 1234.5 right-justified +DECLARE_MENU_EDIT_TYPE(float, float51sign, ftostr51sign, 10 ); // +1234.5 DECLARE_MENU_EDIT_TYPE(float, float52sign, ftostr52sign, 100 ); // +123.45 -DECLARE_MENU_EDIT_TYPE(float, float62, ftostr62rj, 100 ); // 1234.56 right-justified DECLARE_MENU_EDIT_TYPE(uint32_t, long5, ftostr5rj, 0.01f ); // 12345 right-justified //////////////////////////////////////////// @@ -119,9 +121,9 @@ DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float3); // 123 right-justif DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52); // 123.45 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float43); // 1.234 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float5); // 12345 right-justified -DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51); // +1234.5 +DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51); // 1234.5 right-justified +DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51sign); // +1234.5 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52sign); // +123.45 -DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float62); // 1234.56 right-justified DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(long5); // 12345 right-justified #define draw_menu_item_edit_bool(sel, row, pstr, pstr2, data, ...) DRAW_BOOL_SETTING(sel, row, pstr, data) @@ -179,8 +181,10 @@ class TMenuItem : MenuItemBase { static char* to_string(const int16_t value) { return NAME::strfunc(unscale(value)); } public: static void action_edit(PGM_P const pstr, type_t * const ptr, const type_t minValue, const type_t maxValue, const screenFunc_t callback=NULL, const bool live=false) { - const int16_t minv = scale(minValue); - init(pstr, ptr, minv, int16_t(scale(maxValue)) - minv, int16_t(scale(*ptr)) - minv, edit, callback, live); + // Make sure minv and maxv fit within int16_t + const int16_t minv = MAX(scale(minValue), INT_MIN), + maxv = MIN(scale(maxValue), INT_MAX); + init(pstr, ptr, minv, maxv - minv, scale(*ptr) - minv, edit, callback, live); } static void edit() { MenuItemBase::edit(to_string, load); } }; @@ -199,8 +203,8 @@ DECLARE_MENU_EDIT_ITEM(float52); DECLARE_MENU_EDIT_ITEM(float43); DECLARE_MENU_EDIT_ITEM(float5); DECLARE_MENU_EDIT_ITEM(float51); +DECLARE_MENU_EDIT_ITEM(float51sign); DECLARE_MENU_EDIT_ITEM(float52sign); -DECLARE_MENU_EDIT_ITEM(float62); DECLARE_MENU_EDIT_ITEM(long5); class MenuItem_bool { diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp index 89955484b..05396f850 100644 --- a/Marlin/src/lcd/menu/menu_advanced.cpp +++ b/Marlin/src/lcd/menu/menu_advanced.cpp @@ -571,14 +571,14 @@ void menu_backlash(); START_MENU(); MENU_BACK(MSG_ADVANCED_SETTINGS); - #define EDIT_QSTEPS(Q) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_##Q##STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, _planner_refresh_positioning) + #define EDIT_QSTEPS(Q) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_##Q##STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, _planner_refresh_positioning) EDIT_QSTEPS(A); EDIT_QSTEPS(B); EDIT_QSTEPS(C); #if ENABLED(DISTINCT_E_FACTORS) - #define EDIT_ESTEPS(N,E) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_E##N##STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(E)], 5, 9999, _planner_refresh_e##E##_positioning) - MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, _planner_refresh_positioning); + #define EDIT_ESTEPS(N,E) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_E##N##STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(E)], 5, 9999, _planner_refresh_e##E##_positioning) + MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, _planner_refresh_positioning); EDIT_ESTEPS(1,0); EDIT_ESTEPS(2,1); #if E_STEPPERS > 2 @@ -594,7 +594,7 @@ void menu_backlash(); #endif // E_STEPPERS > 3 #endif // E_STEPPERS > 2 #elif E_STEPPERS - MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_positioning); + MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_positioning); #endif END_MENU(); From bf28ad4b6c8deb00086851a32f65c2a97288b20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20P=C3=A9rez?= Date: Wed, 17 Apr 2019 21:52:20 +0200 Subject: [PATCH 18/20] Fix clear of Z position last digit (#13731) --- Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp | 2 +- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp index c493b371c..c8927725c 100644 --- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp +++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp @@ -517,7 +517,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const else { #if DISABLED(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) if (!TEST(axis_known_position, axis)) - lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" ")); + lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" ")); else #endif lcd_put_u8str(value); diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index e101a5682..a917bc2e8 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -245,7 +245,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const else { #if DISABLED(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) if (!TEST(axis_known_position, axis)) - lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" ")); + lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" ")); else #endif lcd_put_u8str(value); From 836435c5ef644ef150cea6bec4b077a9ff316481 Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Wed, 17 Apr 2019 13:55:31 -0600 Subject: [PATCH 19/20] Fix action_edit int range bug (#13737) --- Marlin/src/lcd/menu/menu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h index ecacc18ae..acc51a2ae 100644 --- a/Marlin/src/lcd/menu/menu.h +++ b/Marlin/src/lcd/menu/menu.h @@ -182,8 +182,8 @@ class TMenuItem : MenuItemBase { public: static void action_edit(PGM_P const pstr, type_t * const ptr, const type_t minValue, const type_t maxValue, const screenFunc_t callback=NULL, const bool live=false) { // Make sure minv and maxv fit within int16_t - const int16_t minv = MAX(scale(minValue), INT_MIN), - maxv = MIN(scale(maxValue), INT_MAX); + const int16_t minv = MAX(scale(minValue), INT16_MIN), + maxv = MIN(scale(maxValue), INT16_MAX); init(pstr, ptr, minv, maxv - minv, scale(*ptr) - minv, edit, callback, live); } static void edit() { MenuItemBase::edit(to_string, load); } From e1acc09c6e7f505bef25c5d8354faac3e3a8b5f0 Mon Sep 17 00:00:00 2001 From: Kajetan Rzepecki Date: Wed, 17 Apr 2019 21:57:50 +0200 Subject: [PATCH 20/20] Fix LPC1768 HAL SSD* screen init (#13741) --- .../HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp index aad3603ad..58631a1e1 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp @@ -137,8 +137,11 @@ uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_v case U8G_COM_MSG_WRITE_BYTE: //u8g->pin_list[U8G_PI_SET_A0] = 1; - //if (u8g_com_arduino_ssd_start_sequence(u8g) == 0) - // return u8g_i2c_stop(), 0; + if (u8g_com_ssd_I2C_start_sequence(u8g) == 0) { + u8g_i2c_stop(); + return 0; + } + if (u8g_i2c_send_byte(arg_val) == 0) { u8g_i2c_stop(); return 0; @@ -186,9 +189,6 @@ uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_v case U8G_COM_MSG_ADDRESS: /* define cmd (arg_val = 0) or data mode (arg_val = 1) */ u8g->pin_list[U8G_PI_A0_STATE] = arg_val; u8g->pin_list[U8G_PI_SET_A0] = 1; /* force a0 to set again */ - - u8g_i2c_start(0); // send slave address and write bit - u8g_i2c_send_byte(arg_val ? 0x40 : 0x80); // Write to ? Graphics DRAM mode : Command mode break; } // switch