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

Cleanup model selection

Browse Source
This commit is contained in:
Ben V. Brown
2020-07-25 22:28:38 +10:00
parent f36e78f664
commit e6d1249c91
17 changed files with 165 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,11 +59,13 @@ void gui_drawTipTemp(bool symbol) {
// Draw tip temp handling unit conversion & tolerance near setpoint
uint16_t Temp = 0;
#ifdef ENABLED_FAHRENHEIT_SUPPORT
if (systemSettings.temperatureInF)
if (systemSettings.temperatureInF){
Temp = TipThermoModel::getTipInF();
else
}else
#endif
Temp = TipThermoModel::getTipInC();
{
Temp = TipThermoModel::getTipInC();
}
OLED::printNumber(Temp, 3); // Draw the tip temp out finally
if (symbol) {
@@ -247,7 +249,7 @@ static void gui_solderingTempAdjust() {
if (xTaskGetTickCount() - lastChange > 200)
return; // exit if user just doesn't press anything for a bit
#if defined (MODEL_TS80P)+defined(MODEL_TS80)>0
#ifdef OLED_FLIP
if (!OLED::getRotation()) {
#else
if (OLED::getRotation()) {
@@ -272,7 +274,7 @@ static void gui_solderingTempAdjust() {
OLED::drawSymbol(1);
}
OLED::print(SymbolSpace);
#if defined (MODEL_TS80P)+defined(MODEL_TS80)>0
#ifdef OLED_FLIP
if (!OLED::getRotation()) {
#else
if (OLED::getRotation()) {
@@ -646,9 +648,10 @@ void startGUITask(void const *argument __unused) {
{
//Generate the flipped screen into ram for later use
//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)];
for (int row = 0; row < 2; row++) {
for (int x = 0; x < 84; x++) {
idleScreenBGF[(row * 84) + x] = idleScreenBG[(row * 84)
+ (83 - x)];
}
}
}
@@ -769,7 +772,7 @@ void startGUITask(void const *argument __unused) {
} else {
OLED::setFont(0);
#if defined (MODEL_TS80P)+defined(MODEL_TS80)>0
#ifdef OLED_FLIP
if (!OLED::getRotation()) {
#else
if (OLED::getRotation()) {
@@ -790,7 +793,7 @@ void startGUITask(void const *argument __unused) {
if (tempOnDisplay) {
// draw temp over the start soldering button
// Location changes on screen rotation
#if defined (MODEL_TS80P)+defined(MODEL_TS80)>0
#ifdef OLED_FLIP
if (!OLED::getRotation()) {
#else
if (OLED::getRotation()) {