From 095f060c24bed5aef1c640f8463218962f5bb548 Mon Sep 17 00:00:00 2001 From: rondlh <77279634+rondlh@users.noreply.github.com> Date: Sun, 24 Nov 2024 06:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Fix=20some?= =?UTF-8?q?=20ExtUI=20return=20types=20(#27542)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/extui/ui_api.cpp | 8 ++++---- Marlin/src/lcd/extui/ui_api.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp index a38d45f073..6744643fa9 100644 --- a/Marlin/src/lcd/extui/ui_api.cpp +++ b/Marlin/src/lcd/extui/ui_api.cpp @@ -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)); } diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h index 6a775fa7c8..8404033b7b 100644 --- a/Marlin/src/lcd/extui/ui_api.h +++ b/Marlin/src/lcd/extui/ui_api.h @@ -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);