encoders: enable setting lower and upper limit for certain message types

shanteacontrols · Feb 20, 2024 · 65faed0 · 65faed0
1 parent 65b98b9
commit 65faed0
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 1 deletion.
diff --git a/src/firmware/application/database/Config.h b/src/firmware/application/database/Config.h
@@ -81,6 +81,8 @@ namespace database
                 PULSES_PER_STEP,
                 ACCELERATION,
                 REMOTE_SYNC,
+                LOWER_LIMIT,
+                UPPER_LIMIT,
                 AMOUNT
             };
 

diff --git a/src/firmware/application/database/Layout.h b/src/firmware/application/database/Layout.h
@@ -198,6 +198,24 @@ namespace database
                 LESSDB::autoIncrementSetting_t::DISABLE,
                 0,
             },
+
+            // lower value limit
+            {
+                io::Encoders::Collection::SIZE(),
+                LESSDB::sectionParameterType_t::WORD,
+                LESSDB::preserveSetting_t::DISABLE,
+                LESSDB::autoIncrementSetting_t::DISABLE,
+                0,
+            },
+
+            // upper value limit
+            {
+                io::Encoders::Collection::SIZE(),
+                LESSDB::sectionParameterType_t::WORD,
+                LESSDB::preserveSetting_t::DISABLE,
+                LESSDB::autoIncrementSetting_t::DISABLE,
+                16383,
+            },
         };
 
         std::vector<LESSDB::Section> _analogSections = {

diff --git a/src/firmware/application/io/encoders/Encoders.cpp b/src/firmware/application/io/encoders/Encoders.cpp
@@ -308,6 +308,10 @@ void Encoders::sendMessage(size_t index, position_t encoderState, encoderDescrip
             }
         }
 
+        _value[index] = core::util::CONSTRAIN(static_cast<uint16_t>(_value[index]),
+                                              static_cast<uint16_t>(_database.read(database::Config::Section::encoder_t::LOWER_LIMIT, index)),
+                                              static_cast<uint16_t>(_database.read(database::Config::Section::encoder_t::UPPER_LIMIT, index)));
+
         if (descriptor.type == type_t::CONTROL_CHANGE_14BIT)
         {
             if (descriptor.event.index >= 96)

diff --git a/src/firmware/application/system/Config.h b/src/firmware/application/system/Config.h
@@ -81,6 +81,8 @@ namespace sys
                 ACCELERATION,
                 MIDI_ID_MSB,
                 REMOTE_SYNC,
+                LOWER_LIMIT,
+                UPPER_LIMIT,
                 AMOUNT
             };
 

diff --git a/src/firmware/application/system/Layout.h b/src/firmware/application/system/Layout.h
@@ -156,6 +156,20 @@ namespace sys
                 0,
                 1,
             },
+
+            // lower value limit
+            {
+                io::Encoders::Collection::SIZE(),
+                0,
+                16383,
+            },
+
+            // upper value limit
+            {
+                io::Encoders::Collection::SIZE(),
+                0,
+                16383,
+            },
         };
 
         std::vector<SysExConf::Section> _analogSections = {

diff --git a/src/firmware/application/util/conversion/Conversion.h b/src/firmware/application/util/conversion/Conversion.h
@@ -94,7 +94,9 @@ namespace util
             database::Config::Section::encoder_t::PULSES_PER_STEP,
             database::Config::Section::encoder_t::ACCELERATION,
             database::Config::Section::encoder_t::MIDI_ID,
-            database::Config::Section::encoder_t::REMOTE_SYNC
+            database::Config::Section::encoder_t::REMOTE_SYNC,
+            database::Config::Section::encoder_t::LOWER_LIMIT,
+            database::Config::Section::encoder_t::UPPER_LIMIT,
         };
 
         static constexpr database::Config::Section::analog_t SYS_EX2_DB_ANALOG[static_cast<uint8_t>(sys::Config::Section::analog_t::AMOUNT)] = {