Skip to content

Commit

Permalink
Merge pull request #267 from jakpor/fix/basic_temp_display
Browse files Browse the repository at this point in the history
(Basic DIY): Fix temperature parsing in OLED and debug for Basic DYI version
  • Loading branch information
samuelbles07 authored Dec 2, 2024
2 parents 107fb21 + 39ef69c commit 1937e3d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/AgOledDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ void OledDisplay::showDashboard(const char *status) {
if (config.isTemperatureUnitInF()) {
snprintf(strBuf, sizeof(strBuf), "T:%0.1f F", utils::degreeC_To_F(temp));
} else {
snprintf(strBuf, sizeof(strBuf), "T:%0.f1 C", temp);
snprintf(strBuf, sizeof(strBuf), "T:%0.1f C", temp);
}
} else {
if (config.isTemperatureUnitInF()) {
Expand Down
14 changes: 7 additions & 7 deletions src/AgValue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
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?
return false;
}
Expand Down Expand Up @@ -228,7 +228,7 @@ bool Measurements::update(MeasurementType type, int val, int ch) {
// Calculate average based on how many elements on the list
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
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;
Expand Down Expand Up @@ -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
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?
return false;
}
Expand Down Expand Up @@ -299,7 +299,7 @@ bool Measurements::update(MeasurementType type, float val, int ch) {
// Calculate average based on how many elements on the list
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
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;
Expand Down Expand Up @@ -348,7 +348,7 @@ int Measurements::get(MeasurementType type, int ch) {

// Sanity check if measurement type is defined for integer data type or not
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?
return false;
}
Expand Down Expand Up @@ -383,7 +383,7 @@ float Measurements::getFloat(MeasurementType type, int ch) {

// Sanity check if measurement type is defined for float data type or not
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?
return false;
}
Expand Down Expand Up @@ -434,7 +434,7 @@ float Measurements::getAverage(MeasurementType type, int ch) {

// Sanity check if measurement type is not defined
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);
assert(0);
}
Expand Down

0 comments on commit 1937e3d

Please sign in to comment.