Merge branch '2.7.6'

changelog.md

@@ -1,4 +1,13 @@
 # Changelog
+## Version 2.7.6
+- Internal changes
+  removed QueueList.h and use std::queue instead
+
+## Version 2.7.5
+- New Examples 
+  - Examples / Light / RGB_LED_Stripe_5050
+  - Examples / Switch / Relay
+
 ## Version 2.7.4
 - New
   - Speaker & TV `onAdjustVolume` callback changed:

examples/Light/RGB_LED_Stripe_5050/RGB_LED_Stripe_5050.ino

@@ -0,0 +1,117 @@
+/*
+ * If you encounter any issues:
+ * - check the readme.md at https://github.com/sinricpro/esp8266-esp32-sdk/blob/master/README.md
+ * - ensure all dependent libraries are installed
+ *   - see https://github.com/sinricpro/esp8266-esp32-sdk/blob/master/README.md#arduinoide
+ *   - see https://github.com/sinricpro/esp8266-esp32-sdk/blob/master/README.md#dependencies
+ * - open serial monitor and check whats happening
+ * - check full user documentation at https://sinricpro.github.io/esp8266-esp32-sdk
+ * - visit https://github.com/sinricpro/esp8266-esp32-sdk/issues and check for existing issues or open a new one
+ */
+
+// Uncomment the following line to enable serial debug output
+//#define ENABLE_DEBUG
+
+#ifdef ENABLE_DEBUG
+       #define DEBUG_ESP_PORT Serial
+       #define NODEBUG_WEBSOCKETS
+       #define NDEBUG
+#endif 
+
+#include <Arduino.h>
+#ifdef ESP8266 
+       #include <ESP8266WiFi.h>
+#endif 
+#ifdef ESP32   
+       #include <WiFi.h>
+#endif
+
+#include "SinricPro.h"
+#include "SinricProLight.h"
+
+#define WIFI_SSID         "YOUR-WIFI-SSID"    
+#define WIFI_PASS         "YOUR-WIFI-PASS"
+#define APP_KEY           "YOUR-APPKEY"             // Should look like "de0bxxxx-1x3x-4x3x-ax2x-5dabxxxxxxxx"
+#define APP_SECRET        "YOUR-APPSECRET"          // Should look like "5f36xxxx-x3x7-4x3x-xexe-e86724a9xxxx-4c4axxxx-3x3x-x5xe-x9x3-333d65xxxxxx"
+#define LIGHT_ID          "YOUR-DEVICEID"           // Should look like "5dc1564130xxxxxxxxxxxxxx"
+#define BAUD_RATE         9600                      // Change baudrate to your need for serial log
+
+#define BLUE_PIN          D5                        // PIN for BLUE Mosfet  - change this to your need (D5 = GPIO14 on ESP8266)
+#define RED_PIN           D6                        // PIN for RED Mosfet   - change this to your need (D6 = GPIO12 on ESP8266)
+#define GREEN_PIN         D7                        // PIN for GREEN Mosfet - change this to your need (D7 = GPIO13 on ESP8266)
+
+struct {                                            // Stores current device state with following initial values:
+  bool powerState = false;                          // initial state is off
+  int brightness = 100;                             // initial brightness is set to 100
+  struct {
+    byte r = 255;                                   // color
+    byte g = 255;                                   // is set 
+    byte b = 255;                                   // to white
+  } color;
+} device_state; 
+
+// setStripe: sets the mosfets values corresponding to values stored in device_state
+void setStripe() {
+  int rValue = map(device_state.color.r * device_state.brightness, 0, 255 * 100, 0, 1023);  // calculate red value and map between 0 and 1023 for analogWrite
+  int gValue = map(device_state.color.g * device_state.brightness, 0, 255 * 100, 0, 1023);  // calculate green value and map between 0 and 1023 for analogWrite
+  int bValue = map(device_state.color.b * device_state.brightness, 0, 255 * 100, 0, 1023);  // calculate blue value and map between 0 and 1023 for analogWrite
+
+  if (device_state.powerState == false) {           // turn off?
+    digitalWrite(RED_PIN,   LOW);                   // set
+    digitalWrite(GREEN_PIN, LOW);                   // mosfets
+    digitalWrite(BLUE_PIN,  LOW);                   // low
+  } else {
+    analogWrite(RED_PIN,   rValue);                 // write red value to pin
+    analogWrite(GREEN_PIN, gValue);                 // write green value to pin
+    analogWrite(BLUE_PIN,  bValue);                 // write blue value to pin
+  }
+}
+
+bool onPowerState(const String &deviceId, bool &state) {
+  device_state.powerState = state;                  // store the new power state
+  setStripe();                                      // update the mosfets
+  return true;
+}
+
+bool onBrightness(const String &deviceId, int &brightness) {
+  device_state.brightness = brightness;             // store new brightness level
+  setStripe();                                      // update the mosfets
+  return true;
+}
+
+bool onAdjustBrightness(const String &deviceId, int &brightnessDelta) {
+  device_state.brightness += brightnessDelta;       // calculate and store new absolute brightness
+  brightnessDelta = device_state.brightness;        // return absolute brightness
+  setStripe();                                      // update the mosfets
+  return true;
+}
+
+bool onColor(const String &deviceId, byte &r, byte &g, byte &b) {
+  device_state.color.r = r;                         // store new red value
+  device_state.color.g = g;                         // store new green value
+  device_state.color.b = b;                         // store new blue value
+  setStripe();                                      // update the mosfets
+  return true;
+}
+
+void setup() {
+  pinMode(RED_PIN,   OUTPUT);                       // set red-mosfet pin as output
+  pinMode(GREEN_PIN, OUTPUT);                       // set green-mosfet pin as output
+  pinMode(BLUE_PIN,  OUTPUT);                       // set blue-mosfet pin as output
+
+  Serial.begin(BAUD_RATE);                          // setup serial 
+
+  WiFi.begin(WIFI_SSID, WIFI_PASS);                 // connect wifi
+
+  SinricProLight &myLight = SinricPro[LIGHT_ID];    // create light device
+  myLight.onPowerState(onPowerState);               // set PowerState callback
+  myLight.onBrightness(onBrightness);               // set Brightness callback
+  myLight.onAdjustBrightness(onAdjustBrightness);   // set AdjustBrightness callback
+  myLight.onColor(onColor);                         // set Color callback
+
+  SinricPro.begin(APP_KEY, APP_SECRET);             // start SinricPro 
+}
+
+void loop() {
+  SinricPro.handle();                               // handle SinricPro communication
+}

