24bits for timers should be enough

This commit is contained in:
bsongis
2014-08-16 11:37:59 +02:00
parent 906a20738b
commit 7714c5779f
2 changed files with 4 additions and 4 deletions
@@ -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));
+2 -2
View File
@@ -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)