Compare commits
14 Commits
v1.3.51
...
84cc8beb9b
Author | SHA1 | Date | |
---|---|---|---|
84cc8beb9b | |||
fd70e3179d | |||
c553640ad8 | |||
807eca3c43 | |||
b52730bf67 | |||
9a59b91e88 | |||
a5af4013d8 | |||
e54ce58ec4 | |||
142eafd232 | |||
63ab9e0993 | |||
aaa5506d40 | |||
8037adc045 | |||
6e7c728cd8 | |||
3fe8271344 |
4
.github/workflows/gitea-release.yml
vendored
4
.github/workflows/gitea-release.yml
vendored
@ -40,8 +40,8 @@ jobs:
|
|||||||
# Copy firmware binary
|
# Copy firmware binary
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||||
|
|
||||||
# Create SPIFFS binary with correct chip revision
|
# Create SPIFFS binary without header
|
||||||
( printf '\xe9\x03\x01\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||||
|
|
||||||
# Create full binary
|
# Create full binary
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
|
4
.github/workflows/github-release.yml
vendored
4
.github/workflows/github-release.yml
vendored
@ -47,8 +47,8 @@ jobs:
|
|||||||
# Copy firmware binary
|
# Copy firmware binary
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||||
|
|
||||||
# Create SPIFFS binary with correct chip revision
|
# Create SPIFFS binary without header
|
||||||
( printf '\xe9\x03\x01\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||||
|
|
||||||
# Create full binary (always)
|
# Create full binary (always)
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
|
31
CHANGELOG.md
31
CHANGELOG.md
@ -1,10 +1,35 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.3.55] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.55
|
||||||
|
- update component descriptions in README files
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.54] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.54
|
||||||
|
- workflow: update SPIFFS binary creation to exclude header
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.53] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- version: update to version 1.3.53
|
||||||
|
- update changelog for version 1.3.51
|
||||||
|
- update changelog for version 1.3.51
|
||||||
|
- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.52] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.52
|
||||||
|
- workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3)
|
||||||
|
|
||||||
|
|
||||||
## [1.3.51] - 2025-02-22
|
## [1.3.51] - 2025-02-22
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.51
|
- update changelog for version 1.3.51
|
||||||
- config: update platformio.ini to specify correct chip revision and remove unused dependencies
|
- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
|
||||||
|
|
||||||
|
|
||||||
## [1.3.50] - 2025-02-22
|
## [1.3.50] - 2025-02-22
|
||||||
### Changed
|
### Changed
|
||||||
|
16
README.de.md
16
README.de.md
@ -53,14 +53,14 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
|
|||||||
### Komponenten
|
### Komponenten
|
||||||
- **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
|
- **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
|
||||||
[Amazon Link](https://amzn.eu/d/aXThslf)
|
[Amazon Link](https://amzn.eu/d/aXThslf)
|
||||||
- **HX711 Wägezellen-Verstärker:** Für Gewichtsmessung.
|
- **HX711 5kg Wägezellen-Verstärker:** Für Gewichtsmessung.
|
||||||
[Amazon Link](https://amzn.eu/d/1wZ4v0x)
|
[Amazon Link](https://amzn.eu/d/06A0DLb)
|
||||||
- **OLED Display:** 128x64 SSD1306.
|
- **OLED 0.96 Zoll I2C weiß/gelb Display:** 128x64 SSD1306.
|
||||||
[Amazon Link](https://amzn.eu/d/dozAYDU)
|
[Amazon Link](https://amzn.eu/d/0AuBp2c)
|
||||||
- **PN532 NFC Modul:** Für NFC-Tag-Operationen.
|
- **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
|
||||||
[Amazon Link](https://amzn.eu/d/8205DDh)
|
[Amazon Link](https://amzn.eu/d/jfIuQXb)
|
||||||
- **NFC-Tag:** NTAG215
|
- **NFC Tags Ntag215:** RFID Tag
|
||||||
[Amazon Link](https://amzn.eu/d/fywy4c4)
|
[Amazon Link](https://amzn.eu/d/9Z6mXc1)
|
||||||
|
|
||||||
### Pin-Konfiguration
|
### Pin-Konfiguration
|
||||||
| Komponente | ESP32 Pin |
|
| Komponente | ESP32 Pin |
|
||||||
|
16
README.md
16
README.md
@ -56,14 +56,14 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
|
|||||||
### Components
|
### Components
|
||||||
- **ESP32 Development Board:** Any ESP32 variant.
|
- **ESP32 Development Board:** Any ESP32 variant.
|
||||||
[Amazon Link](https://amzn.eu/d/aXThslf)
|
[Amazon Link](https://amzn.eu/d/aXThslf)
|
||||||
- **HX711 Load Cell Amplifier:** For weight measurement.
|
- **HX711 5kg Load Cell Amplifier:** For weight measurement.
|
||||||
[Amazon Link](https://amzn.eu/d/1wZ4v0x)
|
[Amazon Link](https://amzn.eu/d/06A0DLb)
|
||||||
- **OLED Display:** 128x64 SSD1306.
|
- **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
|
||||||
[Amazon Link](https://amzn.eu/d/dozAYDU)
|
[Amazon Link](https://amzn.eu/d/0AuBp2c)
|
||||||
- **PN532 NFC Module:** For NFC tag operations.
|
- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
|
||||||
[Amazon Link](https://amzn.eu/d/8205DDh)
|
[Amazon Link](https://amzn.eu/d/jfIuQXb)
|
||||||
- **NFC-Tag:** NTAG215
|
- **NFC Tags Ntag215:** RFID Tag
|
||||||
[Amazon Link](https://amzn.eu/d/fywy4c4)
|
[Amazon Link](https://amzn.eu/d/9Z6mXc1)
|
||||||
|
|
||||||
|
|
||||||
### Pin Configuration
|
### Pin Configuration
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.51"
|
version = "1.3.55"
|
||||||
|
|
||||||
#test
|
#test
|
||||||
|
|
||||||
@ -22,7 +22,10 @@ monitor_speed = 115200
|
|||||||
lib_deps =
|
lib_deps =
|
||||||
tzapu/WiFiManager @ ^2.0.17
|
tzapu/WiFiManager @ ^2.0.17
|
||||||
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
||||||
|
#me-no-dev/AsyncTCP @ ^1.1.1
|
||||||
https://github.com/esphome/AsyncTCP.git
|
https://github.com/esphome/AsyncTCP.git
|
||||||
|
#mathieucarbou/ESPAsyncWebServer @ ^3.6.0
|
||||||
|
#esp32async/AsyncTCP @ ^3.3.5
|
||||||
bogde/HX711 @ ^0.7.5
|
bogde/HX711 @ ^0.7.5
|
||||||
adafruit/Adafruit SSD1306 @ ^2.5.13
|
adafruit/Adafruit SSD1306 @ ^2.5.13
|
||||||
adafruit/Adafruit GFX Library @ ^1.11.11
|
adafruit/Adafruit GFX Library @ ^1.11.11
|
||||||
@ -39,10 +42,6 @@ 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"
|
||||||
|
|
||||||
; Specify the correct chip revision
|
|
||||||
board_build.f_cpu = 240000000L
|
|
||||||
board_build.f_flash = 80000000L
|
|
||||||
|
|
||||||
build_flags =
|
build_flags =
|
||||||
-Os
|
-Os
|
||||||
-ffunction-sections
|
-ffunction-sections
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
#include "nfc.h"
|
#include "nfc.h"
|
||||||
#include "scale.h"
|
#include "scale.h"
|
||||||
#include "esp_task_wdt.h"
|
#include "esp_task_wdt.h"
|
||||||
#include "esp_log.h"
|
|
||||||
#include <Update.h>
|
#include <Update.h>
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
|
|
||||||
@ -166,6 +165,9 @@ void sendAmsData(AsyncWebSocketClient *client) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void setupWebserver(AsyncWebServer &server) {
|
void setupWebserver(AsyncWebServer &server) {
|
||||||
|
// Deaktiviere alle Debug-Ausgaben
|
||||||
|
Serial.setDebugOutput(false);
|
||||||
|
|
||||||
// WebSocket-Optimierungen
|
// WebSocket-Optimierungen
|
||||||
ws.onEvent(onWsEvent);
|
ws.onEvent(onWsEvent);
|
||||||
ws.enable(true);
|
ws.enable(true);
|
||||||
@ -391,34 +393,35 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
static size_t updateSize = 0;
|
static size_t updateSize = 0;
|
||||||
static int command = 0;
|
static int command = 0;
|
||||||
|
|
||||||
oledShowMessage("Upgrade please wait");
|
//oledShowMessage("Upgrade please wait");
|
||||||
|
|
||||||
if (!index) {
|
if (!index) {
|
||||||
// Reduziere Debug-Level während des Updates
|
|
||||||
esp_log_level_set("*", ESP_LOG_ERROR);
|
|
||||||
|
|
||||||
updateSize = request->contentLength();
|
updateSize = request->contentLength();
|
||||||
command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
|
command = (filename.indexOf("website") > -1) ? U_SPIFFS : U_FLASH;
|
||||||
|
|
||||||
if (command == U_SPIFFS) {
|
if (command == U_SPIFFS) {
|
||||||
oledShowMessage("SPIFFS Update...");
|
oledShowMessage("SPIFFS Update...");
|
||||||
backupJsonConfigs();
|
backupJsonConfigs();
|
||||||
|
|
||||||
if (!Update.begin(updateSize, command)) {
|
// SPIFFS update with pure binary data
|
||||||
|
if (!Update.begin((updateSize - 4), command)) { // Exclude header size
|
||||||
restoreJsonConfigs();
|
restoreJsonConfigs();
|
||||||
String errorMsg = String("Update begin failed: ") + Update.errorString();
|
String errorMsg = String("Update begin failed: ") + Update.errorString();
|
||||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
||||||
// Stelle Debug-Level wieder her
|
|
||||||
esp_log_level_set("*", ESP_LOG_INFO);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Skip initial header completely for SPIFFS update
|
||||||
|
if (index == 0 && len >= 4) {
|
||||||
|
data += 4;
|
||||||
|
len -= 4;
|
||||||
|
updateSize -= 4;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
oledShowMessage("Firmware Update...");
|
oledShowMessage("Firmware Update...");
|
||||||
if (!Update.begin(updateSize, command)) {
|
if (!Update.begin(updateSize, command)) {
|
||||||
String errorMsg = String("Update begin failed: ") + Update.errorString();
|
String errorMsg = String("Update begin failed: ") + Update.errorString();
|
||||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
||||||
// Stelle Debug-Level wieder her
|
|
||||||
esp_log_level_set("*", ESP_LOG_INFO);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -450,12 +453,8 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
}
|
}
|
||||||
String errorMsg = String("Update end failed: ") + Update.errorString();
|
String errorMsg = String("Update end failed: ") + Update.errorString();
|
||||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
||||||
// Stelle Debug-Level wieder her
|
|
||||||
esp_log_level_set("*", ESP_LOG_INFO);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Stelle Debug-Level wieder her
|
|
||||||
esp_log_level_set("*", ESP_LOG_INFO);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
Reference in New Issue
Block a user