me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warn user tick type correction

Browse Source
This commit is contained in:
Ben V. Brown
2023-07-28 19:58:46 +10:00
parent 7254b78404
commit 13e1c24152
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Core/Inc/settingsGUI.hpp
View File

@@ -8,9 +8,11 @@
#ifndef GUI_HPP_ #ifndef GUI_HPP_
#define GUI_HPP_ #define GUI_HPP_
#include "BSP.h" #include "BSP.h"
#include "FreeRTOS.h"
#include "Settings.h" #include "Settings.h"
#include "Translation.h" #include "Translation.h"
#define PRESS_ACCEL_STEP (TICKS_100MS / 3) #define PRESS_ACCEL_STEP (TICKS_100MS / 3)
#define PRESS_ACCEL_INTERVAL_MIN TICKS_100MS #define PRESS_ACCEL_INTERVAL_MIN TICKS_100MS
#define PRESS_ACCEL_INTERVAL_MAX (TICKS_100MS * 3) #define PRESS_ACCEL_INTERVAL_MAX (TICKS_100MS * 3)
@@ -35,7 +37,7 @@ typedef struct {
} menuitem; } menuitem;
void enterSettingsMenu(); void enterSettingsMenu();
void warnUser(const char *warning, const int timeout); void warnUser(const char *warning, const TickType_t timeout);
extern const menuitem rootSettingsMenu[]; extern const menuitem rootSettingsMenu[];
#endif /* GUI_HPP_ */ #endif /* GUI_HPP_ */

24
source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h
View File

@@ -3,16 +3,16 @@
#include "OLED.hpp" #include "OLED.hpp"
#include <stdbool.h> #include <stdbool.h>
void GUIDelay(); // void GUIDelay(); //
bool checkForUnderVoltage(void); // bool checkForUnderVoltage(void); //
uint32_t getSleepTimeout(void); // uint32_t getSleepTimeout(void); //
bool shouldBeSleeping(bool inAutoStart); // bool shouldBeSleeping(bool inAutoStart); //
bool shouldShutdown(void); // bool shouldShutdown(void); //
void gui_drawTipTemp(bool symbol, const FontStyle font); // void gui_drawTipTemp(bool symbol, const FontStyle font); //
void printVoltage(void); // void printVoltage(void); //
void warnUser(const char *warning, const int timeout); // void warnUser(const char *warning, const TickType_t timeout); //
void gui_drawBatteryIcon(void); // void gui_drawBatteryIcon(void); //
bool checkForUnderVoltage(void); // bool checkForUnderVoltage(void); //
uint16_t min(uint16_t a, uint16_t b); // uint16_t min(uint16_t a, uint16_t b); //
void printCountdownUntilSleep(int sleepThres); // void printCountdownUntilSleep(int sleepThres); //
#endif #endif

2
source/Core/Threads/OperatingModes/utils/ShowWarning.cpp
View File

@@ -1,6 +1,6 @@
#include "Buttons.hpp" #include "Buttons.hpp"
#include "OperatingModeUtilities.h" #include "OperatingModeUtilities.h"
void warnUser(const char *warning, const int timeout) { void warnUser(const char *warning, const TickType_t timeout) {
OLED::clearScreen(); OLED::clearScreen();
OLED::printWholeScreen(warning); OLED::printWholeScreen(warning);
OLED::refresh(); OLED::refresh();