From f35fdfab7c6234fea5775d1e626aa16bbafccc12 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Fri, 17 May 2019 13:42:51 +0200
Subject: [PATCH] fixes for 2.5.1 arduino core

---
 CHANGELOG.md        | 6 ++++++
 lib/MyESP/MyESP.cpp | 8 ++++----
 lib/MyESP/MyESP.h   | 2 +-
 src/ems-esp.cpp     | 2 +-
 src/ems_devices.h   | 1 +
 src/version.h       | 2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1d64bacf..5c6b15a45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- MM50 Mixer
+
+### Fixed
+
+- runtime exceptions with latest 2.5.1 arduino core
+
 ### Changed
 
 ## [1.7.0] 2019-05-11
diff --git a/lib/MyESP/MyESP.cpp b/lib/MyESP/MyESP.cpp
index 2997543aa..ac1b4adcb 100644
--- a/lib/MyESP/MyESP.cpp
+++ b/lib/MyESP/MyESP.cpp
@@ -906,14 +906,14 @@ void MyESP::showSystemStats() {
     char buffer[16]     = {0};
     /* Crash info */
     myDebug_P(PSTR(" [EEPROM] EEPROM size: %u"), EEPROMr.reserved() * SPI_FLASH_SEC_SIZE);
-    strlcpy(output_str, PSTR(" [EEPROM] EEPROM Sector pool size is "), sizeof(output_str));
+    strlcpy(output_str, " [EEPROM] EEPROM Sector pool size is ", sizeof(output_str));
     strlcat(output_str, itoa(EEPROMr.size(), buffer, 10), sizeof(output_str));
-    strlcat(output_str, PSTR(", and in use are: "), sizeof(output_str));
+    strlcat(output_str, ", and in use are: ", sizeof(output_str));
     for (uint32_t i = 0; i < EEPROMr.size(); i++) {
         strlcat(output_str, itoa(EEPROMr.base() - i, buffer, 10), sizeof(output_str));
-        strlcat(output_str, PSTR(" "), sizeof(output_str));
+        strlcat(output_str, " ", sizeof(output_str));
     }
-    myDebug_P(output_str);
+    myDebug(output_str);
 #endif
 
 #ifdef ARDUINO_BOARD
diff --git a/lib/MyESP/MyESP.h b/lib/MyESP/MyESP.h
index eed927d77..513cc01e6 100644
--- a/lib/MyESP/MyESP.h
+++ b/lib/MyESP/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyEMS_h
 #define MyEMS_h
 
-#define MYESP_VERSION "1.1.10"
+#define MYESP_VERSION "1.1.11"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index b9caf386c..c059bcf20 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -93,7 +93,7 @@ typedef struct {
     bool     doingColdShot; // true if we've just sent a jolt of cold water
 } _EMSESP_Shower;
 
-command_t PROGMEM project_cmds[] = {
+command_t project_cmds[] = {
 
     {true, "led <on | off>", "toggle status LED on/off"},
     {true, "led_gpio <gpio>", "set the LED pin. Default is the onboard LED (D1=5)"},
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 0030a7d83..96261fb31 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -166,6 +166,7 @@ const _Other_Type Other_Types[] = {
     {EMS_MODEL_OTHER, 250, 0x11, "WM10 Switch Module"}, // warning, fake product id!
     {EMS_MODEL_OTHER, 160, 0x20, "MM100 Mixing Module"},
     {EMS_MODEL_OTHER, 160, 0x21, "MM100 Mixing Module"},
+    {EMS_MODEL_OTHER, 159, 0x21, "MM50 Mixing Module"},
     {EMS_MODEL_OTHER, 68, 0x09, "BC10/RFM20 Receiver"},
     {EMS_MODEL_OTHER, 190, 0x09, "BC10 Base Controller"},
     {EMS_MODEL_OTHER, 114, 0x09, "BC10 Base Controller"},
diff --git a/src/version.h b/src/version.h
index ebd036990..96cb58d33 100644
--- a/src/version.h
+++ b/src/version.h
@@ -6,5 +6,5 @@
 #pragma once
 
 #define APP_NAME "EMS-ESP"
-#define APP_VERSION "1.8.0b0"
+#define APP_VERSION "1.8.0b1"
 #define APP_HOSTNAME "ems-esp"