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

Merge pull request #540 from Ralim/Fix-dropped-zeros

Browse Source 
Fix dropped zeros
This commit is contained in:
Ben V. Brown
2019-12-31 23:06:31 +11:00
committed by GitHub
parent a4ccb3ae96 0d713ae257
commit 76a3ec00d0
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workspace/TS100/Core/Inc/OLED.hpp
View File

@@ -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() {

5
workspace/TS100/Core/Src/OLED.cpp
View File

@@ -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);
}

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

@@ -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();