Commit Graph

254 Commits

Author SHA1 Message Date
Thomas Basler
64bfb63ba8 Revert espressif32 from 6.4.0 back to 6.3.2
Total available heap size was reduced from 281kb to 247kb which causes TLS issues (among others)
2023-09-18 20:47:29 +02:00
helgeerbe
f7bd4a40d8 revert Revert "Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development"
merge of v23.9.11 broke the system. As a workaround upgrade espressif32 from 6.3.2 to 6.4.0 is skipped. See #440
2023-09-14 13:45:23 +02:00
helgeerbe
2eeb5f1d19 Revert "Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development"
This reverts commit eb1c2dbd8c, reversing
changes made to 0cb42a6424.

merge of v23.9.11 broke the system
2023-09-12 20:18:10 +02:00
helgeerbe
eb1c2dbd8c Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-09-12 19:27:32 +02:00
Thomas Basler
094fadb2ee Update espressif32 from 6.3.2 to 6.4.0 2023-09-01 00:02:47 +02:00
Thomas Basler
34b3dad252 Upgrade espMqttClient from 1.4.4 to 1.4.5 2023-08-31 23:55:48 +02:00
helgeerbe
69456affce Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-08-02 19:46:35 +02:00
Thomas Basler
2eeb7423bf Update olikraus/U8g2 from 2.35.3 to 2.35.4 2023-07-31 22:42:06 +02:00
Thomas Basler
c374a83cfe Update bblanchon/ArduinoJson from 6.21.2 to 6.21.3 2023-07-31 22:40:54 +02:00
helgeerbe
2440028d38 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-07-24 13:16:15 +02:00
Thomas Basler
2e25fdcf8f Formatting style in platformio.ini 2023-07-22 18:08:34 +02:00
Thomas Basler
0d5b938328 Update olikraus/U8g2 from 2.34.22 to 2.35.3 2023-07-22 16:01:19 +02:00
helgeerbe
f68f68be77 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-07-13 12:19:21 +02:00
Thomas Basler
cf91839838 Upgrade espMqttClient from 1.4.3 to 1.4.4 2023-07-12 18:38:35 +02:00
helgeerbe
633ef88296 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-07-12 13:45:19 +02:00
Thomas Basler
56e2b462fb Update espressif32 from 6.3.1 to 6.3.2 2023-07-10 20:26:07 +02:00
Stephan
1871a9a692 use FSPI for esp32-c3 and revise device profiles 2023-07-10 19:04:13 +02:00
helgeerbe
006f63ed02 feature: add digest auth on power meter
Power Meter -> HTTP(S) + Jason configuration allows now basic and digest authentication (all Shelly Gen2 devices)
2023-07-04 11:54:46 +02:00
helgeerbe
9a4eb75160 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-07-02 14:32:12 +02:00
helgeerbe
cd1db49a98 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-06-22 21:14:12 +02:00
Thomas Basler
93057fc3dc Feature: Added touch icon for iOS and Android
Implements #1060
2023-06-21 22:44:18 +02:00
Thomas Basler
582867cdb9 Update olikraus/U8g2 from 2.34.18 to 2.34.22 2023-06-21 20:44:18 +02:00
Thomas Basler
e0b054d2b5 Pre-Compile a new generic esp32s3 binary without any pin config. 2023-06-21 20:31:31 +02:00
Thomas Basler
7656735103 Pre-Compile a new generic esp32 binary without any pin config. 2023-06-21 20:30:08 +02:00
helgeerbe
e68baa3086 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-06-09 13:16:56 +02:00
Thomas Basler
abfc2735ba Add separate property to platformio.ini to control the environments built by github actions
This is now independent of the default_envs which also affects local development
2023-06-08 22:48:04 +02:00
Thomas Basler
9ac1bb3409 Update olikraus/U8g2 from 2.34.17 to 2.34.18 2023-06-08 21:05:53 +02:00
Thomas Basler
b8745f6199 Update nrf24/RF24 from 1.4.5 to 1.4.7 2023-06-08 21:01:58 +02:00
Thomas Basler
78135fb62e Update espressif32 from 6.3.0 to 6.3.1 2023-06-08 21:00:38 +02:00
MalteSchm
e7c8a89bd3 inital version of full solar passthrough
Webinterface change to set full solar passthrough values

