patrick/Sensor3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved 'setDouble' from 'Fermenter' to 'console'

Browse Source
This commit is contained in:
Patrick Haßel 2024-04-22 12:32:52 +02:00
parent de4bdfa98b
commit 77890778d4
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/patrix/console.cpp
View File

@ -248,3 +248,28 @@ const char *getFlashChipMode() {
return "[???]"; return "[???]";
} }
} }
bool setDouble(const char *name, double *destinationPtr, double min, double max) {
const char *valueStr = strtok(nullptr, "");
if (valueStr == nullptr) {
consolePrintUsage();
return false;
}
double value = strtod(valueStr, nullptr);
if (isnan(value)) {
error("Failed to parse double for \"%s\": %s", name, valueStr);
return false;
}
if ((!isnan(min) && value < min) || (!isnan(max) && value > max)) {
error("Value out of range for \"%s\" [%f..%f]: %f", name, min, max, value);
return false;
}
if (*destinationPtr != value) {
*destinationPtr = value;
info("Value for \"%s\" set to: %f", name, value);
configPutDouble(name, value);
} else {
info("Value for \"%s\" unchanged: %f", name, value);
}
return true;
}

2
lib/patrix/console.h
View File

@ -11,4 +11,6 @@ bool patrix_command(char *cmd);
void consolePrintUsage(); void consolePrintUsage();
bool setDouble(const char *name, double *destinationPtr, double min, double max);
#endif #endif

25
src/Fermenter/Fermenter.cpp
View File

@ -136,31 +136,6 @@ void writeDecimal(int *digit, double value) {
lc.setDigit(0, (*digit)++, integer / 10 % 10, false); lc.setDigit(0, (*digit)++, integer / 10 % 10, false);
} }
bool setDouble(const char *name, double *destinationPtr, double min, double max) {
const char *valueStr = strtok(nullptr, "");
if (valueStr == nullptr) {
consolePrintUsage();
return false;
}
double value = strtod(valueStr, nullptr);
if (isnan(value)) {
error("Failed to parse double for \"%s\": %s", name, valueStr);
return false;
}
if ((!isnan(min) && value < min) || (!isnan(max) && value > max)) {
error("Value out of range for \"%s\" [%f..%f]: %f", name, min, max, value);
return false;
}
if (*destinationPtr != value) {
*destinationPtr = value;
info("Value for \"%s\" set to: %f", name, value);
configPutDouble(name, value);
} else {
info("Value for \"%s\" unchanged: %f", name, value);
}
return true;
}
bool patrix_command(char *first) { bool patrix_command(char *first) {
bool result = false; bool result = false;
if (strcmp(first, "over") == 0 || strcmp(first, "o") == 0) { if (strcmp(first, "over") == 0 || strcmp(first, "o") == 0) {