'next' EEPROM support continued: Timer countdown modes

2014-01-22 15:00:42 +01:00
parent 3332cbf051
commit da2561b672
8 changed files with 39 additions and 55 deletions
@@ -788,14 +788,13 @@ enum TimerMode {
 class TimerData {
  public:
    TimerData() { clear(); }
-    TimerMode mode;   // timer trigger source -> off, abs, THs, TH%, THt, sw/!sw, !m_sw/!m_sw
-    int8_t    modeB;
-    bool minuteBeep;
-    bool countdownBeep;
-    bool      dir;    // 0=>Count Down, 1=>Count Up
+    TimerMode    mode;   // timer trigger source -> off, abs, THs, TH%, THt, sw/!sw, !m_sw/!m_sw
+    bool         minuteBeep;
+    unsigned int countdownBeep;
+    bool         dir;    // 0=>Count Down, 1=>Count Up
    unsigned int val;
-    bool      persistent;
-    int pvalue;
+    bool         persistent;
+    int          pvalue;
    void clear() { memset(this, 0, sizeof(TimerData)); }
 };

@@ -915,8 +914,6 @@ enum Capability {
 MixesWithoutExpo,
 Timers,
 TimeDivisions,
- minuteBeep,
- countdownBeep,
 CustomFunctions,
 VoicesAsNumbers,
 VoicesMaxLength,