Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Modbus Sunspec compatibility to opendtu-onbattery #1150

Open
wants to merge 67 commits into
base: development
Choose a base branch
from
Open
Changes from 4 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
4084b4d
Add Modbus
ArekKubacki Feb 13, 2023
cc98831
Added Modbus
ArekKubacki Feb 13, 2023
ddb0325
Merge remote-tracking branch 'origin/master'
ArekKubacki Feb 13, 2023
802601a
Checking that the measurement does not exceed the max Power
ArekKubacki Feb 15, 2023
0777a9c
Modbus BugFix
ArekKubacki Feb 15, 2023
53b9690
Modbus BugFix
ArekKubacki Feb 15, 2023
e13348c
Added WatchDog to Modbus
ArekKubacki Mar 8, 2023
32b9750
Update from master
ArekKubacki Mar 8, 2023
3277e71
Merge branch 'master' into master
ArekKubacki Mar 8, 2023
1b8b56f
Revert "Merge branch 'master' into v1"
ArekKubacki May 30, 2023
314b285
Merge branch 'tbnobody-master'
ArekKubacki May 30, 2023
6ec026b
Edit platformio.ini
ArekKubacki May 30, 2023
5077d03
Fixed Temperature, Frequency etc.
ArekKubacki Jun 2, 2023
8d52334
Merge remote-tracking branch 'origin/master'
ArekKubacki Jun 2, 2023
a3b2457
Modbus fixed
ArekKubacki Jun 2, 2023
54e1641
Fixed Temp, Freq, AC
ArekKubacki Jun 2, 2023
2d9c942
Merge remote-tracking branch 'origin/master'
ArekKubacki Jun 2, 2023
45c9984
Merge
ArekKubacki Jun 2, 2023
adeed86
Merge
ArekKubacki Jun 5, 2023
0fb144f
Modbus Added
ArekKubacki Jun 5, 2023
6765ab6
ModbusDtu h file fixed
ArekKubacki Jun 5, 2023
f7678a0
Fixed Modbus Library
ArekKubacki Jun 5, 2023
acdd4ed
simulating a Fronius Smart Meter with openDTU. currently only feeding…
Jun 10, 2023
5684efa
if only one inverter is connected, use its measurement data.
Jun 12, 2023
909e53b
Merge pull request #1 from tbnobody/master
AloisKlingler Jun 28, 2023
634f962
adding totals as webapi live
Jun 28, 2023
e551d8d
Merge branch 'master' of https://github.com/AloisKlingler/OpenDTU-Fro…
Jun 28, 2023
7a09c3d
Merge pull request #2 from tbnobody/master
AloisKlingler Jun 29, 2023
e6ec4e4
disable wifi powersave mode
Jul 6, 2023
a4e8644
Merge pull request #3 from tbnobody/master
AloisKlingler Aug 8, 2023
6bc9acb
single phase inverters: use variable to fill them to phase 1 to smart…
Aug 8, 2023
99100b7
fixing still empty values on HMS inverters
Aug 9, 2023
423b33e
Merge pull request #4 from tbnobody/master
AloisKlingler Aug 9, 2023
9ebfd82
next try to avoid sending 0-values to modbus-register.
Aug 20, 2023
2f1bb0d
missed some changes in last commit
Aug 20, 2023
c2a06bb
Merge pull request #5 from tbnobody/master
AloisKlingler Sep 7, 2023
226e106
Merge pull request #6 from tbnobody/master
AloisKlingler Sep 12, 2023
cc19c16
Merge pull request #7 from tbnobody/master
AloisKlingler Sep 14, 2023
1aaa4c2
no more additional smartmeter data to increase reliability
Sep 14, 2023
afd6cc4
Merge pull request #8 from tbnobody/master
AloisKlingler Sep 20, 2023
10f5320
Merge pull request #9 from tbnobody/master
AloisKlingler Oct 11, 2023
7465e28
Merge pull request #10 from tbnobody/master
AloisKlingler Nov 20, 2023
b95041e
init variable on starting
Nov 20, 2023
1f77c38
adding configuration element in settings -> network settings to enabl…
Nov 20, 2023
9932a06
Revert "adding configuration element in settings -> network settings …
Jul 31, 2024
66bd4db
Revert "init variable on starting"
Jul 31, 2024
373ff32
Revert "no more additional smartmeter data to increase reliability"
Jul 31, 2024
a2e1c0d
Revert "missed some changes in last commit"
Jul 31, 2024
6c13883
Merge branch 'master' of https://github.com/tbnobody/OpenDTU into tbn…
Jul 31, 2024
735ab0c
Merge branch 'tbnobody-master'
Jul 31, 2024
510e7ca
resolve mergeconflicts v24.6.29
Jul 31, 2024
4888113
fix cpplint failing checks
Jul 31, 2024
4b82f64
migrate Modbus to TaskScheduler
Aug 1, 2024
ef9612e
fix wrong taskname for modbustask
Aug 1, 2024
38aac57
v24.8.1-0.2.2 based on v24.8.1
Aug 1, 2024
ef6e845
Merge branch 'master' of https://github.com/tbnobody/OpenDTU
Aug 1, 2024
e341b96
bring back detailled smartmeter data if only one hoymiles inverter is…
Aug 2, 2024
fcfe327
wrong modbus register leaded to wrong Reactive Power in smartmeter data
Aug 2, 2024
e5fe5b9
Update settings.json
AloisKlingler Aug 4, 2024
03e6e79
Update settings.json
AloisKlingler Aug 4, 2024
c2c4e03
Update settings.json
AloisKlingler Aug 4, 2024
7a4cf2f
rectify settings.json
Aug 4, 2024
93ab87c
Update main.cpp
AloisKlingler Aug 4, 2024
61b2d98
extract strings to have a better possibility to configure dynamic sun…
Aug 5, 2024
389f982
Merge pull request #15 from tbnobody/master
AloisKlingler Aug 6, 2024
ad04999
from Fronius-Simulation to SunSpec-OpenDTU compatibility.
Aug 6, 2024
7a2ae06
fix delayed starting of modbus server
Aug 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -6,4 +6,3 @@
.vscode/settings.json
platformio-device-monitor*.log
platformio_override.ini
.DS_Store
19 changes: 1 addition & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -63,16 +63,6 @@ Firmware version seems to play not a significant role and cannot be read from th
* Build with [Vue.js](https://vuejs.org)
* Source is written in TypeScript

## Breaking changes
Generated using: `git log --date=short --pretty=format:"* %h%x09%ad%x09%s" | grep BREAKING`
```
* 3b7aef6 2023-02-13 BREAKING CHANGE: Web API!
* d4c838a 2023-02-06 BREAKING CHANGE: Prometheus API!
* daf847e 2022-11-14 BREAKING CHANGE: Removed deprecated config parsing method
* 69b675b 2022-11-01 BREAKING CHANGE: Structure WebAPI /api/livedata/status changed
* 27ed4e3 2022-10-31 BREAKING: Change power factor from percent value to value between 0 and 1
```

## Hardware you need

### ESP32 board
@@ -226,15 +216,7 @@ A documentation of the Web API can be found here: [Web-API Documentation](docs/W
* <https://www.printables.com/model/293003-sol-opendtu-esp32-nrf24l01-case>
* <https://www.thingiverse.com/thing:5661780>
* <https://www.thingiverse.com/thing:5632374>
* <https://www.thingiverse.com/thing:5852233>
* <https://www.printables.com/model/377994-opendtu-pcb-box-for-the-wider-board>
* <https://www.printables.com/model/376840-esp32-ahoy-opendtu-pcb-housing>

## Available layouts for printed circuit boards
* [BreakoutBoard - sample printed circuit board for OpenDTU and Ahoy](https://github.com/dokuhn/openDTU-BreakoutBoard)
* [Board for OpenDTU with Display](https://github.com/SteffMUC/openDTU_wDisplay2)
* [OpenDTU PCB mit Display](https://github.com/turrican944/OpenDTU-PCB)
* [PCB for OpenDTU in Cable Branchbox](https://github.com/plewka/ESP-Solar_OpenDTU)

## Building
* Building the WebApp
@@ -268,3 +250,4 @@ A documentation of the Web API can be found here: [Web-API Documentation](docs/W
- [Ahoy](https://github.com/grindylow/ahoy)
- [DTU Simulator](https://github.com/Ziyatoe/DTUsimMI1x00-Hoymiles)
- [OpenDTU extended to talk to Victrons MPPT battery chargers (Ve.Direct)](https://github.com/helgeerbe/OpenDTU_VeDirect)
- [BreakoutBoard - sample printed circuit board for OpenDTU and Ahoy](https://github.com/dokuhn/openDTU-BreakoutBoard)
2 changes: 1 addition & 1 deletion docs/DeviceProfiles/wt32-eth01.json
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
"mdc": 23,
"mdio": 18,
"type": 0,
"clk_mode": 0
"clk_mode": 3
}
}
]
1 change: 0 additions & 1 deletion docs/MQTT_Topics.md
Original file line number Diff line number Diff line change
@@ -51,7 +51,6 @@ serial will be replaced with the serial number of the inverter.
| Topic | R / W | Description | Value / Unit |
| --------------------------------------- | ----- | ---------------------------------------------------- | -------------------------- |
| [serial]/[1-4]/current | R | DC current of specific input in ampere | Ampere (A) |
| [serial]/[1-4]/name | R | Name of the DC input channel as configured in web GUI| |
| [serial]/[1-4]/irradiation | R | Ratio DC Power over set maximum power (in web GUI) | % |
| [serial]/[1-4]/power | R | DC power of specific input in watt | Watt (W) |
| [serial]/[1-4]/voltage | R | DC voltage of specific input in volt | Volt (V) |
Loading