Semi working version

MarlinFirmware · Feb 26, 2023 · 1cf8411 · 1cf8411
1 parent 1cfb7e4
commit 1cf8411
Show file tree

Hide file tree

Showing 160 changed files with 29 additions and 16 deletions.
diff --git a/DWIN_SET/000_boot.bmp b/DWIN_SET/000_boot.bmp
diff --git a/DWIN_SET/001_home.bmp b/DWIN_SET/001_home.bmp
diff --git a/DWIN_SET/38_C_no_filement1.bmp → DWIN_SET/002_print.bmp b/DWIN_SET/38_C_no_filement1.bmp → DWIN_SET/002_print.bmp
diff --git a/DWIN_SET/003_print_status.bmp b/DWIN_SET/003_print_status.bmp
diff --git a/DWIN_SET/004_print_adjust.bmp b/DWIN_SET/004_print_adjust.bmp
diff --git a/DWIN_SET/005_print_finished.bmp b/DWIN_SET/005_print_finished.bmp
diff --git a/DWIN_SET/006_temp_menu.bmp b/DWIN_SET/006_temp_menu.bmp
diff --git a/DWIN_SET/007_temp_manual.bmp b/DWIN_SET/007_temp_manual.bmp
diff --git a/DWIN_SET/008_fan.bmp b/DWIN_SET/008_fan.bmp
diff --git a/DWIN_SET/009_settings_menu.bmp b/DWIN_SET/009_settings_menu.bmp
diff --git a/DWIN_SET/00_starting.bmp b/DWIN_SET/00_starting.bmp
diff --git a/DWIN_SET/010_leveling_menu.bmp b/DWIN_SET/010_leveling_menu.bmp
diff --git a/DWIN_SET/011_leveling_offset.bmp b/DWIN_SET/011_leveling_offset.bmp
diff --git a/DWIN_SET/012_leveling_manual.bmp b/DWIN_SET/012_leveling_manual.bmp
diff --git a/DWIN_SET/013_leveling_automatic.bmp b/DWIN_SET/013_leveling_automatic.bmp
diff --git a/DWIN_SET/014_leveling_probing.bmp b/DWIN_SET/014_leveling_probing.bmp
diff --git a/DWIN_SET/015_filament.bmp b/DWIN_SET/015_filament.bmp
diff --git a/DWIN_SET/016_move.bmp b/DWIN_SET/016_move.bmp
diff --git a/DWIN_SET/017_gcode.bmp b/DWIN_SET/017_gcode.bmp
diff --git a/DWIN_SET/018_settings_menu2.bmp b/DWIN_SET/018_settings_menu2.bmp
diff --git a/DWIN_SET/019_pid.bmp b/DWIN_SET/019_pid.bmp
diff --git a/DWIN_SET/01_C_main.bmp b/DWIN_SET/01_C_main.bmp
diff --git a/DWIN_SET/01_boot.wav b/DWIN_SET/01_boot.wav
diff --git a/DWIN_SET/020_volume.bmp b/DWIN_SET/020_volume.bmp
diff --git a/DWIN_SET/021_brightness.bmp b/DWIN_SET/021_brightness.bmp
diff --git a/DWIN_SET/022_information.bmp b/DWIN_SET/022_information.bmp
diff --git a/DWIN_SET/02_C_PrintFile.bmp b/DWIN_SET/02_C_PrintFile.bmp
diff --git a/DWIN_SET/02_click.wav b/DWIN_SET/02_click.wav
diff --git a/DWIN_SET/03_C_PrintFile.bmp b/DWIN_SET/03_C_PrintFile.bmp
diff --git a/DWIN_SET/03_notification.wav b/DWIN_SET/03_notification.wav
diff --git a/DWIN_SET/04_C_PrintFile.bmp b/DWIN_SET/04_C_PrintFile.bmp
diff --git a/DWIN_SET/05_C_PrintFile.bmp b/DWIN_SET/05_C_PrintFile.bmp
diff --git a/DWIN_SET/06_C_PrintFile.bmp b/DWIN_SET/06_C_PrintFile.bmp
diff --git a/DWIN_SET/07_C_ChooseFile.bmp b/DWIN_SET/07_C_ChooseFile.bmp
diff --git a/DWIN_SET/08_C_ChooseFile.bmp b/DWIN_SET/08_C_ChooseFile.bmp
diff --git a/DWIN_SET/09_C_Printstatus1.bmp b/DWIN_SET/09_C_Printstatus1.bmp
diff --git a/DWIN_SET/0_DWIN_ASC.HZK b/DWIN_SET/0_DWIN_ASC.HZK
diff --git a/DWIN_SET/10_C_Printstatus2.bmp b/DWIN_SET/10_C_Printstatus2.bmp
diff --git a/DWIN_SET/11_C_Printstatus3.bmp b/DWIN_SET/11_C_Printstatus3.bmp
diff --git a/DWIN_SET/12_C_Printstatus4.bmp b/DWIN_SET/12_C_Printstatus4.bmp
diff --git a/DWIN_SET/13.bin b/DWIN_SET/13.bin
diff --git a/DWIN_SET/13_C_StopPause.bmp b/DWIN_SET/13_C_StopPause.bmp
diff --git a/DWIN_SET/14.bin b/DWIN_SET/14.bin
diff --git a/DWIN_SET/14_C_Ajustment.bmp b/DWIN_SET/14_C_Ajustment.bmp
diff --git a/DWIN_SET/16_C_TempControl2.bmp b/DWIN_SET/16_C_TempControl2.bmp
diff --git a/DWIN_SET/17_C_PLAorABS.bmp b/DWIN_SET/17_C_PLAorABS.bmp
diff --git a/DWIN_SET/18_C_PLAorABS.bmp b/DWIN_SET/18_C_PLAorABS.bmp
diff --git a/DWIN_SET/19_C_NozzleHotbet.bmp b/DWIN_SET/19_C_NozzleHotbet.bmp
diff --git a/DWIN_SET/200_popup_gcode.bmp b/DWIN_SET/200_popup_gcode.bmp
diff --git a/DWIN_SET/201_popup_gcode_sel.bmp b/DWIN_SET/201_popup_gcode_sel.bmp
diff --git a/DWIN_SET/202_popup_numpad.bmp b/DWIN_SET/202_popup_numpad.bmp
diff --git a/DWIN_SET/203_popup_numpad_sel.bmp b/DWIN_SET/203_popup_numpad_sel.bmp
diff --git a/DWIN_SET/204_popup_abort.bmp b/DWIN_SET/204_popup_abort.bmp
diff --git a/DWIN_SET/205_popup_abort_sel.bmp b/DWIN_SET/205_popup_abort_sel.bmp
diff --git a/DWIN_SET/206_popup_pause.bmp b/DWIN_SET/206_popup_pause.bmp
diff --git a/DWIN_SET/207_popup_pause_sel.bmp b/DWIN_SET/207_popup_pause_sel.bmp
diff --git a/DWIN_SET/208_popup_resume.bmp b/DWIN_SET/208_popup_resume.bmp
diff --git a/DWIN_SET/209_popup_resume_sel.bmp b/DWIN_SET/209_popup_resume_sel.bmp
diff --git a/DWIN_SET/20_C_Shut_Cool.bmp b/DWIN_SET/20_C_Shut_Cool.bmp
diff --git a/DWIN_SET/210_popup_presets.bmp b/DWIN_SET/210_popup_presets.bmp
diff --git a/DWIN_SET/211_popup_presets_sel.bmp b/DWIN_SET/211_popup_presets_sel.bmp
diff --git a/DWIN_SET/212_popup_steppers.bmp b/DWIN_SET/212_popup_steppers.bmp
diff --git a/DWIN_SET/213_popup_steppers_sel.bmp b/DWIN_SET/213_popup_steppers_sel.bmp
diff --git a/DWIN_SET/214_popup_eeprom.bmp b/DWIN_SET/214_popup_eeprom.bmp
diff --git a/DWIN_SET/215_popup_eeprom_sel.bmp b/DWIN_SET/215_popup_eeprom_sel.bmp
diff --git a/DWIN_SET/21_C_Tool.bmp b/DWIN_SET/21_C_Tool.bmp
diff --git a/DWIN_SET/22_C_BedLeveling.bmp b/DWIN_SET/22_C_BedLeveling.bmp
diff --git a/DWIN_SET/22_Config.bin b/DWIN_SET/22_Config.bin
diff --git a/DWIN_SET/23_C_ChangeFilement.bmp b/DWIN_SET/23_C_ChangeFilement.bmp
diff --git a/DWIN_SET/240_debug1.bmp b/DWIN_SET/240_debug1.bmp
diff --git a/DWIN_SET/241_debug2.bmp b/DWIN_SET/241_debug2.bmp
diff --git a/DWIN_SET/248_power_loss.bmp b/DWIN_SET/248_power_loss.bmp
diff --git a/DWIN_SET/249_wait.bmp b/DWIN_SET/249_wait.bmp
diff --git a/DWIN_SET/24_C_Warn.bmp b/DWIN_SET/24_C_Warn.bmp
diff --git a/DWIN_SET/65_Volume.ICO → DWIN_SET/24_icons.ico b/DWIN_SET/65_Volume.ICO → DWIN_SET/24_icons.ico
diff --git a/DWIN_SET/15_Homing_Failed.bmp → DWIN_SET/250_kill.bmp b/DWIN_SET/15_Homing_Failed.bmp → DWIN_SET/250_kill.bmp
diff --git a/DWIN_SET/25_C_Warn.bmp b/DWIN_SET/25_C_Warn.bmp
diff --git a/DWIN_SET/25_SPercentage.ICO b/DWIN_SET/25_SPercentage.ICO
diff --git a/DWIN_SET/26_C_ChngFlmHeating.bmp b/DWIN_SET/26_C_ChngFlmHeating.bmp
diff --git a/DWIN_SET/27_C_ChngorNot.bmp b/DWIN_SET/27_C_ChngorNot.bmp
diff --git a/DWIN_SET/38_ICON.ICO → DWIN_SET/27_buttons.ico b/DWIN_SET/38_ICON.ICO → DWIN_SET/27_buttons.ico
diff --git a/DWIN_SET/28_C_ChngorNot.bmp b/DWIN_SET/28_C_ChngorNot.bmp
diff --git a/DWIN_SET/29_C_10mmMove.bmp b/DWIN_SET/29_C_10mmMove.bmp
diff --git a/DWIN_SET/30_C_1mmMove.bmp b/DWIN_SET/30_C_1mmMove.bmp
diff --git a/DWIN_SET/30_progress_left.ico b/DWIN_SET/30_progress_left.ico
diff --git a/DWIN_SET/31_C_01mmMove.bmp b/DWIN_SET/31_C_01mmMove.bmp
diff --git a/DWIN_SET/32_C_Autohome.bmp b/DWIN_SET/32_C_Autohome.bmp
diff --git a/DWIN_SET/33_C_Language1.bmp b/DWIN_SET/33_C_Language1.bmp
diff --git a/DWIN_SET/34_E_Language2.bmp b/DWIN_SET/34_E_Language2.bmp
diff --git a/DWIN_SET/35_C_Information.bmp b/DWIN_SET/35_C_Information.bmp
diff --git a/DWIN_SET/35_PrintStatus.ICO b/DWIN_SET/35_PrintStatus.ICO
diff --git a/DWIN_SET/36_C_ContinuePrintstatus1.bmp b/DWIN_SET/36_C_ContinuePrintstatus1.bmp
diff --git a/DWIN_SET/37_C_ContinuePrintstatus2.bmp b/DWIN_SET/37_C_ContinuePrintstatus2.bmp
diff --git a/DWIN_SET/37_progress_right.ico b/DWIN_SET/37_progress_right.ico
diff --git a/DWIN_SET/39_C_no_filement2.bmp b/DWIN_SET/39_C_no_filement2.bmp
diff --git a/DWIN_SET/40_C_Keyboard1.bmp b/DWIN_SET/40_C_Keyboard1.bmp
diff --git a/DWIN_SET/41_C_Keyboard2.bmp b/DWIN_SET/41_C_Keyboard2.bmp
diff --git a/DWIN_SET/41_percent.ICO b/DWIN_SET/41_percent.ICO
diff --git a/DWIN_SET/42_C_YesorNoblack.bmp b/DWIN_SET/42_C_YesorNoblack.bmp
diff --git a/DWIN_SET/43_C_Autoleve.bmp b/DWIN_SET/43_C_Autoleve.bmp
diff --git a/DWIN_SET/44_C_HeatStop.bmp b/DWIN_SET/44_C_HeatStop.bmp
diff --git a/DWIN_SET/45_E_main.bmp b/DWIN_SET/45_E_main.bmp
diff --git a/DWIN_SET/45_PPercentage.ICO b/DWIN_SET/45_PPercentage.ICO
diff --git a/DWIN_SET/46_E_PrintFile.bmp b/DWIN_SET/46_E_PrintFile.bmp
diff --git a/DWIN_SET/47_E_PrintFile.bmp b/DWIN_SET/47_E_PrintFile.bmp
diff --git a/DWIN_SET/48_E_PrintFile.bmp b/DWIN_SET/48_E_PrintFile.bmp
diff --git a/DWIN_SET/49_E_PrintFile.bmp b/DWIN_SET/49_E_PrintFile.bmp
diff --git a/DWIN_SET/50_E_PrintFile.bmp b/DWIN_SET/50_E_PrintFile.bmp
diff --git a/DWIN_SET/51_E_Printstatus1.bmp b/DWIN_SET/51_E_Printstatus1.bmp
diff --git a/DWIN_SET/52_E_Printstatus2.bmp b/DWIN_SET/52_E_Printstatus2.bmp
diff --git a/DWIN_SET/53_E_Printstatus3.bmp b/DWIN_SET/53_E_Printstatus3.bmp
diff --git a/DWIN_SET/54_E_Printstatus4.bmp b/DWIN_SET/54_E_Printstatus4.bmp
diff --git a/DWIN_SET/55_E_StopPause.bmp b/DWIN_SET/55_E_StopPause.bmp
diff --git a/DWIN_SET/56_E_Ajustment.bmp b/DWIN_SET/56_E_Ajustment.bmp
diff --git a/DWIN_SET/57_E_TempControl1.bmp b/DWIN_SET/57_E_TempControl1.bmp
diff --git a/DWIN_SET/58_E_TempControl2.bmp b/DWIN_SET/58_E_TempControl2.bmp
diff --git a/DWIN_SET/59_E_PLAorABS.bmp b/DWIN_SET/59_E_PLAorABS.bmp
diff --git a/DWIN_SET/60_AutoHome.ICO b/DWIN_SET/60_AutoHome.ICO
diff --git a/DWIN_SET/60_E_PLAorABS.bmp b/DWIN_SET/60_E_PLAorABS.bmp
diff --git a/DWIN_SET/61_E_NozzleHotbet.bmp b/DWIN_SET/61_E_NozzleHotbet.bmp
diff --git a/DWIN_SET/62_E_Shut_Cool.bmp b/DWIN_SET/62_E_Shut_Cool.bmp
diff --git a/DWIN_SET/63_E_Tool.bmp b/DWIN_SET/63_E_Tool.bmp
diff --git a/DWIN_SET/64_E_BedLeveling.bmp b/DWIN_SET/64_E_BedLeveling.bmp
diff --git a/DWIN_SET/65_E_ChangeFilement.bmp b/DWIN_SET/65_E_ChangeFilement.bmp
diff --git a/DWIN_SET/66_E_Warn.bmp b/DWIN_SET/66_E_Warn.bmp
diff --git a/DWIN_SET/67_E_Warn.bmp b/DWIN_SET/67_E_Warn.bmp
diff --git a/DWIN_SET/68_AutoLeve.ICO b/DWIN_SET/68_AutoLeve.ICO
diff --git a/DWIN_SET/68_E_ChngFlmHeating.bmp b/DWIN_SET/68_E_ChngFlmHeating.bmp
diff --git a/DWIN_SET/69_E_ChngorNot.bmp b/DWIN_SET/69_E_ChngorNot.bmp
diff --git a/DWIN_SET/70_E_ChngorNot.bmp b/DWIN_SET/70_E_ChngorNot.bmp
diff --git a/DWIN_SET/71_E_10mmMove.bmp b/DWIN_SET/71_E_10mmMove.bmp
diff --git a/DWIN_SET/72_E_1mmMove.bmp b/DWIN_SET/72_E_1mmMove.bmp
diff --git a/DWIN_SET/73_E_01mmMove.bmp b/DWIN_SET/73_E_01mmMove.bmp
diff --git a/DWIN_SET/74_E_Autohome.bmp b/DWIN_SET/74_E_Autohome.bmp
diff --git a/DWIN_SET/75_E_Information.bmp b/DWIN_SET/75_E_Information.bmp
diff --git a/DWIN_SET/76_E_ContinuePrintstatus1.bmp b/DWIN_SET/76_E_ContinuePrintstatus1.bmp
diff --git a/DWIN_SET/77_E_ContinuePrintstatus2.bmp b/DWIN_SET/77_E_ContinuePrintstatus2.bmp
diff --git a/DWIN_SET/78_E_no_filement1.bmp b/DWIN_SET/78_E_no_filement1.bmp
diff --git a/DWIN_SET/78_Filement.ICO b/DWIN_SET/78_Filement.ICO
diff --git a/DWIN_SET/79_E_no_filement2.bmp b/DWIN_SET/79_E_no_filement2.bmp
diff --git a/DWIN_SET/80_E_YesorNoblack.bmp b/DWIN_SET/80_E_YesorNoblack.bmp
diff --git a/DWIN_SET/81_E_Refuel1.bmp b/DWIN_SET/81_E_Refuel1.bmp
diff --git a/DWIN_SET/82_E_Refuel2.bmp b/DWIN_SET/82_E_Refuel2.bmp
diff --git a/DWIN_SET/83_E_Refuel3.bmp b/DWIN_SET/83_E_Refuel3.bmp
diff --git a/DWIN_SET/84_E_Auxleve.bmp b/DWIN_SET/84_E_Auxleve.bmp
diff --git a/DWIN_SET/85_E_Autoleve.bmp b/DWIN_SET/85_E_Autoleve.bmp
diff --git a/DWIN_SET/86_C_Wait.bmp b/DWIN_SET/86_C_Wait.bmp
diff --git a/DWIN_SET/87_E_Wait.bmp b/DWIN_SET/87_E_Wait.bmp
diff --git a/DWIN_SET/88_MachineFault.bmp b/DWIN_SET/88_MachineFault.bmp
diff --git a/DWIN_SET/89_Heating_Failed.bmp b/DWIN_SET/89_Heating_Failed.bmp
diff --git a/DWIN_SET/90_Thermistor_Error.bmp b/DWIN_SET/90_Thermistor_Error.bmp
diff --git a/DWIN_SET/T5OS_V20_NOACK.BIN b/DWIN_SET/T5OS_V20_NOACK.BIN
diff --git a/DWIN_SET/T5UID1.CFG b/DWIN_SET/T5UID1.CFG
diff --git a/DWIN_SET/T5UID1_V22.BIN b/DWIN_SET/T5UID1_V22.BIN
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -3049,7 +3049,7 @@
 //#define DGUS_LCD_UI_HIPRECY
 //#define DGUS_LCD_UI_MKS
 #define DGUS_LCD_UI_RELOADED
