system: make preset change with program change in optional

shanteacontrols · Mar 15, 2024 · a332579 · a332579
1 parent 69e5af3
commit a332579
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/firmware/application/system/Config.h b/src/firmware/application/system/Config.h
@@ -143,6 +143,7 @@ namespace sys
             ACTIVE_PRESET                              = static_cast<uint8_t>(database::Config::systemSetting_t::ACTIVE_PRESET),
             PRESET_PRESERVE                            = static_cast<uint8_t>(database::Config::systemSetting_t::PRESET_PRESERVE),
             DISABLE_FORCED_REFRESH_AFTER_PRESET_CHANGE = static_cast<uint8_t>(database::Config::systemSetting_t::CUSTOM_SYSTEM_SETTING_START),
+            ENABLE_PRESET_CHANGE_WITH_PROGRAM_CHANGE_IN,
             AMOUNT
         };
 

diff --git a/src/firmware/application/system/System.cpp b/src/firmware/application/system/System.cpp
@@ -47,7 +47,11 @@ Instance::Instance(HWA&        hwa,
                               {
                               case MIDI::messageType_t::PROGRAM_CHANGE:
                               {
-                                  _components.database().setPreset(event.index);
+                                  if (_components.database().read(database::Config::Section::system_t::SYSTEM_SETTINGS,
+                                                                  Config::systemSetting_t::ENABLE_PRESET_CHANGE_WITH_PROGRAM_CHANGE_IN))
+                                  {
+                                      _components.database().setPreset(event.index);
+                                  }
                               }
                               break;
 
@@ -627,8 +631,13 @@ std::optional<uint8_t> Instance::sysConfigGet(sys::Config::Section::global_t sec
         return std::nullopt;
     }
 
-    if (index != static_cast<size_t>(sys::Config::systemSetting_t::DISABLE_FORCED_REFRESH_AFTER_PRESET_CHANGE))
+    switch (index)
     {
+    case static_cast<size_t>(sys::Config::systemSetting_t::DISABLE_FORCED_REFRESH_AFTER_PRESET_CHANGE):
+    case static_cast<size_t>(sys::Config::systemSetting_t::ENABLE_PRESET_CHANGE_WITH_PROGRAM_CHANGE_IN):
+        break;
+
+    default:
         return std::nullopt;
     }
 
@@ -650,8 +659,13 @@ std::optional<uint8_t> Instance::sysConfigSet(sys::Config::Section::global_t sec
         return std::nullopt;
     }
 
-    if (index != static_cast<size_t>(sys::Config::systemSetting_t::DISABLE_FORCED_REFRESH_AFTER_PRESET_CHANGE))
+    switch (index)
     {
+    case static_cast<size_t>(sys::Config::systemSetting_t::DISABLE_FORCED_REFRESH_AFTER_PRESET_CHANGE):
+    case static_cast<size_t>(sys::Config::systemSetting_t::ENABLE_PRESET_CHANGE_WITH_PROGRAM_CHANGE_IN):
+        break;
+
+    default:
         return std::nullopt;
     }