From 584c836918e46fd318fe9ff908610bdd61c8fab4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 27 Sep 2020 16:46:26 -0500
Subject: [PATCH] E3 DWIN: General cleanup
---
Marlin/src/lcd/dwin/e3v2/dwin.cpp | 128 +++++++++---------------------
Marlin/src/lcd/dwin/e3v2/dwin.h | 4 +-
2 files changed, 38 insertions(+), 94 deletions(-)
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index faf9720fa78..1bd49d4dd29 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -494,6 +494,16 @@ inline void Draw_Back_First(const bool is_sel=true) {
if (is_sel) Draw_Menu_Cursor(0);
}
+inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, auto &valref) {
+ if (encoder_diffState == ENCODER_DIFF_CW)
+ valref += EncoderRate.encoderMoveValue;
+ else if (encoder_diffState == ENCODER_DIFF_CCW)
+ valref -= EncoderRate.encoderMoveValue;
+ else if (encoder_diffState == ENCODER_DIFF_ENTER)
+ return true;
+ return false;
+}
+
//
// Draw Menus
//
@@ -1146,13 +1156,7 @@ inline ENCODER_DiffState get_encoder_state() {
void HMI_Move_X() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Move_X_scale += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Move_X_scale -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scale)) {
checkkey = AxisMove;
EncoderRate.enabled = false;
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Move_X_scale);
@@ -1175,13 +1179,7 @@ void HMI_Move_X() {
void HMI_Move_Y() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Move_Y_scale += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Move_Y_scale -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scale)) {
checkkey = AxisMove;
EncoderRate.enabled = false;
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Move_Y_scale);
@@ -1204,13 +1202,7 @@ void HMI_Move_Y() {
void HMI_Move_Z() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Move_Z_scale += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Move_Z_scale -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scale)) {
checkkey = AxisMove;
EncoderRate.enabled = false;
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(3), HMI_ValueStruct.Move_Z_scale);
@@ -1236,13 +1228,7 @@ void HMI_Move_Z() {
static float last_E_scale = 0;
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Move_E_scale += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Move_E_scale -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scale)) {
checkkey = AxisMove;
EncoderRate.enabled = false;
last_E_scale = HMI_ValueStruct.Move_E_scale;
@@ -1278,11 +1264,7 @@ void HMI_Move_Z() {
case -4: zoff_line = PREPARE_CASE_ZOFF + MROWS - index_prepare; break;
default: zoff_line = TUNE_CASE_ZOFF + MROWS - index_tune;
}
- if (encoder_diffState == ENCODER_DIFF_CW)
- HMI_ValueStruct.offset_value += EncoderRate.encoderMoveValue;
- else if (encoder_diffState == ENCODER_DIFF_CCW)
- HMI_ValueStruct.offset_value -= EncoderRate.encoderMoveValue;
- else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.offset_value)) {
EncoderRate.enabled = false;
#if HAS_BED_PROBE
probe.offset.z = dwin_zoffset;
@@ -1326,13 +1308,7 @@ void HMI_Move_Z() {
case -3: temp_line = PREHEAT_CASE_TEMP; break;
default: temp_line = TUNE_CASE_TEMP + MROWS - index_tune;
}
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.E_Temp += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.E_Temp -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.E_Temp)) {
EncoderRate.enabled = false;
if (HMI_ValueStruct.show_mode == -1) { // temperature
checkkey = TemperatureID;
@@ -1379,13 +1355,7 @@ void HMI_Move_Z() {
case -3: bed_line = PREHEAT_CASE_BED; break;
default: bed_line = TUNE_CASE_BED + MROWS - index_tune;
}
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Bed_Temp += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Bed_Temp -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Bed_Temp)) {
EncoderRate.enabled = false;
if (HMI_ValueStruct.show_mode == -1) {
checkkey = TemperatureID;
@@ -1433,13 +1403,7 @@ void HMI_Move_Z() {
default: fan_line = TUNE_CASE_FAN + MROWS - index_tune;
}
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Fan_speed += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Fan_speed -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Fan_speed)) {
EncoderRate.enabled = false;
if (HMI_ValueStruct.show_mode == -1) {
checkkey = TemperatureID;
@@ -1477,13 +1441,7 @@ void HMI_Move_Z() {
void HMI_PrintSpeed() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.print_speed += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.print_speed -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.print_speed)) {
checkkey = Tune;
EncoderRate.enabled = false;
feedrate_percentage = HMI_ValueStruct.print_speed;
@@ -1501,13 +1459,7 @@ void HMI_PrintSpeed() {
void HMI_MaxFeedspeedXYZE() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Max_Feedspeed += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Max_Feedspeed -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Feedspeed)) {
checkkey = MaxSpeed;
EncoderRate.enabled = false;
if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, E_AXIS))
@@ -1527,9 +1479,7 @@ void HMI_MaxFeedspeedXYZE() {
void HMI_MaxAccelerationXYZE() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) { HMI_ValueStruct.Max_Acceleration += EncoderRate.encoderMoveValue;}
- else if (encoder_diffState == ENCODER_DIFF_CCW) { HMI_ValueStruct.Max_Acceleration -= EncoderRate.encoderMoveValue;}
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Acceleration)) {
checkkey = MaxAcceleration;
EncoderRate.enabled = false;
if (HMI_flag.acc_axis == X_AXIS) planner.set_max_acceleration(X_AXIS, HMI_ValueStruct.Max_Acceleration);
@@ -1555,11 +1505,7 @@ void HMI_MaxAccelerationXYZE() {
void HMI_MaxJerkXYZE() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW)
- HMI_ValueStruct.Max_Jerk += EncoderRate.encoderMoveValue;
- else if (encoder_diffState == ENCODER_DIFF_CCW)
- HMI_ValueStruct.Max_Jerk -= EncoderRate.encoderMoveValue;
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Jerk)) {
checkkey = MaxJerk;
EncoderRate.enabled = false;
if (WITHIN(HMI_flag.step_axis, X_AXIS, E_AXIS))
@@ -1581,13 +1527,7 @@ void HMI_MaxAccelerationXYZE() {
void HMI_StepXYZE() {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
- if (encoder_diffState == ENCODER_DIFF_CW) {
- HMI_ValueStruct.Max_Step += EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
- HMI_ValueStruct.Max_Step -= EncoderRate.encoderMoveValue;
- }
- else if (encoder_diffState == ENCODER_DIFF_ENTER) { // return
+ if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Step)) {
checkkey = Step;
EncoderRate.enabled = false;
if (WITHIN(HMI_flag.step_axis, X_AXIS, E_AXIS))
@@ -1842,7 +1782,7 @@ void HMI_SDCardUpdate() {
if (DWIN_lcd_sd_status != card.isMounted()) {
DWIN_lcd_sd_status = card.isMounted();
// SERIAL_ECHOLNPAIR("HMI_SDCardUpdate: ", int(DWIN_lcd_sd_status));
- if (card.isMounted()) {
+ if (DWIN_lcd_sd_status) {
if (checkkey == SelectFile)
Redraw_SD_List();
}
@@ -1863,10 +1803,11 @@ void HMI_SDCardUpdate() {
}
}
-/* Start Frame */
-
-void HMI_StartFrame(const bool with_update) {
- Goto_MainMenu();
+//
+// The status area is always on-screen, except during
+// full-screen modal dialogs. (TODO: Keep alive during dialogs)
+//
+void Draw_Status_Area(const bool with_update) {
// Clear the bottom area of the screen
DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, STATUS_Y, DWIN_WIDTH, DWIN_HEIGHT - 1);
@@ -1906,6 +1847,11 @@ void HMI_StartFrame(const bool with_update) {
}
}
+void HMI_StartFrame(const bool with_update) {
+ Goto_MainMenu();
+ Draw_Status_Area(with_update);
+}
+
inline void Draw_Info_Menu() {
Clear_Main_Window();
@@ -2233,12 +2179,10 @@ void HMI_PauseOrStop() {
ENCODER_DiffState encoder_diffState = get_encoder_state();
if (encoder_diffState == ENCODER_DIFF_NO) return;
- if (encoder_diffState == ENCODER_DIFF_CW) {
+ if (encoder_diffState == ENCODER_DIFF_CW)
Draw_Select_Highlight(false);
- }
- else if (encoder_diffState == ENCODER_DIFF_CCW) {
+ else if (encoder_diffState == ENCODER_DIFF_CCW)
Draw_Select_Highlight(true);
- }
else if (encoder_diffState == ENCODER_DIFF_ENTER) {
if (select_print.now == 1) { // pause window
if (HMI_flag.select_flag) {
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.h b/Marlin/src/lcd/dwin/e3v2/dwin.h
index 7b759d9cbfe..8a1726691eb 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.h
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.h
@@ -335,8 +335,8 @@ void Icon_temperature(bool value);
void Icon_leveling(bool value);
// Other
-bool Pause_HeatStatus();
-void HMI_StartFrame(const bool with_update); // Startup screen
+void Draw_Status_Area(const bool with_update); // Status Area
+void HMI_StartFrame(const bool with_update); // Prepare the menu view
void HMI_MainMenu(); // Main process screen
void HMI_SelectFile(); // File page
void HMI_Printing(); // Print page