Adding webapi and config changes to enable full solar passthrough over certain battery Soc

inital version of full solar passthrough in power limiter

Passthrough mode can be enabled via MQTT

translations

re-enable comment

remove unused variable
2023-06-02 12:49:24 +02:00
Thomas Basler
bd891f9a6d Upgrade espMqttClient from 1.4.2 to 1.4.3 2023-05-29 21:08:09 +02:00
Thomas Basler
08b44fb2ba Added post build script to generate a .factory.bin file
This file can just be flashed to address 0x0 and contains all other required data. No need to flash multiple files anymore.
2023-05-25 20:47:45 +02:00
helgeerbe
b7ac70b1ca Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-05-23 09:19:57 +02:00
Thomas Basler
456a433cd5 Upgrade platform-espressif32 from 6.1.0 to 6.3.0 2023-05-22 18:40:30 +02:00
helgeerbe
1c7b7d3cdf Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-05-10 18:16:25 +02:00
Thomas Basler
efcbd81927 Feature: Add used PIO environment to the system info page 2023-05-08 21:43:50 +02:00
helgeerbe
178d40d5b4 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-05-04 20:24:29 +02:00
Thomas Basler
65b728eebb Fix: No OpenDTU startup of CDC (like Pico or ESP32-S3) devices if no usb host is connected
Should also fix #826
2023-05-03 21:16:27 +02:00
Thomas Basler
09f8a633d7 Fix: Source does not build with platform >= 6.2.0
Stick at 6.1.0 at the moment... There is already a issue opened on arduino-esp32 (https://github.com/espressif/arduino-esp32/issues/8108)
2023-05-02 20:49:11 +02:00
helgeerbe
d1885b6177 workaround for faild builds on github actions 2023-04-29 23:19:08 +02:00
helgeerbe
dae4c6fbf5 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-28 22:38:39 +02:00
Markus Krause
d361619ade add v2 opendtufusion 2023-04-28 21:26:22 +02:00
Markus Krause
72231bca5e improve opendtufusion ini 2023-04-28 21:26:22 +02:00
Markus Krause
4e51914a04 add opendtufusion board 2023-04-28 21:26:22 +02:00
helgeerbe
37b5edb010 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-25 18:51:18 +02:00
Thomas Basler
12d03f06b0 Added functionality to apply custom patch files during building
Usefull  to patch existing libraries
2023-04-20 23:13:18 +02:00
Thomas Basler
f5fc52b92f Move auto_firmware_version.py to pio-scripts subdirectory 2023-04-20 22:46:05 +02:00
helgeerbe
a1b3bdfee8 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-18 12:09:22 +02:00
Thomas Basler
a1d5f97efb Upgrade ArduinoJson from 6.21.1 to 6.21.2 2023-04-17 22:01:38 +02:00
Thomas Basler
5e11f0b854 Implement property in HoymilesRadio_CMT to set the frequency during runtime 2023-04-15 10:55:48 +02:00
Thomas Basler
45882543b6 Allow dynamic pin mapping for CMT module 2023-04-15 10:55:47 +02:00
Thomas Basler
90c689a41a Implement HoymilesRadio_CMT 2023-04-15 10:55:47 +02:00
Thomas Basler
a252d2ac3a Added CMT2300 driver 2023-04-15 10:55:47 +02:00
helgeerbe
71128e5a55 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-11 09:37:56 +02:00
qubeck
00def1d8d1
Generic SML based power meters support (#146)
* add support for energy & power readings on SML based power meters, taking OBIS 16.7.1 for power (using mod. SML Parser lib. by olliiiver)

* switched SML read to use software serial

* made total power meter response controled by meter source to obtain either the sum of phase powers or explicit total power provided by meter

* made mqtt subscriptions to power meter topics meter source dependend

* simplified SML read loop and OBIS handler registration, + minor refactoring

* minor cleanup/style changes and optim. PowerMeter

* fixed build, add SOURCE_SML == 4

* removed optional usage of HW serial for SML power meter

* switched to usage of _powerMeter1Power for SML power reading to allign better with existing code

---------

Co-authored-by: helgeerbe <helge@erbehome.de>
2023-04-07 20:20:00 +02:00
Thomas Basler
8673336151 Upgrade U8g2 from 2.34.16 to 2.34.17 2023-04-06 22:40:01 +02:00
Thomas Basler
ee5fe9441e Upgrade ArduinoJson from 6.21.0 to 6.21.1 2023-04-06 22:38:42 +02:00
helgeerbe
ef51d75f2c Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-06 10:46:02 +02:00
tbnobody
d6ff90260e Undo latest change 2023-04-06 10:37:05 +02:00
tbnobody
7f17176462 Test multpile commits 2023-04-06 10:37:05 +02:00
Thomas Basler
778dc93dee Merge remote-tracking branch 'github/master' 2023-04-05 20:40:23 +02:00
Thomas Basler
c2cacb8d7b Fix: Replace spaces by underscores in platformio environment d1_mini_esp32 (#765) 2023-04-05 19:41:35 +02:00
tbnobody
44ca697c0e
Undo latest change 2023-04-05 11:53:53 +02:00
tbnobody
395a822f60
Test multpile commits 2023-04-05 11:53:08 +02:00
Thomas Basler
e0150a8962 Increase platform package version from 6.0.1 to 6.1.0 2023-04-05 11:52:34 +02:00
Bernhard Kaszt
e35254c8f2
New Power meter support: HTTP(S) + JSON (Shelly 3EM, Tasmota, Volkszähler etc.) (#153)
* Implement HTTP(s) + JSON type Power Meter support

---------

Co-authored-by: Bernhard Kaszt <berni@bcserv.eu>
2023-04-03 21:36:20 +02:00
Bernhard Kaszt
c7ef661db7 platformio.ini: Fix indentation 2023-04-02 10:14:34 +02:00
Thomas Basler
4244233dd3 Increase platform package version from 6.0.1 to 6.1.0 2023-04-01 12:49:16 +02:00
MalteSchm
5f42f66c02 fix indent error 2023-03-29 19:05:31 +02:00
helgeerbe
b3c17c8ee8 Merge branch 'pr/MalteSchm/144' into development 2023-03-27 22:16:53 +02:00
helgeerbe
e0a80734f3 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-27 21:10:03 +02:00
Thomas Basler
9523b99b22 Upgrade espMqttClient from 1.4.1 to 1.4.2 2023-03-27 16:58:35 +02:00
MalteSchm
a4767827b4 merging master 2023-03-26 11:25:08 +02:00
MalteSchm
0be574809b adding power pin 2023-03-26 11:09:08 +02:00
MalteSchm
db7ad52a4d platformio ini file changes 2023-03-24 10:05:46 +01:00
helgeerbe
3f8226c36c Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-23 19:14:14 +01:00
Thomas Basler
a17362a9c5 Upgrade olikraus/U8g2 from 2.34.13 to 2.34.16 2023-03-20 18:14:38 +01:00
Thomas Basler
e95af04da4 Compile with newer c++ standard 2023-03-20 18:06:49 +01:00
helgeerbe
06370baa0e Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-18 22:42:05 +01:00
Thomas Basler
a542ea7fbb Upgrade ArduinoJson from 6.20.1 to 6.21.0 2023-03-17 18:23:56 +01:00
Thomas Basler
01a8c6d873 Upgrade espMqttClient from v1.3.3 to v1.4.1 2023-03-17 18:21:28 +01:00
MalteSchm
63c956af15 swap can library to better support newer ESPs 2023-03-12 17:27:41 +01:00
helgeerbe
1e6e40a3ab add Pylontech pins to d1 mini config 2023-03-07 21:27:51 +01:00
helgeerbe
6a89ae986e Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-07 21:17:48 +01:00
Luca Kröger
ff0c69c908 added lolin s2 mini reference layout 2023-03-07 15:39:50 +01:00
Bernhard Kaszt
44a770be0e Add Pylontech PIN numbers to platformio.ini 2023-03-05 21:22:10 +01:00
helgeerbe
73fe3bfb96 Add missing can lib 2023-02-23 12:05:50 +01:00
helgeerbe
a2473645a5 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-02-23 12:01:34 +01:00
Thomas Basler
dc309e9616 Update sunset from 1.1.3 to 1.1.7 2023-02-20 20:01:56 +01:00
helgeerbe
f560f25302 initial merge of power_limiter * missing is inverter and channel setting in gui
* due to bug _webApiPrometheus.init is commented out
2023-02-20 15:56:02 +01:00
helgeerbe
cb7874ac8d remove serial ports from platformio
* use auto detect
2023-02-20 09:43:31 +01:00
Thomas Basler
b319c78dc1 Added methods to calculate and show sunrise and sunset times 2023-02-18 18:15:48 +01:00
helgeerbe
27f20a76f0 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-02-16 12:35:18 +01:00
Thomas Basler
f5fb628559 Update espressif32 from 6.0.0 to 6.0.1 2023-02-14 19:13:24 +01:00
Thomas Basler
04c7d40cde Update ArduinoJson from ^6.20.0 to 6.20.1 2023-02-13 20:35:38 +01:00
helgeerbe
1c01e927f9 Add victron pins to device manager 2023-02-02 23:01:22 +01:00
helgeerbe
bec6c20531 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2023-01-26 10:30:55 +01:00
helgeerbe
9a7a0d293e Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2023-01-20 14:54:04 +01:00
dAjaY85
7074dd5757 Display init zum Zweiten
chango to full Buffer Mode, remove picture loop,
because it's not worked.
look: https://github.com/olikraus/u8glib/wiki/tpictureloop

snprintf + public vars
- dispPowerSafe => true: PowerSafe Mode on
- dispLogo => true: showing Logo upper right corner
- dispContrast => possible to adjust the Display Contrast

change in date time, buffer deleted

Display-Constructor changed, reset goes to front

Arrow and Logo only shown, when production is on

Refactor OLEDDisplayClass to DisplayGraphicClass
2023-01-18 23:22:36 +01:00
Thomas Basler
753d73accd Fix compile issue with ESP32-C3 and C++11 2023-01-18 23:13:38 +01:00
Thomas Basler
07a438db33 Upgrade ArduinoJson from 6.19.4 to 6.20.0 2023-01-17 18:55:14 +01:00
Thomas Basler
17ffda9816 Upgrade espressif framework from 5.3.0 to 6.0.0 2023-01-17 18:51:48 +01:00
helgeerbe
ddb6346087 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2023-01-03 10:51:56 +01:00
Thomas Basler
d75ac167fa Fix building with platform-espressif32 5.3.0
The bootloader.bin is placed in the build output directory by the build script
2022-12-31 12:57:06 +01:00
helgeerbe
e49bbe0faf Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-12-27 14:17:24 +01:00
helgeerbe
df5cde2e82 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-12-05 11:46:31 +01:00
Martin Dummer
9bfc7044fc
add platformio_override.ini as personal config override
Personal edits in platformio.ini causes annoying merge conflicts then
new commits are pulled from upstream. Adding an personal override config
which is further ignored from git will avoid this.

Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
2022-12-02 23:50:12 +01:00
Thomas Basler
d73a4d9674 Added lolin32_lite board 2022-11-29 18:49:36 +01:00
Thomas Basler
ae023674fc Fix #399: Move pin assignment to generic environment to prevent compilation errors 2022-11-29 18:48:39 +01:00
Thomas Basler
f171555de8 Merge branch 'pr396' into dev 2022-11-28 18:30:45 +01:00
MrReSc
f6a7404314 Support for NodeMCU-ESP-S3-12K-Kit added 2022-11-28 10:03:36 +01:00
Thomas Basler
36abaeee12 Moved pin assignment outside the hoymiles library
Allows setting the pins during runtime and not  just using the defines
2022-11-27 12:07:25 +01:00
helgeerbe
1fc0e76c41 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-11-22 17:10:53 +01:00
Thomas Basler
c0e6e13139 Added support for LilyGO_T_ETH_POE board 2022-11-19 00:03:25 +01:00
helgeerbe
f35395e76f Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-11-16 16:39:01 +01:00
Thomas Basler
50d73c7440 Upgraded espMqttClient to v1.3.3 2022-11-14 17:53:00 +01:00
helgeerbe
a9336968c7 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-10-20 23:39:05 +02:00
Thomas Basler
511b59ff25 Added config for wt32-eth01 board and move upload_port config to global section 2022-10-20 18:55:52 +02:00
Thomas Basler
fede8e21cb Added more strict compile flags 2022-10-19 22:16:31 +02:00
helgeerbe
5de35ee353 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-10-17 10:10:34 +02:00
Thomas Basler
c4729c240d Optimize order of monitor_filters
The order is important. FIrst analyze for exceptions, then add the time, then add to logfile and at the end colorize the output
2022-10-11 23:14:04 +02:00
helgeerbe
366e7dc409 Merge remote-tracking branch
'tbnobody/OpenDTU/master'
2022-10-07 10:32:51 +02:00
Thomas Basler
0a68b5af30 Harden compiling by using -Wall 2022-10-05 18:57:11 +02:00
Thomas Basler
647966428a Updated dependencies 2022-10-03 22:48:55 +02:00
helgeerbe
df7c821bd4 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-10-03 13:34:05 +02:00
Thomas Basler
6484a017c4 Upgrade espMqttClient from 1.2.3 to 1.3.1 2022-09-25 22:20:23 +02:00
helgeerbe
bee600bfd8 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2022-09-19 10:49:41 +02:00
Stefan Kreutter
0d5bdbe9cf added Olimex ESP32-EVB with MOD-NRF24LR
added platformio definitiones for the Olimex ESP32-EVB board with MOD-NRF24LR
2022-09-15 19:34:01 +02:00
Thomas Basler
593f80afd1 Specify version of espMqttClient library 2022-09-15 19:28:30 +02:00
Thomas Basler
271c71e064 Replace ESPAsyncWebServer
Use fork from yubox-node-org instead of originial from me-no-dev
Maybe that fixes several issues with the websockets
2022-09-15 19:26:45 +02:00
helgeerbe
12fc34d4de add victrons rx, tx pins 2022-08-29 16:19:47 +02:00
helgeerbe
865c9cdac5 Merge branch 'master' into ve.direct 2022-08-17 12:25:07 +02:00
Thomas Basler
7015b04ee6 Update required version of RF24 library 2022-08-16 23:24:48 +02:00
Thomas Basler
e55f5afa62 Update platform dependencies 2022-08-16 23:22:46 +02:00
helgeerbe
c7c1506e42 First version 2022-08-11 17:26:00 +02:00
helgeerbe
4435fbcdad Add support for MQTT TLS
To support TLS its necessary to use another MQTT library.
The new lib is a drop-in replacement for the async-mqtt-client.
2022-08-06 00:14:44 +02:00
Thomas Basler
63ccf38250 Place port settings in generic section 2022-07-19 22:21:20 +02:00
Thomas Basler
5b8c18b727 Disable debug build for poe board 2022-07-19 22:02:34 +02:00
Thomas Basler
d5c0d13d1e Adjusted platformio.ini for ethernet usage 2022-07-19 21:27:36 +02:00
Thomas Basler
f917f5dc0d First experimental support for Olimex ESP32 POE board
Ethernet is NOT implemented for now
2022-07-12 18:53:01 +02:00
Axel Hinrichs
81d2861006 [firmware] add minimum platform requirement 2022-07-01 09:31:05 +02:00
Thomas Basler
183b919ae6 Rename data folder to webapp_dist 2022-06-22 23:16:45 +02:00
Thomas Basler
3b9d117b4d Show current git hash in web gui 2022-06-20 20:56:50 +02:00
Thomas Basler
0d07e3e09f WIP: Very rough first draft of Hoymiles library 2022-05-30 21:50:08 +02:00
Thomas Basler
68c451aa82 Serve webapp from flash instead of LITTLEFS
This allows a web based firmware update by just replacing one bin file
2022-05-22 22:42:06 +02:00
Thomas Basler
f43e8abe25 Latest arduino is supported upstream 2022-05-22 22:10:02 +02:00
Thomas Basler
50fa7e2abf First basic class structure for mqtt handling 2022-04-18 15:19:26 +02:00
Thomas Basler
5653d0f835 Upgraded to latest Beta build system
This one is using esp32-arduino 2.0.3
2022-04-18 03:38:07 +02:00
Thomas Basler
b58788ded5 Added API endpoint which shows network info 2022-04-12 23:53:58 +02:00
Thomas Basler
a6d7c923bb Implemented first version of LittleFS upload 2022-04-11 19:59:35 +02:00