piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Companion read/write of failsafe settings, how displayed on radio (#1399)

Browse Source 
* Fix failsafe settings

Resolve #1393

* trigger save if failsafe numbers changed + cleanup

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
Raphael Coeffic
2022-01-11 23:09:55 +10:00
committed by GitHub
co-authored by Peter Feerick
parent 71b0e72dd0
commit 7a628d4c15
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_setup.cpp
+9 -5
View File
@@ -113,7 +113,8 @@ class FailSafeBody : public FormGroup {
grid.setLabelWidth(60);
grid.spacer(8);
const int lim = (g_model.extendedLimits ? (512 * LIMIT_EXT_PERCENT / 100) : 512) * 2;
const int lim = calcRESXto1000(
(g_model.extendedLimits ? (512 * LIMIT_EXT_PERCENT / 100) : 512) * 2);
for (int ch=0; ch < maxModuleChannels(moduleIdx); ch++) {
// Channel name
@@ -122,8 +123,11 @@ class FailSafeBody : public FormGroup {
// Channel numeric value
new NumberEdit(this, grid.getFieldSlot(8, 0), -lim, lim,
GET_DEFAULT(g_model.failsafeChannels[ch]),
SET_VALUE(g_model.failsafeChannels[ch], newValue),
[=]() { return calcRESXto1000(g_model.failsafeChannels[ch]); },
[=](int32_t newValue) {
g_model.failsafeChannels[ch] = calc1000toRESX(newValue);
SET_DIRTY();
},
0, PREC1 | RIGHT);
// Channel bargraph
@@ -136,7 +140,7 @@ class FailSafeBody : public FormGroup {
out2fail->setPressHandler([=]() {
setCustomFailsafe(moduleIdx);
AUDIO_WARNING1();
storageDirty(EE_MODEL);
SET_DIRTY();
return 0;
});
@@ -1401,7 +1405,7 @@ void ModelSetupPage::build(FormWindow * window)
for (auto &flightModeData : g_model.flightModeData) {
memclear(&flightModeData, TRIMS_ARRAY_SIZE);
}
storageDirty(EE_MODEL);
SET_DIRTY();
AUDIO_WARNING1();
return 0;
});