mirror of
https://github.com/s00500/ESPUI.git
synced 2024-10-31 22:10:54 +00:00
Merge branch 'master' into lambda-with-examples
This commit is contained in:
commit
62b4b56a4d
@ -30,15 +30,17 @@
|
|||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
#include <ESP8266mDNS.h>
|
#include <ESP8266mDNS.h>
|
||||||
#include <umm_malloc/umm_heap_select.h>
|
#include <umm_malloc/umm_heap_select.h>
|
||||||
|
#ifndef CORE_MOCK
|
||||||
#ifndef MMU_IRAM_HEAP
|
#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 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 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
|
||||||
#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
|
#error on ESP8266 and ESPUI, you must define OOM debug option when developping
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
//Settings
|
//Settings
|
||||||
#define SLOW_BOOT 0
|
#define SLOW_BOOT 0
|
||||||
|
@ -11,15 +11,17 @@ DNSServer dnsServer;
|
|||||||
// esp8266
|
// esp8266
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
#include <umm_malloc/umm_heap_select.h>
|
#include <umm_malloc/umm_heap_select.h>
|
||||||
|
#ifndef CORE_MOCK
|
||||||
#ifndef MMU_IRAM_HEAP
|
#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 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 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
|
||||||
#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
|
#error on ESP8266 and ESPUI, you must define OOM debug option when developping
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
const char* ssid = "ESPUI";
|
const char* ssid = "ESPUI";
|
||||||
const char* password = "espui";
|
const char* password = "espui";
|
||||||
@ -68,7 +70,7 @@ void buttonCallback(Control* sender, int type)
|
|||||||
void buttonExample(Control* sender, int type, void* param)
|
void buttonExample(Control* sender, int type, void* param)
|
||||||
{
|
{
|
||||||
Serial.print("param: ");
|
Serial.print("param: ");
|
||||||
Serial.println(long(param));
|
Serial.println((long)param);
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case B_DOWN:
|
case B_DOWN:
|
||||||
|
@ -11,15 +11,17 @@ DNSServer dnsServer;
|
|||||||
// esp8266
|
// esp8266
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
#include <umm_malloc/umm_heap_select.h>
|
#include <umm_malloc/umm_heap_select.h>
|
||||||
|
#ifndef CORE_MOCK
|
||||||
#ifndef MMU_IRAM_HEAP
|
#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 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 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
|
||||||
#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
|
#error on ESP8266 and ESPUI, you must define OOM debug option when developping
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
const char* ssid = "ESPUI";
|
const char* ssid = "ESPUI";
|
||||||
const char* password = "espui";
|
const char* password = "espui";
|
||||||
@ -73,7 +75,7 @@ void buttonCallback(Control* sender, int type)
|
|||||||
void buttonExample(Control* sender, int type, void* param)
|
void buttonExample(Control* sender, int type, void* param)
|
||||||
{
|
{
|
||||||
Serial.print("param: ");
|
Serial.print("param: ");
|
||||||
Serial.println(long(param));
|
Serial.println((long)param);
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case B_DOWN:
|
case B_DOWN:
|
||||||
|
@ -11,15 +11,17 @@ DNSServer dnsServer;
|
|||||||
// esp8266
|
// esp8266
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
#include <umm_malloc/umm_heap_select.h>
|
#include <umm_malloc/umm_heap_select.h>
|
||||||
|
#ifndef CORE_MOCK
|
||||||
#ifndef MMU_IRAM_HEAP
|
#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 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 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
|
||||||
#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
|
#error on ESP8266 and ESPUI, you must define OOM debug option when developping
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
const char* ssid = "ESPUI";
|
const char* ssid = "ESPUI";
|
||||||
const char* password = "espui";
|
const char* password = "espui";
|
||||||
@ -67,7 +69,7 @@ void buttonCallback(Control* sender, int type)
|
|||||||
void buttonExample(Control* sender, int type, void* param)
|
void buttonExample(Control* sender, int type, void* param)
|
||||||
{
|
{
|
||||||
Serial.print("param: ");
|
Serial.print("param: ");
|
||||||
Serial.println(long(param));
|
Serial.println((long)param);
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case B_DOWN:
|
case B_DOWN:
|
||||||
|
@ -24,11 +24,6 @@
|
|||||||
"name": "ArduinoJson",
|
"name": "ArduinoJson",
|
||||||
"authors": "Benoit Blanchon",
|
"authors": "Benoit Blanchon",
|
||||||
"frameworks": "arduino"
|
"frameworks": "arduino"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LittleFS_esp32",
|
|
||||||
"authors": "lorol",
|
|
||||||
"frameworks": "arduino"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"version": "2.2.3",
|
"version": "2.2.3",
|
||||||
|
Loading…
Reference in New Issue
Block a user