sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Display running

Browse Source
This commit is contained in:
Ben V. Brown
2022-04-13 18:51:05 +10:00
parent dda595a2e8
commit d4e27a5b9b
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/Core/Threads/GUIThread.cpp
View File

@@ -15,6 +15,7 @@ extern "C" {
#include "Settings.h"
#include "TipThermoModel.h"
#include "Translation.h"
#include "bflb_platform.h"
#include "cmsis_os.h"
#include "configuration.h"
#include "main.hpp"
@@ -799,8 +800,16 @@ void showDebugMenu(void) {
}
void showWarnings() {
MSG((char *)"showWarningsshowWarnings\r\n");
return;
// Display alert if settings were reset
if (settingsWereReset) {
MSG((char *)"WarnUser - %ld\r\n\r\n", (uint64_t)Tr);
MSG((char *)"WarnUser - %ld\r\n\r\n", (uint64_t)Tr);
MSG((char *)"WarnUser - %ld\r\n\r\n", (uint64_t)Tr);
MSG((char *)"WarnUser - %ld\r\n\r\n", (uint64_t)Tr);
MSG((char *)"WarnUser - %ld\r\n\r\n", (uint64_t)Tr);
warnUser(translatedString(Tr->SettingsResetMessage), 10 * TICKS_SECOND);
}
#ifndef NO_WARN_MISSING
@@ -808,6 +817,7 @@ void showWarnings() {
// In this case though, we dont want to nag the user _too_ much
// So only show first 2 times
while (DetectedAccelerometerVersion == AccelType::Scanning) {
MSG((char *)"Accel Detect");
osDelay(5);
}
// Display alert if accelerometer is not detected
@@ -837,10 +847,14 @@ uint8_t disconnectedTipF[sizeof(disconnectedTip)];
/* StartGUITask function */
void startGUITask(void const *argument) {
(void)argument;
MSG((char *)"startGUITask\r\n");
prepareTranslations();
MSG((char *)"OLEDInit\r\n");
OLED::initialize(); // start up the LCD
MSG((char *)"setBrightness\r\n");
OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
MSG((char *)"setInverseDisplay\r\n");
OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
uint8_t tempWarningState = 0;
@@ -848,6 +862,8 @@ void startGUITask(void const *argument) {
bool tempOnDisplay = false;
bool tipDisconnectedDisplay = false;
bool showExitMenuTransition = false;
MSG((char *)"flip\r\n");
{
// Generate the flipped screen into ram for later use
// flipped is generated by flipping each row
@@ -859,18 +875,24 @@ void startGUITask(void const *argument) {
}
}
}
MSG((char *)"tipTemp\r\n");
getTipRawTemp(1); // reset filter
MSG((char *)"setRotation\r\n");
OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
MSG((char *)"Bootlogo\r\n");
BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR);
// BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR);
MSG((char *)"showWarnings\r\n");
showWarnings();
MSG((char *)"AutoStartMode\r\n");
if (getSettingValue(SettingsOptions::AutoStartMode)) {
// jump directly to the autostart mode
gui_solderingMode(getSettingValue(SettingsOptions::AutoStartMode) - 1);
buttonLockout = true;
}
MSG((char *)"GUI Thread Start\r\n");
for (;;) {
ButtonState buttons = getButtonState();