Code optimization

- removed unnecessary includes
- simplified call for standard request handler
- simplified SinricProSwitch to a typedef
   since SinricProDevice handles powerState

Author: sivar2311

SinricPro.h

@@ -5,4 +5,6 @@
  *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
  */
 
+#include <ArduonoJson.h>
+#include <WebSockets.h>
 #include "src/SinricPro.h"

src/SinricProContactsensor.h

@@ -9,7 +9,6 @@
 #define _SINRICCONTACTSENSOR_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProContactsensor :  public SinricProDevice {
   public:

src/SinricProDimSwitch.h

@@ -9,7 +9,6 @@
 #define _SINRICDIMSWITCH_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProDimSwitch :  public SinricProDevice {
   public:
@@ -37,10 +36,10 @@ SinricProDimSwitch::SinricProDimSwitch(const char* deviceId, unsigned long event
 
 bool SinricProDimSwitch::handleRequest(const char* deviceId, const char* action, JsonObject &request_value, JsonObject &response_value) {
   if (strcmp(deviceId, this->deviceId) != 0) return false;
+  
+  if (SinricProDevice::handleRequest(deviceId, action, request_value, response_value)) return true;
 
-  bool success = SinricProDevice::handleRequest(deviceId, action, request_value, response_value);
-  if (success) return success;
-
+  bool success = false;
   String actionString = String(action);
 
   if (powerLevelCallback && actionString == "setPowerLevel") {

src/SinricProDoorbell.h

@@ -9,7 +9,6 @@
 #define _SINRICDOORBELL_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProDoorbell :  public SinricProDevice {
   public:

src/SinricProFan.h

@@ -9,7 +9,6 @@
 #define _SINRICFAN_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 /*
  * SinricFan is the same deviceType like SinricDimSwitch

src/SinricProFanUS.h

@@ -9,7 +9,6 @@
 #define _SINRICFANUS_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProFanUS :  public SinricProDevice {
   public:
@@ -34,9 +33,9 @@ SinricProFanUS::SinricProFanUS(const char* deviceId, unsigned long eventWaitTime
 
 bool SinricProFanUS::handleRequest(const char* deviceId, const char* action, JsonObject &request_value, JsonObject &response_value) {
   if (strcmp(deviceId, this->deviceId) != 0) return false;
-  bool success = SinricProDevice::handleRequest(deviceId, action, request_value, response_value); // call default handler
-  if (success) return success; // default handler handled request? return...
+  if (SinricProDevice::handleRequest(deviceId, action, request_value, response_value)) return true;
 
+  bool success = false;
   String actionString = String(action);
 
   if (actionString == "setRangeValue" && rangeValueCallback) {

src/SinricProLight.h

@@ -9,7 +9,6 @@
 #define _SINRICLIGHT_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProLight :  public SinricProDevice {
   public:
@@ -52,9 +51,9 @@ SinricProLight::SinricProLight(const char* deviceId, unsigned long eventWaitTime
 
 bool SinricProLight::handleRequest(const char* deviceId, const char* action, JsonObject &request_value, JsonObject &response_value) {
   if (strcmp(deviceId, this->deviceId) != 0) return false;
-  bool success = SinricProDevice::handleRequest(deviceId, action, request_value, response_value); // call default handler
-  if (success) return success; // default handler handled request? return...
+  if (SinricProDevice::handleRequest(deviceId, action, request_value, response_value)) return true;
 
+  bool success = false;
   String actionString = String(action);
 
   if (brightnessCallback && actionString == "setBrightness") {

src/SinricProLock.h

@@ -9,7 +9,6 @@
 #define _SINRICLOCK_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProLock :  public SinricProDevice {
   public:

src/SinricProMotionsensor.h

@@ -9,7 +9,6 @@
 #define _SINRICMOTIONSENSOR_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProMotionsensor :  public SinricProDevice {
   public:

src/SinricProSpeaker.h

@@ -9,7 +9,6 @@
 #define _SINRICSPEAKER_H_
 
 #include "SinricProDevice.h"
-#include <ArduinoJson.h>
 
 class SinricProSpeaker :  public SinricProDevice {
   public:
@@ -63,9 +62,9 @@ SinricProSpeaker::SinricProSpeaker(const char* deviceId, unsigned long eventWait
 
 bool SinricProSpeaker::handleRequest(const char* deviceId, const char* action, JsonObject &request_value, JsonObject &response_value) {
   if (strcmp(deviceId, this->deviceId) != 0) return false;
-  bool success = SinricProDevice::handleRequest(deviceId, action, request_value, response_value); // call default handler
-  if (success) return success; // default handler handled request? return...
+  if (SinricProDevice::handleRequest(deviceId, action, request_value, response_value)) return true;
 
+  bool success = false;
   String actionString = String(action);
 
   if (volumeCallback && actionString == "setVolume") {