fix(OpenGloves): tick input sensors

senseshift · Feb 10, 2024 · 61f9492 · 61f9492
1 parent 825e6f0
commit 61f9492
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/firmware/mode_configs/opengloves/opengloves.cpp b/firmware/mode_configs/opengloves/opengloves.cpp
@@ -153,7 +153,8 @@ void setupMode()
     auto* pinch = new BUTTON_CLASS(PIN_BUTTON_PINCH, BUTTON_PINCH_INVERT);
 #endif
 
-    OpenGlovesTrackingComponent::Config const tracking_config(2000, false);
+    Serial.begin(115200);
+    OpenGlovesTrackingComponent::Config tracking_config(2000, false);
     auto* opengloves_tracking =
       new OpenGlovesTrackingComponent(tracking_config, input_sensors, new StreamTransport(Serial));
 

diff --git a/lib/opengloves/opengloves/opengloves.cpp b/lib/opengloves/opengloves/opengloves.cpp
@@ -59,7 +59,7 @@ namespace og {
                   length - written,
                   "%c%u",
                   'A' + i,
-                  ifloor<std::uint8_t, float>(finger_curl * MAX_ANALOG_VALUE)
+                  ifloor<std::uint16_t, float>(finger_curl * MAX_ANALOG_VALUE)
                 );
             }
 #else

diff --git a/lib/opengloves/senseshift/opengloves/opengloves.hpp b/lib/opengloves/senseshift/opengloves/opengloves.hpp
@@ -75,7 +75,7 @@ namespace SenseShift::OpenGloves {
 
         auto collectData() -> og::InputPeripheralData
         {
-            og::InputPeripheralData data;
+            og::InputPeripheralData data{};
 
             const auto& curls = this->curl.fingers;
             const auto& splays = this->splay.fingers;

diff --git a/lib/opengloves_freertos/senseshift/opengloves/opengloves_task.hpp b/lib/opengloves_freertos/senseshift/opengloves/opengloves_task.hpp
@@ -2,6 +2,7 @@
 
 #include <Arduino.h>
 
+#include <array>
 #include <cstddef>
 #include <optional>
 
@@ -32,8 +33,8 @@ namespace SenseShift::OpenGloves {
             }
         };
 
-        OpenGlovesTrackingComponent(Config config, InputSensors& input_sensors, ITransport* communication) :
-          config(config), input_sensors_(std::move(input_sensors)), communication_(communication)
+        OpenGlovesTrackingComponent(Config& config, InputSensors& input_sensors, ITransport* communication) :
+          config_(config), input_sensors_(std::move(input_sensors)), communication_(communication)
         {
             this->encoder_ = new og::AlphaEncoder();
         }
@@ -46,15 +47,16 @@ namespace SenseShift::OpenGloves {
 
         void tick() override
         {
+            this->input_sensors_.tick();
             const auto data = this->input_sensors_.collectData();
-
-            char buffer[256];
-            this->encoder_->encode_input(data, buffer, sizeof(buffer));
-            this->communication_->send(buffer, sizeof(buffer));
+            const auto length = this->encoder_->encode_input(data, buffer.data(), buffer.size());
+            this->communication_->send(buffer.data(), length);
         }
 
       private:
-        Config& config;
+        std::array<char, 256> buffer;
+
+        Config& config_;
         InputSensors input_sensors_;
         ITransport* communication_;
         og::IEncoder* encoder_;