From ae2df3a271487f1bec9478ffd3ecc9a3b2780ab7 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Sat, 15 May 2021 12:42:25 +0100
Subject: [PATCH] Fix KurtInRide/SmartControl compiler warnings

.. they hide issues that are real.
---
 src/Train/KurtInRide.cpp       | 8 ++++++++
 src/Train/KurtSmartControl.cpp | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Train/KurtInRide.cpp b/src/Train/KurtInRide.cpp
index 4ff74e5f2..4f7824c1b 100644
--- a/src/Train/KurtInRide.cpp
+++ b/src/Train/KurtInRide.cpp
@@ -33,6 +33,8 @@ uint8_t inride_state_to_calibration_state(inride_state state, inride_calibration
     case INRIDE_STATE_SPINDOWN_READY:
     case INRIDE_STATE_SPINDOWN_ACTIVE:
         return CALIBRATION_STATE_COAST;
+    default:
+        break;
     }
 
     return CALIBRATION_STATE_FAILURE;
@@ -76,6 +78,7 @@ const char* inride_state_to_debug_string(inride_state state, inride_calibration_
         case INRIDE_CAL_RESULT_TOO_SLOW: return "INRIDE SPINDOWN_ACTIVE CALIBRATION:TOO_SLOW";
         case INRIDE_CAL_RESULT_MIDDLE:   return "INRIDE SPINDOWN_ACTIVE CALIBRATION:MIDDLE";
         }
+    default:
         break;
     }
 
@@ -101,6 +104,8 @@ const char* inride_state_to_rtd_string(inride_state state, inride_calibration_re
 
     case INRIDE_STATE_SPINDOWN_ACTIVE:
         return "INRIDE SPINDOWN - COASTING, DO NOT PEDAL";
+    default:
+        break;
     }
 
     return "INRIDE UNKNOWN STATE";
@@ -114,6 +119,7 @@ QString inride_command_result_to_string(inride_command_result r) {
     case INRIDE_COM_RESULT_INVALID_REQUEST:    return QString("INRIDE_COM_RESULT_INVALID_REQUEST");
     case INRIDE_COM_RESULT_CALIBRATION_RESULT: return QString("INRIDE_COM_RESULT_CALIBRATION_RESULT");
     case INRIDE_COM_RESULT_UNKNOWN_ERROR:      return QString("INRIDE_COM_RESULT_UNKNOWN_ERROR");
+    default: break;
     }
     return QString("Error");
 }
@@ -201,6 +207,7 @@ typedef struct alpha_coast {
 
 alpha_coast alpha(uint32_t interval, uint32_t ticks, uint32_t revs, double speedKPH, uint32_t ticksPrevious, uint32_t revsPrevious, double speedKPHPrevious, bool proFlywheel)
 {
+    Q_UNUSED(interval);
     alpha_coast result;
     result.alpha = 0.0;
     result.coasting = false;
@@ -224,6 +231,7 @@ alpha_coast alpha(uint32_t interval, uint32_t ticks, uint32_t revs, double speed
 
 int power_for_speed(double kph, double spindown, double alpha, uint32_t revolutions)
 {
+    Q_UNUSED(alpha);
     double mph = kph * 0.621371;
     double rawPower = (5.244820 * mph) + (0.019168 * (mph * mph * mph));
     double dragOffset = 0;
diff --git a/src/Train/KurtSmartControl.cpp b/src/Train/KurtSmartControl.cpp
index 85eef7dcc..637102794 100644
--- a/src/Train/KurtSmartControl.cpp
+++ b/src/Train/KurtSmartControl.cpp
@@ -112,7 +112,7 @@ smart_control_power_data smart_control_process_power_data(const uint8_t *data, s
 
         uint8_t hashSeed = 0x42;
         uint8_t inData[20];
-        for (int i = 0; i < size; ++i) {
+        for (size_t i = 0; i < size; ++i) {
             inData[i] = data[i];
         }
         uint8_t hash = hash8WithSeed(hashSeed, &inData[size - 1], 1);
@@ -148,7 +148,7 @@ smart_control_config_data smart_control_process_config_data(const uint8_t *data,
 {
     uint8_t hashSeed = 0x42;
     uint8_t* inData = (uint8_t*)malloc(size);
-    for (int i = 0; i < size; ++i) {
+    for (size_t i = 0; i < size; ++i) {
         inData[i] = data[i];
     }
     uint8_t hash = hash8WithSeed(hashSeed, &inData[size - 1], 1);
@@ -217,6 +217,7 @@ smart_control_config_data smart_control_process_config_data(const uint8_t *data,
 
 
 #ifndef MIN
+#pragma GCC diagnostic ignored "-Wtype-limits"
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define MAX(a,b) (((a)>(b))?(a):(b))
 #endif