* 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>
* updated arduinojson to version 7.3.0, enabled comments within json files
* update ESPAsyncWebServer/AsyncTCP to the ESP32Async fork
ESP32Async/ESPAsyncWebServer and ESP32Async/AsyncTCP are much better maintained and it looks like a lot of bugs are fixed compared to the ESPHome version we used before.
* Arduino 3.x compatibility (while maintaining 2.x compatibility)
- nightly reboot is now optional (and rescheduled to 3:56 daily)
- lowbatt count in sys websocket messages (once a minute)
- new preview window, showing pending image on 1:1 size, great for debugging json template or other custom content. Right click tag and choose 'Tag preview'
- dayahead Fixed surcharge now takes either one value (old behaviour) or an array with 24 elements for each hour, to add a surcharge depending on the time of day (as apparently they use in Denmark). The array should be entered like `[n,n,...,n]`
- added 1.54" template for dayahead prices
- in dayahead content, added option to only display the graph, without the current time/price/arrow. With this, the display only has to refresh one a day, which will save battery
- added the number of timedout tags to the 'sys' websocket message. The timeoutcount key/value is only present once a minute.
`{"sys":{"currtime":1730133055,"heap":194124,"recordcount":27,"dbsize":5488,"littlefsfree":5246976,"psfree":8350371,"apstate":1,"runstate":2,"rssi":-70,"wifistatus":3,"wifissid":"sensors","uptime":72,"timeoutcount":0}}`
- cosmetic: tagtype update now doesn't give an error when it tries to process readme.md
So far the serial output is a mix of \r\n for println() and \n for
sprintf() and such.
This commit consolidates this to a consistent \r\n.
There should be no noticeable difference for users of terminals that
auto-substitute a sole \n to \r\n.
This will however make the serial output friendly to default behavior of
various terminal emulators like 'screen' and 'minicom'.
This commit doesn't touch anything that is not serial output and also
leaves 'ets_printf' alone just in case.
Co-authored-by: Thomas B. Rücker <thomas.ruecker@relexsolutions.com>
- use the actual color table in tagtype json for rendering images (until now, that color table was ignored)
- added proper ordered dithering (works with all colors now, not just gray and pink)
- on the static image content card, you can now choose floyd-steinberg or ordered dithering (or turn dithering off)
- added ÅÄÖ to twcondensed20 font
- small bugfixes
- fix serial passthrough via UART in OEPL-flasher.py
- added last updated time of a tag in tagdb
- day ahead prices choice of whole money units or cents
- optimization of file upload during updates
- show mac address in wifi setup
- fixed reload of display after unexpected reboot of tag
commit d41ab4b27c
Author: Nic Limper <nic@xs4all.nl>
Date: Mon Mar 4 13:16:15 2024 +0100
remove subghz in platformio.ini
commit dfa1a5cecd
Author: Nic Limper <nic@xs4all.nl>
Date: Mon Mar 4 13:15:14 2024 +0100
Revert "Disable SubGhz support until C6 side is ready."
This reverts commit 3bc96dc48e.
commit cdd26072fd
Author: Nic Limper <nic@xs4all.nl>
Date: Mon Mar 4 13:14:46 2024 +0100
Revert "Merge remote-tracking branch 'mine/oepl_pr_1' into oepl_pr_1"
This reverts commit 39b1938263, reversing
changes made to 3bc96dc48e.
commit 39b1938263
Merge: 3bc96dc42b62dff5
Author: Skip Hansen <skip@gfrn.org>
Date: Mon Mar 4 03:54:35 2024 -0800
Merge remote-tracking branch 'mine/oepl_pr_1' into oepl_pr_1
commit 3bc96dc48e
Author: Skip Hansen <skip@gfrn.org>
Date: Mon Mar 4 03:43:12 2024 -0800
Disable SubGhz support until C6 side is ready.
commit 2b62dff5f5
Author: Nic Limper <nic@xs4all.nl>
Date: Mon Mar 4 11:44:06 2024 +0100
fix gzip wwwfiles
to prevent unchanged gzipped files showing up in the commit
commit 0864870540
Author: Skip Hansen <skip@gfrn.org>
Date: Sun Mar 3 16:46:53 2024 -0800
Added SubGhz channel support to AP Web GUI.
- adds tag serial debug in webflasher and power up/down buttons
- fixes bug where esp32-s3 connected via usb cdc slows down when no terminal connection is present
- fix: ghost tags reporting a different channel id than the AP are now ignored
- webflasher now ramps up/down power to prevent spikes
- bugfix: C6 doesn't get reset anoymore by the watchdog during flashing
- bugfix: C6 could go in flash mode unintended
- a failed connection during swd write blocks is now reported back instead of silently ignored
- added 4 areas of Sweden to day ahead price content
- new context menu option 'Delete all inactive tags' (only when right clicking on an inactive tag).
- adjusted some timings
- added webinterface for tag flasher
- added tcp transport for communicating with tag flasher (OTG USB also still works)
- added content 'timestamp', makes use of preloaded images and buttons on the 2.9" M3
- webinterface is now aware of C6 and flasher capabilities
- AP can run without ieee801.15.4 radio (i.e. flasher only) by shorting FLASHER_AP_TXD and FLASHER_AP_RXD
- added tcp transport option to OEPL-Flasher.py (serial also still works)
- added new environment OpenEPaperLink_Mini_AP_v4
- lots of finetuning and bug fixes
Pretty complex change here: pending images/commands are now queued.
A command (like LED flasher) will not overwrite a pending image anymore. Also, sending multiple preloaded images is possible.
Also works (at least, as far as I could test) in combination with Multi AP and mirroring tags ('display a copy' content type).
It you want to test this: don't forget to upload the changed files in /www (the pending icon is now displaying the amount of queued messages). Timing improvements will follow later (only one message can be transmitted every checkin. If multiple messages are queued, at this moment, you have to wait until the next checkin which takes 40-60 sec).
This comes also with the advantage of better stability if you upload multiple images to the same tag in succession. Before queuing, if was possible to replace the image between sending the pending message and the image transfer to the tag, causing md5 mismatches and instability.
Solves #47
- changed ESPAsyncWebServer and AsyncTCP (both not properly maintained for more than 5 years) to more recent fork with bugfixes
- fixed concurrency issues in /imgupload. Hurts the upload performance a lot, but probably that's not a real issue. Parallel uploads are now possible (still within the max 5 TCP connection limit)
- added short date format definition in language.json
- changed english date format to mm/dd
- added lightgrey (4)/darkgrey (5)/pink (6) colors in jsontemplate (uses pattern dither)
- fixed ntp init timing
- separated content types for 'not configured', 'static image', 'uploaded image' and 'home assistant' (which is all the same internally, but it confused the users to always see 'static image'
- changed channel reported by the AP to the ieee801.15.4 channel instead of the WiFi channel
- added geocoding to the 'location' fields (e.g. weather forecast). Now you can choose an ambiguous location from a dropdown.
- added 'firmware update rejected' wakeup reason
- Added Signika-SB.ttf and some small bitmap fonts
- Removed calibrib50/60/80/100/120/150 bitmap fonts, as they can be better rendered using truetype. Fallback is in place to auto translate to Signika-SB.ttf with the right size in case it is still used in a json template
- Renamed confusing tag type names to 'M2 + size' and 'M3 + size'. Because the universal firmware, there is no need to tell every subtile type change apart anymore.
- added `textbox` to json templates (https://github.com/jjwbruijn/OpenEPaperLink/wiki/Json-template#paragraph-text)
- redesign of count days/hours
- redesign of RSS feed
- designed Buienradar for more tag sizes
- on a scheduled or user initiated reboot, 'REBOOTING' is sent to the error channel of the websockets just before the connection is dropped
- phased out "hwtype": [] in content_cards.json (new location is in the tagtype json, which contains a list of valid content types)
In case of problems using this commit: keep in mind the heavy caching of the tagtypes in the browser. You might still unknowingly use the old contents.
- optional previewtype and previewlut parameters for /imgupload call
- new 35.json for M3 6.0" (no template yet; coming up next)
- updated upload-demo.html
- prevent using html file for tag firmware update
- removed excessive logging
- fallback to .bak on tagDB load error
- scheduled reboot once at night around 4:00
- neopixel patterns optimized. The 'breathing' led state now is green colored if everything is okay, and blue if there are one or more tags timed out.
- time zone is now set before wifi connect to show correct time zone in the logs during startup
- concurrent image upload POST is now blocked. If an upload is in progress while you do a second http POST, http status 409 Conflict is returned.
- small synchronisation bug fix in web interface on loading tag type
- dialog window close bugfix in painter
- image upload is now logged in /log.txt
* New hardware profile: PoE AP
- added harware profiles for C6 firmware in menuconfig
- added free PSRAM stat in webinterface
* fix(fsfree): fixed var type of freesize of FS
- neopixel idle color now represents AP status
- option to invert colors (advanced options at tag card)
- filename dropdown in tag card when a filename is expected
- redrawing pending instead of raw, if previews are off and tag reboots
- tft brightness setting independent from neopixel brightness
