feedc0de/airgradient
1
0
Fork 0
forked from airgradienthq/arduino
Code Pull Requests Activity

Merge pull request #267 from jakpor/fix/basic_temp_display

Browse Source 
(Basic DIY): Fix temperature parsing in OLED and debug for Basic DYI version
This commit is contained in:
Samuel Siburian
2024-12-03 02:18:07 +07:00
committed by GitHub
parent 107fb21331 39ef69cbdf
commit 1937e3d59e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AgOledDisplay.cpp
View File

@ -394,7 +394,7 @@ void OledDisplay::showDashboard(const char *status) {
if (config.isTemperatureUnitInF()) { if (config.isTemperatureUnitInF()) {
snprintf(strBuf, sizeof(strBuf), "T:%0.1f F", utils::degreeC_To_F(temp)); snprintf(strBuf, sizeof(strBuf), "T:%0.1f F", utils::degreeC_To_F(temp));
} else { } else {
snprintf(strBuf, sizeof(strBuf), "T:%0.f1 C", temp); snprintf(strBuf, sizeof(strBuf), "T:%0.1f C", temp);
} }
} else { } else {
if (config.isTemperatureUnitInF()) { if (config.isTemperatureUnitInF()) {

14
src/AgValue.cpp
View File

@ -189,7 +189,7 @@ bool Measurements::update(MeasurementType type, int val, int ch) {
// Sanity check if measurement type is defined for integer data type or not // Sanity check if measurement type is defined for integer data type or not
if (temporary == nullptr) { if (temporary == nullptr) {
Serial.printf("%s is not defined for integer data type\n", measurementTypeStr(type)); Serial.printf("%s is not defined for integer data type\n", measurementTypeStr(type).c_str());
// TODO: Just assert? // TODO: Just assert?
return false; return false;
} }
@ -228,7 +228,7 @@ bool Measurements::update(MeasurementType type, int val, int ch) {
// Calculate average based on how many elements on the list // Calculate average based on how many elements on the list
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size(); temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
if (_debug) { if (_debug) {
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type), ch, temporary->update.avg); Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type).c_str(), ch, temporary->update.avg);
} }
return true; return true;
@ -260,7 +260,7 @@ bool Measurements::update(MeasurementType type, float val, int ch) {
// Sanity check if measurement type is defined for float data type or not // Sanity check if measurement type is defined for float data type or not
if (temporary == nullptr) { if (temporary == nullptr) {
Serial.printf("%s is not defined for float data type\n", measurementTypeStr(type)); Serial.printf("%s is not defined for float data type\n", measurementTypeStr(type).c_str());
// TODO: Just assert? // TODO: Just assert?
return false; return false;
} }
@ -299,7 +299,7 @@ bool Measurements::update(MeasurementType type, float val, int ch) {
// Calculate average based on how many elements on the list // Calculate average based on how many elements on the list
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size(); temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
if (_debug) { if (_debug) {
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type), ch, temporary->update.avg); Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type).c_str(), ch, temporary->update.avg);
} }
return true; return true;
@ -348,7 +348,7 @@ int Measurements::get(MeasurementType type, int ch) {
// Sanity check if measurement type is defined for integer data type or not // Sanity check if measurement type is defined for integer data type or not
if (temporary == nullptr) { if (temporary == nullptr) {
Serial.printf("%s is not defined for integer data type\n", measurementTypeStr(type)); Serial.printf("%s is not defined for integer data type\n", measurementTypeStr(type).c_str());
// TODO: Just assert? // TODO: Just assert?
return false; return false;
} }
@ -383,7 +383,7 @@ float Measurements::getFloat(MeasurementType type, int ch) {
// Sanity check if measurement type is defined for float data type or not // Sanity check if measurement type is defined for float data type or not
if (temporary == nullptr) { if (temporary == nullptr) {
Serial.printf("%s is not defined for float data type\n", measurementTypeStr(type)); Serial.printf("%s is not defined for float data type\n", measurementTypeStr(type).c_str());
// TODO: Just assert? // TODO: Just assert?
return false; return false;
} }
@ -434,7 +434,7 @@ float Measurements::getAverage(MeasurementType type, int ch) {
// Sanity check if measurement type is not defined // Sanity check if measurement type is not defined
if (measurementAverage == -1000) { if (measurementAverage == -1000) {
Serial.printf("ERROR! %s is not defined on get average value function\n", measurementTypeStr(type)); Serial.printf("ERROR! %s is not defined on get average value function\n", measurementTypeStr(type).c_str());
delay(1000); delay(1000);
assert(0); assert(0);
} }