Bläddra i källkod

Fix DGUS screen bug (#18320)

George Fu 4 år sedan
förälder
incheckning
c4b11e03b9
Inget konto är kopplat till bidragsgivarens mejladress

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp Visa fil

@@ -592,7 +592,7 @@ void DGUSScreenVariableHandler::HandleManualExtrude(DGUS_VP_Variable &var, void
592 592
       case VP_MOVE_E0: target_extruder = ExtUI::extruder_t::E0; break;
593 593
     #endif
594 594
     #if HOTENDS >= 2
595
-      case VP_MOVE_E1: target_extruder = ExtUI::extruder_t::E1; break
595
+      case VP_MOVE_E1: target_extruder = ExtUI::extruder_t::E1; break;
596 596
     #endif
597 597
     default: return;
598 598
   }

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp Visa fil

@@ -387,7 +387,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
387 387
     #endif
388 388
   #endif
389 389
   #if HOTENDS >= 2
390
-    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, DGUSLCD_SendFloatAsLongValueToDisplay<0>),
390
+    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<0>),
391 391
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
392 392
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
393 393
     VPHELPER(VP_MOVE_E1, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr),

+ 5
- 2
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h Visa fil

@@ -151,7 +151,7 @@ constexpr uint16_t VP_SETTINGS = 0x2400;
151 151
 
152 152
 // PID autotune
153 153
 constexpr uint16_t VP_PID_AUTOTUNE_E0 = 0x2410;
154
-//constexpr uint16_t VP_PID_AUTOTUNE_E1 = 0x2412;
154
+constexpr uint16_t VP_PID_AUTOTUNE_E1 = 0x2412;
155 155
 //constexpr uint16_t VP_PID_AUTOTUNE_E2 = 0x2414;
156 156
 //constexpr uint16_t VP_PID_AUTOTUNE_E3 = 0x2416;
157 157
 //constexpr uint16_t VP_PID_AUTOTUNE_E4 = 0x2418;
@@ -246,7 +246,7 @@ constexpr uint16_t VP_FAN3_STATUS = 0x3306;
246 246
 
247 247
 // Heater status
248 248
 constexpr uint16_t VP_E0_STATUS = 0x3310;
249
-//constexpr uint16_t VP_E1_STATUS = 0x3312;
249
+constexpr uint16_t VP_E1_STATUS = 0x3312;
250 250
 //constexpr uint16_t VP_E2_STATUS = 0x3314;
251 251
 //constexpr uint16_t VP_E3_STATUS = 0x3316;
252 252
 //constexpr uint16_t VP_E4_STATUS = 0x3318;
@@ -273,6 +273,9 @@ constexpr uint16_t VP_E1_STEP_PER_MM = 0x3612;
273 273
 constexpr uint16_t VP_E0_PID_P = 0x3700; // at the moment , 2 byte unsigned int , 0~1638.4
274 274
 constexpr uint16_t VP_E0_PID_I = 0x3702;
275 275
 constexpr uint16_t VP_E0_PID_D = 0x3704;
276
+constexpr uint16_t VP_E1_PID_P = 0x3706; // at the moment , 2 byte unsigned int , 0~1638.4
277
+constexpr uint16_t VP_E1_PID_I = 0x3708;
278
+constexpr uint16_t VP_E1_PID_D = 0x370A;
276 279
 constexpr uint16_t VP_BED_PID_P = 0x3710;
277 280
 constexpr uint16_t VP_BED_PID_I = 0x3712;
278 281
 constexpr uint16_t VP_BED_PID_D = 0x3714;

Laddar…
Avbryt
Spara