From 94209ac3088eca00de8dc495c9867ed4b8405750 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 17 Aug 2019 12:41:54 +0200 Subject: [PATCH] small fix --- radio/src/gui/480x272/widgets.h | 2 +- radio/src/opentx.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/480x272/widgets.h b/radio/src/gui/480x272/widgets.h index b7f65e417..ebd7363b3 100644 --- a/radio/src/gui/480x272/widgets.h +++ b/radio/src/gui/480x272/widgets.h @@ -69,7 +69,7 @@ int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int void drawMenuTemplate(const char * title, uint8_t icon, const uint8_t * icons=nullptr, uint32_t options=0); void drawSplash(); void drawSleepBitmap(); -void drawShutdownAnimation(uint32_t duration, uint32_t total_duration, const char * message); +void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message); // Main view standard widgets void drawTopBar(); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 4905906ba..bd41995ab 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1733,7 +1733,7 @@ void copyTrimsToOffset(uint8_t ch) inline uint32_t PWR_PRESS_DURATION_MIN() { - return 2 - g_eeGeneral.pwrOnSpeed; + return (2 - g_eeGeneral.pwrOnSpeed) * 100; } constexpr uint32_t PWR_PRESS_DURATION_MAX = 500; // 5s @@ -2034,7 +2034,7 @@ int main() inline uint32_t PWR_PRESS_SHUTDOWN_DELAY() { - return 2 - g_eeGeneral.pwrOffSpeed; + return (2 - g_eeGeneral.pwrOffSpeed) * 100; } uint32_t pwr_press_time = 0;