George Fu 5 лет назад
Родитель
Сommit
c4b11e03b9
Аккаунт пользователя с таким Email не найден

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp Просмотреть файл

592
       case VP_MOVE_E0: target_extruder = ExtUI::extruder_t::E0; break;
592
       case VP_MOVE_E0: target_extruder = ExtUI::extruder_t::E0; break;
593
     #endif
593
     #endif
594
     #if HOTENDS >= 2
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
     #endif
596
     #endif
597
     default: return;
597
     default: return;
598
   }
598
   }

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp Просмотреть файл

387
     #endif
387
     #endif
388
   #endif
388
   #endif
389
   #if HOTENDS >= 2
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
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
391
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
392
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
392
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
393
     VPHELPER(VP_MOVE_E1, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr),
393
     VPHELPER(VP_MOVE_E1, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr),

+ 5
- 2
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h Просмотреть файл

151
 
151
 
152
 // PID autotune
152
 // PID autotune
153
 constexpr uint16_t VP_PID_AUTOTUNE_E0 = 0x2410;
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
 //constexpr uint16_t VP_PID_AUTOTUNE_E2 = 0x2414;
155
 //constexpr uint16_t VP_PID_AUTOTUNE_E2 = 0x2414;
156
 //constexpr uint16_t VP_PID_AUTOTUNE_E3 = 0x2416;
156
 //constexpr uint16_t VP_PID_AUTOTUNE_E3 = 0x2416;
157
 //constexpr uint16_t VP_PID_AUTOTUNE_E4 = 0x2418;
157
 //constexpr uint16_t VP_PID_AUTOTUNE_E4 = 0x2418;
246
 
246
 
247
 // Heater status
247
 // Heater status
248
 constexpr uint16_t VP_E0_STATUS = 0x3310;
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
 //constexpr uint16_t VP_E2_STATUS = 0x3314;
250
 //constexpr uint16_t VP_E2_STATUS = 0x3314;
251
 //constexpr uint16_t VP_E3_STATUS = 0x3316;
251
 //constexpr uint16_t VP_E3_STATUS = 0x3316;
252
 //constexpr uint16_t VP_E4_STATUS = 0x3318;
252
 //constexpr uint16_t VP_E4_STATUS = 0x3318;
273
 constexpr uint16_t VP_E0_PID_P = 0x3700; // at the moment , 2 byte unsigned int , 0~1638.4
273
 constexpr uint16_t VP_E0_PID_P = 0x3700; // at the moment , 2 byte unsigned int , 0~1638.4
274
 constexpr uint16_t VP_E0_PID_I = 0x3702;
274
 constexpr uint16_t VP_E0_PID_I = 0x3702;
275
 constexpr uint16_t VP_E0_PID_D = 0x3704;
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
 constexpr uint16_t VP_BED_PID_P = 0x3710;
279
 constexpr uint16_t VP_BED_PID_P = 0x3710;
277
 constexpr uint16_t VP_BED_PID_I = 0x3712;
280
 constexpr uint16_t VP_BED_PID_I = 0x3712;
278
 constexpr uint16_t VP_BED_PID_D = 0x3714;
281
 constexpr uint16_t VP_BED_PID_D = 0x3714;

Загрузка…
Отмена
Сохранить