From 93d0bf7d27abb60b2f467e0df07fb02971348de3 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Mon, 11 Sep 2023 13:29:32 +0200 Subject: [PATCH 1/3] some more minor changes before #249 --- examples/completeExample/completeExample.cpp | 4 +++- examples/gui-generic-api/gui-generic-api.ino | 6 ++++-- examples/gui/gui.ino | 6 ++++-- examples/tabbedGui/tabbedGui.ino | 6 ++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/examples/completeExample/completeExample.cpp b/examples/completeExample/completeExample.cpp index 7617e94..6833310 100644 --- a/examples/completeExample/completeExample.cpp +++ b/examples/completeExample/completeExample.cpp @@ -30,15 +30,17 @@ #include #include #include +#ifndef CORE_MOCK #ifndef MMU_IRAM_HEAP #warning Try MMU option '2nd heap shared' in 'tools' IDE menu (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#option-summary) #warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #warning then check http:///heap #endif // MMU_IRAM_HEAP -#if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK) +#ifndef DEBUG_ESP_OOM #error on ESP8266 and ESPUI, you must define OOM debug option when developping #endif #endif +#endif //Settings #define SLOW_BOOT 0 diff --git a/examples/gui-generic-api/gui-generic-api.ino b/examples/gui-generic-api/gui-generic-api.ino index 54f003b..556596b 100644 --- a/examples/gui-generic-api/gui-generic-api.ino +++ b/examples/gui-generic-api/gui-generic-api.ino @@ -11,15 +11,17 @@ DNSServer dnsServer; // esp8266 #include #include +#ifndef CORE_MOCK #ifndef MMU_IRAM_HEAP #warning Try MMU option '2nd heap shared' in 'tools' IDE menu (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#option-summary) #warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #warning then check http:///heap #endif // MMU_IRAM_HEAP -#if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK) +#if !defined(DEBUG_ESP_OOM) #error on ESP8266 and ESPUI, you must define OOM debug option when developping #endif #endif +#endif const char* ssid = "ESPUI"; const char* password = "espui"; @@ -68,7 +70,7 @@ void buttonCallback(Control* sender, int type) void buttonExample(Control* sender, int type, void* param) { Serial.print("param: "); - Serial.println(long(param)); + Serial.println((long)param); switch (type) { case B_DOWN: diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino index 759ed07..71ab831 100644 --- a/examples/gui/gui.ino +++ b/examples/gui/gui.ino @@ -11,15 +11,17 @@ DNSServer dnsServer; // esp8266 #include #include +#ifndef CORE_MOCK #ifndef MMU_IRAM_HEAP #warning Try MMU option '2nd heap shared' in 'tools' IDE menu (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#option-summary) #warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #warning then check http:///heap #endif // MMU_IRAM_HEAP -#if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK) +#ifndef DEBUG_ESP_OOM #error on ESP8266 and ESPUI, you must define OOM debug option when developping #endif #endif +#endif const char* ssid = "ESPUI"; const char* password = "espui"; @@ -73,7 +75,7 @@ void buttonCallback(Control* sender, int type) void buttonExample(Control* sender, int type, void* param) { Serial.print("param: "); - Serial.println(long(param)); + Serial.println((long)param); switch (type) { case B_DOWN: diff --git a/examples/tabbedGui/tabbedGui.ino b/examples/tabbedGui/tabbedGui.ino index a862aa9..4831a6b 100644 --- a/examples/tabbedGui/tabbedGui.ino +++ b/examples/tabbedGui/tabbedGui.ino @@ -11,15 +11,17 @@ DNSServer dnsServer; // esp8266 #include #include +#ifndef CORE_MOCK #ifndef MMU_IRAM_HEAP #warning Try MMU option '2nd heap shared' in 'tools' IDE menu (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#option-summary) #warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #warning then check http:///heap #endif // MMU_IRAM_HEAP -#if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK) +#ifndef DEBUG_ESP_OOM #error on ESP8266 and ESPUI, you must define OOM debug option when developping #endif #endif +#endif const char* ssid = "ESPUI"; const char* password = "espui"; @@ -67,7 +69,7 @@ void buttonCallback(Control* sender, int type) void buttonExample(Control* sender, int type, void* param) { Serial.print("param: "); - Serial.println(long(param)); + Serial.println((long)param); switch (type) { case B_DOWN: From 09596a4e656ee4fba85f49ed4195a99fb9c97e5a Mon Sep 17 00:00:00 2001 From: croghostrider Date: Wed, 13 Sep 2023 17:24:26 +0200 Subject: [PATCH 2/3] fix #196 since Arduino 2.0.0 is LITTLEFS not more required for ESP32. --- library.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/library.json b/library.json index 76d3173..8b3827a 100644 --- a/library.json +++ b/library.json @@ -24,14 +24,9 @@ "name": "ArduinoJson", "authors": "Benoit Blanchon", "frameworks": "arduino" - }, - { - "name": "LittleFS_esp32", - "authors": "lorol", - "frameworks": "arduino" } ], - "version": "2.2.3", + "version": "2.2.4", "frameworks": "arduino", "platforms": "*" } From 0d9a874ba2ceb44fb6d888e40f2f61840ab77ee4 Mon Sep 17 00:00:00 2001 From: croghostrider Date: Wed, 20 Sep 2023 12:59:25 +0200 Subject: [PATCH 3/3] Update library.json --- library.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.json b/library.json index 8b3827a..2d40950 100644 --- a/library.json +++ b/library.json @@ -26,7 +26,7 @@ "frameworks": "arduino" } ], - "version": "2.2.4", + "version": "2.2.3", "frameworks": "arduino", "platforms": "*" }