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

Debugging history.hpp compiling odd

Browse Source
This commit is contained in:
Ben V. Brown
2020-10-13 22:08:30 +11:00
parent 7da04841d6
commit c8182aa192
5 changed files with 27 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workspace/TS100/Core/Threads/GUIThread.cpp
View File

@@ -56,7 +56,7 @@ void GUIDelay() {
}
void gui_drawTipTemp(bool symbol) {
// Draw tip temp handling unit conversion & tolerance near setpoint
uint16_t Temp = 0;
uint32_t Temp = 0;
#ifdef ENABLED_FAHRENHEIT_SUPPORT
if (systemSettings.temperatureInF) {
Temp = TipThermoModel::getTipInF();
@@ -581,13 +581,13 @@ void showDebugMenu(void) {
{
uint32_t temp = systemSettings.CalibrationOffset;
systemSettings.CalibrationOffset = 0;
OLED::printNumber(TipThermoModel::convertTipRawADCTouV(getTipRawTemp(1)), 6);
OLED::printNumber(TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0)), 6);
systemSettings.CalibrationOffset = temp;
}
break;
case 7:
// Temp in C
OLED::printNumber(TipThermoModel::getTipInC(1), 5);
OLED::printNumber(TipThermoModel::getTipInC(), 5);
break;
case 8:
// Handle Temp
@@ -628,7 +628,7 @@ void startGUITask(void const *argument __unused) {
bool tempOnDisplay = false;
{
//Generate the flipped screen into ram for later use
//flipped is generated by flipping each row
//flipped is generated by flipping each row
for (int row = 0; row < 2; row++) {
for (int x = 0; x < 84; x++) {
idleScreenBGF[(row * 84) + x] = idleScreenBG[(row * 84) + (83 - x)];
@@ -716,7 +716,7 @@ void startGUITask(void const *argument __unused) {
currentTempTargetDegC = 0; // ensure tip is off
getInputVoltageX10(systemSettings.voltageDiv, 0);
uint16_t tipTemp = TipThermoModel::getTipInC();
uint32_t tipTemp = TipThermoModel::getTipInC();
// Preemptively turn the display on. Turn it off if and only if
// the tip temperature is below 50 degrees C *and* motion sleep