Merge pull request #109 from FabLab-Luenen/development

Bug-Fix
fablab-luenen · Nov 21, 2020 · fea1711 · fea1711
2 parents f0fb968 + b0878e9
commit fea1711
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Arduino/McLighting/rest_api.h b/Arduino/McLighting/rest_api.h
@@ -341,7 +341,7 @@ server.on("/toggle", []() {
 });
 
 server.on("/on", []() {
-  if (prevmode == OFF) {
+  if (State.mode == OFF) {
     State.mode = SET;
     #if defined(ENABLE_MQTT)
       snprintf(mqtt_buf, sizeof(mqtt_buf), "OK /%i", segState.mode[State.segment]);
@@ -358,7 +358,7 @@ server.on("/on", []() {
 });
 
 server.on("/off", []() {
-  if (State.mode == SET) {
+  if (State.mode == HOLD) {
     State.mode = OFF;
     #if defined(ENABLE_MQTT)
       snprintf(mqtt_buf, sizeof(mqtt_buf), "OK /off", "");

diff --git a/Arduino/McLighting/version.h b/Arduino/McLighting/version.h
@@ -1 +1 @@
-#define SKETCH_VERSION "3.1.3"
+#define SKETCH_VERSION "3.1.4"
diff --git a/Arduino/McLighting/version_info.ino b/Arduino/McLighting/version_info.ino
@@ -274,4 +274,8 @@
  * included pull request from issue #93
  * Fixed a GUI bug on reloading
  * ToDo: bugfixes regarding issue #70
+ * 
+ * 21.11.2020
+ * Version Bump to 3.1.4
+ * Bugfix Rest-API
  */
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define SKETCH_VERSION "3.1.3"
		#define SKETCH_VERSION "3.1.4"