examples/Switch/Relay/Relay.ino

@@ -0,0 +1,57 @@
+/*
+ * If you encounter any issues:
+ * - check the readme.md at https://github.com/sinricpro/esp8266-esp32-sdk/blob/master/README.md
+ * - ensure all dependent libraries are installed
+ *   - see https://github.com/sinricpro/esp8266-esp32-sdk/blob/master/README.md#arduinoide
+ *   - see https://github.com/sinricpro/esp8266-esp32-sdk/blob/master/README.md#dependencies
+ * - open serial monitor and check whats happening
+ * - check full user documentation at https://sinricpro.github.io/esp8266-esp32-sdk
+ * - visit https://github.com/sinricpro/esp8266-esp32-sdk/issues and check for existing issues or open a new one
+ */
+
+// Uncomment the following line to enable serial debug output
+//#define ENABLE_DEBUG
+
+#ifdef ENABLE_DEBUG
+       #define DEBUG_ESP_PORT Serial
+       #define NODEBUG_WEBSOCKETS
+       #define NDEBUG
+#endif 
+
+#include <Arduino.h>
+#ifdef ESP8266 
+       #include <ESP8266WiFi.h>
+#endif 
+#ifdef ESP32   
+       #include <WiFi.h>
+#endif
+
+#include "SinricPro.h"
+#include "SinricProSwitch.h"
+
+#define WIFI_SSID         "YOUR-WIFI-SSID"    
+#define WIFI_PASS         "YOUR-WIFI-PASS"
+#define APP_KEY           "YOUR-APP-KEY"      // Should look like "de0bxxxx-1x3x-4x3x-ax2x-5dabxxxxxxxx"
+#define APP_SECRET        "YOUR-APP-SECRET"   // Should look like "5f36xxxx-x3x7-4x3x-xexe-e86724a9xxxx-4c4axxxx-3x3x-x5xe-x9x3-333d65xxxxxx"
+#define SWITCH_ID         "YOUR-DEVICE-ID"    // Should look like "5dc1564130xxxxxxxxxxxxxx"
+#define BAUD_RATE         9600                // Change baudrate to your need
+
+#define RELAY_PIN         D5                  // Pin where the relay is connected (D5 = GPIO 14 on ESP8266)
+
+bool onPowerState(const String &deviceId, bool &state) {
+  digitalWrite(RELAY_PIN, state);             // set pin state
+  return true;                                // request handled properly
+}
+
+void setup() {
+  pinMode(RELAY_PIN, OUTPUT);                 // set relay-pin to output mode
+  WiFi.begin(WIFI_SSID, WIFI_PASS);           // start wifi
+
+  SinricProSwitch& mySwitch = SinricPro[SWITCH_ID];   // create new switch device
+  mySwitch.onPowerState(onPowerState);                // apply onPowerState callback
+  SinricPro.begin(APP_KEY, APP_SECRET);               // start SinricPro
+}
+
+void loop() {
+  SinricPro.handle();                         // handle SinricPro commands
+}

