me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into supporting-FUSB302

Browse Source
This commit is contained in:
Ben V. Brown
2020-07-23 20:26:56 +10:00
parent b40a21470b db517a13e8
commit 85decdc15b
7 changed files with 3143 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workspace/TS100/Core/Src/gui.cpp
View File

@@ -819,8 +819,8 @@ static void settings_setTempChangeShortStep(void) {
}
}
static void settings_displayTempChangeShortStep(void) {
printShortDescription(24, 5);
OLED::printNumber(systemSettings.TempChangeShortStep, 3);
printShortDescription(24, 6);
OLED::printNumber(systemSettings.TempChangeShortStep, 2);
}
static void settings_setTempChangeLongStep(void) {
@@ -830,8 +830,8 @@ static void settings_setTempChangeLongStep(void) {
}
}
static void settings_displayTempChangeLongStep(void) {
printShortDescription(25, 5);
OLED::printNumber(systemSettings.TempChangeLongStep, 3);
printShortDescription(25, 6);
OLED::printNumber(systemSettings.TempChangeLongStep, 2);
}
static void settings_setPowerPulse(void) {
@@ -934,7 +934,7 @@ void gui_Menu(const menuitem *menu) {
OLED::clearScreen();
menu[currentScreen].draw.func();
uint8_t indicatorHeight = OLED_HEIGHT / scrollContentSize;
uint8_t position = currentScreen * indicatorHeight;
uint8_t position = OLED_HEIGHT * currentScreen / scrollContentSize;
OLED::drawScrollIndicator(position, indicatorHeight);
lastOffset = -1;
lcdRefresh = true;