MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

SImplify the temperature display on the OLED display.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-10-02 15:07:15 +01:00
parent b988e4f1b4
commit 3df5c6041c
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OLED.cpp
View File

@@ -251,18 +251,20 @@ bool COLED::open()
return true; return true;
} }
float readTemperature(const std::string& filePath) { float COLED::readTemperature(const std::string& filePath)
{
std::ifstream file(filePath); std::ifstream file(filePath);
if (!file.is_open()) { if (!file.is_open()) {
std::cerr << "Error: Could not open file " << filePath << std::endl; std::cerr << "Error: Could not open file " << filePath << std::endl;
return -1.0; // Return a negative value to indicate that CPU temp is not available return -1.0F; // Return a negative value to indicate that CPU temp is not available
} }
float temperature; float temperature;
file >> temperature; file >> temperature;
file.close(); file.close();
return temperature / 1000.0; // The temperature is stored in millidegrees Celsius, so a bit of conversion return temperature / 1000.0F; // The temperature is stored in millidegrees Celsius, so a bit of conversion
} }
void COLED::setIdleInt() void COLED::setIdleInt()
@@ -338,16 +340,15 @@ void COLED::setIdleInt()
m_display.print(" -IDLE-"); m_display.print(" -IDLE-");
m_display.setCursor(0, OLED_LINE4); m_display.setCursor(0, OLED_LINE4);
m_display.printf("%s", m_ipaddress.c_str()); m_display.printf("%s", m_ipaddress.c_str());
// Display temperature // Display temperature
float tempCelsius = readTemperature("/sys/class/thermal/thermal_zone0/temp"); float tempCelsius = readTemperature("/sys/class/thermal/thermal_zone0/temp");
if (tempCelsius >= 0.0) { if (tempCelsius >= 0.0F) {
// Round the temperature to the nearest whole number
int roundedTempCelsius = static_cast<int>(std::round(tempCelsius));
// Convert to Fahrenheit // Convert to Fahrenheit
float tempFahrenheit = (roundedTempCelsius * 9/5) + 32; float tempFahrenheit = (tempCelsius * 9.0F / 5.0F) + 32.0F;
m_display.setCursor(0, OLED_LINE5); m_display.setCursor(0, OLED_LINE5);
m_display.setTextSize(1); m_display.setTextSize(1);
m_display.printf("Temp: %.0fF / %dC ",tempFahrenheit,roundedTempCelsius); m_display.printf("Temp: %.0fF / %.0fC ", tempFahrenheit, tempCelsius);
} }
} }
} }
@@ -788,16 +789,15 @@ void COLED::clearCWInt()
m_display.print(" -IDLE-"); m_display.print(" -IDLE-");
m_display.setCursor(0,OLED_LINE3); m_display.setCursor(0,OLED_LINE3);
m_display.printf("%s",m_ipaddress.c_str()); m_display.printf("%s",m_ipaddress.c_str());
// Display temperature // Display temperature
float tempCelsius = readTemperature("/sys/class/thermal/thermal_zone0/temp"); float tempCelsius = readTemperature("/sys/class/thermal/thermal_zone0/temp");
if (tempCelsius >= 0.0) { if (tempCelsius >= 0.0F) {
// Round the temperature to the nearest whole number
int roundedTempCelsius = static_cast<int>(std::round(tempCelsius));
// Convert to Fahrenheit // Convert to Fahrenheit
float tempFahrenheit = (roundedTempCelsius * 9/5) + 32; float tempFahrenheit = (tempCelsius * 9.0F / 5.0F) + 32.0F;
m_display.setCursor(0, OLED_LINE5); m_display.setCursor(0, OLED_LINE5);
m_display.setTextSize(1); m_display.setTextSize(1);
m_display.printf("Temp: %.0fF / %dC ",tempFahrenheit,roundedTempCelsius); m_display.printf("Temp: %.0fF / %.0fC ", tempFahrenheit, tempCelsius);
} }
if (m_displayScroll) if (m_displayScroll)

2
OLED.h
View File

@@ -99,6 +99,8 @@ private:
std::string m_ipaddress; std::string m_ipaddress;
ArduiPi_OLED m_display; ArduiPi_OLED m_display;
float readTemperature(const std::string& filePath);
void OLED_statusbar(); void OLED_statusbar();
}; };