MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-29 06:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mqtt

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

58
OLED.cpp
View File

@@ -251,6 +251,22 @@ bool COLED::open()
return true;
}
float COLED::readTemperature(const std::string& filePath)
{
std::ifstream file(filePath);
if (!file.is_open()) {
std::cerr << "Error: Could not open file " << filePath << std::endl;
return -1.0F; // Return a negative value to indicate that CPU temp is not available
}
float temperature;
file >> temperature;
file.close();
return temperature / 1000.0F; // The temperature is stored in millidegrees Celsius, so a bit of conversion
}
void COLED::setIdleInt()
{
m_mode = MODE_IDLE;
@@ -292,14 +308,14 @@ void COLED::setIdleInt()
if (configFile.is_open()) {
std::string line;
while (std::getline(configFile, line)) {
if (line.find("ssid=") != std::string::npos) {
std::istringstream iss(line);
std::string key, value;
if (std::getline(iss, key, '=') && std::getline(iss, value)) {
ssid = value;
break;
}
}
if (line.find("ssid=") != std::string::npos) {
std::istringstream iss(line);
std::string key, value;
if (std::getline(iss, key, '=') && std::getline(iss, value)) {
ssid = value;
break;
}
}
}
configFile.close();
} else {
@@ -319,11 +335,21 @@ void COLED::setIdleInt()
}
} else { // Connected to network - no Auto-AP mode; normal display layout...
if (m_displayLogoScreensaver) {
m_display.setCursor(0,OLED_LINE3);
m_display.setCursor(0,OLED_LINE2);
m_display.setTextSize(1);
m_display.print(" -IDLE-");
m_display.setCursor(0, OLED_LINE5);
m_display.setCursor(0, OLED_LINE4);
m_display.printf("%s", m_ipaddress.c_str());
// Display temperature
float tempCelsius = readTemperature("/sys/class/thermal/thermal_zone0/temp");
if (tempCelsius >= 0.0F) {
// Convert to Fahrenheit
float tempFahrenheit = (tempCelsius * 9.0F / 5.0F) + 32.0F;
m_display.setCursor(0, OLED_LINE5);
m_display.setTextSize(1);
m_display.printf("Temp: %.0fF / %.0fC ", tempFahrenheit, tempCelsius);
}
}
}
m_display.display();
@@ -744,7 +770,7 @@ void COLED::writeCWInt()
m_display.clearDisplay();
m_display.setCursor(0,30);
m_display.setTextSize(3);
m_display.setTextSize(2);
m_display.print("CW ID TX");
m_display.setTextSize(1);
@@ -764,6 +790,16 @@ void COLED::clearCWInt()
m_display.setCursor(0,OLED_LINE3);
m_display.printf("%s",m_ipaddress.c_str());
// Display temperature
float tempCelsius = readTemperature("/sys/class/thermal/thermal_zone0/temp");
if (tempCelsius >= 0.0F) {
// Convert to Fahrenheit
float tempFahrenheit = (tempCelsius * 9.0F / 5.0F) + 32.0F;
m_display.setCursor(0, OLED_LINE5);
m_display.setTextSize(1);
m_display.printf("Temp: %.0fF / %.0fC ", tempFahrenheit, tempCelsius);
}
if (m_displayScroll)
m_display.startscrolldiagleft(0x00,0x0f);
m_display.display();

4
OLED.h
View File

@@ -34,6 +34,8 @@
#include <string>
#include <fstream>
#include <sstream>
#include <iostream> // for cpu temp value extraction
#include <cmath> // for cpu temp value rounding
#include "ArduiPi_OLED_lib.h"
#include "Adafruit_GFX.h"
@@ -97,6 +99,8 @@ private:
std::string m_ipaddress;
ArduiPi_OLED m_display;
float readTemperature(const std::string& filePath);
void OLED_statusbar();
};