mirror of
https://github.com/OpenEPaperLink/OpenEPaperLink.git
synced 2026-03-22 07:07:43 +01:00
* Fix filesystem mutex handling This fixes the re-initialization of the filesystem mutex when the dyn storage module is reinitialized. Using xSemaphoreCreateMutex would cause a memory leak when the begin function is called multiple times and a semaphore leakage could be caused by the re-initialization of the global fsMutex variable while the semaphore is taken. The fsMutex should not be taken while the logLine function is called as this would cause a nested take of the fsMutex, which causes a deadlock. Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> * Fix hard coded littlefs in json upload Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> * Add new AP hardware support OpenEPaperLink_ESP32-PoE-ISO_AP This is based on Olimex ESP32-PoE-ISO https://www.olimex.com/Products/IoT/ESP32/ESP32-POE-ISO/open-source-hardware It has a SD Card slot that is used to store all filesystem data on SD. Use the prepare_sdcard.sh script to copy all needed data to an empty SD card that is formatted with FAT filesystem. The AP firmware will format the SD if an unformatted or from formatted card is used. This can be used to intially prepare an empty SD card for usage. For tag communication a ESP32-C6-WROOM-1(U) is used with the following connection scheme: ESP32-PoE-ISO | ESP32-C6-WROOM-1 ---------------+------------------ GPIO5 | EN GPIO13 | GPIO9 GPIO36 | GPIO3 GPIO4 | GPIO2 GPIO33 | GPIO24 GPIO32 | GPIO25 | GPIO8 pullup 5.1k Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> * Avoid error message log print when parsers.json is missing Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> * Workaround for IEEE802.15.4 modem stuck issue The ESP32-C6 esp-idf based modem firmware can run into a case where it does not receive data anymore from the tags. This can be detected when it starts to print "receive buffer full, drop the current frame" and does not recover from that. In such a case a modem reset is triggered. Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> * Add OpenEPaperLink_ESP32-PoE-ISO_AP to release build Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> * Add OpenEPaperLink_ESP32-PoE-ISO_AP to condidional build Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> * Add Ethernet support The ethernet support allows to make the network/internet connection via LAN cable instead of WiFi. LAN is preferred, if a LAN cable is connected and a valid IP configuration via DHCP can be obtained, WiFi is switched off. If the LAN cable is disconnected, a fall back to WiFi is done. Use those defines in platform.ini for PHY settings: ETHERNET_PHY_POWER: IO pin where the PHY can be switched of/on, can be -1 if not used. ETHERNET_CLK_MODE: PHY clock mode, see eth_clock_mode_t in ETH.h ETHERNET_PHY_MDC: PHY MDC pin ETHERNET_PHY_MDIO: PHY MDIO pin ETHERNET_PHY_TYPE: PHY type, see eth_phy_type_t in ETH.h Limitations: - only DHCP is supported, no static IP configuration for LAN so far. - If GPIO0 is used for one of the ETHERNET_CLK_MODE modes, then GPIO0 cannot be used to clear the WiFi configuration. Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> --------- Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net> Co-authored-by: Frank Kunz <mailinglists@kunz-im-inter.net>
210 lines
6.3 KiB
C++
210 lines
6.3 KiB
C++
|
|
#include <Arduino.h>
|
|
#include <WiFi.h>
|
|
#include <time.h>
|
|
#ifdef ETHERNET_CLK_MODE
|
|
#include <ETH.h>
|
|
#endif
|
|
|
|
#include "contentmanager.h"
|
|
#include "flasher.h"
|
|
#include "serialap.h"
|
|
#include "settings.h"
|
|
#include "storage.h"
|
|
#include "system.h"
|
|
#include "tag_db.h"
|
|
#include "tagdata.h"
|
|
#include "wifimanager.h"
|
|
|
|
#ifdef HAS_EXT_FLASHER
|
|
#include "webflasher.h"
|
|
#endif
|
|
|
|
#if defined HAS_USB || defined HAS_EXT_FLASHER
|
|
#include "usbflasher.h"
|
|
#endif
|
|
|
|
#include "language.h"
|
|
#include "leds.h"
|
|
#include "udp.h"
|
|
#include "util.h"
|
|
#include "web.h"
|
|
#ifdef HAS_BLE_WRITER
|
|
#include "ble_writer.h"
|
|
#endif
|
|
|
|
util::Timer intervalContentRunner(seconds(1));
|
|
util::Timer intervalSysinfo(seconds(5));
|
|
util::Timer intervalVars(seconds(10));
|
|
util::Timer intervalSaveDB(minutes(5));
|
|
|
|
SET_LOOP_TASK_STACK_SIZE(16 * 1024);
|
|
|
|
void delayedStart(void* parameter) {
|
|
vTaskDelay(30000 / portTICK_PERIOD_MS);
|
|
if (config.runStatus != RUNSTATUS_RUN) {
|
|
wsLog("starting content generation");
|
|
config.runStatus = RUNSTATUS_RUN;
|
|
}
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
vTaskDelete(NULL);
|
|
}
|
|
|
|
void setup() {
|
|
#ifdef UART_LOGGING_TX_ONLY_PIN
|
|
Serial.begin(115200, SERIAL_8N1, -1, UART_LOGGING_TX_ONLY_PIN);
|
|
gpio_set_drive_capability((gpio_num_t)FLASHER_AP_RXD, GPIO_DRIVE_CAP_0);
|
|
#else
|
|
Serial.begin(115200);
|
|
#endif
|
|
#if ARDUINO_USB_CDC_ON_BOOT == 1
|
|
Serial.setTxTimeoutMs(0); // workaround bug in USB CDC that slows down serial output when no usb connected
|
|
#endif
|
|
Serial.print(">\r\n");
|
|
#ifdef HAS_TFT
|
|
extern void yellow_ap_display_init(void);
|
|
yellow_ap_display_init();
|
|
#endif
|
|
|
|
xTaskCreate(ledTask, "ledhandler", 2000, NULL, 2, NULL);
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
|
|
#if defined(OPENEPAPERLINK_MINI_AP_PCB) || defined(OPENEPAPERLINK_NANO_AP_PCB)
|
|
APEnterEarlyReset();
|
|
// this allows us to view the booting process. After the device showing up, you have 3 seconds to open a terminal on the COM port
|
|
vTaskDelay(3000 / portTICK_PERIOD_MS);
|
|
#ifdef DEBUG_VERSION
|
|
// Specifically for the Mini-version (using an ESP32-S2), use another serial port for debug output. Makes it possible to see core dumps
|
|
Serial0.begin(115200, SERIAL_8N1, 38, 37);
|
|
Serial0.printf("Started debug output...\r\n");
|
|
Serial0.setDebugOutput(true);
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef BOARD_HAS_PSRAM
|
|
if (!psramInit()) {
|
|
Serial.printf("This build of the AP expects PSRAM, but we couldn't find/init any. Something is terribly wrong here! System halted.");
|
|
#ifdef HAS_RGB_LED
|
|
showColorPattern(CRGB::Yellow, CRGB::Red, CRGB::Red);
|
|
#endif
|
|
while (1) {
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
}
|
|
};
|
|
heap_caps_malloc_extmem_enable(64);
|
|
#endif
|
|
|
|
Storage.begin();
|
|
|
|
/*
|
|
Serial.println("\n\n##################################");
|
|
Serial.printf("Internal Total heap %d, internal Free Heap %d\n", ESP.getHeapSize(), ESP.getFreeHeap());
|
|
Serial.printf("SPIRam Total heap %d, SPIRam Free Heap %d\n", ESP.getPsramSize(), ESP.getFreePsram());
|
|
Serial.printf("ChipRevision %d, Cpu Freq %d, SDK Version %s\n", ESP.getChipRevision(), ESP.getCpuFreqMHz(), ESP.getSdkVersion());
|
|
Serial.printf("Flash Size %d, Flash Speed %d\n", ESP.getFlashChipSize(), ESP.getFlashChipSpeed());
|
|
Serial.println("##################################\n\n");
|
|
|
|
Serial.printf("Total heap: %d\n", ESP.getHeapSize());
|
|
Serial.printf("Free heap: %d\n", ESP.getFreeHeap());
|
|
Serial.printf("Total PSRAM: %d\n", ESP.getPsramSize());
|
|
Serial.printf("Free PSRAM: %d\n\n", ESP.getFreePsram());
|
|
|
|
Serial.printf("ESP32 Partition table:\n");
|
|
Serial.printf("| Type | Sub | Offset | Size | Label |\n");
|
|
Serial.printf("| ---- | --- | -------- | -------- | ---------------- |\n");
|
|
esp_partition_iterator_t pi = esp_partition_find(ESP_PARTITION_TYPE_ANY, ESP_PARTITION_SUBTYPE_ANY, NULL);
|
|
if (pi != NULL) {
|
|
do {
|
|
const esp_partition_t* p = esp_partition_get(pi);
|
|
Serial.printf("| %02x | %02x | 0x%06X | 0x%06X | %-16s |\r\n",
|
|
p->type, p->subtype, p->address, p->size, p->label);
|
|
} while (pi = (esp_partition_next(pi)));
|
|
}
|
|
*/
|
|
|
|
wm.initEth();
|
|
initAPconfig();
|
|
|
|
updateLanguageFromConfig();
|
|
updateBrightnessFromConfig();
|
|
|
|
config.runStatus = RUNSTATUS_INIT;
|
|
init_web();
|
|
xTaskCreate(initTime, "init time", 5000, NULL, 2, NULL);
|
|
|
|
#ifdef HAS_RGB_LED
|
|
rgbIdle();
|
|
#endif
|
|
|
|
#ifndef SAVE_SPACE
|
|
TagData::loadParsers("/parsers.json");
|
|
#endif
|
|
|
|
if (!loadDB("/current/tagDB.json")) {
|
|
Serial.println("unable to load tagDB, reverting to backup");
|
|
loadDB("/current/tagDB.json.bak");
|
|
} else {
|
|
cleanupCurrent();
|
|
}
|
|
xTaskCreate(APTask, "AP Process", 6000, NULL, 5, NULL);
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
|
|
#ifdef HAS_BLE_WRITER
|
|
if (config.ble) {
|
|
xTaskCreate(BLETask, "BLE Writer", 12000, NULL, 5, NULL);
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAS_USB
|
|
// We'll need to start the 'usbflasher' task for boards with a second (USB) port. This can be used as a 'flasher' interface, using a python script on the host
|
|
xTaskCreate(usbFlasherTask, "usbflasher", 10000, NULL, 5, NULL);
|
|
#else
|
|
|
|
#ifdef ETHERNET_CLK_MODE
|
|
if (!(ETHERNET_CLK_MODE == ETH_CLOCK_GPIO0_IN || ETHERNET_CLK_MODE == ETH_CLOCK_GPIO0_OUT))
|
|
#endif
|
|
pinMode(0, INPUT_PULLUP);
|
|
|
|
#endif
|
|
|
|
#ifdef HAS_EXT_FLASHER
|
|
xTaskCreate(webFlasherTask, "webflasher", 8000, NULL, 3, NULL);
|
|
#endif
|
|
|
|
esp_reset_reason_t resetReason = esp_reset_reason();
|
|
if (resetReason == ESP_RST_PANIC) {
|
|
Serial.println("Panic! Pausing content generation for 30 seconds");
|
|
config.runStatus = RUNSTATUS_PAUSE;
|
|
}
|
|
|
|
xTaskCreate(delayedStart, "delaystart", 5000, NULL, 2, NULL);
|
|
|
|
wsSendSysteminfo();
|
|
util::printHeap();
|
|
}
|
|
|
|
void loop() {
|
|
ws.cleanupClients();
|
|
wm.poll();
|
|
|
|
if (intervalSysinfo.doRun()) {
|
|
wsSendSysteminfo();
|
|
}
|
|
if (intervalVars.doRun() && config.runStatus != RUNSTATUS_STOP) {
|
|
checkVars();
|
|
}
|
|
if (intervalSaveDB.doRun() && config.runStatus != RUNSTATUS_STOP) {
|
|
saveDB("/current/tagDB.json");
|
|
}
|
|
if (intervalContentRunner.doRun() && (apInfo.state == AP_STATE_ONLINE || apInfo.state == AP_STATE_NORADIO)) {
|
|
contentRunner();
|
|
}
|
|
|
|
#ifdef HAS_TFT
|
|
extern void yellow_ap_display_loop(void);
|
|
yellow_ap_display_loop();
|
|
#endif
|
|
|
|
vTaskDelay(100 / portTICK_PERIOD_MS);
|
|
}
|