Fixed: value limitation

- SinricProBlinds
- SinricProDimSwitch
- SinricProFan
- SinricProLight
- SinricProSpeaker

Author: sivar2311

src/SinricProBlinds.h

@@ -81,14 +81,14 @@ bool SinricProBlinds::handleRequest(const char* deviceId, const char* action, Js
   if (actionString == "setRangeValue" && setPositionCallback) {
     int position = request_value["rangeValue"] | 0;
     success = setPositionCallback(String(deviceId), position);
-    response_value["rangeValue"] = position;
+    response_value["rangeValue"] = limitValue(position, 0, 100);
     return success;
   }
 
   if (actionString == "adjustRangeValue" && adjustPositionCallback) {
     int positionDelta = request_value["rangeValueDelta"] | 0;
     success = adjustPositionCallback(String(deviceId), positionDelta);
-    response_value["rangeValue"] = positionDelta;
+    response_value["rangeValue"] = limitValue(positionDelta, 0, 100);
     return success;
   }
 

src/SinricProDevice.h

@@ -60,6 +60,8 @@ class SinricProDevice : public SinricProDeviceInterface {
     unsigned long getTimestamp();
     char* deviceId;
     PowerStateCallback powerStateCallback;
+    template <typename T>
+    T limitValue(T value, T minValue, T maxValue);
   private:
     SinricProInterface* eventSender;
     unsigned long eventWaitTime;
@@ -135,6 +137,14 @@ unsigned long SinricProDevice::getTimestamp() {
   return 0;
 }
 
+template <typename T>
+T SinricProDevice::limitValue(T value, T minValue, T maxValue) {
+  T newValue = value;
+  if (value > maxValue) newValue = maxValue;
+  if (value < minValue) newValue = minValue;
+  return newValue;
+}
+
 /**
  * @brief Set callback function for `powerState` request
  * 

src/SinricProDimSwitch.h

@@ -78,13 +78,13 @@ bool SinricProDimSwitch::handleRequest(const char* deviceId, const char* action,
   if (setPowerLevelCallback && actionString == "setPowerLevel") {
     int powerLevel = request_value["powerLevel"];
     success = setPowerLevelCallback(String(deviceId), powerLevel);
-    response_value["powerLevel"] = powerLevel;
+    response_value["powerLevel"] = limitValue(powerLevel, 0, 100);
   }
 
   if (adjustPowerLevelCallback && actionString == "adjustPowerLevel") {
     int powerLevelDelta = request_value["powerLevelDelta"];
     success = adjustPowerLevelCallback(String(deviceId), powerLevelDelta);
-    response_value["powerLevel"] = powerLevelDelta;
+    response_value["powerLevel"] = limitValue(powerLevelDelta, 0, 100);
   }
   return success;
 }

src/SinricProFanUS.h

@@ -78,18 +78,14 @@ bool SinricProFanUS::handleRequest(const char* deviceId, const char* action, Jso
   if (actionString == "setRangeValue" && setRangeValueCallback) {
     int rangeValue = request_value["rangeValue"] | 0;
     success = setRangeValueCallback(String(deviceId), rangeValue);
-    if (rangeValue < 1) rangeValue = 1;
-    if (rangeValue > 3) rangeValue = 3;
-    response_value["rangeValue"] = rangeValue;
+    response_value["rangeValue"] = limitValue(rangeValue, 1, 3);
     return success;
   }
 
   if (actionString == "adjustRangeValue" && adjustRangeValueCallback) {
     int rangeValueDelta = request_value["rangeValueDelta"] | 0;
     success = adjustRangeValueCallback(String(deviceId), rangeValueDelta);
-    if (rangeValueDelta < 1) rangeValueDelta = 1;
-    if (rangeValueDelta > 3) rangeValueDelta = 3;
-    response_value["rangeValue"] = rangeValueDelta;
+    response_value["rangeValue"] = limitValue(rangeValueDelta, 1, 3);
     return success;
   }
 

src/SinricProLight.h

@@ -160,13 +160,13 @@ bool SinricProLight::handleRequest(const char* deviceId, const char* action, Jso
   if (brightnessCallback && actionString == "setBrightness") {
     int brightness = request_value["brightness"];
     success = brightnessCallback(String(deviceId), brightness);
-    response_value["brightness"] = brightness;
+    response_value["brightness"] = limitValue(brightness, 0, 100);
   }
 
   if (adjustBrightnessCallback && actionString == "adjustBrightness") {
     int brightnessDelta = request_value["brightnessDelta"];
     success = adjustBrightnessCallback(String(deviceId), brightnessDelta);
-    response_value["brightness"] = brightnessDelta;
+    response_value["brightness"] = limitValue(brightnessDelta, 0, 100);
   }
 
   if (colorCallback && actionString == "setColor") {

src/SinricProSpeaker.h

@@ -216,14 +216,14 @@ bool SinricProSpeaker::handleRequest(const char* deviceId, const char* action, J
   if (volumeCallback && actionString == "setVolume") {
     int volume = request_value["volume"];
     success = volumeCallback(String(deviceId), volume);
-    response_value["volume"] = volume;
+    response_value["volume"] = limitValue(volume, 0, 100);
     return success;
   }
 
   if (adjustVolumeCallback && actionString == "adjustVolume") {
     int volume = request_value["volume"];
     success = adjustVolumeCallback(String(deviceId), volume);
-    response_value["volume"] = volume;
+    response_value["volume"] = limitValue(volume, 0, 100);
     return success;
   }
 
@@ -258,7 +258,7 @@ bool SinricProSpeaker::handleRequest(const char* deviceId, const char* action, J
       success = setBandsCallback(deviceId, bandsName, level);
       JsonObject response_value_bands_i = response_value_bands.createNestedObject();
       response_value_bands_i["name"] = bandsName;
-      response_value_bands_i["level"] = level;
+      response_value_bands_i["level"] = limitValue(level, 0, 100);
     }
     return success;
   }
@@ -275,7 +275,7 @@ bool SinricProSpeaker::handleRequest(const char* deviceId, const char* action, J
       success = adjustBandsCallback(deviceId, bandsName, levelDelta);
       JsonObject response_value_bands_i = response_value_bands.createNestedObject();
       response_value_bands_i["name"] = bandsName;
-      response_value_bands_i["level"] = levelDelta;
+      response_value_bands_i["level"] = limitValue(levelDelta, 0, 100);
     }
     return success;
   }
@@ -290,7 +290,7 @@ bool SinricProSpeaker::handleRequest(const char* deviceId, const char* action, J
       success = adjustBandsCallback(deviceId, bandsName, level);
       JsonObject response_value_bands_i = response_value_bands.createNestedObject();
       response_value_bands_i["name"] = bandsName;
-      response_value_bands_i["level"] = level;
+      response_value_bands_i["level"] = limitValue(level, 0, 100);
     }
     return success;
   }