Fixed: Namespace issues with custom devices

Author: sivar2311

changelog.md

@@ -1,4 +1,6 @@
 # Changelog
+## Version 2.9.15
+- Fixed: Namespace issues with custom devices
 
 ## Version 2.9.14
 - Fixed: Cannot connect to the server.

library.json

@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "2.9.14",
+  "version": "2.9.15",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",

library.properties

@@ -1,5 +1,5 @@
 name=SinricPro
-version=2.9.14
+version=2.9.15
 author=Boris Jaeger <[email protected]>
 maintainer=Boris Jaeger <[email protected]>
 sentence=Library for https://sinric.pro - simple way to connect your device to alexa

src/Capabilities/AirQualitySensor.h

@@ -54,4 +54,7 @@ bool AirQualitySensor<T>::sendAirQualityEvent(int pm1, int pm2_5, int pm10, Stri
   return device->sendEvent(eventMessage);
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using AirQualitySensor = SINRICPRO_NAMESPACE::AirQualitySensor<T>;

src/Capabilities/BrightnessController.h

@@ -135,4 +135,7 @@ bool BrightnessController<T>::handleBrightnessController(SinricProRequest &reque
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using BrightnessController = SINRICPRO_NAMESPACE::BrightnessController<T>;

src/Capabilities/ChannelController.h

@@ -183,4 +183,7 @@ bool ChannelController<T>::handleChannelController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using ChannelController = SINRICPRO_NAMESPACE::ChannelController<T>;

src/Capabilities/ColorController.h

@@ -117,4 +117,7 @@ bool ColorController<T>::handleColorController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using ColorController = SINRICPRO_NAMESPACE::ColorController<T>;

src/Capabilities/ColorTemperatureController.h

@@ -174,4 +174,7 @@ bool ColorTemperatureController<T>::handleColorTemperatureController(SinricProRe
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using ColorTemperatureController = SINRICPRO_NAMESPACE::ColorTemperatureController<T>;

src/Capabilities/ContactSensor.h

@@ -47,4 +47,7 @@ bool ContactSensor<T>::sendContactEvent(bool detected, String cause) {
   return device->sendEvent(eventMessage);
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using ContactSensor = SINRICPRO_NAMESPACE::ContactSensor<T>;

src/Capabilities/DoorController.h

@@ -99,4 +99,7 @@ bool DoorController<T>::handleDoorController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using DoorController = SINRICPRO_NAMESPACE::DoorController<T>;

src/Capabilities/Doorbell.h

@@ -46,4 +46,7 @@ bool Doorbell<T>::sendDoorbellEvent(String cause) {
   return device->sendEvent(eventMessage);
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using Doorbell = SINRICPRO_NAMESPACE::Doorbell<T>;

src/Capabilities/EqualizerController.h

@@ -213,4 +213,7 @@ bool EqualizerController<T>::handleEqualizerController(SinricProRequest &request
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using EqualizerController = SINRICPRO_NAMESPACE::EqualizerController<T>;

src/Capabilities/InputController.h

@@ -102,4 +102,7 @@ bool InputController<T>::handleInputController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using InputController = SINRICPRO_NAMESPACE::InputController<T>;

src/Capabilities/KeypadController.h

@@ -78,4 +78,7 @@ bool KeypadController<T>::handleKeypadController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using KeypadController = SINRICPRO_NAMESPACE::KeypadController<T>;

src/Capabilities/LockController.h

@@ -110,4 +110,7 @@ bool LockController<T>::handleLockController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using LockController = SINRICPRO_NAMESPACE::LockController<T>;

src/Capabilities/MediaController.h

@@ -102,4 +102,7 @@ bool MediaController<T>::handleMediaController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using MediaController = SINRICPRO_NAMESPACE::MediaController<T>;

src/Capabilities/ModeController.h

@@ -170,4 +170,7 @@ bool ModeController<T>::handleModeController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using ModeController = SINRICPRO_NAMESPACE::ModeController<T>;

src/Capabilities/MotionSensor.h

@@ -48,4 +48,7 @@ bool MotionSensor<T>::sendMotionEvent(bool detected, String cause) {
   return device->sendEvent(eventMessage);
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using MotionSensor = SINRICPRO_NAMESPACE::MotionSensor<T>;

src/Capabilities/MuteController.h

@@ -98,4 +98,7 @@ bool MuteController<T>::handleMuteController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using MuteController = SINRICPRO_NAMESPACE::MuteController<T>;

src/Capabilities/PercentageController.h

@@ -136,4 +136,7 @@ bool PercentageController<T>::handlePercentageController(SinricProRequest &reque
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using PercentageController = SINRICPRO_NAMESPACE::PercentageController<T>;

src/Capabilities/PowerLevelController.h

@@ -137,4 +137,7 @@ bool PowerLevelController<T>::handlePowerLevelController(SinricProRequest &reque
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using PowerLevelController = SINRICPRO_NAMESPACE::PowerLevelController<T>;

src/Capabilities/PowerSensor.h

@@ -85,4 +85,7 @@ float PowerSensor<T>::getWattHours(unsigned long currentTimestamp) {
   return 0;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using PowerSensor = SINRICPRO_NAMESPACE::PowerSensor<T>;

src/Capabilities/PowerStateController.h

@@ -102,4 +102,7 @@ bool PowerStateController<T>::handlePowerStateController(SinricProRequest &reque
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using PowerStateController = SINRICPRO_NAMESPACE::PowerStateController<T>;

src/Capabilities/RangeController.h

@@ -320,4 +320,7 @@ bool RangeController<T>::handleRangeController(SinricProRequest &request) {
   return false;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using RangeController = SINRICPRO_NAMESPACE::RangeController<T>;

src/Capabilities/SettingController.h

@@ -54,4 +54,7 @@ bool SettingController<T>::handleSettingController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using SettingController = SINRICPRO_NAMESPACE::SettingController<T>;

src/Capabilities/TemperatureSensor.h

@@ -49,4 +49,7 @@ bool TemperatureSensor<T>::sendTemperatureEvent(float temperature, float humidit
   return device->sendEvent(eventMessage);
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using TemperatureSensor = SINRICPRO_NAMESPACE::TemperatureSensor<T>;

src/Capabilities/ThermostatController.h

@@ -208,4 +208,7 @@ bool ThermostatController<T>::handleThermostatController(SinricProRequest &reque
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using ThermostatController = SINRICPRO_NAMESPACE::ThermostatController<T>;

src/Capabilities/ToggleController.h

@@ -108,4 +108,7 @@ bool ToggleController<T>::handleToggleController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using ToggleController = SINRICPRO_NAMESPACE::ToggleController<T>;

src/Capabilities/VolumeController.h

@@ -139,4 +139,7 @@ bool VolumeController<T>::handleVolumeController(SinricProRequest &request) {
   return success;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+template <typename T>
+using VolumeController = SINRICPRO_NAMESPACE::VolumeController<T>;

src/SinricProDevice.h

@@ -109,4 +109,6 @@ bool SinricProDevice::handleRequest(SinricProRequest &request) {
   return false;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+using SinricProDevice = SINRICPRO_NAMESPACE::SinricProDevice;

src/SinricProVersion.h

@@ -6,7 +6,7 @@
 // Version Configuration
 #define SINRICPRO_VERSION_MAJOR     2
 #define SINRICPRO_VERSION_MINOR     9
-#define SINRICPRO_VERSION_REVISION  14
+#define SINRICPRO_VERSION_REVISION  15
 #define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
 #define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"
 #define SINRICPRO_VERISON_INT SINRICPRO_VERSION_MAJOR * 1000000 + SINRICPRO_VERSION_MINOR * 1000 + SINRICPRO_VERSION_REVISION