From 4e62d0b1b7ebfd6dd69a525e575f033fcdafc69d Mon Sep 17 00:00:00 2001 From: elecpower Date: Fri, 19 Mar 2021 06:17:35 +1100 Subject: [PATCH] Fix model upd refs custom function reset timer --- companion/src/firmwares/modeldata.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/companion/src/firmwares/modeldata.cpp b/companion/src/firmwares/modeldata.cpp index 3efb7ae6a..969485081 100644 --- a/companion/src/firmwares/modeldata.cpp +++ b/companion/src/firmwares/modeldata.cpp @@ -1356,7 +1356,6 @@ void ModelData::sortMixes() void ModelData::updateResetParam(CustomFunctionData * cfd) { - if (cfd->func != FuncReset) return; @@ -1367,6 +1366,11 @@ void ModelData::updateResetParam(CustomFunctionData * cfd) switch (updRefInfo.type) { + case REF_UPD_TYPE_TIMER: + if (cfd->param < 0 || cfd->param > 2) + return; + idxAdj = -2; // reverse earlier offset required for rawsource + break; case REF_UPD_TYPE_SENSOR: idxAdj = 5/*3 Timers + Flight + Telemetery*/ + firmware->getCapability(RotaryEncoders); if (cfd->param < idxAdj || cfd->param > (idxAdj + firmware->getCapability(Sensors))) @@ -1376,6 +1380,8 @@ void ModelData::updateResetParam(CustomFunctionData * cfd) return; } + qDebug() << "index1" << updRefInfo.index1 << "shift:" << updRefInfo.shift << "cfd->param:" << cfd->param << "idxAdj:" << idxAdj; + switch (updRefInfo.action) { case REF_UPD_ACT_CLEAR: