btach/MarlinFirmware
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

🧑‍💻 Fix some ExtUI return types (#27542)

Browse source
This commit is contained in:
rondlh 2024-11-24 06:33:20 +08:00 • committed by GitHub
parent f5a5d7a620
commit 095f060c24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/lcd/extui/ui_api.cpp
View file

@ -293,7 +293,7 @@ namespace ExtUI {
return GET_TEMP_ADJUSTMENT(thermalManager.degHotend(extruder - E0));
}
celsius_float_t getTargetTemp_celsius(const heater_t heater) {
celsius_t getTargetTemp_celsius(const heater_t heater) {
switch (heater) {
#if HAS_HEATED_BED
case BED: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetBed());
@ -305,19 +305,19 @@ namespace ExtUI {
}
}
celsius_float_t getTargetTemp_celsius(const extruder_t extruder) {
celsius_t getTargetTemp_celsius(const extruder_t extruder) {
return GET_TEMP_ADJUSTMENT(thermalManager.degTargetHotend(extruder - E0));
}
//
// Fan target/actual speed
//
float getTargetFan_percent(const fan_t fan) {
uint8_t getTargetFan_percent(const fan_t fan) {
UNUSED(fan);
return TERN0(HAS_FAN, thermalManager.fanSpeedPercent(fan - FAN0));
}
float getActualFan_percent(const fan_t fan) {
uint8_t getActualFan_percent(const fan_t fan) {
UNUSED(fan);
return TERN0(HAS_FAN, thermalManager.scaledFanSpeedPercent(fan - FAN0));
}

8
Marlin/src/lcd/extui/ui_api.h
View file

@ -172,10 +172,10 @@ namespace ExtUI {
bool isHeaterIdle(const extruder_t);
celsius_float_t getActualTemp_celsius(const heater_t);
celsius_float_t getActualTemp_celsius(const extruder_t);
celsius_float_t getTargetTemp_celsius(const heater_t);
celsius_float_t getTargetTemp_celsius(const extruder_t);
float getActualFan_percent(const fan_t);
float getTargetFan_percent(const fan_t);
celsius_t getTargetTemp_celsius(const heater_t);
celsius_t getTargetTemp_celsius(const extruder_t);
uint8_t getActualFan_percent(const fan_t);
uint8_t getTargetFan_percent(const fan_t);
// High level positions, by Axis ID, Extruder ID
float getAxisPosition_mm(const axis_t);