fix: resolve compiler warnings

senseshift · Aug 9, 2024 · 3710cf1 · 3710cf1
1 parent 3465d35
commit 3710cf1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/lib/freertos/senseshift/freertos/task.hpp b/lib/freertos/senseshift/freertos/task.hpp
@@ -142,7 +142,6 @@ class ComponentUpdateTask : public Task<ComponentUpdateTask<Tp>> {
     [[noreturn]] void run()
     {
         auto now = millis();
-        auto targetHz = 1000 / this->updateDelay_;
 
         while (true) {
             now = millis();
@@ -151,7 +150,7 @@ class ComponentUpdateTask : public Task<ComponentUpdateTask<Tp>> {
 
             const auto elapsed = millis() - now;
 
-            log_d("T: %d, Fmax: %dHz, Ft: %dHz", elapsed, 1000 / elapsed, targetHz);
+            log_d("T: %d, Fmax: %dHz, Ft: %dHz", elapsed, 1000 / elapsed, 1000 / this->updateDelay_);
             if (elapsed < this->updateDelay_) {
                 delay(this->updateDelay_ - elapsed);
             }

diff --git a/lib/io/senseshift/input/filter.hpp b/lib/io/senseshift/input/filter.hpp
@@ -259,9 +259,9 @@ class ExponentialMovingAverageFilter : public IFilter<Tp> {
 
 /// Deadzone filter. Clamps acc_ to center if it is within the deadzone.
 /// Usually used to filter out noise in the joystick.
-class CenterDeadzoneFilter : public IFilter<float> {
+class SinglePointDeadzoneFilter : public IFilter<float> {
   public:
-    explicit CenterDeadzoneFilter(float deadzone, float center = 0.5F) : deadzone_(deadzone), center_(center){};
+    explicit SinglePointDeadzoneFilter(float deadzone, float center = 0.5F) : deadzone_(deadzone), center_(center){};
 
     inline auto filter(ISimpleSensor<float>* /*sensor*/, float value) -> float override
     {
@@ -270,11 +270,12 @@ class CenterDeadzoneFilter : public IFilter<float> {
     }
 
   private:
+    const float deadzone_;
     const float center_;
-
-    float deadzone_;
 };
 
+using CenterDeadzoneFilter = SinglePointDeadzoneFilter;
+
 /// Interpolates the value from the lookup table.
 /// Can be used to determine battery level from the voltage.
 ///

diff --git a/lib/io/senseshift/input/sensor.hpp b/lib/io/senseshift/input/sensor.hpp
@@ -142,7 +142,7 @@ class SimpleSensorDecorator : public Sensor<Tp> {
     using ValueType = Tp;
     using SourceType = ISimpleSensor<ValueType>;
 
-    explicit SimpleSensorDecorator(SourceType* source) : source_(source), Sensor<Tp>()
+    explicit SimpleSensorDecorator(SourceType* source) : Sensor<Tp>(), source_(source)
     {
     }
 

diff --git a/lib/io/senseshift/input/sensor/analog_threshold.hpp b/lib/io/senseshift/input/sensor/analog_threshold.hpp
@@ -16,8 +16,8 @@ class AnalogThresholdSensor : public BinarySensor {
       Sensor<Tp>* source, Tp threshold_upper, Tp threshold_lower, bool attach_callbacks = false
     ) :
       source_(source),
-      threshold_upper_(threshold_upper),
       threshold_lower_(threshold_lower),
+      threshold_upper_(threshold_upper),
       attach_callbacks_(attach_callbacks)
     {
     }

diff --git a/lib/opengloves/senseshift/opengloves/autoconfig.hpp b/lib/opengloves/senseshift/opengloves/autoconfig.hpp
@@ -453,9 +453,14 @@ auto createTransport() -> ITransport*
 #ifdef BTSERIAL_NAME
     name = BTSERIAL_NAME;
 #else
-    char suffix[4];
-    snprintf(suffix, 4, "%04X", (uint16_t) (ESP.getEfuseMac() >> 32));
-    name = BTSERIAL_PREFIX + std::string(suffix);
+    char suffix[5];
+    int n = snprintf(suffix, 5, "%04X", (uint16_t) (ESP.getEfuseMac() >> 32));
+    if (n < 0 || n >= buffer_size - written) {
+      log_e("Failed to generate Bluetooth name");
+    } else {
+      suffix[4] = '\0';
+      name = BTSERIAL_PREFIX + std::string(suffix, 4);
+    }
 
     log_i("Generated Bluetooth name: %s", name.c_str());
 #endif