diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d3a4d18d81..b877dc1305 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -520,6 +520,10 @@ #define DWINOS_4 #endif +#if NONE(MachineCR10Smart, MachineCR10SmartPro) + #define LOWRES_DWIN +#endif + #if ENABLED(MachineCR30) #define OrigLCD #define RET6_12864_LCD diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h index 99d42a6a94..409bee63ad 100644 --- a/Marlin/src/HAL/AVR/HAL.h +++ b/Marlin/src/HAL/AVR/HAL.h @@ -139,7 +139,7 @@ typedef Servo hal_servo_t; #error "LCD_SERIAL_PORT must be from 0 to 3." #endif #define LCD_SERIAL lcdSerial - #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(DWINOS_4) + #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(EXTENSIBLE_UI) #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free() #endif #endif diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp index a320fb8adf..48d2368a79 100644 --- a/Marlin/src/HAL/AVR/MarlinSerial.cpp +++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp @@ -629,7 +629,7 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser); template class MarlinSerial< LCDSerialCfg >; MSerialLCD lcdSerial(MSerialLCD::HasEmergencyParser); - #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(DWINOS_4) + #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(EXTENSIBLE_UI) template typename MarlinSerial::ring_buffer_pos_t MarlinSerial::get_tx_buffer_free() { const ring_buffer_pos_t t = tx_buffer.tail, // next byte to send. diff --git a/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h index a28d478119..50e187423b 100644 --- a/Marlin/src/HAL/AVR/MarlinSerial.h +++ b/Marlin/src/HAL/AVR/MarlinSerial.h @@ -212,7 +212,7 @@ static ring_buffer_pos_t available(); static void write(const uint8_t c); static void flushTX(); - #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(DWINOS_4) + #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(EXTENSIBLE_UI) static ring_buffer_pos_t get_tx_buffer_free(); #endif diff --git a/README.md b/README.md index e62c67ac6d..6a666b6892 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,14 @@ Shout out to Tom Brazier, as nearly all notable improvements to the Marlin core Insanity Automation Discord - https://discord.gg/TKmJ85PyG4 +## Primary Notes for DW7.4.8 + - Added Linear Adv and Input Shaping Screens + - Signifigant improvement in response times following changes to new generation machines + -- The DWIN OS 3.5 had an option to enable NOACK with an addon bin file. 4.0 has a specific throttled response OS revision. 4.5 needed a totally different UI image flashed. No way it could all live together without completely confusing users so we set about figuring out how to keep universal support and found a balance in data send cycles that the 2560 buffers could still handle the replies without overunning. + - Added support for changing runout sensor type on the LCD + - Added toggle to change babystepping increment on the LCD + - Thanks to EvilGremlin for some of the icon and display graphics work + ## Primary Notes for DW7.4.7 - Added IDEX screens - Fan adjustment now numeric instead of simple on/off diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py index 0fef9cdf79..da86a25c98 100644 --- a/buildroot/share/PlatformIO/scripts/common-cxxflags.py +++ b/buildroot/share/PlatformIO/scripts/common-cxxflags.py @@ -7,7 +7,7 @@ import pioutil if pioutil.is_pio_build(): Import("env") - env.Replace(PROGNAME="%s_DW7.4.7" % (str(env["PIOENV"]))) + env.Replace(PROGNAME="%s_DW7.4.8" % (str(env["PIOENV"]))) cxxflags = [ # "-Wno-incompatible-pointer-types", diff --git a/buildroot/share/PlatformIO/scripts/random-bin.py b/buildroot/share/PlatformIO/scripts/random-bin.py index 9d2c6c72c6..b13fc1c809 100644 --- a/buildroot/share/PlatformIO/scripts/random-bin.py +++ b/buildroot/share/PlatformIO/scripts/random-bin.py @@ -7,5 +7,5 @@ if pioutil.is_pio_build(): from datetime import datetime Import("env") env_name = str(env["PIOENV"]) - env['PROGNAME'] = "firmware_%s_DW7.4.7" % (env_name) + env['PROGNAME'] = "firmware_%s_DW7.4.8" % (env_name) #env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")