mirror of
https://github.com/Ralim/IronOS.git
synced 2025-02-26 07:53:55 +00:00
* Starting GUI render refactor to be more immediate mode Update TemperatureAdjust.cpp . Cleanup Soldering Sleep SolderingProfiles Soldering Rework Rough pass GUI Temp Adjust Cleanup old OperatingMode Debug Menu * Update TemperatureAdjust.cpp * Roughing some transition work * Fixup! Hook in the init starter helper * Better home screen button handler * FIXUP! Fix typo's . * Update SettingsMenu.cpp * More settings rework * More settings rendering * Fixup * Transitions Update SolderingProfile.cpp Hook in transistions * Update TemperatureAdjust.cpp * Update push.yml * Add auto-repeat to settings menu * Miniware: Use IT for I2C writes * Update USBPDDebug_HUSB238.cpp * Force write screen on side animation cancel . * Refactor moving down the settings list * Update settingsGUI.cpp * Update I2C_Wrapper.cpp * Update OLED.cpp * Rework button handling * Fix PD debug at boot * Fixup not showing right menu options * silence some warnings * Style cleanup * Fkit use bit-bang I2C for Miniware * Update GUIRendering.md * Fixup transition on enter soldering mode * Save Settings * Fixes for some animations not running Dont bail on animations if keypress is still held * Fixup settings acceleration * OLED Up animation * Link up/down on debug meny * Make all accelerometers I2C bus aware Update accelerometers_common.h * Make I2C mag optional * Miniware -> Only Bit-Bang I2C * Fixup for scrollbar FIXUP! Debug menu returns to home screen FIXUP! Up oled animation Fix temp exit * Settings menu -> Both buttons return a menu layer * Merge fixup * Update BMA223.cpp * Re-Enable OLED sleep * Save Setting on temp adjust exit * WiP on startup mode * Some autostart working * Add hibernation mode & more autostart fixes * If cant CJC; go to startup * Hibernate in sleep * Cleanup scroll indicator * FIXUP! Ensure startup warnings are linked in * FIXUP! Ensure we render out temp change before timing out * Ensure 100ms delay between CJC samples * Fix not re-calculating menu length on entering menu * Implement NegotiationinProgress for USB-PD * Mask heating until PD finishes negotiation * Fixup staying in hibernate correctly * Warning timeout * Show reset settings warning * Correctly compensate help text start time * Update GUIThread.cpp * Update USBPD.cpp * . * Fixup sleep time * Update printSleepCountdown.cpp * replacing countdown with big plus while in boost mode * bringing back the + 1 since it was missing when not in boost mode * Bail on USB-PD check after 3 seconds incase of DC source * Fix hibernate * Update PIDThread.cpp * did center plus symbol (boost mode) * Big refactor to not make settings increment handler handle the "is last item" return * Fixup boot logo * Fix flashing * Fixup recalculate the menu length on long hold * Fixup missing menu entries * Fix junk left on screen after user confirmation * Re-order button handler to use custom, then default order to allow setting associated setting * Attach setting for settings using custom handler * Fix swap +/- keys * Fix boost temp * Implement last menu option for Language selector * Wait for init before CJC runs * Check last setting via increment value * Update BSP.cpp * removed = from >= Otherwise incrementing would stop and the scroll bar would already flash at the second to last value. * (Hacky) Fix for Settings reset --------- Co-authored-by: discip <53649486+discip@users.noreply.github.com>
161 lines
4.5 KiB
C++
161 lines
4.5 KiB
C++
//
|
|
// Created by laura on 24.04.23.
|
|
//
|
|
|
|
#include "SolderingCommon.h"
|
|
#include "OperatingModes.h"
|
|
#include "Types.h"
|
|
#include "configuration.h"
|
|
#include "history.hpp"
|
|
|
|
extern bool heaterThermalRunaway;
|
|
|
|
void detailedPowerStatus() {
|
|
if (OLED::getRotation()) {
|
|
OLED::setCursor(0, 0);
|
|
} else {
|
|
OLED::setCursor(67, 0);
|
|
}
|
|
// Print wattage
|
|
{
|
|
uint32_t x10Watt = x10WattHistory.average();
|
|
if (x10Watt > 999) {
|
|
// If we exceed 99.9W we drop the decimal place to keep it all fitting
|
|
OLED::print(SmallSymbolSpace, FontStyle::SMALL);
|
|
OLED::printNumber(x10WattHistory.average() / 10, 3, FontStyle::SMALL);
|
|
} else {
|
|
OLED::printNumber(x10WattHistory.average() / 10, 2, FontStyle::SMALL);
|
|
OLED::print(SmallSymbolDot, FontStyle::SMALL);
|
|
OLED::printNumber(x10WattHistory.average() % 10, 1, FontStyle::SMALL);
|
|
}
|
|
OLED::print(SmallSymbolWatts, FontStyle::SMALL);
|
|
}
|
|
|
|
if (OLED::getRotation()) {
|
|
OLED::setCursor(0, 8);
|
|
} else {
|
|
OLED::setCursor(67, 8);
|
|
}
|
|
printVoltage();
|
|
OLED::print(SmallSymbolVolts, FontStyle::SMALL);
|
|
}
|
|
|
|
void basicSolderingStatus(bool boostModeOn) {
|
|
OLED::setCursor(0, 0);
|
|
// We switch the layout direction depending on the orientation of the oled
|
|
if (OLED::getRotation()) {
|
|
// battery
|
|
gui_drawBatteryIcon();
|
|
// Space out gap between battery <-> temp
|
|
OLED::print(LargeSymbolSpace, FontStyle::LARGE);
|
|
// Draw current tip temp
|
|
gui_drawTipTemp(true, FontStyle::LARGE);
|
|
|
|
// We draw boost arrow if boosting,
|
|
// or else gap temp <-> heat indicator
|
|
if (boostModeOn) {
|
|
OLED::drawSymbol(2);
|
|
} else {
|
|
OLED::print(LargeSymbolSpace, FontStyle::LARGE);
|
|
}
|
|
|
|
// Draw heating/cooling symbols
|
|
OLED::drawHeatSymbol(X10WattsToPWM(x10WattHistory.average()));
|
|
} else {
|
|
// Draw heating/cooling symbols
|
|
OLED::drawHeatSymbol(X10WattsToPWM(x10WattHistory.average()));
|
|
// We draw boost arrow if boosting,
|
|
// or else gap temp <-> heat indicator
|
|
if (boostModeOn) {
|
|
OLED::drawSymbol(2);
|
|
} else {
|
|
OLED::print(LargeSymbolSpace, FontStyle::LARGE);
|
|
}
|
|
// Draw current tip temp
|
|
gui_drawTipTemp(true, FontStyle::LARGE);
|
|
// Space out gap between battery <-> temp
|
|
OLED::print(LargeSymbolSpace, FontStyle::LARGE);
|
|
|
|
gui_drawBatteryIcon();
|
|
}
|
|
}
|
|
|
|
bool checkExitSoldering(void) {
|
|
#ifdef POW_DC
|
|
// Undervoltage test
|
|
if (checkForUnderVoltage()) {
|
|
lastButtonTime = xTaskGetTickCount();
|
|
return true;
|
|
}
|
|
#endif
|
|
|
|
#ifdef ACCEL_EXITS_ON_MOVEMENT
|
|
// If the accel works in reverse where movement will cause exiting the soldering mode
|
|
if (getSettingValue(Sensitivity)) {
|
|
if (lastMovementTime) {
|
|
if (lastMovementTime > TICKS_SECOND * 10) {
|
|
// If we have moved recently; in the last second
|
|
// Then exit soldering mode
|
|
|
|
// Movement occurred in last update
|
|
if (((TickType_t)(xTaskGetTickCount() - lastMovementTime)) < (TickType_t)(TICKS_SECOND / 5)) {
|
|
currentTempTargetDegC = 0;
|
|
lastMovementTime = 0;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
// If we have tripped thermal runaway, turn off heater and show warning
|
|
|
|
return false;
|
|
}
|
|
|
|
int8_t getPowerSourceNumber(void) {
|
|
int8_t sourceNumber = 0;
|
|
if (getIsPoweredByDCIN()) {
|
|
sourceNumber = 0;
|
|
} else {
|
|
// We are not powered via DC, so want to display the appropriate state for PD or QC
|
|
bool poweredbyPD = false;
|
|
bool pdHasVBUSConnected = false;
|
|
#ifdef POW_PD
|
|
if (USBPowerDelivery::fusbPresent()) {
|
|
// We are PD capable
|
|
if (USBPowerDelivery::negotiationComplete()) {
|
|
// We are powered via PD
|
|
poweredbyPD = true;
|
|
#ifdef VBUS_MOD_TEST
|
|
pdHasVBUSConnected = USBPowerDelivery::isVBUSConnected();
|
|
#endif
|
|
}
|
|
}
|
|
#endif
|
|
if (poweredbyPD) {
|
|
if (pdHasVBUSConnected) {
|
|
sourceNumber = 2;
|
|
} else {
|
|
sourceNumber = 3;
|
|
}
|
|
} else {
|
|
sourceNumber = 1;
|
|
}
|
|
}
|
|
return sourceNumber;
|
|
}
|
|
|
|
// Returns temperature of the tip in *C/*F (based on user settings)
|
|
TemperatureType_t getTipTemp(void) {
|
|
#ifdef FILTER_DISPLAYED_TIP_TEMP
|
|
static history<TemperatureType_t, FILTER_DISPLAYED_TIP_TEMP> Filter_Temp;
|
|
TemperatureType_t reading = getSettingValue(SettingsOptions::TemperatureInF) ? TipThermoModel::getTipInF() : TipThermoModel::getTipInC();
|
|
Filter_Temp.update(reading);
|
|
return Filter_Temp.average();
|
|
|
|
#else
|
|
return getSettingValue(SettingsOptions::TemperatureInF) ? TipThermoModel::getTipInF() : TipThermoModel::getTipInC();
|
|
#endif
|
|
}
|