lbsadmin/ESPUI
1
0
Fork 0
mirror of https://github.com/s00500/ESPUI.git synced 2024-11-21 22:50:55 +00:00
Code Issues Releases Activity

Merge pull request #251 from d-a-v/minorfixes

Browse Source 
minor fixes for restoring warning-less emulation on host
This commit is contained in:
Lukas Bachschwell 2023-09-08 17:03:12 +02:00 committed by GitHub
commit c7a9438149
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/completeExample/completeExample.cpp
View File

@ -35,7 +35,7 @@
#warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #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://<ip>/heap #warning then check http://<ip>/heap
#endif // MMU_IRAM_HEAP #endif // MMU_IRAM_HEAP
#ifndef DEBUG_ESP_OOM #if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK)
#error on ESP8266 and ESPUI, you must define OOM debug option when developping #error on ESP8266 and ESPUI, you must define OOM debug option when developping
#endif #endif
#endif #endif
@ -396,7 +396,8 @@ void extendedCallback(Control* sender, int type, void* param)
Serial.print(sender->label); Serial.print(sender->label);
Serial.print("' = "); Serial.print("' = ");
Serial.println(sender->value); Serial.println(sender->value);
Serial.println(String("param = ") + String((int)param)); Serial.print("param = ");
Serial.println((long)param);
} }
void setup() { void setup() {
@ -443,6 +444,7 @@ void loop() {
#if !defined(ESP32) #if !defined(ESP32)
((void (*)())0xf00fdead)(); ((void (*)())0xf00fdead)();
#endif #endif
break;
default: default:
Serial.print('#'); Serial.print('#');
break; break;

3
examples/completeExample/completeExample.ino
View File

@ -1 +1,4 @@
// placeholder // placeholder
#if CORE_MOCK
#include "completeExample.cpp"
#endif

5
examples/gui-generic-api/gui-generic-api.ino
View File

@ -16,7 +16,7 @@ DNSServer dnsServer;
#warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #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://<ip>/heap #warning then check http://<ip>/heap
#endif // MMU_IRAM_HEAP #endif // MMU_IRAM_HEAP
#ifndef DEBUG_ESP_OOM #if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK)
#error on ESP8266 and ESPUI, you must define OOM debug option when developping #error on ESP8266 and ESPUI, you must define OOM debug option when developping
#endif #endif
#endif #endif
@ -67,7 +67,8 @@ void buttonCallback(Control* sender, int type)
void buttonExample(Control* sender, int type, void* param) void buttonExample(Control* sender, int type, void* param)
{ {
Serial.println(String("param: ") + String(long(param))); Serial.print("param: ");
Serial.println(long(param));
switch (type) switch (type)
{ {
case B_DOWN: case B_DOWN:

5
examples/gui/gui.ino
View File

@ -16,7 +16,7 @@ DNSServer dnsServer;
#warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #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://<ip>/heap #warning then check http://<ip>/heap
#endif // MMU_IRAM_HEAP #endif // MMU_IRAM_HEAP
#ifndef DEBUG_ESP_OOM #if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK)
#error on ESP8266 and ESPUI, you must define OOM debug option when developping #error on ESP8266 and ESPUI, you must define OOM debug option when developping
#endif #endif
#endif #endif
@ -72,7 +72,8 @@ void buttonCallback(Control* sender, int type)
void buttonExample(Control* sender, int type, void* param) void buttonExample(Control* sender, int type, void* param)
{ {
Serial.println(String("param: ") + String(long(param))); Serial.print("param: ");
Serial.println(long(param));
switch (type) switch (type)
{ {
case B_DOWN: case B_DOWN:

5
examples/tabbedGui/tabbedGui.ino
View File

@ -16,7 +16,7 @@ DNSServer dnsServer;
#warning use decorators: { HeapSelectIram doAllocationsInIRAM; ESPUI.addControl(...) ... } (cf. https://arduino-esp8266.readthedocs.io/en/latest/mmu.html#how-to-select-heap) #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://<ip>/heap #warning then check http://<ip>/heap
#endif // MMU_IRAM_HEAP #endif // MMU_IRAM_HEAP
#ifndef DEBUG_ESP_OOM #if !defined(DEBUG_ESP_OOM) && !defined(CORE_MOCK)
#error on ESP8266 and ESPUI, you must define OOM debug option when developping #error on ESP8266 and ESPUI, you must define OOM debug option when developping
#endif #endif
#endif #endif
@ -66,7 +66,8 @@ void buttonCallback(Control* sender, int type)
void buttonExample(Control* sender, int type, void* param) void buttonExample(Control* sender, int type, void* param)
{ {
Serial.println(String("param: ") + String(long(param))); Serial.print("param: ");
Serial.println(long(param));
switch (type) switch (type)
{ {
case B_DOWN: case B_DOWN: