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 pull request #538 from Ralim/fix-temp-symbol

Browse Source 
Fix the temp symbol to be used in soldering mode
This commit is contained in:
Ben V. Brown
2019-12-29 16:46:40 +11:00
committed by GitHub
parent 3040bc5fa4 832940353b
commit 7683ad155d
3 changed files with 134 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,7 @@ public:
cursor_y = y * fontHeight; cursor_y = y * fontHeight;
} }
static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used
static uint8_t getFont();
static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) { static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) {
drawArea(x, 0, width, 16, buffer); drawArea(x, 0, width, 16, buffer);
} }

17
workspace/TS100/Core/Src/GUIThread.cpp
View File

@@ -63,10 +63,19 @@ void gui_drawTipTemp(bool symbol) {
OLED::printNumber(Temp, 3); // Draw the tip temp out finally OLED::printNumber(Temp, 3); // Draw the tip temp out finally
if (symbol) { if (symbol) {
if (systemSettings.temperatureInF) if (OLED::getFont() == 0) {
OLED::print(SymbolDegF); //Big font, can draw nice symbols
else if (systemSettings.temperatureInF)
OLED::print(SymbolDegC); OLED::drawSymbol(0);
else
OLED::drawSymbol(1);
} else {
//Otherwise fall back to chars
if (systemSettings.temperatureInF)
OLED::print(SymbolDegF);
else
OLED::print(SymbolDegC);
}
} }
} }
ButtonState getButtonState() { ButtonState getButtonState() {

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

@@ -155,6 +155,14 @@ void OLED::setFont(uint8_t fontNumber) {
fontWidth = 12; fontWidth = 12;
} }
} }
uint8_t OLED::getFont() {
if (currentFont == USER_FONT_6x8)
return 1;
else if (currentFont == ExtraFontChars)
return 2;
else
return 0;
}
inline void stripLeaderZeros(char *buffer) { inline void stripLeaderZeros(char *buffer) {
//Removing the leading zero's by swapping them to SymbolSpace //Removing the leading zero's by swapping them to SymbolSpace
// Stop 1 short so that we dont blank entire number if its zero // Stop 1 short so that we dont blank entire number if its zero