Skip to content

Commit 6f758e8

Browse files
genemarsgenemars
committed
**core**:
- fixed crash on ESP8266 boards due to PROGMEM usage (issue #1)
1 parent c84e481 commit 6f758e8

4 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎src/io/IOEventPaths.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232

3333
namespace IO {
3434
namespace IOEventPaths {
35-
const char Events_Disabled[] PROGMEM = "Events.Disable";
36-
const char Program_Status[] PROGMEM = "Program.Status";
37-
const char Receiver_Command[] PROGMEM = "Receiver.Command";
38-
const char Receiver_RawData[] PROGMEM = "Receiver.RawData";
39-
const char Sensor_Button[] PROGMEM = "Sensor.Button";
40-
const char Sensor_ColorHsv[] PROGMEM = "Sensor.ColorHsv";
41-
const char Sensor_Humidity[] PROGMEM = "Sensor.Humidity";
42-
const char Sensor_Level[] PROGMEM = "Sensor.Level";
43-
const char Sensor_Luminance[] PROGMEM = "Sensor.Luminance";
44-
const char Sensor_MotionDetect[] PROGMEM = "Sensor.MotionDetect";
45-
const char Sensor_Orientation[] PROGMEM = "Sensor.Orientation";
46-
const char Sensor_Temperature[] PROGMEM = "Sensor.Temperature";
47-
const char Status_Battery[] PROGMEM = "Status.Battery";
48-
const char Status_ColorHsb[] PROGMEM = "Status.ColorHsb";
49-
const char Status_Error[] PROGMEM = "Status.Error";
50-
const char Status_IdleTime[] PROGMEM = "Status.IdleTime";
51-
const char Status_Level[] PROGMEM = "Status.Level";
52-
const char System_BytesFree[] PROGMEM = "System.BytesFree";
53-
const char System_Status[] PROGMEM = "System.Status";
35+
const char Events_Disabled[] = "Events.Disable";
36+
const char Program_Status[] = "Program.Status";
37+
const char Receiver_Command[] = "Receiver.Command";
38+
const char Receiver_RawData[] = "Receiver.RawData";
39+
const char Sensor_Button[] = "Sensor.Button";
40+
const char Sensor_ColorHsv[] = "Sensor.ColorHsv";
41+
const char Sensor_Humidity[] = "Sensor.Humidity";
42+
const char Sensor_Level[] = "Sensor.Level";
43+
const char Sensor_Luminance[] = "Sensor.Luminance";
44+
const char Sensor_MotionDetect[] = "Sensor.MotionDetect";
45+
const char Sensor_Orientation[] = "Sensor.Orientation";
46+
const char Sensor_Temperature[] = "Sensor.Temperature";
47+
const char Status_Battery[] = "Status.Battery";
48+
const char Status_ColorHsb[] = "Status.ColorHsb";
49+
const char Status_Error[] = "Status.Error";
50+
const char Status_IdleTime[] = "Status.IdleTime";
51+
const char Status_Level[] = "Status.Level";
52+
const char System_BytesFree[] = "System.BytesFree";
53+
const char System_Status[] = "System.Status";
5454
}
5555
}
5656

‎src/io/sys/Diagnostics.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ extern "C" {
5050
namespace IO { namespace System {
5151

5252
namespace SystemStatus {
53-
const char BOOT[] PROGMEM = "boot";
54-
const char DEEP_SLEEP[] PROGMEM = "deep_sleep";
55-
const char SLEEP[] PROGMEM = "sleep";
56-
const char AWAKE[] PROGMEM = "awake";
57-
const char WIFI_CONNECTED[] PROGMEM = "wifi_connected";
58-
const char WIFI_DISCONNECTED[] PROGMEM = "wifi_disconnected";
53+
const char BOOT[] = "boot";
54+
const char DEEP_SLEEP[] = "deep_sleep";
55+
const char SLEEP[] = "sleep";
56+
const char AWAKE[] = "awake";
57+
const char WIFI_CONNECTED[] = "wifi_connected";
58+
const char WIFI_DISCONNECTED[] = "wifi_disconnected";
5959
};
6060

6161
class Diagnostics : Task, public IIOEventSender {

‎src/net/HTTPServer.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ namespace Net {
3939
using namespace IO;
4040
using namespace Service;
4141

42-
const char SSDP_Name[] PROGMEM = CONFIG_DEVICE_MODEL_NAME;
43-
const char SSDP_SerialNumber[] PROGMEM = CONFIG_DEVICE_SERIAL_NUMBER;
44-
const char SSDP_ModelName[] PROGMEM = CONFIG_DEVICE_MODEL_NAME;
45-
const char SSDP_ModelNumber[] PROGMEM = CONFIG_DEVICE_MODEL_NUMBER;
46-
const char SSDP_ModelDescription[] PROGMEM = "HomeGenie Mini Device";
47-
const char SSDP_ModelURL[] PROGMEM = "https://homegenie.it";
48-
const char SSDP_Manufacturer[] PROGMEM = "G-Labs";
49-
const char SSDP_ManufacturerURL[] PROGMEM = "https://github.com/genielabs";
42+
const char SSDP_Name[] = CONFIG_DEVICE_MODEL_NAME;
43+
const char SSDP_SerialNumber[] = CONFIG_DEVICE_SERIAL_NUMBER;
44+
const char SSDP_ModelName[] = CONFIG_DEVICE_MODEL_NAME;
45+
const char SSDP_ModelNumber[] = CONFIG_DEVICE_MODEL_NUMBER;
46+
const char SSDP_ModelDescription[] = "HomeGenie Mini Device";
47+
const char SSDP_ModelURL[] = "https://homegenie.it";
48+
const char SSDP_Manufacturer[] = "G-Labs";
49+
const char SSDP_ManufacturerURL[] = "https://github.com/genielabs";
5050

5151
static WebServer httpServer(HTTP_SERVER_PORT);
5252

‎src/net/SSDPDevice.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
#include "SSDPDevice.h"
77
#include "defs.h"
88

9-
static const char* PROGMEM SSDP_RESPONSE_TEMPLATE =
9+
static const char* SSDP_RESPONSE_TEMPLATE =
1010
"HTTP/1.1 200 OK\r\n"
1111
"EXT:\r\n";
1212

13-
static const char* PROGMEM SSDP_NOTIFY_ALIVE_TEMPLATE =
13+
static const char* SSDP_NOTIFY_ALIVE_TEMPLATE =
1414
"NOTIFY * HTTP/1.1\r\n"
1515
"HOST: 239.255.255.250:1900\r\n"
1616
"NTS: ssdp:alive\r\n";
1717

18-
static const char* PROGMEM SSDP_NOTIFY_UPDATE_TEMPLATE =
18+
static const char* SSDP_NOTIFY_UPDATE_TEMPLATE =
1919
"NOTIFY * HTTP/1.1\r\n"
2020
"HOST: 239.255.255.250:1900\r\n"
2121
"NTS: ssdp:update\r\n";
2222

23-
static const char* PROGMEM SSDP_PACKET_TEMPLATE =
23+
static const char* SSDP_PACKET_TEMPLATE =
2424
"%s" // _ssdp_response_template / _ssdp_notify_template
2525
"CACHE-CONTROL: max-age=%u\r\n" // SSDP_INTERVAL
2626
"SERVER: UPNP/1.1 %s/%s\r\n" // m_modelName, m_modelNumber
@@ -29,7 +29,7 @@ static const char* PROGMEM SSDP_PACKET_TEMPLATE =
2929
"LOCATION: http://%u.%u.%u.%u:%u/%s\r\n" // WiFi.localIP(), m_port, m_schemaURL
3030
"\r\n";
3131

32-
static const char* PROGMEM SSDP_SCHEMA_TEMPLATE =
32+
static const char* SSDP_SCHEMA_TEMPLATE =
3333
"HTTP/1.1 200 OK\r\n"
3434
"Content-Type: text/xml\r\n"
3535
"Connection: close\r\n"

0 commit comments

Comments
 (0)