Fixed: Namespace issues with custom devices

sivar2311 · sivar2311 · commit ac9885c908bf · 2022-01-31T13:51:05.000+01:00
diff --git a/changelog.md b/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.
diff --git a/library.json b/library.json
@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "2.9.14",
+  "version": "2.9.15",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SinricPro
-version=2.9.14
+version=2.9.15
 author=Boris Jaeger <sivar2311@gmail.com>
 maintainer=Boris Jaeger <sivar2311@gmail.com>
 sentence=Library for https://sinric.pro - simple way to connect your device to alexa
diff --git a/src/Capabilities/AirQualitySensor.h b/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>;
diff --git a/src/Capabilities/BrightnessController.h b/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>;
diff --git a/src/Capabilities/ChannelController.h b/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>;
diff --git a/src/Capabilities/ColorController.h b/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>;
diff --git a/src/Capabilities/ColorTemperatureController.h b/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>;
diff --git a/src/Capabilities/ContactSensor.h b/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>;
diff --git a/src/Capabilities/DoorController.h b/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>;
diff --git a/src/Capabilities/Doorbell.h b/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>;
diff --git a/src/Capabilities/EqualizerController.h b/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>;
diff --git a/src/Capabilities/InputController.h b/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>;
diff --git a/src/Capabilities/KeypadController.h b/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>;
diff --git a/src/Capabilities/LockController.h b/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>;
diff --git a/src/Capabilities/MediaController.h b/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>;
diff --git a/src/Capabilities/ModeController.h b/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>;
diff --git a/src/Capabilities/MotionSensor.h b/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>;
diff --git a/src/Capabilities/MuteController.h b/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>;
diff --git a/src/Capabilities/PercentageController.h b/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>;
diff --git a/src/Capabilities/PowerLevelController.h b/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>;
diff --git a/src/Capabilities/PowerSensor.h b/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>;
diff --git a/src/Capabilities/PowerStateController.h b/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>;
diff --git a/src/Capabilities/RangeController.h b/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>;
diff --git a/src/Capabilities/SettingController.h b/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>;
diff --git a/src/Capabilities/TemperatureSensor.h b/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>;
diff --git a/src/Capabilities/ThermostatController.h b/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>;
diff --git a/src/Capabilities/ToggleController.h b/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>;
diff --git a/src/Capabilities/VolumeController.h b/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>;
diff --git a/src/SinricProDevice.h b/src/SinricProDevice.h
@@ -109,4 +109,6 @@ bool SinricProDevice::handleRequest(SinricProRequest &request) {
   return false;
 }
 
-} // SINRICPRO_NAMESPACE
+} // SINRICPRO_NAMESPACE
+
+using SinricProDevice = SINRICPRO_NAMESPACE::SinricProDevice;
diff --git a/src/SinricProVersion.h b/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

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"maintainer": true`
`14`	`14`	`}`
`15`	`15`	`],`
`16`		`- "version": "2.9.14",`
	`16`	`+ "version": "2.9.15",`
`17`	`17`	`"frameworks": "arduino",`
`18`	`18`	`"platforms": [`
`19`	`19`	`"espressif8266",`
-Original file line number
+Diff line change
@@ @@ -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
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,7 @@ bool AirQualitySensor<T>::sendAirQualityEvent(int pm1, int pm2_5, int pm10, Stri`
`54`	`54`	`return device->sendEvent(eventMessage);`
`55`	`55`	`}`
`56`	`56`
`57`		`-} // SINRICPRO_NAMESPACE`
	`57`	`+} // SINRICPRO_NAMESPACE`
	`58`	`+`
	`59`	`+template <typename T>`
	`60`	`+using AirQualitySensor = SINRICPRO_NAMESPACE::AirQualitySensor<T>;`
Original file line number	Diff line number	Diff line change
`@@ -135,4 +135,7 @@ bool BrightnessController<T>::handleBrightnessController(SinricProRequest &reque`
`135`	`135`	`return success;`
`136`	`136`	`}`
`137`	`137`
`138`		`-} // SINRICPRO_NAMESPACE`
	`138`	`+} // SINRICPRO_NAMESPACE`
	`139`	`+`
	`140`	`+template <typename T>`
	`141`	`+using BrightnessController = SINRICPRO_NAMESPACE::BrightnessController<T>;`
Original file line number	Diff line number	Diff line change
`@@ -183,4 +183,7 @@ bool ChannelController<T>::handleChannelController(SinricProRequest &request) {`
`183`	`183`	`return success;`
`184`	`184`	`}`
`185`	`185`
`186`		`-} // SINRICPRO_NAMESPACE`
	`186`	`+} // SINRICPRO_NAMESPACE`
	`187`	`+`
	`188`	`+template <typename T>`
	`189`	`+using ChannelController = SINRICPRO_NAMESPACE::ChannelController<T>;`
Original file line number	Diff line number	Diff line change
`@@ -117,4 +117,7 @@ bool ColorController<T>::handleColorController(SinricProRequest &request) {`
`117`	`117`	`return success;`
`118`	`118`	`}`
`119`	`119`
`120`		`-} // SINRICPRO_NAMESPACE`
	`120`	`+} // SINRICPRO_NAMESPACE`
	`121`	`+`
	`122`	`+template <typename T>`
	`123`	`+using ColorController = SINRICPRO_NAMESPACE::ColorController<T>;`
Original file line number	Diff line number	Diff line change
`@@ -174,4 +174,7 @@ bool ColorTemperatureController<T>::handleColorTemperatureController(SinricProRe`
`174`	`174`	`return success;`
`175`	`175`	`}`
`176`	`176`
`177`		`-} // SINRICPRO_NAMESPACE`
	`177`	`+} // SINRICPRO_NAMESPACE`
	`178`	`+`
	`179`	`+template <typename T>`
	`180`	`+using ColorTemperatureController = SINRICPRO_NAMESPACE::ColorTemperatureController<T>;`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,7 @@ bool ContactSensor<T>::sendContactEvent(bool detected, String cause) {`
`47`	`47`	`return device->sendEvent(eventMessage);`
`48`	`48`	`}`
`49`	`49`
`50`		`-} // SINRICPRO_NAMESPACE`
	`50`	`+} // SINRICPRO_NAMESPACE`
	`51`	`+`
	`52`	`+template <typename T>`
	`53`	`+using ContactSensor = SINRICPRO_NAMESPACE::ContactSensor<T>;`
Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,7 @@ bool DoorController<T>::handleDoorController(SinricProRequest &request) {`
`99`	`99`	`return success;`
`100`	`100`	`}`
`101`	`101`
`102`		`-} // SINRICPRO_NAMESPACE`
	`102`	`+} // SINRICPRO_NAMESPACE`
	`103`	`+`
	`104`	`+template <typename T>`
	`105`	`+using DoorController = SINRICPRO_NAMESPACE::DoorController<T>;`