aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2026-06-27 21:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show default parameter values in p command output

Browse Source 
Also move float comparing logic to a distinct util function.
This commit is contained in:
Oleg Kalachev
2026-06-24 06:42:09 +03:00
parent 545eed8944
commit 64b21a3a6b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flix/parameters.ino
+10 -3
View File
@@ -20,6 +20,7 @@ struct Parameter {
const char *name; // max length is 15 const char *name; // max length is 15
bool integer; bool integer;
union { float *f; int *i; }; // pointer to the variable union { float *f; int *i; }; // pointer to the variable
float inital; // default value
float cache; // what's stored in flash float cache; // what's stored in flash
void (*callback)(); // called after parameter change void (*callback)(); // called after parameter change
Parameter(const char *name, float *variable, void (*callback)() = nullptr) : name(name), integer(false), f(variable), callback(callback) {}; Parameter(const char *name, float *variable, void (*callback)() = nullptr) : name(name), integer(false), f(variable), callback(callback) {};
@@ -137,6 +138,7 @@ void setupParameters() {
if (!storage.isKey(parameter.name)) { if (!storage.isKey(parameter.name)) {
storage.putFloat(parameter.name, parameter.getValue()); // store default value storage.putFloat(parameter.name, parameter.getValue()); // store default value
} }
parameter.inital = parameter.getValue();
parameter.setValue(storage.getFloat(parameter.name, 0)); parameter.setValue(storage.getFloat(parameter.name, 0));
parameter.cache = parameter.getValue(); parameter.cache = parameter.getValue();
} }
@@ -183,8 +185,7 @@ void syncParameters() {
if (motorsActive()) return; // don't use flash while flying, it may cause a delay if (motorsActive()) return; // don't use flash while flying, it may cause a delay
for (auto &parameter : parameters) { for (auto &parameter : parameters) {
if (parameter.getValue() == parameter.cache) continue; // no change if (floatEquals(parameter.getValue(), parameter.cache)) continue; // no change
if (isnan(parameter.getValue()) && isnan(parameter.cache)) continue; // both are NAN
storage.putFloat(parameter.name, parameter.getValue()); storage.putFloat(parameter.name, parameter.getValue());
parameter.cache = parameter.getValue(); // update cache parameter.cache = parameter.getValue(); // update cache
@@ -192,9 +193,15 @@ void syncParameters() {
} }
void printParameters(const char *filter) { void printParameters(const char *filter) {
print("Name Value [Default]\n");
for (auto &parameter : parameters) { for (auto &parameter : parameters) {
if (strncasecmp(parameter.name, filter, strlen(filter))) continue; if (strncasecmp(parameter.name, filter, strlen(filter))) continue;
print("%s = %g\n", parameter.name, parameter.getValue());
if (floatEquals(parameter.getValue(), parameter.inital)) { // parameter changed
print("%-15s %-13g\n", parameter.name, parameter.getValue());
} else {
print("%-15s %-13g [%g]\n", parameter.name, parameter.getValue(), parameter.inital);
}
} }
} }
flix/util.h
+6
View File
@@ -23,6 +23,12 @@ bool valid(float x) {
return isfinite(x); return isfinite(x);
} }
bool floatEquals(float a, float b, float epsilon = 0) {
if (isnan(a) && isnan(b)) return true;
if (a == b) return true;
return fabsf(a - b) <= epsilon;
}
// Wrap angle to [-PI, PI) // Wrap angle to [-PI, PI)
float wrapAngle(float angle) { float wrapAngle(float angle) {
angle = fmodf(angle, 2 * PI); angle = fmodf(angle, 2 * PI);