diff --git a/workspace/TS100/Core/Inc/OLED.hpp b/workspace/TS100/Core/Inc/OLED.hpp index 56f14b2e..2ceacb21 100644 --- a/workspace/TS100/Core/Inc/OLED.hpp +++ b/workspace/TS100/Core/Inc/OLED.hpp @@ -74,7 +74,7 @@ public: drawArea(x, 0, width, 16, buffer); } // Draws an image to the buffer, at x offset from top to bottom (fixed height renders) - static void printNumber(uint16_t number, uint8_t places); + static void printNumber(uint16_t number, uint8_t places,bool noLeaderZeros=true); // Draws a number at the current cursor location // Clears the buffer static void clearScreen() { diff --git a/workspace/TS100/Core/Src/OLED.cpp b/workspace/TS100/Core/Src/OLED.cpp index 71c06f16..7506dd50 100644 --- a/workspace/TS100/Core/Src/OLED.cpp +++ b/workspace/TS100/Core/Src/OLED.cpp @@ -175,7 +175,7 @@ inline void stripLeaderZeros(char *buffer) { } } // maximum places is 5 -void OLED::printNumber(uint16_t number, uint8_t places) { +void OLED::printNumber(uint16_t number, uint8_t places, bool noLeaderZeros) { char buffer[7] = { 0 }; if (places >= 5) { @@ -203,7 +203,8 @@ void OLED::printNumber(uint16_t number, uint8_t places) { } buffer[0] = 2 + number % 10; - stripLeaderZeros(buffer); + if (noLeaderZeros) + stripLeaderZeros(buffer); print(buffer); } diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp index 382f469a..00b6617a 100644 --- a/workspace/TS100/Core/Src/gui.cpp +++ b/workspace/TS100/Core/Src/gui.cpp @@ -96,14 +96,14 @@ static void settings_enterAdvancedMenu(void); * */ const menuitem rootSettingsMenu[] { -/* - * Power Source - * Soldering Menu - * Power Saving Menu - * UI Menu - * Advanced Menu - * Exit - */ + /* + * Power Source + * Soldering Menu + * Power Saving Menu + * UI Menu + * Advanced Menu + * Exit + */ #ifdef MODEL_TS100 { (const char*) SettingsDescriptions[0], { settings_setInputVRange }, { settings_displayInputVRange } }, /*Voltage input*/ @@ -418,7 +418,7 @@ static void settings_setSensitivity(void) { static void settings_displaySensitivity(void) { printShortDescription(4, 7); - OLED::printNumber(systemSettings.sensitivity, 1); + OLED::printNumber(systemSettings.sensitivity, 1, false); } static void settings_setAdvancedSolderingScreens(void) { @@ -613,7 +613,7 @@ static void settings_setCalibrateVIN(void) { 2); OLED::print(SymbolDot); OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) % 10, - 1); + 1, false); OLED::print(SymbolVolts); ButtonState buttons = getButtonState();