From 7714c5779f3c5f3155d204230e9920af0515a5a3 Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 13 Aug 2014 15:35:33 +0200 Subject: [PATCH] 24bits for timers should be enough --- companion/src/firmwares/opentx/opentxeeprom.cpp | 4 ++-- radio/src/myeeprom.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index 7050c66ad..ef52e56da 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -2434,8 +2434,8 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep)); internalField.Append(new UnsignedField<2>(modelData.timers[i].persistent)); internalField.Append(new SpareBitsField<3>()); - internalField.Append(new UnsignedField<32>(modelData.timers[i].val)); - internalField.Append(new SignedField<32>(modelData.timers[i].pvalue)); + internalField.Append(new UnsignedField<24>(modelData.timers[i].val)); + internalField.Append(new SignedField<24>(modelData.timers[i].pvalue)); } else if ((IS_ARM(board) || IS_2560(board)) && version >= 216) { internalField.Append(new UnsignedField<16>(modelData.timers[i].val)); diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index cca2430bb..69ebd27f7 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1638,8 +1638,8 @@ PACK(typedef struct t_TimerData { uint8_t minuteBeep:1; uint8_t persistent:2; uint8_t spare:3; - uint32_t start; - int32_t value; + uint32_t start:24; + int32_t value:24; }) TimerData; #define IS_MANUAL_RESET_TIMER(idx) (g_model.timers[idx].persistent == 2) #elif defined(CPUM2560)