library.json

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

library.properties

@@ -1,5 +1,5 @@
 name=SinricPro
-version=2.7.4
+version=2.7.6
 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/SinricPro.h

@@ -324,11 +324,12 @@ void SinricProClass::handleRequest(DynamicJsonDocument& requestMessage, interfac
 }
 
 void SinricProClass::handleReceiveQueue() {
-  if (receiveQueue.count() == 0) return;
+  if (receiveQueue.size() == 0) return;
 
-  DEBUG_SINRIC("[SinricPro.handleReceiveQueue()]: %i message(s) in receiveQueue\r\n", receiveQueue.count());
-  while (receiveQueue.count() > 0) {
-    SinricProMessage* rawMessage = receiveQueue.pop();
+  DEBUG_SINRIC("[SinricPro.handleReceiveQueue()]: %i message(s) in receiveQueue\r\n", receiveQueue.size());
+  while (receiveQueue.size() > 0) {
+    SinricProMessage* rawMessage = receiveQueue.front();
+    receiveQueue.pop();
     DynamicJsonDocument jsonMessage(1024);
     deserializeJson(jsonMessage, rawMessage->getMessage());
 
@@ -357,11 +358,11 @@ void SinricProClass::handleReceiveQueue() {
 void SinricProClass::handleSendQueue() {
   if (!isConnected()) return;
   if (!baseTimestamp) return;
-  while (sendQueue.count() > 0) {
-    DEBUG_SINRIC("[SinricPro:handleSendQueue()]: %i message(s) in sendQueue\r\n", sendQueue.count());
+  while (sendQueue.size() > 0) {
+    DEBUG_SINRIC("[SinricPro:handleSendQueue()]: %i message(s) in sendQueue\r\n", sendQueue.size());
     DEBUG_SINRIC("[SinricPro:handleSendQueue()]: Sending message...\r\n");
 
-    SinricProMessage* rawMessage = sendQueue.pop();
+    SinricProMessage* rawMessage = sendQueue.front(); sendQueue.pop();
 
     DynamicJsonDocument jsonMessage(1024);
     deserializeJson(jsonMessage, rawMessage->getMessage());

src/SinricProConfig.h

@@ -25,7 +25,7 @@
 // Version Configuration
 #define SINRICPRO_VERSION_MAJOR     2
 #define SINRICPRO_VERSION_MINOR     7
-#define SINRICPRO_VERSION_REVISION  4
+#define SINRICPRO_VERSION_REVISION  6
 #define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
 #define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"