Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
028fe85586 | ||
|
|
27e16c3d1b | ||
|
|
6f9c99edb6 | ||
|
|
a7b97dc0c9 | ||
|
|
2bae0369fa | ||
|
|
1c3aae5f49 | ||
|
|
4054a96067 | ||
|
|
0d38728072 | ||
|
|
0f43f228e7 |
No files matched your search
Binary file not shown.
+52
-64
@@ -9,81 +9,69 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "3.4.2"
|
version = "3.4.6"
|
||||||
to_old_version = "3.4.0"
|
to_old_version = "3.4.0"
|
||||||
|
|
||||||
##
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32@^6.0.0
|
platform = espressif32@^6.0.0
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
framework = arduino
|
framework = arduino
|
||||||
monitor_speed = 115200
|
|
||||||
#monitor_port = /dev/cu.usbmodem01
|
|
||||||
|
|
||||||
lib_deps =
|
|
||||||
tzapu/WiFiManager @ ^2.0.17
|
|
||||||
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
|
||||||
https://github.com/esphome/AsyncTCP.git
|
|
||||||
bogde/HX711 @ ^0.7.5
|
|
||||||
adafruit/Adafruit SSD1306 @ ^2.5.13
|
|
||||||
adafruit/Adafruit GFX Library @ ^1.11.11
|
|
||||||
adafruit/Adafruit PN532 @ ^1.3.3
|
|
||||||
bblanchon/ArduinoJson @ ^7.3.0
|
|
||||||
knolleary/PubSubClient @ ^2.8
|
|
||||||
digitaldragon/SSLClient @ ^1.3.2
|
|
||||||
|
|
||||||
; Enable SPIFFS upload
|
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
; Update partition settings
|
|
||||||
board_build.partitions = partitions.csv
|
board_build.partitions = partitions.csv
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
board_build.flash_mode = dio
|
board_build.flash_mode = dio
|
||||||
board_upload.flash_freq = "40m"
|
board_upload.flash_freq = "40m"
|
||||||
|
extra_scripts = scripts/extra_script.py
|
||||||
build_flags =
|
|
||||||
-Os
|
|
||||||
-ffunction-sections
|
|
||||||
-fdata-sections
|
|
||||||
#-DNDEBUG
|
|
||||||
-mtext-section-literals
|
|
||||||
-DVERSION=\"${common.version}\"
|
|
||||||
-DTOOLDVERSION=\"${common.to_old_version}\"
|
|
||||||
#-DENABLE_HEAP_DEBUGGING
|
|
||||||
-DASYNCWEBSERVER_REGEX
|
|
||||||
#-DCORE_DEBUG_LEVEL=3
|
|
||||||
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
|
||||||
#-DOTA_DEBUG=1
|
|
||||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
|
||||||
-DBOOT_APP_PARTITION_OTA_0=1
|
|
||||||
|
|
||||||
# ===== AsyncTCP Optimierungen - KRITISCH für WiFi-Stabilität =====
|
|
||||||
# Core 1 = Arduino/App Core (nicht Core 0 = WiFi/Protocol Core!)
|
|
||||||
# Schwere Callbacks auf Core 0 stören das WiFi-Radio
|
|
||||||
-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
|
|
||||||
# Längerer ACK-Timeout für instabile Verbindungen (10s statt 5s)
|
|
||||||
-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=10000
|
|
||||||
# Größere Queue für mehr gleichzeitige Requests
|
|
||||||
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
|
||||||
# Mehr Stack für komplexere Callbacks (8KB statt 16KB default, spart RAM)
|
|
||||||
-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
|
|
||||||
# Standard-Priorität beibehalten
|
|
||||||
-DCONFIG_ASYNC_TCP_PRIORITY=10
|
|
||||||
# WDT für AsyncTCP deaktiviert: Mit aktivem WDT konnten langsame
|
|
||||||
# WebSocket-Sender (z. B. große ws.textAll-JSONs) den AsyncTCP-Task
|
|
||||||
# killen und so alle Clients abwerfen.
|
|
||||||
-DCONFIG_ASYNC_TCP_USE_WDT=0
|
|
||||||
|
|
||||||
# ===== LwIP Optimierungen für OTA-Uploads (1.5-2MB) =====
|
|
||||||
# Schnellere Socket-Freigabe (30s statt 60s TIME_WAIT)
|
|
||||||
-DCONFIG_LWIP_TCP_MSL=30000
|
|
||||||
# Größerer RX-Buffer für große Uploads (8KB statt 4KB)
|
|
||||||
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=8192
|
|
||||||
# Max aktive TCP-Verbindungen (unverändert)
|
|
||||||
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
|
||||||
|
|
||||||
extra_scripts =
|
|
||||||
scripts/extra_script.py
|
|
||||||
|
|
||||||
[platformio]
|
[platformio]
|
||||||
default_envs = esp32dev
|
default_envs =
|
||||||
|
esp32dev
|
||||||
|
esp32-s3-devkitc-1
|
||||||
|
|
||||||
|
[env]
|
||||||
|
build_flags =
|
||||||
|
-Os
|
||||||
|
-ffunction-sections
|
||||||
|
-fdata-sections
|
||||||
|
-mtext-section-literals
|
||||||
|
-DVERSION=\"${common.version}\"
|
||||||
|
-DTOOLDVERSION=\"${common.to_old_version}\"
|
||||||
|
-DASYNCWEBSERVER_REGEX
|
||||||
|
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
||||||
|
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
||||||
|
-DBOOT_APP_PARTITION_OTA_0=1
|
||||||
|
-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
|
||||||
|
-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=10000
|
||||||
|
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
||||||
|
-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
|
||||||
|
-DCONFIG_ASYNC_TCP_PRIORITY=10
|
||||||
|
# WDT für AsyncTCP deaktiviert: Mit aktivem WDT konnten langsame
|
||||||
|
# WebSocket-Sender (z. B. große ws.textAll-JSONs) den AsyncTCP-Task
|
||||||
|
# killen und so alle Clients abwerfen.
|
||||||
|
-DCONFIG_ASYNC_TCP_USE_WDT=0
|
||||||
|
-DCONFIG_LWIP_TCP_MSL=30000
|
||||||
|
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=8192
|
||||||
|
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
||||||
|
lib_deps =
|
||||||
|
tzapu/WiFiManager
|
||||||
|
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
||||||
|
https://github.com/esphome/AsyncTCP.git
|
||||||
|
bogde/HX711 @ ^0.7.5
|
||||||
|
adafruit/Adafruit SSD1306 @ ^2.5.13
|
||||||
|
adafruit/Adafruit GFX Library @ ^1.11.11
|
||||||
|
adafruit/Adafruit PN532 @ ^1.3.3
|
||||||
|
bblanchon/ArduinoJson @ ^7.3.0
|
||||||
|
knolleary/PubSubClient @ ^2.8
|
||||||
|
digitaldragon/SSLClient @ ^1.3.2
|
||||||
|
monitor_speed = 115200
|
||||||
|
|
||||||
|
[env:esp32-s3-devkitc-1]
|
||||||
|
board = esp32-s3-devkitc-1
|
||||||
|
framework = arduino
|
||||||
|
extra_scripts = scripts/extra_script.py
|
||||||
|
upload_protocol = esptool
|
||||||
|
board_build.flash_mode = dio
|
||||||
|
platform = espressif32
|
||||||
|
board_build.filesystem = littlefs
|
||||||
|
board_build.partitions = partitions.csv
|
||||||
|
board_upload.flash_size = 8MB
|
||||||
+16
-2
@@ -6,21 +6,35 @@
|
|||||||
//#define PN532_MOSI 23
|
//#define PN532_MOSI 23
|
||||||
//#define PN532_SS 5
|
//#define PN532_SS 5
|
||||||
//#define PN532_MISO 19
|
//#define PN532_MISO 19
|
||||||
|
#if CONFIG_IDF_TARGET_ESP32S3
|
||||||
|
const uint8_t PN532_IRQ = 15;
|
||||||
|
const uint8_t PN532_RESET = 16;
|
||||||
|
#else
|
||||||
const uint8_t PN532_IRQ = 32;
|
const uint8_t PN532_IRQ = 32;
|
||||||
const uint8_t PN532_RESET = 33;
|
const uint8_t PN532_RESET = 33;
|
||||||
|
#endif
|
||||||
// ***** PN532
|
// ***** PN532
|
||||||
|
|
||||||
// ***** HX711 (Waage)
|
// ***** HX711 (Waage)
|
||||||
// HX711 circuit wiring
|
// HX711 circuit wiring
|
||||||
const uint8_t LOADCELL_DOUT_PIN = 16; //16;
|
#if CONFIG_IDF_TARGET_ESP32S3
|
||||||
const uint8_t LOADCELL_SCK_PIN = 17; //17;
|
const uint8_t LOADCELL_DOUT_PIN = 19;
|
||||||
|
const uint8_t LOADCELL_SCK_PIN = 20;
|
||||||
|
#else
|
||||||
|
const uint8_t LOADCELL_DOUT_PIN = 16;
|
||||||
|
const uint8_t LOADCELL_SCK_PIN = 17;
|
||||||
|
#endif
|
||||||
const uint8_t calVal_eepromAdress = 0;
|
const uint8_t calVal_eepromAdress = 0;
|
||||||
const uint16_t SCALE_LEVEL_WEIGHT = 500;
|
const uint16_t SCALE_LEVEL_WEIGHT = 500;
|
||||||
// ***** HX711
|
// ***** HX711
|
||||||
|
|
||||||
// ***** TTP223 (Touch Sensor)
|
// ***** TTP223 (Touch Sensor)
|
||||||
// TTP223 circuit wiring
|
// TTP223 circuit wiring
|
||||||
|
#if CONFIG_IDF_TARGET_ESP32S3
|
||||||
|
const uint8_t TTP223_PIN = 7;
|
||||||
|
#else
|
||||||
const uint8_t TTP223_PIN = 25;
|
const uint8_t TTP223_PIN = 25;
|
||||||
|
#endif
|
||||||
// ***** TTP223
|
// ***** TTP223
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+13
@@ -13,6 +13,17 @@
|
|||||||
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
|
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
|
||||||
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
|
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
|
||||||
|
|
||||||
|
// Adafruit_PN532::begin() toggles RSTPDN too briefly (~1ms/2ms) for some PN532
|
||||||
|
// modules to reliably leave powerdown, which then makes getFirmwareVersion()
|
||||||
|
// return 0 right after begin(). Pulse it explicitly with more margin first.
|
||||||
|
static void pulsePn532Reset() {
|
||||||
|
pinMode(PN532_RESET, OUTPUT);
|
||||||
|
digitalWrite(PN532_RESET, LOW);
|
||||||
|
delay(50);
|
||||||
|
digitalWrite(PN532_RESET, HIGH);
|
||||||
|
delay(200);
|
||||||
|
}
|
||||||
|
|
||||||
TaskHandle_t RfidReaderTask;
|
TaskHandle_t RfidReaderTask;
|
||||||
// AsyncWebServerRequest* volatile activeNfcWriteRequest = nullptr; // Removed
|
// AsyncWebServerRequest* volatile activeNfcWriteRequest = nullptr; // Removed
|
||||||
SemaphoreHandle_t nfcRequestMutex = NULL;
|
SemaphoreHandle_t nfcRequestMutex = NULL;
|
||||||
@@ -561,6 +572,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
Serial.println("1. Neuinitialisierung des PN532...");
|
Serial.println("1. Neuinitialisierung des PN532...");
|
||||||
|
|
||||||
// Reinitialize the PN532
|
// Reinitialize the PN532
|
||||||
|
pulsePn532Reset();
|
||||||
nfc.begin();
|
nfc.begin();
|
||||||
vTaskDelay(pdMS_TO_TICKS(500)); // Give it time to initialize
|
vTaskDelay(pdMS_TO_TICKS(500)); // Give it time to initialize
|
||||||
|
|
||||||
@@ -2335,6 +2347,7 @@ void scanRfidTask(void * parameter) {
|
|||||||
void startNfc() {
|
void startNfc() {
|
||||||
nfcRequestMutex = xSemaphoreCreateMutex();
|
nfcRequestMutex = xSemaphoreCreateMutex();
|
||||||
oledShowProgressBar(4, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
|
oledShowProgressBar(4, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
|
||||||
|
pulsePn532Reset();
|
||||||
nfc.begin(); // Beginne Kommunikation mit RFID Leser
|
nfc.begin(); // Beginne Kommunikation mit RFID Leser
|
||||||
|
|
||||||
delay(1000);
|
delay(1000);
|
||||||
|
|||||||
Reference in new issue
Block a user