Add ability to set melody in settings

src/Melody.cpp

@@ -63,6 +63,24 @@ class AlarmMelody : public Melody {
     uint32_t m_timer;
 };
 
-Melody* Melody::getMelody(Name) {
-    return new AlarmMelody;
+Melody* Melody::getMelody(Name name) {
+    switch(name) {
+        case Name::alarm:
+            return new AlarmMelody;
+        case Name::nice:
+            return new NiceMelody;
+    }
+
+    return nullptr;
+}
+
+const char* Melody::getMelodyName(Name name) {
+    switch(name) {
+        case Name::alarm:
+            return "alarm";
+        case Name::nice:
+            return "nice";
+    }
+
+    return nullptr;
 }

src/Melody.h

@@ -7,6 +7,7 @@ class Melody {
     enum Name { alarm, nice, last_ };
 
     static Melody* getMelody(Name);
+    static const char* getMelodyName(Name);
 
     virtual void init() = 0;
     virtual bool end() const = 0;

src/Settings.cpp

@@ -21,6 +21,7 @@ Settings::Settings() {
     GET_SETTING(startWithSettings);
     GET_SETTING(logViewInTests);
     GET_SETTING(logViewInMasks);
+    GET_SETTING(melody);
 
     uint32_t hash = crc32.finalize();
     uint32_t storedHash;
@@ -36,6 +37,7 @@ Settings::Settings() {
         startWithSettings = false;
         logViewInTests = true;
         logViewInMasks = true;
+        melody = Melody::nice;
         updateEEPROM();
         return;
     }
@@ -57,6 +59,7 @@ void Settings::updateEEPROM() {
     PUT_SETTING(startWithSettings);
     PUT_SETTING(logViewInTests);
     PUT_SETTING(logViewInMasks);
+    PUT_SETTING(melody);
     PUT_SETTING(crc32.finalize());
 #undef PUT_SETTING
 }

src/Settings.h

@@ -3,6 +3,7 @@
 #include <stdint.h>
 
 #include "Time.h"
+#include "Melody.h"
 
 struct Settings {
     Settings();
@@ -16,4 +17,5 @@ struct Settings {
     bool logViewInTests;
     bool logViewInMasks;
     bool confirmAlarm;
+    Melody::Name melody;
 };

src/SettingsSetter.cpp

@@ -109,6 +109,22 @@ void SettingsSetter::processSetViewInMasks() const {
         gDisplay[1] << "Log";
 }
 
+void SettingsSetter::processSetMelody() const {
+    gDisplay[0] << "Notify melody";
+    uint8_t choice = gSettings.melody;
+    bool changed = getInt(choice, 0, Melody::last_ - 1);
+
+    gDisplay[1] << Melody::getMelodyName(gSettings.melody);
+
+    if (!changed)
+        return;
+
+    gSettings.melody = static_cast<Melody::Name>(choice);
+
+    gBeeper.setMelody(gSettings.melody);
+    gBeeper.alarm();
+}
+
 void SettingsSetter::process() {
     if (m_timer.state() != Timer::RUNNING) {
         int8_t shift = 0;
@@ -127,6 +143,11 @@ void SettingsSetter::process() {
             else
                 gBeeper.stop();
 
+            if (m_step == Step::setMelody)
+                gBeeper.alarm();
+            else
+                gBeeper.stop();
+
             gSettings.lagTime = m_lagTime;
             gSettings.updateEEPROM();
         }
@@ -157,6 +178,9 @@ void SettingsSetter::process() {
     case Step::setViewInMasks:
         processSetViewInMasks();
         break;
+    case Step::setMelody:
+        processSetMelody();
+        break;
     }
 }
 

src/SettingsSetter.h

@@ -15,6 +15,7 @@ class SettingsSetter final {
         setStartWithSettings,
         setViewInTests,
         setViewInMasks,
+        setMelody,
         last_
     };
 
@@ -34,6 +35,7 @@ class SettingsSetter final {
     void processStartWithSettings() const;
     void processSetViewInTests() const;
     void processSetViewInMasks() const;
+    void processSetMelody() const;
 
     Step m_step = Step::setLagTime;
     Time m_lagTime;