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

Fix tip selection menu

Browse Source
This commit is contained in:
Ben V. Brown
2019-06-18 08:44:23 +10:00
parent 6b558479e4
commit d05561bc84
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
workspace/TS100/src/gui.cpp
View File

@@ -574,6 +574,12 @@ static void settings_displayResetSettings(void) {
static void settings_setTipModel(void) { static void settings_setTipModel(void) {
systemSettings.tipType++; systemSettings.tipType++;
if(systemSettings.tipType==Tip_MiniWare)
systemSettings.tipType++;
#ifdef MODEL_TS100
if(systemSettings.tipType==Tip_Hakko)
systemSettings.tipType++;
#endif
systemSettings.tipType %= (Tip_Custom + 1); // Wrap after custom systemSettings.tipType %= (Tip_Custom + 1); // Wrap after custom
} }
static void settings_displayTipModel(void) { static void settings_displayTipModel(void) {
@@ -583,7 +589,9 @@ static void settings_displayTipModel(void) {
// set the cursor // set the cursor
// Print the mfg // Print the mfg
OLED::setCursor(55, 0); OLED::setCursor(55, 0);
if (systemSettings.tipType < Tip_MiniWare) { if (systemSettings.tipType == Tip_Custom) {
OLED::print(TipModelStrings[Tip_Custom]);
} else if (systemSettings.tipType < Tip_MiniWare) {
OLED::print(TipModelStrings[Tip_MiniWare]); OLED::print(TipModelStrings[Tip_MiniWare]);
} }
#ifdef MODEL_TS100 #ifdef MODEL_TS100
@@ -591,13 +599,10 @@ static void settings_displayTipModel(void) {
OLED::print(TipModelStrings[Tip_Hakko]); OLED::print(TipModelStrings[Tip_Hakko]);
} }
#endif #endif
else if (systemSettings.tipType == Tip_Custom) {
OLED::print(TipModelStrings[Tip_Custom]);
}
OLED::setCursor(55, 8); OLED::setCursor(55, 8);
if (systemSettings.tipType != Tip_Custom) if (systemSettings.tipType != Tip_Custom)
if (systemSettings.tipType != Tip_MiniWare) OLED::print(TipModelStrings[systemSettings.tipType]);
OLED::print(TipModelStrings[systemSettings.tipType]);
} }
static void calibration_displaySimpleCal(void) { static void calibration_displaySimpleCal(void) {