Merge branch 'dev-2.6.1'

sivar2311 · sivar2311 · commit 741105342578 · 2020-08-14T05:27:19.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 2.6.1
+Fixed:
+  Air Quality Sensor example for sensor type GP2Y1014AU0F
+
 ## Version 2.6.0
 New:
 - Devices
diff --git a/examples/AirQualitySensor/AirQualitySensor_gp2y1014au0f_example.ino b/examples/AirQualitySensor/AirQualitySensor_gp2y1014au0f_example.ino
diff --git a/examples/Camera/Camera.ino b/examples/Camera/Camera.ino
@@ -32,6 +32,7 @@
 #include "SinricPro.h"
 #include "SinricProCamera.h"
 
+// Micro-RTSP from https://github.com/geeksville/Micro-RTSP 
 #include "SimStreamer.h"
 #include "OV2640Streamer.h"
 #include "CRtspSession.h"
diff --git a/library.json b/library.json
@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "2.6.0",
+  "version": "2.6.1",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SinricPro
-version=2.6.0
+version=2.6.1
 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/SinricProConfig.h b/src/SinricProConfig.h
@@ -25,7 +25,7 @@
 // Version Configuration
 #define SINRICPRO_VERSION_MAJOR     2
 #define SINRICPRO_VERSION_MINOR     6
-#define SINRICPRO_VERSION_REVISION  0
+#define SINRICPRO_VERSION_REVISION  1
 #define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
 
 // Server Configuration

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.6.0",`
	`16`	`+ "version": "2.6.1",`
`17`	`17`	`"frameworks": "arduino",`
`18`	`18`	`"platforms": [`
`19`	`19`	`"espressif8266",`