-#define NO_AUTO_ASSIGN_WARNING
+
 #if ENABLED(DGUS_LCD_UI_MKS)
   #define USE_MKS_GREEN_UI
 #endif

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1856,6 +1856,7 @@
 // Additional options for DGUS / DWIN displays
 //
 #if HAS_DGUS_LCD
+  #define LCD_SERIAL_PORT 2
   #define LCD_BAUDRATE 115200
 
   #define DGUS_RX_BUFFER_SIZE 128

diff --git a/Marlin/Makefile b/Marlin/Makefile
@@ -59,7 +59,7 @@
 #
 
 # This defines the board to compile for (see boards.h for your board's ID)
-HARDWARE_MOTHERBOARD ?= 11
+HARDWARE_MOTHERBOARD ?= 1331
 
 ifeq ($(OS),Windows_NT)
   # Windows

diff --git a/Marlin/src/pins/ramps/pins_I3PLUS3030.h b/Marlin/src/pins/ramps/pins_I3PLUS3030.h
@@ -2,9 +2,8 @@
 
 #include "env_validate.h"
 
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "I3PLUS3030"
-#endif
+#define BOARD_INFO_NAME "I3PLUS3030"
+#define BOARD_NAME "I3PLUS3030"
 
 #define LARGE_FLASH true
 #define X_STEP_PIN         61 

