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

Change advanced views ( home and soldering )

Browse Source
This commit is contained in:
Mel-kior
2021-08-18 19:24:51 +02:00
parent 8a72bfc625
commit 9aa34348da
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,28 +551,27 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
OLED::clearScreen(); OLED::clearScreen();
// Draw in the screen details // Draw in the screen details
if (systemSettings.detailedSoldering) { if (systemSettings.detailedSoldering) {
OLED::print(translatedString(Tr->SolderingAdvancedPowerPrompt), gui_drawTipTemp(true, FontStyle::LARGE);
FontStyle::SMALL); // Power:
#ifndef NO_SLEEP_MODE
if (systemSettings.sensitivity && systemSettings.SleepTime) {
OLED::setCursor(47, 0);
display_countdown(getSleepTimeout());
}
#endif
if (boostModeOn) {
OLED::setCursor(54, 8);
OLED::print(SymbolPlus, FontStyle::SMALL);
}
OLED::setCursor(67, 0);
OLED::printNumber(x10WattHistory.average() / 10, 2, FontStyle::SMALL); OLED::printNumber(x10WattHistory.average() / 10, 2, FontStyle::SMALL);
OLED::print(SymbolDot, FontStyle::SMALL); OLED::print(SymbolDot, FontStyle::SMALL);
OLED::printNumber(x10WattHistory.average() % 10, 1, FontStyle::SMALL); OLED::printNumber(x10WattHistory.average() % 10, 1, FontStyle::SMALL);
OLED::print(SymbolWatts, FontStyle::SMALL); OLED::print(SymbolWatts, FontStyle::SMALL);
#ifndef NO_SLEEP_MODE
if (systemSettings.sensitivity && systemSettings.SleepTime) {
OLED::print(SymbolSpace, FontStyle::SMALL);
display_countdown(getSleepTimeout());
}
#endif
OLED::setCursor(0, 8);
OLED::print(translatedString(Tr->SleepingTipAdvancedString), FontStyle::SMALL);
gui_drawTipTemp(true, FontStyle::SMALL);
if (boostModeOn) {
OLED::print(SymbolPlus, FontStyle::SMALL);
} else {
OLED::print(SymbolSpace, FontStyle::SMALL);
}
OLED::setCursor(67, 8);
printVoltage(); printVoltage();
OLED::print(SymbolVolts, FontStyle::SMALL); OLED::print(SymbolVolts, FontStyle::SMALL);
} else { } else {
@@ -904,15 +903,22 @@ void startGUITask(void const *argument __unused) {
if (isTipDisconnected()) { if (isTipDisconnected()) {
OLED::print(translatedString(Tr->TipDisconnectedString), FontStyle::SMALL); OLED::print(translatedString(Tr->TipDisconnectedString), FontStyle::SMALL);
} else { } else {
OLED::print(translatedString(Tr->IdleTipString), FontStyle::SMALL); if (!(systemSettings.coolingTempBlink && (tipTemp > 55) && (xTaskGetTickCount() % 1000 < 300)))
gui_drawTipTemp(false, FontStyle::SMALL); // Blink temp if setting enable and temp < 55°
OLED::print(translatedString(Tr->IdleSetString), FontStyle::SMALL); // 1000 tick/sec
OLED::printNumber(systemSettings.SolderingTemp, 3, FontStyle::SMALL); // OFF 300ms ON 700ms
gui_drawTipTemp(true, FontStyle::LARGE); // draw in the temp
OLED::setCursor(73, 0); // top right
OLED::printNumber(systemSettings.SolderingTemp, 3, FontStyle::SMALL); // draw set temp
if (systemSettings.temperatureInF)
OLED::print(SymbolDegF, FontStyle::SMALL);
else
OLED::print(SymbolDegC, FontStyle::SMALL);
} }
OLED::setCursor(0, 8);
OLED::print(translatedString(Tr->InputVoltageString), FontStyle::SMALL); OLED::setCursor(67, 8); // bottom right
printVoltage(); printVoltage(); // draw voltage then symbol (v)
OLED::print(SymbolVolts, FontStyle::SMALL);
} else { } else {
#ifdef OLED_FLIP #ifdef OLED_FLIP