1
0
mirror of https://github.com/s00500/ESPUI.git synced 2024-11-21 07:30:53 +00:00

Merge branch 'master' into lambda-with-examples

This commit is contained in:
David Gauchard 2023-09-22 22:18:34 +02:00
commit 62b4b56a4d
5 changed files with 15 additions and 12 deletions

View File

@ -30,15 +30,17 @@
#include <ESP8266WiFi.h>
#include <ESP8266mDNS.h>
#include <umm_malloc/umm_heap_select.h>
#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://<ip>/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

View File

@ -11,15 +11,17 @@ DNSServer dnsServer;
// esp8266
#include <ESP8266WiFi.h>
#include <umm_malloc/umm_heap_select.h>
#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://<ip>/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:

View File

@ -11,15 +11,17 @@ DNSServer dnsServer;
// esp8266
#include <ESP8266WiFi.h>
#include <umm_malloc/umm_heap_select.h>
#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://<ip>/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:

View File

@ -11,15 +11,17 @@ DNSServer dnsServer;
// esp8266
#include <ESP8266WiFi.h>
#include <umm_malloc/umm_heap_select.h>
#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://<ip>/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:

View File

@ -24,11 +24,6 @@
"name": "ArduinoJson",
"authors": "Benoit Blanchon",
"frameworks": "arduino"
},
{
"name": "LittleFS_esp32",
"authors": "lorol",
"frameworks": "arduino"
}
],
"version": "2.2.3",