andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes for 2.5.1 arduino core

Browse Source
This commit is contained in:
proddy
2019-05-17 13:42:51 +02:00
parent 14353d8e3c
commit f35fdfab7c
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- MM50 Mixer
### Fixed
- runtime exceptions with latest 2.5.1 arduino core
### Changed ### Changed
## [1.7.0] 2019-05-11 ## [1.7.0] 2019-05-11

8
lib/MyESP/MyESP.cpp
View File

@@ -906,14 +906,14 @@ void MyESP::showSystemStats() {
char buffer[16] = {0}; char buffer[16] = {0};
/* Crash info */ /* Crash info */
myDebug_P(PSTR(" [EEPROM] EEPROM size: %u"), EEPROMr.reserved() * SPI_FLASH_SEC_SIZE); 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, 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++) { for (uint32_t i = 0; i < EEPROMr.size(); i++) {
strlcat(output_str, itoa(EEPROMr.base() - i, buffer, 10), sizeof(output_str)); 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 #endif
#ifdef ARDUINO_BOARD #ifdef ARDUINO_BOARD

2
lib/MyESP/MyESP.h
View File

@@ -9,7 +9,7 @@
#ifndef MyEMS_h #ifndef MyEMS_h
#define MyEMS_h #define MyEMS_h
#define MYESP_VERSION "1.1.10" #define MYESP_VERSION "1.1.11"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <ArduinoOTA.h> #include <ArduinoOTA.h>

2
src/ems-esp.cpp
View File

@@ -93,7 +93,7 @@ typedef struct {
bool doingColdShot; // true if we've just sent a jolt of cold water bool doingColdShot; // true if we've just sent a jolt of cold water
} _EMSESP_Shower; } _EMSESP_Shower;
command_t PROGMEM project_cmds[] = { command_t project_cmds[] = {
{true, "led <on | off>", "toggle status LED on/off"}, {true, "led <on | off>", "toggle status LED on/off"},
{true, "led_gpio <gpio>", "set the LED pin. Default is the onboard LED (D1=5)"}, {true, "led_gpio <gpio>", "set the LED pin. Default is the onboard LED (D1=5)"},

1
src/ems_devices.h
View File

@@ -166,6 +166,7 @@ const _Other_Type Other_Types[] = {
{EMS_MODEL_OTHER, 250, 0x11, "WM10 Switch Module"}, // warning, fake product id! {EMS_MODEL_OTHER, 250, 0x11, "WM10 Switch Module"}, // warning, fake product id!
{EMS_MODEL_OTHER, 160, 0x20, "MM100 Mixing Module"}, {EMS_MODEL_OTHER, 160, 0x20, "MM100 Mixing Module"},
{EMS_MODEL_OTHER, 160, 0x21, "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, 68, 0x09, "BC10/RFM20 Receiver"},
{EMS_MODEL_OTHER, 190, 0x09, "BC10 Base Controller"}, {EMS_MODEL_OTHER, 190, 0x09, "BC10 Base Controller"},
{EMS_MODEL_OTHER, 114, 0x09, "BC10 Base Controller"}, {EMS_MODEL_OTHER, 114, 0x09, "BC10 Base Controller"},

2
src/version.h
View File

@@ -6,5 +6,5 @@
#pragma once #pragma once
#define APP_NAME "EMS-ESP" #define APP_NAME "EMS-ESP"
#define APP_VERSION "1.8.0b0" #define APP_VERSION "1.8.0b1"
#define APP_HOSTNAME "ems-esp" #define APP_HOSTNAME "ems-esp"