Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-02-05 18:49:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup when to persist

Browse Source
This commit is contained in:
Rob Giseburt
2019-11-04 11:07:47 -05:00
parent add4bb778c
commit 3cfff7bd16
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
g2core/config.cpp
View File

@@ -140,9 +140,9 @@ static void _set_defa(nvObj_t *nv, bool print)
}
strncpy(nv->token, cfgArray[nv->index].token, TOKEN_LEN);
cfgArray[nv->index].set(nv); // run the set method, nv_set(nv);
if (cfgArray[nv->index].flags & F_PERSIST) {
nv_persist(nv);
}
// if (cfgArray[nv->index].flags & F_PERSIST) {
// nv_persist(nv);
// }
}
}
sr_init_status_report(); // reset status reports

4
g2core/persistence.cpp
View File

@@ -130,9 +130,9 @@ stat_t read_persistent_value(nvObj_t *nv)
stat_t write_persistent_value(nvObj_t *nv)
{
if (read_persistent_value(nv) != STAT_OK) {
// if (read_persistent_value(nv) != STAT_OK) {
nvm.changed_nv_indexes[nvm.changed_nvs++] = nv->index;
}
// }
return (STAT_OK);
}

12
g2core/report.cpp
View File

@@ -194,7 +194,7 @@ void sr_init_status_report()
// record the index of the "stat" variable so we can use it during reporting
sr.stat_index = nv_get_index((const char *)"", (const char *)"stat");
// setup the status report array
// setup the status report array
for (uint8_t i=0; i < NV_STATUS_REPORT_LEN ; i++) {
if (sr_defaults[i][0] == NUL) break; // quit on first blank array entry
sr.status_report_value[i] = -1234567; // pre-load values with an unlikely number
@@ -204,7 +204,7 @@ void sr_init_status_report()
return;
}
nv_set(nv);
nv_persist(nv); // conditionally persist - automatic by nv_persist()
// nv_persist(nv); // conditionally persist - automatic by nv_persist()
nv->index++; // increment SR NVM index
}
}
@@ -379,8 +379,8 @@ static uint8_t _populate_filtered_status_report()
char tmp[TOKEN_LEN+1];
float current_value;
nvObj_t *nv = nv_reset_nv_list(); // sets nv to the start of the body
// Set thresholds to detect value changes based on precision for the value.
// Set thresholds to detect value changes based on precision for the value.
// Allow for floating point roundoffs, i.e. precision = 2 is 0.01 becomes --> 0.009
float precision[8] = { 0.9, 0.09, 0.009, 0.0009, 0.00009, 0.000009, 0.0000009, 0.00000009 };
@@ -395,7 +395,7 @@ static uint8_t _populate_filtered_status_report()
}
nv_get_nvObj(nv);
// extract the value and cast into a float, regardless of value type
// extract the value and cast into a float, regardless of value type
if ((valueType)(cfgArray[nv->index].flags & F_TYPE_MASK) == TYPE_FLOAT) {
current_value = nv->value_flt;
} else {
@@ -414,7 +414,7 @@ static uint8_t _populate_filtered_status_report()
strcpy(nv->token, tmp); //...or here.
sr.status_report_value[i] = current_value;
if ((nv = nv->nx) == NULL) { // should never be NULL unless SR length exceeds available buffer array
return (false);
return (false);
}
has_data = true;
} else {