diff --git a/assets/Boot Screen.psd b/assets/Boot Screen.psd
diff --git a/platformio.ini b/platformio.ini
@@ -52,6 +52,17 @@ extra_scripts      =
   pre:buildroot/share/PlatformIO/scripts/preflight-checks.py
   post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
 lib_deps           =
+                      LiquidCrystal@1.3.4
+                      TMCStepper@>=0.5.2,<1.0.0
+                      Adafruit NeoPixel@1.2.5
+  U8glib-HAL        = https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
+  Adafruit_MAX31865 = https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip
+  LiquidTWI2        = https://github.com/lincomatic/LiquidTWI2/archive/master.zip
+  Arduino-L6470     = https://github.com/ameyer/Arduino-L6470/archive/dev.zip
+  SailfishLCD       = https://github.com/mikeshub/SailfishLCD/archive/master.zip
+  SailfishRGB_LED   = https://github.com/mikeshub/SailfishRGB_LED/archive/master.zip
+  SlowSoftI2CMaster = https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip
+  TMC26XStepper     = https://github.com/interactive-matter/TMC26XStepper/archive/master.zip
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/tests>
   -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
@@ -277,23 +288,25 @@ monitor_eol       = LF
 monitor_echo      = yes
 monitor_filters   = colorize, time, send_on_enter
 
+[env:mega2560_debug]
+platform          = atmelavr@~3.4
+build_flags       = ${common.build_flags} -Wl,--relax
+board_build.f_cpu = 16000000L
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
+board    = megaatmega2560
+lib_deps          = ${common.lib_deps}
+    jdolinay/avr-debugger @ ~1.4
+debug_tool = avr-stub
+debug_port = COM4
+build_type = debug
+
+
 #
 # Just print the dependency tree
 #
 [env:include_tree]
 platform         = atmelavr
 board            = megaatmega2560
 lib_deps          = ${common.lib_deps}
-  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
-  LiquidCrystal@1.3.4
-  TMCStepper@>=0.5.2,<1.0.0
-  Adafruit NeoPixel@1.2.5
-  Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip
-  LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
-  Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip
-  SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
-  SailfishRGB_LED=https://github.com/mikeshub/SailfishRGB_LED/archive/master.zip
-  SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip
-  TMC26XStepper=https://github.com/interactive-matter/TMC26XStepper/archive/master.zip
 build_flags      = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
 build_src_filter = +<src/MarlinCore.cpp>