Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2af4a5dd93 | |||
| 82c21461c4 | |||
| a75a5f8b2a | |||
| 80dd02fbdb | |||
| e6755450df | |||
| 9215bf791b | |||
| 311bfc99f3 |
@@ -4342,7 +4342,7 @@
|
|||||||
* Extras for an ESP32-based motherboard with WIFISUPPORT
|
* Extras for an ESP32-based motherboard with WIFISUPPORT
|
||||||
* These options don't apply to add-on WiFi modules based on ESP32 WiFi101.
|
* These options don't apply to add-on WiFi modules based on ESP32 WiFi101.
|
||||||
*/
|
*/
|
||||||
#if ENABLED(WIFISUPPORT)
|
#if ANY(WIFISUPPORT, ESP3D_WIFISUPPORT)
|
||||||
//#define WEBSUPPORT // Start a webserver (which may include auto-discovery) using SPIFFS
|
//#define WEBSUPPORT // Start a webserver (which may include auto-discovery) using SPIFFS
|
||||||
//#define OTASUPPORT // Support over-the-air firmware updates
|
//#define OTASUPPORT // Support over-the-air firmware updates
|
||||||
//#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
|
//#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
|
||||||
|
|||||||
+1
-1
@@ -41,7 +41,7 @@
|
|||||||
* here we define this default string as the date where the latest release
|
* here we define this default string as the date where the latest release
|
||||||
* version was tagged.
|
* version was tagged.
|
||||||
*/
|
*/
|
||||||
//#define STRING_DISTRIBUTION_DATE "2024-04-07"
|
//#define STRING_DISTRIBUTION_DATE "2024-04-10"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines a generic printer name to be output to the LCD after booting Marlin.
|
* Defines a generic printer name to be output to the LCD after booting Marlin.
|
||||||
|
|||||||
@@ -3935,11 +3935,11 @@ static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive."
|
|||||||
#if !(defined(WIFI_SSID) && defined(WIFI_PWD))
|
#if !(defined(WIFI_SSID) && defined(WIFI_PWD))
|
||||||
#error "ESP32 motherboard with WIFISUPPORT requires WIFI_SSID and WIFI_PWD."
|
#error "ESP32 motherboard with WIFISUPPORT requires WIFI_SSID and WIFI_PWD."
|
||||||
#endif
|
#endif
|
||||||
#elif ENABLED(WIFI_CUSTOM_COMMAND)
|
#elif ENABLED(WIFI_CUSTOM_COMMAND) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
|
||||||
#error "WIFI_CUSTOM_COMMAND requires an ESP32 motherboard and WIFISUPPORT."
|
#error "WIFI_CUSTOM_COMMAND requires an ESP32 motherboard and WIFISUPPORT."
|
||||||
#elif ENABLED(OTASUPPORT)
|
#elif ENABLED(OTASUPPORT) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
|
||||||
#error "OTASUPPORT requires an ESP32 motherboard and WIFISUPPORT."
|
#error "OTASUPPORT requires an ESP32 motherboard and WIFISUPPORT."
|
||||||
#elif defined(WIFI_SSID) || defined(WIFI_PWD)
|
#elif (defined(WIFI_SSID) || defined(WIFI_PWD)) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
|
||||||
#error "WIFI_SSID and WIFI_PWD only apply to ESP32 motherboard with WIFISUPPORT."
|
#error "WIFI_SSID and WIFI_PWD only apply to ESP32 motherboard with WIFISUPPORT."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
* version was tagged.
|
* version was tagged.
|
||||||
*/
|
*/
|
||||||
#ifndef STRING_DISTRIBUTION_DATE
|
#ifndef STRING_DISTRIBUTION_DATE
|
||||||
#define STRING_DISTRIBUTION_DATE "2024-04-07"
|
#define STRING_DISTRIBUTION_DATE "2024-04-10"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ TFT_IO tftio;
|
|||||||
#define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1)
|
#define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1)
|
||||||
#define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1)
|
#define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1)
|
||||||
|
|
||||||
// RGB565 color picker: https://embeddednotepad.com/page/rgb565-color-picker
|
// RGB565 color picker: https://rgbcolorpicker.com/565
|
||||||
// Hex code to color name: https://www.color-name.com/
|
// Hex code to color name: https://www.color-name.com/
|
||||||
|
|
||||||
#define COLOR_BLACK 0x0000 // #000000
|
#define COLOR_BLACK 0x0000 // #000000
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
#define COLOR(color) RGB(((color >> 16) & 0xFF), ((color >> 8) & 0xFF), (color & 0xFF))
|
#define COLOR(color) RGB(((color >> 16) & 0xFF), ((color >> 8) & 0xFF), (color & 0xFF))
|
||||||
#define HALF(color) RGB(RED(color) >> 1, GREEN(color) >> 1, BLUE(color) >> 1)
|
#define HALF(color) RGB(RED(color) >> 1, GREEN(color) >> 1, BLUE(color) >> 1)
|
||||||
|
|
||||||
// RGB565 color picker: https://embeddednotepad.com/page/rgb565-color-picker
|
// RGB565 color picker: https://rgbcolorpicker.com/565
|
||||||
// Hex code to color name: https://www.color-name.com/
|
// Hex code to color name: https://www.color-name.com/
|
||||||
|
|
||||||
#define COLOR_BLACK 0x0000 // #000000
|
#define COLOR_BLACK 0x0000 // #000000
|
||||||
|
|||||||
@@ -320,17 +320,29 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
// TMC software SPI
|
// TMC SPI
|
||||||
//
|
//
|
||||||
#if HAS_TMC_SPI
|
#if HAS_TMC_SPI
|
||||||
#ifndef TMC_SPI_MOSI
|
#if ENABLED(TMC_USE_SW_SPI)
|
||||||
#define TMC_SPI_MOSI AUX2_09
|
#ifndef TMC_SPI_MOSI
|
||||||
#endif
|
#define TMC_SPI_MOSI AUX2_09
|
||||||
#ifndef TMC_SPI_MISO
|
#endif
|
||||||
#define TMC_SPI_MISO AUX2_07
|
#ifndef TMC_SPI_MISO
|
||||||
#endif
|
#define TMC_SPI_MISO AUX2_07
|
||||||
#ifndef TMC_SPI_SCK
|
#endif
|
||||||
#define TMC_SPI_SCK AUX2_05
|
#ifndef TMC_SPI_SCK
|
||||||
|
#define TMC_SPI_SCK AUX2_05
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#ifndef TMC_SPI_MOSI
|
||||||
|
#define TMC_SPI_MOSI AUX3_04
|
||||||
|
#endif
|
||||||
|
#ifndef TMC_SPI_MISO
|
||||||
|
#define TMC_SPI_MISO AUX3_03
|
||||||
|
#endif
|
||||||
|
#ifndef TMC_SPI_SCK
|
||||||
|
#define TMC_SPI_SCK AUX3_05
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
|
|||||||
lib_compat_mode = off
|
lib_compat_mode = off
|
||||||
build_src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
|
build_src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
|
||||||
lib_deps = ${common.lib_deps}
|
lib_deps = ${common.lib_deps}
|
||||||
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/8791f3ff43.zip
|
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/66a2b82c8f.zip
|
||||||
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/c6b319f447.zip
|
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/c6b319f447.zip
|
||||||
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/322fb5fc23.zip
|
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/322fb5fc23.zip
|
||||||
extra_scripts = ${common.extra_scripts}
|
extra_scripts = ${common.extra_scripts}
|
||||||
|
|||||||
Reference in New Issue
Block a user