dependabot[bot]
8051db6a9b
Bump esbuild from 0.18.20 to 0.25.1 in /lib/SvelteUi/app ( #943 )
...
Bumps [esbuild](https://github.com/evanw/esbuild ) from 0.18.20 to 0.25.1.
- [Release notes](https://github.com/evanw/esbuild/releases )
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG-2023.md )
- [Commits](https://github.com/evanw/esbuild/compare/v0.18.20...v0.25.1 )
---
updated-dependencies:
- dependency-name: esbuild
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-24 09:10:54 +01:00
Gunnar Skjold
d0bfdae5d8
Automatic release notes ( #942 )
2025-03-24 09:05:02 +01:00
Gunnar Skjold
4d681ed2e2
Support fw upgrade via MQTT with JSON payload ( #941 )
2025-03-24 09:00:05 +01:00
Gunnar Skjold
8ee3f53714
Fixed firmare upload when web context is defined ( #938 )
2025-03-24 08:59:52 +01:00
Gunnar Skjold
e8cf8a98ed
Fixed baud/parity autodetect ( #937 )
2025-03-24 08:59:40 +01:00
Gunnar Skjold
9153a98694
Fix : #935 - Brownout reboot loop ( #936 )
2025-03-24 08:59:30 +01:00
Gunnar Skjold
37aa6ae816
Fix : #918 - MQTT/SSL does not reconnect after disconnect ( #933 )
2025-03-24 08:59:18 +01:00
Gunnar Skjold
8a35346fcf
Fixed backup and restore of price modifiers ( #925 ) ( #932 )
...
* Fix : #925 - Backup/restore of price modifiers
* Removed unused importy
2025-03-24 08:58:31 +01:00
Gunnar Skjold
792ae4c935
Fix : #926 - Historical data lost when upgrading ESP8266 between 2.4.x versions ( #931 )
2025-03-24 08:58:14 +01:00
Gunnar Skjold
a7324d828a
Fixed nullpointer in upgrade
2025-02-14 18:51:07 +01:00
Gunnar Skjold
fe739c51d3
Cloud stuff
2025-02-14 18:04:12 +01:00
Gunnar Skjold
795d2d0375
Some debugging of cloud connection
2025-02-14 14:51:47 +01:00
Gunnar Skjold
5ef36a91f6
Updated esbuild dependency
2025-02-13 13:10:50 +01:00
Gunnar Skjold
8491d6c471
Changed to the latest possible node version
2025-02-13 13:07:57 +01:00
Gunnar Skjold
f95f22058a
Merge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2025-02-13 13:01:05 +01:00
Gunnar Skjold
b5c45cebfa
Merge pull request #866 from saddfox/devcontainer
...
Add devcontainer
2025-02-13 12:55:57 +01:00
Gunnar Skjold
19a953b269
Updated workflows
2025-02-13 12:55:43 +01:00
Gunnar Skjold
6ae970ff68
Updated workflows
2025-02-13 12:45:43 +01:00
Gunnar Skjold
0f0ee82af9
Various bug fix for GUI
2025-02-13 12:33:54 +01:00
Gunnar Skjold
d84b9351e1
Fixed ESP8266 build
2025-02-03 18:02:20 +01:00
Gunnar Skjold
6668258b66
Support for update entity in HA
2025-02-03 17:51:36 +01:00
Gunnar Skjold
9c42aab04f
Fixed extra price
2025-01-27 16:31:43 +01:00
Gunnar Skjold
c771870e3e
Merge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2025-01-27 16:08:02 +01:00
Gunnar Skjold
fb59ee52c1
Merge pull request #890 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/nanoid-3.3.8
...
Bump nanoid from 3.3.7 to 3.3.8 in /lib/SvelteUi/app
2025-01-27 16:04:28 +01:00
Gunnar Skjold
3483910136
Merge pull request #907 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/vite-4.5.9
...
Bump vite from 4.5.5 to 4.5.9 in /lib/SvelteUi/app
2025-01-27 16:04:16 +01:00
Gunnar Skjold
13e70f7bd4
Merge pull request #906 from dbeinder/nullterm
...
Reserve space for null terminator
2025-01-27 16:03:44 +01:00
Gunnar Skjold
210001e232
Prevent meterid override
2025-01-24 13:22:08 +01:00
Gunnar Skjold
094e588ad5
Strip non-ascii from meter id
2025-01-24 07:44:21 +01:00
Gunnar Skjold
f9d0cdfa47
Fixed nullpointer
2025-01-23 21:37:17 +01:00
Gunnar Skjold
0476058958
Fixed wifi scan for 8266
2025-01-23 14:46:52 +01:00
Gunnar Skjold
3e337a5639
Option to enter manual SSID
2025-01-23 14:37:28 +01:00
Gunnar Skjold
bf0e1d1bf3
Lib updates
2025-01-23 14:16:05 +01:00
Gunnar Skjold
d3b65b0175
SSID scan
2025-01-23 14:13:23 +01:00
Gunnar Skjold
2caa7252a0
Enforce pattern on all input fields
2025-01-23 12:01:39 +01:00
Gunnar Skjold
f7596de166
Fixed memory leak
2025-01-23 11:22:03 +01:00
Gunnar Skjold
f5178459e8
Fixed incorrect additional price in array
2025-01-22 19:59:41 +01:00
Gunnar Skjold
a55f7dc66a
Fixed vcc reading on esp8266
2025-01-22 19:09:08 +01:00
Gunnar Skjold
3d9cad8953
Fixed invalid characters in meterId
2025-01-22 17:56:33 +01:00
Gunnar Skjold
67535b2792
Fixed cloud connection for C3
2025-01-22 17:49:54 +01:00
Gunnar Skjold
2b5f3f50df
Fixed cloud connection for C3
2025-01-22 17:49:38 +01:00
Gunnar Skjold
111807a743
Web framework update
2025-01-22 17:32:41 +01:00
dependabot[bot]
348ba8cfc4
Bump vite from 4.5.5 to 4.5.9 in /lib/SvelteUi/app
...
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ) from 4.5.5 to 4.5.9.
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.9/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v4.5.9/packages/vite )
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-01-22 06:43:57 +00:00
david-beinder
81c72f0ca3
Reserve space for null terminator
2025-01-18 01:11:24 +01:00
Gunnar Skjold
20de294a8c
Updated build
2025-01-12 18:21:40 +01:00
Gunnar Skjold
e31faaa726
Added a DSMR frame as documentation
2025-01-12 17:59:26 +01:00
Gunnar Skjold
4ad2921132
Fixed config reload for HA and Domoticz if changed
2025-01-12 12:01:16 +01:00
Gunnar Skjold
1fa62fa97c
Fixed aidon package timestamp
2025-01-12 10:32:14 +01:00
Gunnar Skjold
affa66f78f
Allow special characters in mqtt user/pass
2025-01-12 10:23:57 +01:00
Gunnar Skjold
84860bc684
Failsafe on combining tariff counters
2025-01-12 10:16:19 +01:00
Gunnar Skjold
0cadedf9df
Fixed red blink after 49 days
2025-01-12 10:05:57 +01:00
Gunnar Skjold
0c3eea8d37
Added timestamp sensors to HA
2025-01-12 09:57:29 +01:00
Gunnar Skjold
1d4e7e564d
Fixed timestamp bug
2025-01-09 15:35:22 +01:00
Gunnar Skjold
067aa0c6cb
More changes for slovakian iskra
2024-12-23 11:57:32 +01:00
dependabot[bot]
3d540e2a65
Bump nanoid from 3.3.7 to 3.3.8 in /lib/SvelteUi/app
...
Bumps [nanoid](https://github.com/ai/nanoid ) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/ai/nanoid/releases )
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8 )
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-12-17 12:48:44 +00:00
Gunnar Skjold
61d4728ffa
DSMR with encrypted payload
2024-12-14 10:54:02 +01:00
Gunnar Skjold
42e0ca963c
Merge branch 'main' into pnu
2024-12-12 10:51:52 +01:00
Gunnar Skjold
3bc40cb136
Some adjustments for Iskra
2024-12-12 09:44:10 +01:00
Gunnar Skjold
1453bbbb7e
Adjustments on auto updater for 8266
2024-12-07 21:45:47 +01:00
Gunnar Skjold
9da2d0760e
More adjustments for auto update
2024-12-07 11:32:45 +01:00
Gunnar Skjold
18af98511a
Some adjustments
2024-12-05 20:10:44 +01:00
Gunnar Skjold
40c84d2429
Fixed firmware upload from GUI
2024-12-05 19:15:17 +01:00
Gunnar Skjold
c0d95f918e
Merge branch 'main' into pnu
2024-12-05 18:15:37 +01:00
Gunnar Skjold
0947d335ce
Fixed unprocessable characters in json
2024-12-05 14:20:12 +01:00
Gunnar Skjold
43e2b2478b
Added more for Slovenian Iskra
2024-12-05 13:57:33 +01:00
Gunnar Skjold
a5fc1f0cbe
New firmware upload
2024-12-05 13:40:30 +01:00
Gunnar Skjold
bf3059ba04
Now moving LittleFS in a better way
2024-12-04 20:37:56 +01:00
Gunnar Skjold
319b534d4f
Improved firmware update
2024-11-29 16:44:56 +01:00
Gunnar Skjold
b7c2510098
Store upgrade progress to eeprom
2024-11-29 11:26:00 +01:00
Gunnar Skjold
07205b8008
Merge branch 'main' into pnu
...
# Conflicts:
# lib/HwTools/src/HwTools.cpp
# lib/SvelteUi/app/dist/index.css
# lib/SvelteUi/app/dist/index.js
# lib/SvelteUi/app/vite.config.js
2024-11-29 08:05:49 +01:00
saddfox
165a385844
add devcontainer
2024-11-10 18:09:18 +01:00
Gunnar Skjold
fa76233151
Added missing code for setting mqtt keep alive
2024-11-09 15:44:30 +01:00
Gunnar Skjold
22b7877ee9
Fixed build error
2024-11-09 15:29:19 +01:00
Gunnar Skjold
bd9a1bb330
Some frame data
2024-11-09 15:17:04 +01:00
Gunnar Skjold
1b5efaa937
Fixed some labels
2024-11-09 15:16:53 +01:00
Gunnar Skjold
05ce4c5c1a
Ability to change MQTT timeout and keepalive
2024-11-09 15:12:54 +01:00
Gunnar Skjold
e022f630b2
Removed UDP as recommended cloud connection method
2024-11-07 09:55:15 +01:00
Gunnar Skjold
a73ff87653
Removed UDP as recommended cloud connection method
2024-11-07 09:37:05 +01:00
Gunnar Skjold
70d6a8699b
Added default settings to KMP communicator
2024-11-06 18:22:56 +01:00
Gunnar Skjold
118c633878
Fixed autodetect
2024-11-06 18:10:38 +01:00
Gunnar Skjold
fa5985f60b
Prevent redirect loop when changing from context to empty
2024-11-04 08:41:34 +01:00
Gunnar Skjold
c1309e9a13
Add package timestamp if missing
2024-11-03 11:28:03 +01:00
Gunnar Skjold
718eef7999
Fixed configfile download when using context path
2024-11-03 11:21:35 +01:00
Gunnar Skjold
afdd282adf
Make client id required
2024-11-03 10:43:27 +01:00
Gunnar Skjold
1302f18fab
Adjustments to make IPv6 address visible in GUI
2024-11-03 10:21:13 +01:00
Gunnar Skjold
fc89670ea4
Manually merged changes from pull #826
2024-11-03 10:07:51 +01:00
Gunnar Skjold
225320ea7d
git branchMerge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2024-11-03 10:02:00 +01:00
Gunnar Skjold
b2cf3bb0c4
Merge pull request #847 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/rollup-3.29.5
...
Bump rollup from 3.29.4 to 3.29.5 in /lib/SvelteUi/app
2024-11-03 09:59:23 +01:00
Gunnar Skjold
e36a8ade42
Merge pull request #848 from ackjewtn/add_wesp32_poe_board
...
Add support for wESP32-PoE board
2024-11-03 09:59:13 +01:00
Gunnar Skjold
2ef67d92c4
Fixed missing prices after changes in entsoe API
2024-11-03 09:51:54 +01:00
Peter Wahlberg
1c9af6b1c2
Revert formatting
2024-09-27 17:17:02 +02:00
Peter Wahlberg
4f47ffa21e
Add support for wESP32-PoE board
2024-09-27 17:01:30 +02:00
dependabot[bot]
3d1026f829
Bump rollup from 3.29.4 to 3.29.5 in /lib/SvelteUi/app
...
Bumps [rollup](https://github.com/rollup/rollup ) from 3.29.4 to 3.29.5.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5 )
---
updated-dependencies:
- dependency-name: rollup
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-09-27 05:02:27 +00:00
Gunnar Skjold
af6ecc5d47
Adjustments of clock parsing from dlms
2024-09-21 20:03:46 +02:00
Gunnar Skjold
025c556626
More relaxed on when hourly data is received
2024-09-21 16:04:05 +02:00
Gunnar Skjold
0b342d6c49
Some changes to data update
2024-09-21 13:00:22 +02:00
Gunnar Skjold
ada57b1052
Trying to fix data reset issue
2024-09-19 12:54:58 +02:00
Gunnar Skjold
cf773985b1
Merge pull request #836 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/svelte-4.2.19
...
Bump svelte from 3.59.2 to 4.2.19 in /lib/SvelteUi/app
2024-09-19 12:39:39 +02:00
Gunnar Skjold
75a14ad9cb
Merge pull request #840 from ruffy91/patch-1
...
Added kWH multiplier to phases
2024-09-19 12:39:26 +02:00
Fabian
fbe90cbc5a
Update IEC6205675.cpp
...
kWh multiplier also applies to all the phases, not only total energy
2024-09-04 21:38:20 +02:00
dependabot[bot]
f0bc895952
Bump svelte from 3.59.2 to 4.2.19 in /lib/SvelteUi/app
...
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte ) from 3.59.2 to 4.2.19.
- [Release notes](https://github.com/sveltejs/svelte/releases )
- [Changelog](https://github.com/sveltejs/svelte/blob/svelte@4.2.19/packages/svelte/CHANGELOG.md )
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.19/packages/svelte )
---
updated-dependencies:
- dependency-name: svelte
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-08-30 17:21:59 +00:00
Gunnar Skjold
f5c10c1a50
Send price config to cloud
2024-08-24 21:22:43 +02:00
Gunnar Skjold
c4736c730e
Send price config to cloud
2024-08-24 20:55:34 +02:00
Gunnar Skjold
d2c96c733c
Send price config to cloud
2024-08-24 09:40:58 +02:00
Gunnar Skjold
d0dd9de4d7
Updated fix for missing graph data
2024-08-24 08:37:24 +02:00
Gunnar Skjold
159244974d
Trying to fix issue
2024-08-20 20:55:26 +02:00
Gunnar Skjold
933926fbb4
Fixed debug logging
2024-08-15 20:02:35 +02:00
Gunnar Skjold
2c95f036ba
Fixed power factor sensors in HA
2024-08-15 19:44:24 +02:00
Gunnar Skjold
c5c0b52eb7
Try to fix day clearing issue
2024-08-15 19:33:30 +02:00
Gunnar Skjold
561b62cafe
Cloud configuration
2024-08-15 19:18:10 +02:00
Gunnar Skjold
55520cd7f6
GUI package upgrades
2024-08-06 20:54:39 +02:00
Gunnar Skjold
e27d41839e
Merge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2024-08-06 20:52:41 +02:00
Gunnar Skjold
569a0ddfaa
Some final adjustments
2024-08-06 20:51:02 +02:00
Gunnar Skjold
de63263dbb
Fixed date skew when computer is on different timezone
2024-08-02 22:34:53 -08:00
Gunnar Skjold
8adb7055c0
Fixed date skew when computer is on different timezone
2024-08-02 19:02:00 -11:00
Gunnar Skjold
11e09c5b56
Fixed undefined month
2024-08-03 07:32:10 +02:00
Gunnar Skjold
ac32f74eba
Bugfix
2024-08-02 19:59:30 +02:00
Gunnar Skjold
d49b8c3839
Option to disable UART TX
2024-08-02 19:59:16 +02:00
Gunnar Skjold
054fd43a0d
Initial implementation of custom upgrade code
2024-08-02 17:56:39 +02:00
ArnieO
423c5da25e
Uploaded overview of meters / interfaces
2024-07-17 09:11:04 +02:00
Gunnar Skjold
9a4a8a10f2
Corrected RSA block size
2024-07-14 21:31:17 +02:00
Gunnar Skjold
d15992142e
Removed test ip
2024-07-14 21:24:29 +02:00
Gunnar Skjold
fed3948f85
Corrected RSA block size
2024-07-14 21:23:45 +02:00
Gunnar Skjold
b77342a648
Some cloud changes
2024-07-14 21:07:50 +02:00
Gunnar Skjold
04f407aba0
Stability improvements
2024-07-11 17:48:50 +02:00
Gunnar Skjold
b122fae04c
Updated license headers
2024-07-11 14:03:00 +02:00
Gunnar Skjold
8a4efd0047
Restructuring to be able to include precompiled kmp lib
2024-07-11 13:15:22 +02:00
Gunnar Skjold
4407526d96
Changed order of if cases
2024-07-03 09:56:08 +02:00
Gunnar Skjold
1d91416348
Fix for meters with clock skew
2024-07-03 09:22:09 +02:00
Gunnar Skjold
a1bbcc20e3
Fixed 8266 build
2024-06-29 10:24:38 +02:00
Gunnar Skjold
2b779920d7
Fixed issue when graphs go blank if meter clock is running fast
2024-06-29 10:18:24 +02:00
Gunnar Skjold
de79fd4c43
Send prices to MQTT when having fixed price only
2024-06-29 10:15:15 +02:00
Gunnar Skjold
8dfaa34d03
Buffer adjustments for 8266
2024-06-29 10:14:43 +02:00
Gunnar Skjold
0d0dc07903
Some changes for cloud service
2024-06-29 10:13:41 +02:00
Gunnar Skjold
e38a064928
Fixed timezone issue in DLMS timestamps
2024-06-27 10:54:22 +02:00
Gunnar Skjold
81b3aacc4d
Fixed debug
2024-06-15 09:21:12 +02:00
Gunnar Skjold
6277d5880d
Updated frontened
2024-06-10 17:28:34 +02:00
Gunnar Skjold
8424d1f75e
Set threephase when applying OBIS codes
2024-06-09 10:21:55 +02:00
Gunnar Skjold
099b23d2d5
Merge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2024-06-07 19:13:21 +02:00
Gunnar Skjold
28d746415c
Remote KMP as selection in config
2024-06-07 19:13:03 +02:00
Gunnar Skjold
fd373a5846
Disable remote debug for C3
2024-06-07 19:12:33 +02:00
Gunnar Skjold
cd7315990f
Build option to enable KMP
2024-06-07 18:55:37 +02:00
Gunnar Skjold
59bf0ce066
Build option to disable remote debug
2024-06-07 18:48:26 +02:00
Gunnar Skjold
93e55f457a
Tariff thresholds on MQTT
2024-06-06 21:38:03 +02:00
Gunnar Skjold
4d340c5482
Use estimated if Aidon sends same value as last hour
2024-06-06 21:37:45 +02:00
Gunnar Skjold
1db0082103
Added export price sensor to HA payload
2024-06-06 18:09:33 +02:00
Gunnar Skjold
f593e14e68
Combined import/export in data.json
2024-06-06 17:34:33 +02:00
Gunnar Skjold
da6328c246
Fixed HA hostname ESP8266 build issue
2024-06-06 17:17:59 +02:00
Gunnar Skjold
5eeab2ba89
Fixed amperage plot
2024-06-06 15:55:43 +02:00
Gunnar Skjold
eeaaf088ac
Fixed issues with HA sensors
2024-06-06 15:41:21 +02:00
Gunnar Skjold
32afea2817
Iskra
2024-06-04 20:33:03 +02:00
Gunnar Skjold
e7b496280d
KMP stuff
2024-06-03 18:09:40 +02:00
Gunnar Skjold
d0621e98cd
Fixed blank webpage
2024-05-30 14:07:45 +02:00
Gunnar Skjold
202d57843c
Iskra case fix?
2024-05-30 13:28:50 +02:00
Gunnar Skjold
770d662f2c
Changes to allow interaction with cloud service
2024-05-30 09:46:45 +02:00
Gunnar Skjold
da1d5993f4
Merge pull request #796 from devdems/main
...
Add Slovenia
2024-05-23 23:34:06 +02:00
Gunnar Skjold
7ad97daf86
Some cleanup
2024-05-23 22:20:01 +02:00
Gunnar Skjold
3b155d78b1
Removed som debugging
2024-05-23 21:58:17 +02:00
Gunnar Skjold
37a1e3b93e
Another iskra special case
2024-05-23 20:57:32 +02:00
Gunnar Skjold
846cf85331
Use export price for export calculations
2024-05-23 20:33:13 +02:00
Gunnar Skjold
a1a6953521
Use export price for export cost calculations
2024-05-23 20:21:56 +02:00
Gunnar Skjold
a137316cec
Added voltage check for all Pow* devices
2024-05-23 19:40:28 +02:00
Gunnar Skjold
faa468b287
Fixed loading order of json and when to display price graph
2024-05-23 19:12:38 +02:00
Gunnar Skjold
703c68a2cf
Fixed autodetect
2024-05-23 18:58:20 +02:00
Gunnar Skjold
b6168a0082
Fixed 404
2024-05-23 17:35:17 +02:00
Gunnar Skjold
38ec99f2ee
Move price elements
2024-05-23 17:34:26 +02:00
Gunnar Skjold
22f8349f2f
Fixed bugs after testing
2024-05-23 17:13:32 +02:00
Gunnar Skjold
d98a021f39
Edit day and month data
2024-05-23 15:17:19 +02:00
Gunnar Skjold
77d899fe0a
Fixed month in clock
2024-05-23 14:06:42 +02:00
Gunnar Skjold
c03bfcbcd7
Auto change buffer size based on baud rate when autodetect
2024-05-23 14:03:16 +02:00
Gunnar Skjold
f3732674b0
Fixed autodetect and enabled for Pow-K (To handle when configured as P1)
2024-05-23 13:59:16 +02:00
devdems
5926ddfaf9
Update ConfigurationPanel.svelte
...
Add Slovenia
2024-05-21 16:07:20 +02:00
Gunnar Skjold
99e341e582
Changed buffer size defaults and some null terminator issues on json mqtt
2024-05-01 07:38:30 +02:00
Gunnar Skjold
05506cdc9f
Fixed ESP8266 build issue
2024-04-21 10:35:30 +02:00
Gunnar Skjold
3f1861deda
MQTT on interval
2024-04-21 10:21:39 +02:00
Gunnar Skjold
efacbd4b31
Code restructuring
2024-04-21 08:43:59 +02:00
Gunnar Skjold
beaaa191e8
Color fix
2024-04-20 13:08:39 +02:00
Gunnar Skjold
43d49f21a3
Changed GPIO dropdowns
2024-04-20 10:51:27 +02:00
Gunnar Skjold
95c495b773
Some changes for cloud service
2024-04-20 09:13:41 +02:00
Gunnar Skjold
68c680debf
Set TX pin low if passive communicator
2024-04-19 14:51:27 +02:00
Gunnar Skjold
fec6cc7612
Updated HA state class on realtime sensors
2024-04-19 08:48:57 +02:00
Gunnar Skjold
dc3cea80b6
Fixed HA state class on realtime sensors
2024-04-15 19:54:40 +02:00
Gunnar Skjold
ce67ef2bea
Show current export price in export gauge
2024-04-14 14:47:53 +02:00
Gunnar Skjold
3a980fac4c
Fixed price config
2024-04-14 14:20:46 +02:00
Gunnar Skjold
77873f4a38
Fixed mixup of last month cost and kwh
2024-04-14 13:33:11 +02:00
Gunnar Skjold
d9d384ea02
Fixed code
2024-04-14 13:30:46 +02:00
Gunnar Skjold
16fb1ea87c
Fixed context bug
2024-04-14 13:24:20 +02:00
Gunnar Skjold
c74e719327
Fixed ESP8266 build issue
2024-04-13 11:38:03 +02:00
Gunnar Skjold
8c8e14f60c
Some changes for cloud
2024-04-13 11:29:56 +02:00
Gunnar Skjold
3b93897a8e
Added new headers to upgrade request
2024-04-13 10:19:08 +02:00
Gunnar Skjold
e080c7d535
Fixed static IP
2024-04-11 22:08:58 +02:00
Gunnar Skjold
64ea8c4888
Fixed static IP
2024-04-10 20:44:05 +02:00
Gunnar Skjold
e7ae24b26f
Fixed accidental clearing more than just GPIO
2024-04-10 20:36:43 +02:00
Gunnar Skjold
84ff999c4c
Fixed missing config tile
2024-04-09 21:57:44 +02:00
Gunnar Skjold
71e7e779da
Some adjustments to GUI
2024-04-09 20:52:57 +02:00
Gunnar Skjold
99904f9097
Fixed stuck value
2024-04-09 18:12:23 +02:00
Gunnar Skjold
89015191de
Improved MQTT stability and changed some defaults
2024-04-09 17:16:12 +02:00
Gunnar Skjold
a7d3382947
Fixed missing L2
2024-04-08 14:59:53 +02:00
Gunnar Skjold
abef32c73c
Fixed some defaults
2024-04-07 12:01:05 +02:00
Gunnar Skjold
b52c580f6f
Merge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2024-04-07 11:50:02 +02:00
Gunnar Skjold
429f0ba699
Merge pull request #761 from avandorp/avandorp-ha-uptime-device-class
...
Use correct home assistant device class for uptime
2024-04-07 11:45:02 +02:00
Gunnar Skjold
d918a593ce
Removed connect timeout from MQTT
2024-04-07 11:31:21 +02:00
Arthur van Dorp
fb410ecfef
Use correct home assistant device class for uptime
2024-04-06 21:43:06 +02:00
Gunnar Skjold
ee6c249370
Cloud updates
2024-04-06 12:53:36 +02:00
Gunnar Skjold
05b340738e
Make realtime plot work for production
2024-04-06 12:53:17 +02:00
Gunnar Skjold
86663f53f6
Some adjustments and debugging for realtime plot
2024-04-06 12:16:08 +02:00
Gunnar Skjold
bd11dee1e5
White numbers on graph in dark mode
2024-04-06 11:44:41 +02:00
Gunnar Skjold
29c8011cda
Changes for cloud
2024-04-06 11:34:04 +02:00
Gunnar Skjold
4884d3a0e2
Merge pull request #757 from UtilitechAS/dev-v2.3
...
Dev v2.3
2024-04-05 21:55:49 +02:00
Gunnar Skjold
6079b17e3d
Remove unnecessary style
2024-04-05 21:33:57 +02:00
Gunnar Skjold
d069d4e102
Remove unknown headers
2024-04-05 21:23:44 +02:00
Gunnar Skjold
e1162ad970
Fixed 8266 build
2024-04-05 21:01:16 +02:00
Gunnar Skjold
71be381e1a
Fixed error
2024-04-05 20:54:08 +02:00
Gunnar Skjold
a19901b58f
Cloud config in config print
2024-04-05 20:16:43 +02:00
Gunnar Skjold
361d3a38ed
Changed LED behaviour when in AP mode
2024-04-04 19:53:44 +02:00
Gunnar Skjold
c22bca3130
Fixed config export and import
2024-04-04 19:31:16 +02:00
Gunnar Skjold
2bfd863882
Added ESP32-S3 build
2024-04-04 16:12:27 +02:00
Gunnar Skjold
17c87c40df
Set some defaults
2024-04-04 15:46:26 +02:00
Gunnar Skjold
10b76ab2e6
Adjustments
2024-04-04 15:26:13 +02:00
Gunnar Skjold
15c3b2067c
Fixed removal of price config row
2024-04-04 14:56:55 +02:00
Gunnar Skjold
e366f10632
Removed logging
2024-04-04 14:40:59 +02:00
Gunnar Skjold
fc1850195b
Adjustments to realtime plot
2024-04-04 14:31:33 +02:00
Gunnar Skjold
b85d11b1f3
Merge branch 'main' into dev-v2.3
2024-04-04 13:38:14 +02:00
Gunnar Skjold
fff6d1b068
Temporarily removed KMP
2024-04-04 13:37:17 +02:00
Gunnar Skjold
bdb0bf3df0
Merge pull request #742 from avandorp/patch-1
...
Add uptime to system sensors for home assistant
2024-04-04 10:03:59 +02:00
Gunnar Skjold
c6e111c347
Merge pull request #747 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/follow-redirects-1.15.6
...
Bump follow-redirects from 1.15.4 to 1.15.6 in /lib/SvelteUi/app
2024-04-04 10:03:32 +02:00
Gunnar Skjold
063b960fc2
Merge pull request #755 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/vite-3.2.10
...
Bump vite from 3.2.8 to 3.2.10 in /lib/SvelteUi/app
2024-04-04 10:03:21 +02:00
Gunnar Skjold
95967aaf59
Fixed debug on HAN error
2024-04-04 09:35:39 +02:00
dependabot[bot]
34e103c1d8
Bump vite from 3.2.8 to 3.2.10 in /lib/SvelteUi/app
...
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ) from 3.2.8 to 3.2.10.
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/v3.2.10/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v3.2.10/packages/vite )
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-04-03 18:48:26 +00:00
Gunnar Skjold
bdd2ec10cd
Adjusted x-labels on realtime plot
2024-04-02 13:01:00 +02:00
Gunnar Skjold
37f90cb267
White logo and some adjustments
2024-04-02 12:57:08 +02:00
Gunnar Skjold
db90dbfd8f
Adjustments to realtime plot
2024-04-02 12:05:29 +02:00
Gunnar Skjold
61d23ab453
Fixed LNG 0 values
2024-04-02 11:43:45 +02:00
Gunnar Skjold
864cd1fbbb
Fixed breaking data
2024-04-02 11:35:37 +02:00
Gunnar Skjold
517869f43d
GUI improvements after testign
2024-04-02 10:54:40 +02:00
Gunnar Skjold
766849d6fc
Adjustment
2024-03-26 13:39:29 +01:00
Gunnar Skjold
67e6a51a8a
Force board profiles on boot
2024-03-26 10:40:56 +01:00
Gunnar Skjold
4093b64dd0
Fixed 8266 build
2024-03-26 10:40:37 +01:00
Gunnar Skjold
4068f127ba
Color adjustments
2024-03-25 10:16:33 +01:00
Gunnar Skjold
71abe188ca
MQTT JSON classic/multi topic/flat
2024-03-23 11:20:39 +01:00
Gunnar Skjold
5022f42692
New strategy for updating data storage
2024-03-23 09:12:58 +01:00
Gunnar Skjold
6c1401d042
Fixed data loading
2024-03-21 20:49:32 +01:00
Gunnar Skjold
7041a29894
Natural rounding
2024-03-21 20:37:06 +01:00
Gunnar Skjold
e292f79421
Roaming support
2024-03-21 20:27:11 +01:00
Gunnar Skjold
d7ce808321
Added label comments for ethernet boards
2024-03-21 14:25:05 +01:00
Gunnar Skjold
210ddad515
Show tariff when using NOx with support
2024-03-21 14:21:39 +01:00
Gunnar Skjold
449257ae3f
Update meter config when changed
2024-03-21 14:18:35 +01:00
Gunnar Skjold
def9867990
Changed calculation behaviour
2024-03-21 13:49:16 +01:00
Gunnar Skjold
26a63e30e0
Increased range for counters in data storage
2024-03-21 13:39:14 +01:00
Gunnar Skjold
9efdf1daa5
Changed variable type
2024-03-21 09:13:13 +01:00
Gunnar Skjold
f2e7879974
Optimized some JSONs
2024-03-21 08:57:56 +01:00
Gunnar Skjold
b8ac1a9565
Removed some debug
2024-03-20 19:30:38 +01:00
Gunnar Skjold
14eb27e0d9
crc
2024-03-19 21:50:09 +01:00
Gunnar Skjold
f68666bd4a
crc
2024-03-19 11:31:14 +01:00
Gunnar Skjold
2087c287bf
Fixed 8266 build
2024-03-18 17:05:09 +01:00
Gunnar Skjold
d85da6c9cb
Added more baud rates
2024-03-18 17:04:31 +01:00
Gunnar Skjold
6a99b0a6a7
8N2
2024-03-17 09:50:49 +01:00
Gunnar Skjold
dfca5e37dc
CRC and Pow board profile
2024-03-17 09:14:02 +01:00
dependabot[bot]
1f74f1e6b2
Bump follow-redirects from 1.15.4 to 1.15.6 in /lib/SvelteUi/app
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-03-16 23:22:24 +00:00
Gunnar Skjold
bdba6a0254
Support TX pin
2024-03-16 20:32:45 +01:00
Gunnar Skjold
7c4c096e94
KMP
2024-03-15 18:26:50 +01:00
Gunnar Skjold
1ab5a4d2cb
Visual updates
2024-03-15 18:26:30 +01:00
Gunnar Skjold
4bd2b5230b
Updated unit scaling
2024-03-15 18:26:13 +01:00
Gunnar Skjold
c0945abfa0
Timeout on MQTT
2024-03-15 18:23:18 +01:00
Gunnar Skjold
d94f27949c
Dependency update
2024-03-15 18:22:32 +01:00
Gunnar Skjold
6a427b513d
Added sensors to LNG format
2024-03-15 18:21:17 +01:00
Gunnar Skjold
47a7d4e13b
KMP headers
2024-03-10 09:03:06 +01:00
Gunnar Skjold
263ce9749a
Prep for KMP
2024-03-06 19:47:57 +01:00
Gunnar Skjold
13d0521984
Prep for KMP
2024-03-06 19:44:44 +01:00
Gunnar Skjold
e3511f0ee2
Fixed HDLC partitioning
2024-03-04 09:08:31 +01:00
Gunnar Skjold
f4de3e6178
Fixed language switch problem
2024-03-02 09:03:45 +01:00
Gunnar Skjold
2bb5361b22
Testing logo change
2024-03-02 08:33:28 +01:00
Gunnar Skjold
9caec71e1c
Support HDLC segmentation
2024-03-02 08:33:19 +01:00
Gunnar Skjold
7813d3ea08
Fixed ESP32 UART2
2024-03-02 07:51:11 +01:00
Arthur van Dorp
73ed4f87e4
Add uptime to system sensors for home assistant
...
Uptime is already part of the MQTT messages, but not sensors indicated to home assistant. Useful for troubleshooting purposes.
2024-03-01 18:41:38 +01:00
Gunnar Skjold
c06dabba51
Adjustments for high scale wattage
2024-02-29 15:41:34 +01:00
Gunnar Skjold
23cbcf9a0a
Adjustments for v2.3 testing
2024-02-29 14:20:51 +01:00
Gunnar Skjold
785cefabb5
Merge branch 'main' into dev-v2.3
2024-02-29 09:06:47 +01:00
Gunnar Skjold
aa6283de5b
Merge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2024-02-29 09:00:23 +01:00
Gunnar Skjold
2b563c7230
Fixed error blink after 49.7 days
2024-02-29 08:54:42 +01:00
Gunnar Skjold
45d0fa2bfa
Fixed code
2024-02-29 08:53:47 +01:00
ArnieO
09fdd2dc22
Update LICENSE
...
Correct two cases of garbled text where there should have been apostrophe sign.
2024-02-15 12:29:29 +01:00
Gunnar Skjold
ab2086f909
Fixed price save
2024-02-15 08:40:08 +01:00
Gunnar Skjold
16d1ee9761
Fixed IPv6 tick
2024-02-15 08:11:38 +01:00
Gunnar Skjold
348488af72
Stripping some debugging
2024-02-14 20:06:18 +01:00
Gunnar Skjold
9103a5b730
Adjustments to WDT
2024-02-13 20:54:44 +01:00
Gunnar Skjold
830e22d182
IPv6 support
2024-01-31 20:58:46 +01:00
Gunnar Skjold
21bff28aee
Smart config
2024-01-26 20:17:13 +01:00
Gunnar Skjold
e9472513d2
MQTT LWT
2024-01-26 19:47:28 +01:00
Gunnar Skjold
b6e69ca5d0
Merge pull request #711 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/follow-redirects-1.15.4
...
Bump follow-redirects from 1.15.2 to 1.15.4 in /lib/SvelteUi/app
2024-01-26 19:39:52 +01:00
Gunnar Skjold
d28ef99cee
Merge pull request #719 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/vite-3.2.8
...
Bump vite from 3.2.7 to 3.2.8 in /lib/SvelteUi/app
2024-01-26 19:39:37 +01:00
Gunnar Skjold
3b531fab5b
Merge branch 'main' into dev-v2.3
2024-01-26 19:29:58 +01:00
Gunnar Skjold
e575ab755c
Only authenticate GCM if auth key available
2024-01-26 19:21:27 +01:00
Gunnar Skjold
1ba452213d
Removed debugging
2024-01-26 19:15:56 +01:00
Gunnar Skjold
a2c20575c8
Pulse meter
2024-01-26 18:23:40 +01:00
Gunnar Skjold
9a767d9ac4
Pulse meter
2024-01-26 18:21:51 +01:00
Gunnar Skjold
52bc2f6a9b
Special price regions for NO with government support
2024-01-25 18:03:23 +01:00
Gunnar Skjold
cfa4502af8
Some changes to make firmware fit on all platforms
2024-01-25 12:27:26 +01:00
Gunnar Skjold
6fe308b5f6
Platform update
2024-01-23 21:06:20 +01:00
Gunnar Skjold
80be1ceef1
Subtract price
2024-01-23 20:41:56 +01:00
Gunnar Skjold
bfa1a65dfd
Some changes
2024-01-20 16:25:28 +01:00
Gunnar Skjold
afcc542e25
Fixed build errors
2024-01-20 13:49:47 +01:00
Gunnar Skjold
f334847e82
Fixed debug
2024-01-20 13:47:57 +01:00
Gunnar Skjold
9eb56beb6c
GUI translations
2024-01-20 13:47:42 +01:00
dependabot[bot]
87c565763a
Bump vite from 3.2.7 to 3.2.8 in /lib/SvelteUi/app
...
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ) from 3.2.7 to 3.2.8.
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/v3.2.8/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v3.2.8/packages/vite )
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-19 23:40:56 +00:00
Gunnar Skjold
87ddf00afa
Support for pulse meter
2024-01-18 07:57:56 +01:00
Gunnar Skjold
e7ca408baa
Fixed host and ip change issues
2024-01-11 14:03:20 +01:00
dependabot[bot]
1d5c45c43c
Bump follow-redirects from 1.15.2 to 1.15.4 in /lib/SvelteUi/app
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-10 20:02:12 +00:00
Gunnar Skjold
183cb1e2b1
Adjustments after changing type of phase power
2024-01-07 11:04:43 +01:00
Gunnar Skjold
768dc97c9c
Per phase power and power factor graphs
2024-01-07 10:58:11 +01:00
Gunnar Skjold
fe3f100edb
Merge branch 'main' into dev-v2.3
2024-01-06 20:12:27 +01:00
Gunnar Skjold
8a59fcb89a
Adaptations for new sensors
2024-01-06 20:10:33 +01:00
Gunnar Skjold
333169ef8f
Merge pull request #613 from cnrd/phase-accumlation
...
Added support for getting accumulated energy for phases (Kamstrup)
2024-01-06 19:53:10 +01:00
Gunnar Skjold
d497aa91f4
Fixed month/day limitations on prices
2024-01-06 19:34:50 +01:00
Gunnar Skjold
b951fe9099
Fixed 8266 build
2024-01-06 19:11:22 +01:00
Gunnar Skjold
48ab87ba50
Support start and end date on prices
2024-01-06 18:58:50 +01:00
Gunnar Skjold
bad107926c
Fixed cloud bugs
2024-01-06 10:05:44 +01:00
Gunnar Skjold
6012c19fc4
Updated cloud connector
2024-01-06 09:52:35 +01:00
Gunnar Skjold
460238e99d
Support changing context path to accomodate being behind a proxy
2023-12-26 10:10:58 +01:00
Gunnar Skjold
64870cf9ca
Adjustments to export plot color
2023-12-25 19:43:25 +01:00
Gunnar Skjold
cd446f8cb8
Some adjustments to realtime plot
2023-12-25 19:36:55 +01:00
Gunnar Skjold
f68a3a321a
Modifications to dark mode
2023-12-25 19:25:43 +01:00
Gunnar Skjold
9ff6cf355f
Fixing bugs
2023-12-25 18:36:35 +01:00
Gunnar Skjold
453492b5eb
Fixed percent price
2023-12-25 14:52:22 +01:00
Gunnar Skjold
f11263a48f
Fixed link color
2023-12-25 14:48:46 +01:00
Gunnar Skjold
fffd95dcf2
Price config
2023-12-25 14:47:28 +01:00
Gunnar Skjold
fa87cfaa61
Fixed build errors
2023-12-25 07:44:42 +01:00
Gunnar Skjold
50de5abf93
Merge branch 'main' into dev-v2.3
2023-12-25 07:41:01 +01:00
Gunnar Skjold
b1294fdd86
Run default device tests
2023-12-24 11:33:44 +01:00
Gunnar Skjold
ce2a67a284
Confirm firmware version
2023-12-24 10:18:35 +01:00
Gunnar Skjold
39e42d5333
Upload firmware to target
2023-12-24 09:13:21 +01:00
Gunnar Skjold
7503f9a077
Upload firmware to target
2023-12-24 09:12:21 +01:00
Gunnar Skjold
651f72489c
Fixed workflow file
2023-12-24 08:47:00 +01:00
Gunnar Skjold
3596a87ff9
Using internal python
2023-12-24 08:15:38 +01:00
Gunnar Skjold
5c1acf5c45
Changed python on build to 3.11
2023-12-24 08:14:21 +01:00
Gunnar Skjold
c46b7972d0
Changes to workflow
2023-12-24 08:01:08 +01:00
Gunnar Skjold
df26c91a3b
Initial actions-driven test environment
2023-12-24 07:59:05 +01:00
Gunnar Skjold
7a70bd7511
Some adjustments to MQTT
2023-12-24 07:10:58 +01:00
Gunnar Skjold
c583c2b44a
Fixed mqtt changed flag
2023-12-24 07:03:05 +01:00
Gunnar Skjold
4c28d512a1
Changed mqtt disconnect to avoid exception
2023-12-24 06:59:40 +01:00
Gunnar Skjold
1775d0abce
Fixed bug
2023-12-24 06:30:36 +01:00
Gunnar Skjold
8e65f1fe14
Fixed bug
2023-12-24 06:27:24 +01:00
Gunnar Skjold
c1d1bf6bb5
Fixed bug
2023-12-23 21:52:19 +01:00
Gunnar Skjold
fc09ab5cc9
Slight update on how missing I2 is shown
2023-12-23 18:39:09 +01:00
Gunnar Skjold
6e3a6f71e2
Fixed buffer issues and ESP8266 HA reboot issue"
2023-12-23 18:32:27 +01:00
Gunnar Skjold
557ba659d5
Make sure MQTT config is updated for current connection if changed
2023-12-22 19:47:00 +01:00
Gunnar Skjold
32ad71bba6
Fixed checking "Clear all other configuration"
2023-12-21 15:56:30 +01:00
Gunnar Skjold
8816097bca
Fixed receive buffer for large payloads
2023-12-21 15:25:23 +01:00
Gunnar Skjold
378b67a5bd
Show when I2 is unavailable
2023-12-21 14:50:20 +01:00
Gunnar Skjold
859868c99b
Use multipliers with DSMR
2023-12-21 14:23:36 +01:00
Gunnar Skjold
d7ca741c92
Some changes for HA
2023-12-21 14:12:46 +01:00
Gunnar Skjold
d49753ed33
Resend sensors to HA if online status received
2023-12-15 20:37:25 +01:00
Gunnar Skjold
2ae15ac13a
Expire time on HA sensors
2023-12-15 20:19:49 +01:00
Gunnar Skjold
00278659f8
Resend sensors to HA if online status received
2023-12-15 20:03:24 +01:00
Gunnar Skjold
0c1525b018
Fixed ESP8266 for previous commit
2023-12-15 19:04:39 +01:00
Gunnar Skjold
ed778441d5
Ability to load cert/key for mqtt without ca
2023-12-15 18:50:08 +01:00
Gunnar Skjold
c43c07386a
Fixed some minuor issues
2023-12-10 18:01:57 +01:00
Gunnar Skjold
91958f5464
Show AP IP if no connection handler
2023-12-10 17:31:39 +01:00
Gunnar Skjold
194905237b
Added ESP32S3
2023-12-10 17:27:16 +01:00
Gunnar Skjold
f3805ad111
Fixed build issue
2023-12-10 17:05:09 +01:00
Gunnar Skjold
0f22fd561e
Improved ethernet connection
2023-12-10 16:56:13 +01:00
Gunnar Skjold
ee462ec468
Merge branch 'main' into dev-v2.3
2023-12-10 09:49:22 +01:00
Gunnar Skjold
ed899440ed
Typ-o fix
2023-12-10 09:17:44 +01:00
Gunnar Skjold
8e9e60ec03
Fixed build
2023-12-04 14:01:24 +01:00
Gunnar Skjold
a121fbd28e
Updated build
2023-12-04 13:48:45 +01:00
Gunnar Skjold
d823d747a5
Updated build
2023-12-04 13:42:53 +01:00
Gunnar Skjold
c1b35b8ce0
Some changes before release
2023-12-04 13:40:58 +01:00
Gunnar Skjold
fd996f44ba
URL for price sources
2023-12-04 13:18:12 +01:00
Gunnar Skjold
0606c47367
Merge branch 'main' of github.com:UtilitechAS/amsreader-firmware
2023-12-04 13:00:10 +01:00
Gunnar Skjold
b6cd55719c
Added cHF as currency
2023-12-04 12:58:08 +01:00
Gunnar Skjold
b79f48d6ac
Merge pull request #682 from UtilitechAS/license_migration
...
Migrating to Fair Source license
2023-12-04 12:50:57 +01:00
Gunnar Skjold
ad342d2b7a
Changed L2 calculation formula
2023-12-04 12:46:17 +01:00
Gunnar Skjold
8eb7136981
Additional delay for exchange rate fetch
2023-12-04 12:31:21 +01:00
Gunnar Skjold
1c5303e771
Default multiplier 1.0
2023-12-04 12:20:59 +01:00
Gunnar Skjold
9efc19090e
Improved feedback for upgrade error
2023-12-04 12:17:07 +01:00
Gunnar Skjold
a30cd76354
Indicator for estimated I2. Also fix on charts
2023-12-04 11:59:18 +01:00
Gunnar Skjold
ddd08e25df
Keep last reason for reboot
2023-12-03 21:38:20 +01:00
Gunnar Skjold
09d255d656
Fix
2023-12-03 21:14:26 +01:00
Gunnar Skjold
7239f295e8
Fixed volt and amp for some browsers
2023-12-03 21:13:48 +01:00
Gunnar Skjold
111bd70763
Merge branch 'main' into dev-v2.3
2023-11-25 10:46:46 +01:00
Gunnar Skjold
0e6abd0f18
Removing option for auto reboot on wifi error
2023-11-25 10:31:21 +01:00
Gunnar Skjold
2b0626b203
Enabled tariff thresholds for sweden
2023-11-25 10:18:49 +01:00
Gunnar Skjold
afa013ca03
Renamed EntsoeApi to PriceService
2023-11-25 10:04:21 +01:00
Gunnar Skjold
6d4d901dba
Migrating to new license
2023-11-25 09:11:13 +01:00
Gunnar Skjold
9c66a47464
Updates for MQTT handler
2023-11-25 09:08:56 +01:00
Gunnar Skjold
5dc405f1da
Trying to fix barchart
2023-11-25 09:05:45 +01:00
Gunnar Skjold
a2977180c1
Preserve old exchange rate if new cannot be fetched
2023-11-25 09:05:30 +01:00
Gunnar Skjold
725af5150d
Adjustments to GUI
2023-11-25 09:05:17 +01:00
Gunnar Skjold
f734cb2179
SSDP
2023-11-25 09:04:33 +01:00
Gunnar Skjold
8a0c0298ab
Some adjustments for fetching exchange rate
2023-11-25 09:04:06 +01:00
Gunnar Skjold
56b6a720c9
Some changes for DLMS
2023-11-16 20:43:47 +01:00
Gunnar Skjold
76d76844a9
Merge branch 'master' into dev-v2.3
2023-11-16 18:35:50 +01:00
Gunnar Skjold
ae82914795
Initial changes for v2.3
2023-11-16 18:21:56 +01:00
Gunnar Skjold
0fa178a617
Merge branch 'mqtt_changes'
2023-11-16 18:20:50 +01:00
Gunnar Skjold
8cada69aaf
Migrating to new license
2023-11-16 17:59:33 +01:00
Gunnar Skjold
6bdd7855a7
8266
2023-11-08 20:47:55 +01:00
Gunnar Skjold
faafc5a993
Fix 8266
2023-11-08 20:41:05 +01:00
Gunnar Skjold
bbaf96f532
Merge branch 'master' into mqtt_changes
2023-11-08 20:34:39 +01:00
Gunnar Skjold
133c8bc967
Limit buffer size on ESP8266 to avoid reboots
2023-11-08 18:52:27 +01:00
Gunnar Skjold
f04e15f5d0
Limit buffer size on ESP8266 to avoid reboots
2023-11-08 18:40:37 +01:00
Gunnar Skjold
445973f9ce
Some updates for price fetching
2023-11-05 10:24:42 +01:00
Gunnar Skjold
d6af7374c2
Merge branch 'master' into mqtt_changes
2023-11-03 19:57:17 +01:00
Gunnar Skjold
63c3d31552
Increased MQTT write buffer size
2023-11-01 21:53:56 +01:00
Gunnar Skjold
d82e705875
Ensure that the default 1.0 multiplier for currency is not used
2023-11-01 21:48:44 +01:00
Gunnar Skjold
206c90ca46
Fixed price display for 25hr days
2023-10-29 09:47:58 +01:00
Gunnar Skjold
92ceb316cb
Changes to energyspeedometer QT
2023-10-28 08:30:15 +02:00
Gunnar Skjold
a6d8857655
Fixed number of decimal points on MQTT payload
2023-10-28 08:20:39 +02:00
Gunnar Skjold
98858315de
Changes for Energy Speedometer connection
2023-10-20 14:33:56 +02:00
Gunnar Skjold
1ceffd0bc9
Changes for Energy Speedometer connection
2023-10-20 13:26:38 +02:00
Gunnar Skjold
f7cb022e3e
Merge branch 'master' into mqtt_changes
2023-10-20 08:13:52 +02:00
Gunnar Skjold
4634050700
Ability to clear fixed price
2023-10-15 15:47:31 +02:00
Gunnar Skjold
60fff4533a
11b mode for 8266
2023-10-15 15:47:05 +02:00
Gunnar Skjold
6a0921a445
Added option to disable 802.11b for ESP8266
2023-10-14 08:44:55 +02:00
Gunnar Skjold
2a44f89a7b
Disabling voltage check for wifi
2023-10-14 08:20:11 +02:00
Gunnar Skjold
7b025ddb01
Moved MQTT connection into handler
2023-10-14 08:07:56 +02:00
Gunnar Skjold
f9b4680b9c
Improved MQTT SSL
2023-10-12 18:44:40 +02:00
Gunnar Skjold
2a10096306
Merge pull request #652 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/postcss-8.4.31
...
Bump postcss from 8.4.24 to 8.4.31 in /lib/SvelteUi/app
2023-10-11 20:24:25 +02:00
Gunnar Skjold
17d8d325c0
Added support for MQTTs without CA validation and public/private key
2023-10-11 20:23:53 +02:00
Gunnar Skjold
88ddc6ea15
Fixed runaway price update
2023-10-10 21:08:37 +02:00
Gunnar Skjold
3af19c9b15
Minor adjustment to autodisable of 802.11b
2023-10-10 20:54:13 +02:00
dependabot[bot]
2d6b523e37
Bump postcss from 8.4.24 to 8.4.31 in /lib/SvelteUi/app
...
Bumps [postcss](https://github.com/postcss/postcss ) from 8.4.24 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases )
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss/compare/8.4.24...8.4.31 )
---
updated-dependencies:
- dependency-name: postcss
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-10-07 20:36:22 +00:00
Gunnar Skjold
28a6a62907
Fixed issue where price graph disappears
2023-10-04 07:01:13 +02:00
Gunnar Skjold
be9b7a16e4
Removed 802.11b tick from ESP8266
2023-09-26 20:53:14 +02:00
Gunnar Skjold
81dedcbf6e
Fix for negative calculated L2 current
2023-09-26 20:40:46 +02:00
Gunnar Skjold
248660e818
Auto disable 802.11b for BUS powered devices on first boot if possible
2023-09-26 20:32:54 +02:00
Gunnar Skjold
1a265492dd
Fixed realtime data update
2023-09-26 20:14:08 +02:00
Gunnar Skjold
7b0c2eea33
Fixed realtime data update
2023-09-26 20:12:24 +02:00
Gunnar Skjold
f459b0af14
Experimenting with different color for export
2023-09-24 07:41:14 +02:00
Gunnar Skjold
545be710ba
Smarter price fetch from GUI
2023-09-23 20:16:30 +02:00
Gunnar Skjold
fc01d7fd56
Removed unnecessary ESP32 check
2023-09-23 14:23:18 +02:00
Gunnar Skjold
954984d8ee
Fixed build error
2023-09-23 14:12:48 +02:00
Gunnar Skjold
dd47523fd0
Updated gui dist
2023-09-23 14:05:22 +02:00
Gunnar Skjold
9b9d535dd0
Merge pull request #606 from dbeinder/use11b
...
Add option to disable 802.11b data rates
2023-09-23 14:04:01 +02:00
Gunnar Skjold
e2ff7613b6
Merge branch 'master' into use11b
2023-09-23 14:03:55 +02:00
Gunnar Skjold
b9d6f16529
Improved voltage check for pow-u
2023-09-21 09:27:18 +02:00
Gunnar Skjold
96c9c4c3a2
Possible fix for overflow situation
2023-09-20 20:30:15 +02:00
Gunnar Skjold
3229ae237e
Fix for tariff peak overwrite
2023-09-20 20:29:54 +02:00
Gunnar Skjold
ecea4977b1
Updated ttl on web resources
2023-09-13 19:52:23 +02:00
Gunnar Skjold
a3551316ba
Changed from slow to normal mem for noinit attr
2023-09-13 19:48:36 +02:00
Gunnar Skjold
03edc65a7a
Preserve realtime data on reboot. Also disconnect WiFi on Pow-U if power drops too low
2023-09-12 20:50:23 +02:00
Gunnar Skjold
40215ee746
Fixed uptime rollower in MQTT raw mode
2023-09-12 18:58:25 +02:00
Gunnar Skjold
b76efc42db
Fixed peak sensor for HA
2023-09-11 08:27:41 +02:00
Gunnar Skjold
94debd4233
Added CPU frequency to status page
2023-09-10 20:51:21 +02:00
Gunnar Skjold
dfbfbab531
Changed wifi disconnect behaviour
2023-09-10 20:38:07 +02:00
Gunnar Skjold
b91dc5a17d
Fixed issue where downscaling caused data to be lost
2023-09-05 13:24:10 +02:00
Gunnar Skjold
67ca1fed01
Added a conditional vcc pin to s2 mini profile
2023-09-05 12:15:18 +02:00
Gunnar Skjold
baf8dc8310
De-centered zero line in graphs
2023-09-05 11:40:10 +02:00
Gunnar Skjold
6b0ea0abc0
Store current price in HA LTS
2023-09-05 10:54:31 +02:00
Gunnar Skjold
bcea9698dd
Apply previous state when receiving only accumulated values from meter
2023-09-05 08:57:15 +02:00
Gunnar Skjold
b435f0eaaf
Previously uncommited change
2023-08-31 09:32:21 +02:00
Gunnar Skjold
61c5500fdd
Fixed red HAN after 49.7 days
2023-08-31 09:18:48 +02:00
Gunnar Skjold
719ceb610c
Fixed realtime export counter
2023-08-24 07:49:09 +02:00
Gunnar Skjold
fc42d4391b
Fixed ENTSO-E price fetching around midnight
2023-08-18 09:20:41 +02:00
Gunnar Skjold
53afd37d08
Do not show serial break
2023-08-18 09:09:39 +02:00
Gunnar Skjold
103fe5c457
Fixed alignment on iskra
2023-08-01 08:45:15 +02:00
Gunnar Skjold
494cb55ef4
Added previously unadded change for date correction in gui
2023-07-31 08:54:35 +02:00
Gunnar Skjold
0a08767c9b
Iskra proprietary fix
2023-07-31 08:53:59 +02:00
Gunnar Skjold
49fd79f367
Fixed fetching prices just after midnight
2023-07-30 16:32:54 +02:00
Gunnar Skjold
1ba168b268
Added frame data
2023-07-30 16:27:51 +02:00
Gunnar Skjold
c765746c62
Fixed clock issue after midnight
2023-07-30 16:27:37 +02:00
Gunnar Skjold
e8016025d8
Added special Iskra data
2023-07-30 16:12:44 +02:00
Conrad Juhl Andersen
7cbcbd4bc8
Added support for getting accumulated energy for phases (Kamstrup)
2023-07-20 13:04:27 +02:00
Gunnar Skjold
4a3d884526
Disable TX pin on HAN port
2023-07-11 16:43:06 +02:00
Gunnar Skjold
9c25eaff55
Merge pull request #607 from dbeinder/ui_compress
...
Pre-compress index JS/CSS with gzip
2023-07-09 20:39:20 +02:00
david-beinder
76f09b306a
Pre-compress index JS/CSS with gzip
2023-07-06 01:20:53 +02:00
david-beinder
7c5a1b1fb8
Add option to disable 802.11b data rates
2023-07-05 23:49:53 +02:00
ArnieO
84fe477783
Add files via upload
...
Mottatt Omnia E-meter User guide fra Kamstrup.
2023-07-05 14:03:36 +02:00
Gunnar Skjold
4b34df091c
Removed handshake timeout as reason for AP mode
2023-07-03 15:46:12 +02:00
Gunnar Skjold
7aa7f6adc6
Fixed display of cost when all turns negative
2023-07-03 08:58:32 +02:00
Gunnar Skjold
c462b3bb00
Fixed clock skew on graphs around midnight
2023-07-02 14:51:57 +02:00
Gunnar Skjold
4f90954084
Fixed scaling issue on graphs
2023-07-02 14:03:06 +02:00
Gunnar Skjold
1132db9bfa
Only switch to AP mode on WiFi connection error if user have never visited GUI (first setup)
2023-07-02 13:57:22 +02:00
Gunnar Skjold
9d09c619e4
Removed unused label
2023-07-02 13:55:46 +02:00
Gunnar Skjold
78891e8d33
Save buffer size
2023-07-02 13:54:04 +02:00
Gunnar Skjold
e629bb0d68
Configurable buffer size and patch of GUI dependencies
2023-07-02 13:43:45 +02:00
Gunnar Skjold
ca1c237776
Swap to AP mode if WiFi psk is wrong
2023-06-11 09:45:17 +02:00
Gunnar Skjold
5b6b9879b1
Switch to subunit of currency if price is low
2023-06-11 08:54:03 +02:00
Gunnar Skjold
06a0366762
Fixed negative month cost in realtime calculation
2023-06-11 08:20:09 +02:00
Gunnar Skjold
538624b6eb
Fixed wrong date
2023-06-11 08:08:33 +02:00
Gunnar Skjold
4496b958ff
Fixed overlapping labels in graph
2023-06-11 08:03:07 +02:00
Gunnar Skjold
b2a93c0b4c
Changed label for monthplot
2023-06-11 07:06:03 +02:00
Gunnar Skjold
2cbe566910
Fixed mouseover label on prices for "tomorrow"
2023-06-11 06:59:07 +02:00
Gunnar Skjold
a4b07f4097
Merge branch 'master' of github.com:UtilitechAS/amsreader-firmware
2023-06-11 06:53:17 +02:00
Gunnar Skjold
f8cb9d187f
Adjusted retry delay on prices
2023-06-11 06:41:46 +02:00
Gunnar Skjold
5e9fe74dd0
Merge pull request #586 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/vite-3.2.7
...
Bump vite from 3.0.9 to 3.2.7 in /lib/SvelteUi/app
2023-06-06 10:58:24 +02:00
dependabot[bot]
5b7b30c0d0
Bump vite from 3.0.9 to 3.2.7 in /lib/SvelteUi/app
...
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ) from 3.0.9 to 3.2.7.
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/v3.2.7/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v3.2.7/packages/vite )
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-06-06 02:25:27 +00:00
Gunnar Skjold
9d902c63de
Fixed NPE
2023-05-22 12:51:26 +02:00
Gunnar Skjold
a57405a7a5
Fixed NaN in clock
2023-05-22 10:26:12 +02:00
Gunnar Skjold
550d32ee33
Fixed issue with new device
2023-05-22 09:55:15 +02:00
Gunnar Skjold
9f7e174c7b
Updated code that fixes broken DNS on IPv6 networks
2023-05-21 13:50:05 +02:00
Gunnar Skjold
104617afd2
Use device timezone in gui
2023-05-21 12:34:00 +02:00
Gunnar Skjold
959664f61d
Even more changes for negative prices
2023-05-21 12:10:00 +02:00
Gunnar Skjold
5834b07393
Adjustments to avoid dns resolving in a closed network
2023-05-20 22:03:26 +02:00
Gunnar Skjold
8dbcf2424a
Hack to fix DNS on networks with IPv6
2023-05-20 21:59:18 +02:00
Gunnar Skjold
74345046b1
Adjustments for negative prices
2023-05-20 21:58:57 +02:00
Gunnar Skjold
516c80e38c
Fixed negative and 0 price
2023-05-16 22:04:51 +02:00
Gunnar Skjold
17bbac8670
Updated exchange rate api call
2023-05-05 19:34:48 +02:00
Gunnar Skjold
ccee3f505d
Changes after testing
2023-05-05 18:30:30 +02:00
Gunnar Skjold
48eb640838
Changes after testing
2023-05-05 18:12:26 +02:00
Gunnar Skjold
90ebe3803d
More adaptations
2023-05-04 17:31:16 +02:00
Gunnar Skjold
07ff4e2b0c
Added last month in realtime data. Also increased precision on realtime data
2023-05-04 14:33:14 +02:00
Gunnar Skjold
7e011a184b
Added delay for stability purposes
2023-05-04 12:12:08 +02:00
Gunnar Skjold
324459df97
Reduce verbose debug
2023-05-04 12:02:16 +02:00
Gunnar Skjold
2db38835c5
Fixed errors in SVG
2023-05-04 11:58:39 +02:00
Gunnar Skjold
804e43824b
Fixed data storage update
2023-05-04 11:44:22 +02:00
Gunnar Skjold
60c7cea724
Extended range for multipliers
2023-05-03 07:51:11 +02:00
Gunnar Skjold
b9fe6cab83
Improved on automatic clearing of graph
2023-05-02 14:21:58 +02:00
Gunnar Skjold
e3f41fdb4c
Fixed issue introduced in previous commit
2023-05-02 14:02:40 +02:00
Gunnar Skjold
9e5cb48101
Improved update and clearing of hour/day in data storage for graphs
2023-05-02 13:39:16 +02:00
Gunnar Skjold
259d8424a3
Merge pull request #550 from dbeinder/version_lib
...
Speedup build
2023-05-02 10:51:26 +02:00
david-beinder
a6ae86abb8
Remove redundant 'typedef'
...
'typedef' is not needed in C++ and generates a warning
2023-05-02 10:48:54 +02:00
david-beinder
a23abf626b
Convert Arduino sketch to C++
2023-05-02 10:48:54 +02:00
david-beinder
849eac1c0f
Move version constants into its own compile-unit
...
Speeds up the build by moving those constants into a separate compile-unit.
Currently, since the version header is auto regenerated on each build,
all modules that include it, also have to be recompiled every time.
2023-05-02 10:48:53 +02:00
Gunnar Skjold
13dda2bb19
Added decimals on month plot if number under 10. Also added mouse-over with better precision
2023-05-02 10:40:53 +02:00
Gunnar Skjold
eea1782280
Fixed segfault when enabling verbose debug with fixed price
2023-05-02 10:20:54 +02:00
Gunnar Skjold
d729d0c5bd
Fixed update of data in month plot after entering new month
2023-05-02 10:15:31 +02:00
Gunnar Skjold
72cc0996e1
Merge branch 'master' of github.com:UtilitechAS/amsreader-firmware
2023-04-29 06:40:32 +02:00
Gunnar Skjold
b1ad844bc6
Fixed reactive energy sensors in HA
2023-04-29 06:40:25 +02:00
Gunnar Skjold
4977ad3471
Merge pull request #548 from dbeinder/fixedprice
...
Add backup, restore, clearing of 'fixedPrice' setting
2023-04-29 06:16:02 +02:00
david-beinder
a3dcd2cfb2
Add backup, restore, clearing of 'fixedPrice'
2023-04-28 22:46:44 +02:00
Gunnar Skjold
c1701c8ee9
Fixed c3 bootloader
2023-04-28 19:32:54 +02:00
Gunnar Skjold
1e88148971
Fixed flash script
2023-04-28 18:42:49 +02:00
Gunnar Skjold
cef7ed15cb
Merge pull request #543 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/yaml-2.2.2
...
Bump yaml from 2.1.1 to 2.2.2 in /lib/SvelteUi/app
2023-04-28 18:37:53 +02:00
dependabot[bot]
7c93537fef
Bump yaml from 2.1.1 to 2.2.2 in /lib/SvelteUi/app
...
Bumps [yaml](https://github.com/eemeli/yaml ) from 2.1.1 to 2.2.2.
- [Release notes](https://github.com/eemeli/yaml/releases )
- [Commits](https://github.com/eemeli/yaml/compare/v2.1.1...v2.2.2 )
---
updated-dependencies:
- dependency-name: yaml
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-04-25 20:32:45 +00:00
Gunnar Skjold
8b97544a2c
Remove old Kaifa special case code
2023-04-25 11:53:58 +02:00
Gunnar Skjold
a5f872a86c
More timezone adjustments after testing
2023-04-25 08:09:47 +02:00
Gunnar Skjold
6e8233e4af
Fixed timestamp from meter
2023-04-24 15:46:56 +02:00
Gunnar Skjold
d85d68b4a6
Hide firmware upgrade when no upgrade
2023-04-24 15:46:34 +02:00
Gunnar Skjold
ed9cf4b87d
Fixed NTP
2023-04-24 15:26:31 +02:00
Gunnar Skjold
39e86fa180
Show only half the labels on small screens
2023-04-21 18:55:15 +02:00
Gunnar Skjold
5d278a9d5a
Splitting loop into smaller methods
2023-04-19 15:12:49 +02:00
Gunnar Skjold
61040e3e7c
Crossing fingers
2023-04-18 22:06:29 +02:00
Gunnar Skjold
c4005f10a3
Some debugging changes and other optimizations
2023-04-18 11:50:44 +02:00
Gunnar Skjold
7bed5add5d
Fix
2023-04-17 21:44:36 +02:00
Gunnar Skjold
18e382f21f
Fix
2023-04-17 21:41:20 +02:00
Gunnar Skjold
94865b632e
Some more optimization
2023-04-17 21:33:00 +02:00
Gunnar Skjold
f0461a7cdb
Some adjustments
2023-04-17 11:49:22 +02:00
Gunnar Skjold
4cd6013d64
More improvements on buffer
2023-04-15 20:51:35 +02:00
Gunnar Skjold
b06dbb8d79
Buffer improvements and fixed special characters in ssid
2023-04-15 20:38:26 +02:00
Gunnar Skjold
02fe2073c2
Better error handling for price api
2023-04-15 09:30:19 +02:00
Gunnar Skjold
ec7ceafa84
General optimizations
2023-04-15 09:14:25 +02:00
Gunnar Skjold
276ac67d2e
Only clear HA config if illegal characters are loaded from flash
2023-04-15 07:47:48 +02:00
Gunnar Skjold
be116d5b35
Improved firmware upgrade
2023-04-15 07:44:33 +02:00
Gunnar Skjold
9c8788225d
Clear HA or domoticz config if not in use
2023-04-15 06:06:26 +02:00
Gunnar Skjold
df44b05792
Clear HA conf by default
2023-04-13 10:20:15 +02:00
Gunnar Skjold
8ee8eee6c4
Fixed laout error on realtime data
2023-04-10 14:14:20 +02:00
Gunnar Skjold
28e13b73e6
Fixed missing HA sensors
2023-04-10 14:08:41 +02:00
Gunnar Skjold
088e5645c7
Increased RX serial buff
2023-04-07 09:00:53 +02:00
Gunnar Skjold
3e3d61912d
Serial debugging
2023-04-07 08:39:36 +02:00
Gunnar Skjold
b7854baa6d
Some HAN serial port debugging
2023-04-07 08:36:42 +02:00
Gunnar Skjold
68bbfd6527
Load data before restoring from config file
2023-04-05 07:54:59 +02:00
Gunnar Skjold
c1ca3d0c65
Fixed month number in clock
2023-04-03 07:07:44 +02:00
Gunnar Skjold
71cac46470
Config restore loads username into password field
2023-04-03 07:06:18 +02:00
Gunnar Skjold
700f023292
Possibility to specify fixed energy price
2023-04-01 10:57:21 +02:00
Gunnar Skjold
ea43b2b632
Some changes after testing new HA features
2023-04-01 10:43:55 +02:00
Gunnar Skjold
c456e3fdf1
Fixed config loading for ha
2023-04-01 08:20:41 +02:00
Gunnar Skjold
4947f0ec7f
Clear HA config in next config version
2023-04-01 08:02:12 +02:00
Gunnar Skjold
799c2f19d9
Changes after uahn merge
2023-04-01 08:00:15 +02:00
Gunnar Skjold
18dc188835
Merge pull request #481 from dbeinder/mosquito
...
Add HAN pullup config and mosquito board
2023-04-01 07:43:34 +02:00
Gunnar Skjold
7db745829e
Merge branch 'master' into mosquito
2023-04-01 07:43:24 +02:00
Gunnar Skjold
81fedaaa6a
Moved from postfix to prefix on HA sensor name tag
2023-04-01 07:38:24 +02:00
Gunnar Skjold
71e0f13f0e
Various changes after testing new HA features
2023-04-01 07:31:40 +02:00
Gunnar Skjold
f214af3595
Added price API rate limit error
2023-03-31 13:57:38 +02:00
Gunnar Skjold
fb9ae2f5f6
Updated boot reason descriptions
2023-03-31 13:52:22 +02:00
Gunnar Skjold
4c73f39214
Fixed state class on sensors
2023-03-31 13:49:02 +02:00
Gunnar Skjold
1e7176af0b
HA configuration
2023-03-30 14:54:10 +02:00
Gunnar Skjold
0d8c88b1fc
Fixed DST 25hr day error on month plot
2023-03-30 12:25:07 +02:00
Gunnar Skjold
d189d904fe
Fixed edge case where graph data sometimes goes crazy
2023-03-30 11:55:39 +02:00
Gunnar Skjold
3c86e824a2
Added boot time to status page
2023-03-30 09:44:41 +02:00
Gunnar Skjold
061f6433d6
Added another proprietary L&G
2023-03-30 09:00:12 +02:00
Gunnar Skjold
0d923e30d6
Added another proprietary L&G
2023-03-30 08:59:56 +02:00
Gunnar Skjold
51f761d25e
Fixed incorrect change of HA current hour/day/month kwh state class
2023-03-29 08:53:13 +02:00
Gunnar Skjold
58fec70e7c
Added detection for Kaifa through system title
2023-03-27 09:20:16 +02:00
Gunnar Skjold
dff55b4eee
Remove copy/paste l2current substitution from DSMR parser
2023-03-27 08:46:41 +02:00
Gunnar Skjold
931f0d400b
Only publish prices once when fetching today and tomorrow at the same time
2023-03-26 15:24:55 +02:00
Gunnar Skjold
0178dc4184
Various fixes for HA
2023-03-26 15:12:24 +02:00
Gunnar Skjold
be522b40f9
Fixed swapped voltage ranges, esp32 vs esp8266
2023-03-26 10:52:01 +02:00
Gunnar Skjold
068c55e7bb
Fixed disabling encryption
2023-03-26 10:49:00 +02:00
Gunnar Skjold
8e88d7e11b
Show boot reason on status page
2023-03-26 10:40:02 +02:00
Gunnar Skjold
e36acef1d4
Fixed DST offset in day graph
2023-03-26 10:14:10 +02:00
Gunnar Skjold
07d5481a72
Actual fix for DST change
2023-03-26 10:06:37 +02:00
Gunnar Skjold
dbd6205cca
Fixed issue with price graph in relation to entering or leaving DST
2023-03-25 19:14:21 +01:00
david-beinder
35d47902c6
Add HAN pullup config and mosquito board
2023-03-18 23:39:55 +01:00
Gunnar Skjold
938f9f69d1
Fixed memory leak in baud autodetect
2023-03-11 10:17:44 +01:00
Gunnar Skjold
cd27472e2d
Fixed checkbox tick and changed backup/restore label
2023-03-11 09:19:09 +01:00
Gunnar Skjold
64f8414217
Fixed precision on domoticz energy counter
2023-03-11 08:53:51 +01:00
Gunnar Skjold
a2c1250724
Some updates for esp32c3
2023-02-27 09:00:07 +01:00
Gunnar Skjold
4b7160b502
Only report realtime data on MQTT if EnergyAccounting is initialized
2023-02-27 08:30:56 +01:00
Gunnar Skjold
cc50457404
Fixed spikes in realtime production on top of hour
2023-02-27 08:04:29 +01:00
Gunnar Skjold
cd48192a74
Removed classic UI
2023-02-22 18:09:16 +01:00
Gunnar Skjold
cd031c33aa
Added forced 2400 baud for Pow-K
2023-02-22 07:12:54 +01:00
Gunnar Skjold
6c59b15681
Added esp32c3 release build
2023-02-22 07:07:51 +01:00
Gunnar Skjold
7c8593122b
Removed forced baud rate
2023-02-22 07:07:31 +01:00
Gunnar Skjold
6d8fd4e083
Merge pull request #460 from dbeinder/c3-generic-boards
...
Add generic boards for ESP32-C3
2023-02-22 06:56:09 +01:00
david-beinder
79d674710f
Add generic boards for ESP32-C3
2023-02-21 23:25:14 +01:00
Gunnar Skjold
062068eacd
Increased range of tariff thresholds
2023-02-21 15:29:10 +01:00
Gunnar Skjold
98309ea532
Allow extended ascii in ssid
2023-02-21 13:55:38 +01:00
Gunnar Skjold
0f75fa4a58
Fixed redirect issue after initial setup with DHCP on ESP8266
2023-02-21 13:40:55 +01:00
Gunnar Skjold
d08f75d9c3
Fixed error changing from static ip to dhcp
2023-02-21 12:44:43 +01:00
Gunnar Skjold
dd4a43c831
Better feedback from entso-e
2023-02-21 07:54:11 +01:00
Gunnar Skjold
1f5a04e606
Increased range for instant values
2023-02-14 20:23:23 +01:00
Gunnar Skjold
4d6e63a171
Fixed GPIO HAN select for ESP8266
2023-02-12 20:48:38 +01:00
Gunnar Skjold
0093410e05
Removed kicad backup
2023-02-10 18:57:50 +01:00
Gunnar Skjold
ee63a606e8
Fixed voltage read issue
2023-02-10 18:55:55 +01:00
Gunnar Skjold
d0ccd2d007
Minor ui adjustment
2023-02-10 17:28:19 +01:00
Gunnar Skjold
bb2f74d1ca
Various UI improvements
2023-02-06 18:20:48 +01:00
Gunnar Skjold
dfef18fa09
Updated Entsoe endpoint
2023-02-06 11:32:53 +01:00
Gunnar Skjold
485c21dc69
Removed unnecessary build flag
2023-02-06 10:59:40 +01:00
Gunnar Skjold
9ceb84bc9c
C3 build
2023-02-06 07:46:34 +01:00
Gunnar Skjold
24e68428c4
Commited gui dist files
2023-02-05 19:26:48 +01:00
Gunnar Skjold
c2c5855e6a
Fixed issue where authentication key got corrupted from configfile upload
2023-02-02 16:15:03 +01:00
Gunnar Skjold
de19de2129
Fixed incorrect change in previous commit
2023-02-01 19:00:50 +01:00
Gunnar Skjold
1719263de0
Fixed config migration issue from v2.1
2023-02-01 18:46:22 +01:00
Gunnar Skjold
e70b872c98
Removed v2.0 config loading
2023-02-01 18:46:06 +01:00
Gunnar Skjold
b7d28238ab
Extended cache for js and css
2023-01-31 17:16:18 +01:00
Gunnar Skjold
6c9a8b0692
Label fix
2023-01-31 17:04:46 +01:00
Gunnar Skjold
9f3dba3aab
Fixed reconnect after setup
2023-01-30 20:58:08 +01:00
Gunnar Skjold
e4e4ad4107
Fixed autodetect
2023-01-30 18:32:17 +01:00
Gunnar Skjold
e8fb9570bb
Chasing a reboot bug...
2023-01-30 16:52:12 +01:00
Gunnar Skjold
bc42099962
Fixing some bug reports
2023-01-30 16:07:08 +01:00
Gunnar Skjold
be71cbe609
Some changes after bug reports
2023-01-30 12:02:23 +01:00
Gunnar Skjold
0d6df03c94
Fixed reboot loop, changed temperature sensor behaviour and changed some debugging
2023-01-29 22:45:35 +01:00
Gunnar Skjold
d777040c0a
Fixed loading error from previous version energy accounting
2023-01-29 17:04:04 +01:00
Gunnar Skjold
a5636a60f8
Some changes after testing
2023-01-28 20:24:18 +01:00
Gunnar Skjold
6f817b2ed5
Some changes after testing
2023-01-28 20:19:06 +01:00
Gunnar Skjold
e4fec4f4c2
Some final changes
2023-01-28 11:53:26 +01:00
Gunnar Skjold
3a25964ec4
Merge pull request #412 from UtilitechAS/dev-v2.2
...
v2.2
2023-01-28 10:54:20 +01:00
Gunnar Skjold
1227dff412
Changed autocomplete in setup form
2023-01-26 19:55:39 +01:00
Gunnar Skjold
26ee2e6efc
Some changes after testing + changing hostname for hub
2023-01-26 19:42:19 +01:00
Gunnar Skjold
d6a8d31278
Some updates for documentation
2023-01-23 18:19:33 +01:00
Gunnar Skjold
3f2b534baa
Merge branch 'master' into dev-v2.2
2023-01-23 13:59:38 +01:00
Gunnar Skjold
70f413013c
Merge pull request #408 from aadnehovda/patch-1
...
Unknown HA entity units.
2023-01-23 13:57:33 +01:00
Ådne Hovda
6edcd174bb
Unknown HA entity units.
...
It appears that HA units are case sensitive: https://developers.home-assistant.io/docs/core/entity/sensor/ , so for SensorDeviceClass.REACTIVE_POWER it should be "var", not "VAr". Also for SensorDeviceClass.TEMPERATURE, the degree symbol is required: "°C".
Entity sensor.ams_ed6e_qo (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'VAr' which is not a valid unit for the device class ('reactive_power') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22
Entity sensor.ams_ed6e_q (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'VAr' which is not a valid unit for the device class ('reactive_power') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22
Entity sensor.ams_ed6e_tqo (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'kVArh' which is not a valid unit for the device class ('energy') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22
Entity sensor.ams_ed6e_tqi (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'kVArh' which is not a valid unit for the device class ('energy') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22
2023-01-23 11:09:47 +01:00
Gunnar Skjold
3170ef6ce9
c3 scripts
2023-01-21 13:45:47 +01:00
Gunnar Skjold
fb56f4d012
More changes for repo
2023-01-21 13:45:09 +01:00
Gunnar Skjold
c5756f0cba
Renamed repo
2023-01-21 13:43:11 +01:00
Gunnar Skjold
95c9ecc8b2
Merge branch 'master' into dev-v2.2
2023-01-18 21:14:49 +01:00
Gunnar Skjold
bdee066c33
Fixed reboot loop
2023-01-18 21:14:40 +01:00
Gunnar Skjold
957039d0c0
Merge branch 'master' into dev-v2.2
2023-01-18 20:48:38 +01:00
Gunnar Skjold
dd23a0fa60
Fixed reboot look
2023-01-18 20:48:27 +01:00
Gunnar Skjold
7777a0a059
Merge branch 'master' into dev-v2.2
2023-01-18 17:11:10 +01:00
Gunnar Skjold
e8fc6d48bf
Fixed issue where GPIO setup becomes invalid
2023-01-18 17:11:01 +01:00
Gunnar Skjold
c98148c886
Update readme
2023-01-17 19:56:28 +01:00
Gunnar Skjold
6ba2b4060e
Update images for readme and wiki
2023-01-17 19:55:00 +01:00
Gunnar Skjold
762c17ca8e
Updated readme and example ini file
2023-01-17 19:48:24 +01:00
Gunnar Skjold
fad6ada1e0
Updated release
2023-01-17 19:15:57 +01:00
Gunnar Skjold
fb1d343ee3
Removed debugging
2023-01-17 19:03:07 +01:00
Gunnar Skjold
1f3c32e80a
Adding secrets to build
2023-01-17 18:57:11 +01:00
Gunnar Skjold
43fbca7099
Update release build
2023-01-17 18:42:09 +01:00
Gunnar Skjold
7a36082564
Trying stuff to get build working
2023-01-17 18:34:47 +01:00
Gunnar Skjold
fb2cfdfe01
Trying to fix build
2023-01-17 18:28:08 +01:00
Gunnar Skjold
6c3dca9344
Updated build
2023-01-17 18:15:32 +01:00
Gunnar Skjold
cce5d75fd7
Updated build
2023-01-17 18:13:54 +01:00
Gunnar Skjold
8fd411c1d6
Updated build
2023-01-17 18:13:20 +01:00
Gunnar Skjold
4b15ac74fc
Update FUNDING.yml
2023-01-17 18:05:44 +01:00
Gunnar Skjold
508b2e6c45
Icon for safari
2023-01-17 17:51:50 +01:00
Gunnar Skjold
af630615db
Changes after testing
2023-01-17 17:49:01 +01:00
Gunnar Skjold
222a4f13e2
Changes after testing
2023-01-17 17:48:42 +01:00
Gunnar Skjold
3bc6c75c5a
Some more changes for L&G
2023-01-15 11:20:28 +01:00
Gunnar Skjold
dbb3eac709
Some changes for L&G
2023-01-15 10:56:46 +01:00
Gunnar Skjold
1cee48eab4
Some design changes
2023-01-14 09:34:28 +01:00
Gunnar Skjold
c28752a00a
Fixed firmware upgrade
2023-01-12 21:24:36 +01:00
Gunnar Skjold
365061df29
Some changes after testing
2023-01-12 20:17:37 +01:00
Gunnar Skjold
870617f780
More changes for v2.2
2023-01-11 20:41:27 +01:00
Gunnar Skjold
4972b980ba
Changes for v2.2
2023-01-06 14:34:07 +01:00
Gunnar Skjold
51c70abda3
Merge branch 'master' into dev-v2.2
2023-01-04 18:55:38 +01:00
Gunnar Skjold
8d448533c7
Fixed config export for esp32
2022-12-19 18:36:04 +01:00
Gunnar Skjold
43cb9a0000
Fixed DSMR CRC check
2022-12-19 18:14:12 +01:00
Gunnar Skjold
d49b7eac09
Minor change
2022-12-19 16:49:40 +01:00
Gunnar Skjold
8f057e687c
Merge pull request #387 from lassebm/lg-e360-fixes
...
Landis+Gyr E360 fixes
2022-12-19 16:45:52 +01:00
Lasse Bang Mikkelsen
5b4f680114
Align Landis+Gyr naming
2022-12-17 12:38:18 +01:00
Lasse Bang Mikkelsen
fabdfbadf4
Add support for Landis+Gyr meters using "LGF" manufacturer ID
2022-12-16 20:20:40 +01:00
Lasse Bang Mikkelsen
afa47ea633
Use list type 4 when phase active import/export power is available
2022-12-16 20:19:15 +01:00
Gunnar Skjold
461d76e651
Merge branch 'master' into dev-v2.2
2022-12-15 18:32:36 +01:00
Gunnar Skjold
c40e20c8e9
Extract active import/export per phase from DSMR
2022-12-15 18:25:13 +01:00
Gunnar Skjold
4e97554514
Some changes during testing
2022-12-14 19:37:32 +01:00
Gunnar Skjold
28a9d6746b
Fixed discover when setting different hostname in setup
2022-12-14 18:15:46 +01:00
Gunnar Skjold
7ea4fe881c
HAN serial autodetect
2022-12-13 21:05:42 +01:00
Gunnar Skjold
c4eaf8184b
Check if authenticated to show upgrade links and config up/download
2022-12-10 09:27:18 +01:00
Gunnar Skjold
312972f77d
Some improvements to v2.2
2022-12-09 20:26:48 +01:00
Gunnar Skjold
27b9058af5
Some improvements to v2.2
2022-12-09 20:26:31 +01:00
Gunnar Skjold
bc4d61098c
Some error handling
2022-12-09 19:10:24 +01:00
Gunnar Skjold
b2de6472cf
Some experiments with captive portal
2022-12-09 18:24:43 +01:00
Gunnar Skjold
6c3ddc57b5
Removed "auto multiplier" for Kamstrup
2022-12-08 13:44:21 +01:00
Gunnar Skjold
2ff7044c85
Fixed incorrect value for peaks in MQTT
2022-12-07 20:13:30 +01:00
Gunnar Skjold
0145be851e
Merge branch 'master' into dev-v2.2
2022-12-07 20:11:14 +01:00
Gunnar Skjold
6b0d540f39
Added 300 baud
2022-12-07 11:51:45 +01:00
Gunnar Skjold
2218ac4e8a
Fixed graph clearing problem
2022-12-07 11:32:55 +01:00
Gunnar Skjold
33bd3da310
Various fix for realtime values
2022-12-06 15:45:43 +01:00
Gunnar Skjold
a239e1a63d
Fix on special case for Kaifa MA304T3
2022-12-06 08:28:30 +01:00
Gunnar Skjold
8a809ec128
Bugfix from testing
2022-12-04 14:32:47 +01:00
Gunnar Skjold
b48a0f13fe
More v2.2
2022-12-04 14:12:35 +01:00
Gunnar Skjold
b07ed075f4
Even more v2.2
2022-12-02 20:38:56 +01:00
Gunnar Skjold
0927cab8e2
Some changes for fetching prices from amshub
2022-12-02 19:24:53 +01:00
Gunnar Skjold
eed35b7bbc
Merge branch 'hub-prices' into dev-v2.2
2022-12-02 19:08:29 +01:00
Gunnar Skjold
e34da5fd83
Merge branch 'master' into hub-prices
2022-12-02 19:04:14 +01:00
Gunnar Skjold
148fb14c93
More v2.2
2022-12-02 19:03:16 +01:00
Gunnar Skjold
000cfd8697
Merge branch 'master' into dev-v2.2
2022-12-01 18:12:32 +01:00
Gunnar Skjold
1ef5703971
Fixed changing mdns settings
2022-12-01 18:06:19 +01:00
Gunnar Skjold
cda3b80b35
Some changes
2022-11-29 21:24:58 +01:00
Gunnar Skjold
c7b8090634
Some minor changes
2022-11-29 21:02:23 +01:00
Gunnar Skjold
63a8d79b95
Making it work on 8266
2022-11-29 20:50:36 +01:00
Gunnar Skjold
02ae3fc7f5
More v2.2
2022-11-29 20:20:56 +01:00
Gunnar Skjold
2dcc874592
More v2.2
2022-11-25 19:18:32 +01:00
Gunnar Skjold
d4d9d2224f
More v2.2
2022-11-23 20:52:37 +01:00
Gunnar Skjold
902e43979b
Even more v2.2
2022-11-21 18:48:04 +01:00
Gunnar Skjold
8e54f23367
More v2.2
2022-11-20 20:47:29 +01:00
Gunnar Skjold
ab7128c53a
Further work on v2.2
2022-11-19 15:44:23 +01:00
Gunnar Skjold
6563700df4
Merge branch 'master' into dev-v2.2
2022-11-15 18:07:02 +01:00
Gunnar Skjold
538de5ea99
Increased range of multipliers
2022-11-08 18:41:31 +01:00
Gunnar Skjold
042e2bcc85
Fixed power saving
2022-11-07 14:57:53 +01:00
Gunnar Skjold
b6f630b134
Some more Svelte implementation
2022-11-01 20:59:38 +01:00
Gunnar Skjold
65a09dcecf
Merge branch 'master' into dev-v2.2
2022-11-01 19:07:00 +01:00
Gunnar Skjold
775e5a0881
Support different size numbers in L&G payload
2022-11-01 18:41:43 +01:00
Gunnar Skjold
6c0d5fcc09
Some adjustments to wifi power saving option
2022-10-31 10:09:07 +01:00
Gunnar Skjold
69d8fa9254
Made wifi sleep mode configurable
2022-10-27 19:17:50 +02:00
root
71d261bf34
Merge branch 'hub-prices' of github.com:gskjold/AmsReader into hub-prices
2022-10-23 19:11:51 +02:00
root
9f4f5b4620
Merge branch 'master' into hub-prices
2022-10-23 19:09:15 +02:00
Gunnar Skjold
c38c305bab
Fixed threshold update via config file
2022-10-21 19:21:55 +02:00
Gunnar Skjold
bfee2a1d64
Fixed month average calculation
2022-10-21 18:43:30 +02:00
Gunnar Skjold
ec7edae9a1
Updated issue templates
2022-10-21 17:43:33 +02:00
Gunnar Skjold
d8e265b7ac
Fixed JSON errors
2022-10-20 20:12:33 +02:00
Gunnar Skjold
1987cddab7
Some more cleanup
2022-10-20 20:11:13 +02:00
Gunnar Skjold
e18be5f97c
Better memory optimization
2022-10-19 20:58:57 +02:00
Gunnar Skjold
537597d6d1
Expanding size of daily and monthly data points
2022-10-19 20:30:29 +02:00
Gunnar Skjold
a89013cec3
Fixed config file upload
2022-10-19 20:24:21 +02:00
Gunnar Skjold
9c7a0cb7ff
Fixed graph error
2022-10-19 19:59:41 +02:00
Gunnar Skjold
ade12199b9
Reclaiming some heap space
2022-10-19 19:54:26 +02:00
Gunnar Skjold
92692c6eaf
More implementation of Svelte GUI
2022-10-18 20:52:42 +02:00
Gunnar Skjold
e4114c3e74
Merge branch 'master' into dev-v2.2
2022-10-18 18:30:37 +02:00
Gunnar Skjold
39b68aca51
Removed invalid code
2022-10-18 18:30:26 +02:00
root
feffbb53a3
Merge branch 'master' of github.com:gskjold/AmsToMqttBridge into hub-prices
2022-10-17 15:42:23 +02:00
Gunnar Skjold
8ac1e034b1
Reverted WiFi_connect method
2022-10-17 13:09:28 +02:00
Gunnar Skjold
f446dff865
Fixed LED blink delay
2022-10-17 13:09:04 +02:00
root
e1b2554af2
Merge branch 'master' of github.com:gskjold/AmsToMqttBridge into hub-prices
2022-10-16 18:46:47 +02:00
Gunnar Skjold
627a50ab50
Fixed priceapi dropdowns
2022-10-16 18:46:31 +02:00
Gunnar Skjold
a20d007b45
Merge branch 'hub-prices' of github.com:gskjold/AmsReader into hub-prices
2022-10-16 18:32:25 +02:00
Gunnar Skjold
64840e13f0
Merge branch 'master' into hub-prices
2022-10-16 18:31:26 +02:00
Gunnar Skjold
34ebe9601a
Changed blink behaviour
2022-10-16 18:31:11 +02:00
root
72f1d59338
Merge branch 'hub-prices' of github.com:gskjold/AmsReader into hub-prices
2022-10-16 17:36:48 +02:00
Gunnar Skjold
07ed425320
Merge branch 'master' into hub-prices
2022-10-16 17:34:19 +02:00
Gunnar Skjold
2e75e1c4dc
Moved HA files
2022-10-13 20:58:08 +02:00
Gunnar Skjold
e6df68481f
Merge branch 'master' into dev-v2.2
2022-10-13 20:47:48 +02:00
Gunnar Skjold
fa299198fc
Fixed all build warnings
2022-10-13 20:33:59 +02:00
Gunnar Skjold
6d81b0a856
Fixed all build warnings
2022-10-13 20:24:56 +02:00
Gunnar Skjold
dd095da97b
Reduced footprint of GPIO config page
2022-10-13 19:27:25 +02:00
Gunnar Skjold
1b6ce203b7
Better debug output whem receiving unknown data
2022-10-13 17:40:44 +02:00
Gunnar Skjold
2850be4e48
Merge pull request #322 from tbarnekov/extend_power_info
...
Populate Active Import and Export per phase and export to HA
2022-10-12 20:34:09 +02:00
Gunnar Skjold
7eca31de84
Fixed build errors
2022-10-12 20:01:55 +02:00
Gunnar Skjold
a64f960cc7
Added Pow-U+ profile
2022-10-12 19:30:00 +02:00
Gunnar Skjold
ce3a47a7e6
Fixed error blinks and improved WiFi reconnect
2022-10-12 19:25:48 +02:00
Thomas Barnekov
8395e1dc77
Merge remote-tracking branch 'origin/master' into extend_power_info
2022-10-10 17:06:09 +02:00
Thomas Barnekov
39a4761415
Add DOCTYPE to html to fix quirks mode
2022-10-10 16:59:43 +02:00
root
dc25c147b9
Merge remote-tracking branch 'public/master' into hub-prices
2022-10-07 17:36:49 +00:00
Gunnar Skjold
867ab9d6c2
Build variable for upgrade URL
2022-10-07 19:35:30 +02:00
Gunnar Skjold
6a76144566
Merge branch 'master' into hub-prices
2022-10-07 17:49:47 +02:00
Thomas Barnekov
5e03e3d3c2
Move per-phase power consumption and power factor values to new ha4.json
2022-10-07 13:40:29 +02:00
Thomas Barnekov
adb5050621
Merge branch 'gskjold:master' into extend_power_info
2022-10-06 17:31:43 +02:00
Gunnar Skjold
026cd25c8c
Setting modem sleep to max
2022-10-06 17:30:37 +02:00
Gunnar Skjold
06ec97b42a
Make sure we dont use more than 5 peaks if defined higher
2022-10-06 17:20:13 +02:00
Gunnar Skjold
b420a0e6f4
Limit peak count if over 5
2022-10-06 17:12:12 +02:00
Thomas Barnekov
7cd52d5689
Add individual power reading for all phases (include in HA)
2022-10-06 00:35:30 +02:00
Thomas Barnekov
ad78ff3082
Fix implicit cast and non-const char pointer warnings
2022-10-05 22:42:43 +02:00
Gunnar Skjold
fe7be81f1e
Rudimentary detection for L&G data. Probably change this in the future
2022-10-01 12:11:46 +02:00
Gunnar Skjold
7674fc2ad0
Merge branch 'lng-parser'
2022-10-01 11:56:08 +02:00
Gunnar Skjold
d50181c347
Upgrade with custom URL
2022-10-01 11:43:42 +02:00
Gunnar Skjold
8ca771fa5a
Changed "BUS" to "M-BUS"
2022-10-01 09:25:56 +02:00
Gunnar Skjold
7d557b2679
Only show new version when actually new in firmware page. Also be more specific on USB power in upgrade warning
2022-10-01 09:24:07 +02:00
Gunnar Skjold
2f0c912388
Exclude decimals in BUILD_EPOCH flag
2022-10-01 09:22:09 +02:00
Gunnar Skjold
57e6d0fbe3
Modifications to make price sensors work in HA
2022-09-30 19:18:23 +02:00
Gunnar Skjold
e7c25fafda
Prices and realtime HA sensors
2022-09-28 20:13:03 +02:00
Gunnar Skjold
2a4772fe25
Fixed memory leak when reconnecting to MQTT/SSL
2022-09-27 19:59:37 +02:00
Gunnar Skjold
f1f7408208
Added price zones
2022-09-25 11:46:04 +02:00
Gunnar Skjold
feb8e5007b
Fixed MQTT buffer size
2022-09-25 10:50:34 +02:00
Gunnar Skjold
c4af1ee74f
Fixed saving tariff thresholds
2022-09-25 10:50:09 +02:00
Gunnar Skjold
992e1b6121
Net value for active power (L&G)
2022-09-12 08:03:32 +02:00
Gunnar Skjold
95d3008a66
Updates to Svelte UI
2022-09-12 07:29:25 +02:00
Gunnar Skjold
04cd6ac387
Some changes to make Svelte UI work
2022-09-03 14:37:31 +02:00
Gunnar Skjold
584c7b1154
More restructuring
2022-09-03 14:03:15 +02:00
Gunnar Skjold
493c4b4337
Moved Svelte UI to lib folder
2022-09-03 13:41:11 +02:00
Gunnar Skjold
488c969858
Some serious restructuring to be able to swap between implementations
2022-09-03 13:12:29 +02:00
Gunnar Skjold
8b0d4185d3
Created new UI with Svelte
2022-09-03 12:19:56 +02:00
Gunnar Skjold
9cc7529934
Fixed L&G scaling
2022-08-31 08:19:09 +02:00
Gunnar Skjold
ef8715be6d
Merge branch 'master' into lng-parser
2022-08-31 08:04:24 +02:00
Gunnar Skjold
e232b875fa
Fixed Aidon timestamp
2022-08-23 21:07:06 +02:00
Gunnar Skjold
f18171fecc
Fixed MQTT byte mode
2022-08-23 20:39:47 +02:00
Gunnar Skjold
a3c7a09211
Adding peaks to data.json and MQTT RAW
2022-08-23 20:21:19 +02:00
Gunnar Skjold
a6f3bc3f71
Added version to system json
2022-08-23 19:49:19 +02:00
Gunnar Skjold
44bcd386d1
aggregate obis 1.8.x and 2.8.x for L&G
2022-08-23 09:04:45 +02:00
Gunnar Skjold
01547f9a52
Adjustments to make L&G parser work
2022-08-19 13:26:29 +02:00
Gunnar Skjold
608470c5f7
Merge branch 'master' into hub-prices
2022-08-18 19:56:31 +02:00
Gunnar Skjold
940d38af5c
Merge branch 'master' into lng-parser
2022-08-17 17:33:24 +02:00
Gunnar Skjold
4e451c51e1
HW serial fix for S2
2022-08-17 17:33:06 +02:00
Gunnar Skjold
43def1c311
Fixed Pow-P1 profile
2022-08-17 17:32:53 +02:00
Gunnar Skjold
2978116207
Fixed formatting error in HA payload
2022-08-16 11:55:07 +02:00
Gunnar Skjold
a055465ce0
Untestet L&G data parser
2022-08-16 08:22:43 +02:00
Gunnar Skjold
68b3415a6c
Cleanup for price API
2022-08-13 16:32:55 +02:00
Gunnar Skjold
d8f3ae8b07
Merge branch 'master' into hub-prices
2022-08-13 16:00:25 +02:00
Gunnar Skjold
998b986604
Adjusted modem sleep to a safer value
2022-08-12 20:48:34 +02:00
Gunnar Skjold
7799431405
Remove unused files
2022-08-12 20:42:13 +02:00
Gunnar Skjold
1a92cd1978
Fetch prices from hub
2022-08-12 20:41:53 +02:00
Gunnar Skjold
508c14a671
Fixed modem sleep on S2 and fixed default wifi power
2022-08-12 09:02:04 +02:00
Gunnar Skjold
4a7ef87269
Fixed realtime day calculation
2022-08-10 17:43:51 +02:00
Gunnar Skjold
3a4fc707b0
Show real time production
2022-08-10 10:53:16 +02:00
Gunnar Skjold
5d2e320b07
Fixed export labels on graph
2022-08-10 10:28:31 +02:00
Gunnar Skjold
d12613b91a
Trying to fix HA accumulated
2022-08-10 10:01:24 +02:00
Gunnar Skjold
e6a02f34ab
USB power warning when upgrading
2022-08-10 09:31:50 +02:00
Gunnar Skjold
0b2ffbfd77
Revert to arduino 2.0.3 because of #298
2022-08-10 09:30:31 +02:00
Gunnar Skjold
cab6c54ed9
Correct Vcc GPIO for Pow-K+
2022-08-01 12:48:31 +02:00
Gunnar Skjold
313024f273
Support OTA upgrade from ESP8266
2022-08-01 08:17:24 +02:00
Gunnar Skjold
91fc078c5e
Higher precision on prices
2022-07-31 20:26:38 +02:00
Gunnar Skjold
5b9d44a3e9
Fixed loading of energy accounting
2022-07-31 20:19:01 +02:00
Gunnar Skjold
ed523bda24
Pow-P1 profile
2022-07-30 13:21:34 +02:00
Gunnar Skjold
e3a1a242d2
Fixed debugging
2022-07-29 22:24:06 +02:00
Gunnar Skjold
ddfade65d8
Merge branch 'master' into new-parser
2022-07-29 21:21:40 +02:00
Gunnar Skjold
0ef8390df0
Fixed config file
2022-07-28 13:45:53 +02:00
Gunnar Skjold
f43fe5f864
Fixed cost overflow
2022-07-28 13:40:23 +02:00
Gunnar Skjold
f9ddd7533a
Changes after testing + adding S2 profiles
2022-07-21 20:54:55 +02:00
Gunnar Skjold
f9f18bc106
Merge branch 'master' into new-parser
2022-07-20 18:50:47 +02:00
Gunnar Skjold
280dd8605b
Changed platform to reduce ESP32 footprint
2022-07-19 07:49:11 +02:00
Gunnar Skjold
41324cf590
Merge branch 'master' into new-parser
2022-07-19 07:40:19 +02:00
Gunnar Skjold
64132d5ce3
Reducing memory footprint to fit ESP32
2022-07-19 07:40:13 +02:00
Gunnar Skjold
0e75732022
Merge branch 'master' into new-parser
2022-07-19 07:20:43 +02:00
Gunnar Skjold
6975714922
Merge branch 'master' of github.com:gskjold/AmsToMqttBridge
2022-07-19 06:43:19 +02:00
Gunnar Skjold
7f3e0e6089
Limit threshold average to use a single peak per day
2022-07-19 06:43:06 +02:00
Gunnar Skjold
6ff5518738
Create README.md
2022-07-17 20:34:51 +02:00
Gunnar Skjold
be29daee77
Shared Wemos MBUS shield
2022-07-17 20:17:39 +02:00
Gunnar Skjold
a90ed40aee
Fixed config file loading of energyaccounting
2022-07-05 21:48:56 +02:00
Gunnar Skjold
32ba6c31f0
Max hour average from more than one hour. Plus a fix for real time cost calculation
2022-07-05 20:34:48 +02:00
Gunnar Skjold
caf00f99e3
Merge branch 'master' into new-parser
2022-06-28 18:16:06 +02:00
Gunnar Skjold
aaa318e511
Updated issue templates
2022-06-28 14:02:00 +02:00
Gunnar Skjold
648cac0b06
Some adjustmenst
2022-06-23 20:22:15 +02:00
Gunnar Skjold
a5d1a2c0ee
Some adjustments
2022-06-23 20:03:29 +02:00
Gunnar Skjold
55f1b4b129
Fixed ESP32-S2 ADC
2022-06-23 19:25:41 +02:00
Gunnar Skjold
b805363c60
MQTT/SSL config re-enabled for ESP8266 in case it actually is in use
2022-06-23 08:13:13 +02:00
Gunnar Skjold
846b166ae9
MQTT/SSL config re-enabled for ESP8266 in case it actually is in use
2022-06-23 08:12:25 +02:00
Gunnar Skjold
4e039c2cc9
Escape backslash in JSON
2022-06-23 08:10:57 +02:00
Gunnar Skjold
e5556fe80b
Fixed minimum value for lowest threshold
2022-06-19 08:31:13 +02:00
Gunnar Skjold
c5aa65a780
Fixed previous commit
2022-06-12 10:55:28 +02:00
Gunnar Skjold
30cf1435da
Fixed firmware upgrade for ESP32S2
2022-06-12 10:34:01 +02:00
Gunnar Skjold
fca46a3f54
Restructured AMS data parsing
2022-06-12 09:46:20 +02:00
Gunnar Skjold
0dca85d67b
Fixed currency conversion between nordic currencies
2022-06-04 10:28:23 +02:00
Gunnar Skjold
d9a5a21fe0
Added link to known hardware configurations
2022-06-04 10:12:52 +02:00
Gunnar Skjold
68eaa7d39b
Reload prices when ENTSO-E config has changed
2022-06-04 10:07:15 +02:00
Gunnar Skjold
3231d0747e
Fixed code error
2022-06-04 10:05:09 +02:00
Gunnar Skjold
2617956b38
Disabled MQTT SSL for ESP8266
2022-06-04 09:55:25 +02:00
Gunnar Skjold
07614226b3
Fixed 404 after uploading SSL certificates to MQTT
2022-06-04 08:20:42 +02:00
Gunnar Skjold
cddb170f24
Added build target for esp32 solo
2022-06-01 20:51:25 +02:00
Gunnar Skjold
ba7915ca7c
Added UART1 HW serial for ESP32-S2
2022-05-25 09:27:31 +02:00
Gunnar Skjold
ee12db4f51
Added baud rates
2022-05-15 08:56:26 +02:00
Gunnar Skjold
f01fbfca53
Fixed code that modified original byte stream
2022-05-14 10:59:48 +02:00
Gunnar Skjold
fab637cf60
Fixed GBT multiframe
2022-05-13 09:16:40 +02:00
Gunnar Skjold
b2e144efcf
Fixed error
2022-05-13 09:03:38 +02:00
Gunnar Skjold
10308ce738
Added support for GBT transfer
2022-05-07 10:01:30 +02:00
Gunnar Skjold
70f5b0f912
Change default MQTT buffer
2022-04-23 08:48:34 +02:00
Gunnar Skjold
d724a90085
Fixed analog read of voltage
2022-04-17 10:07:25 +02:00
Gunnar Skjold
1ab529785a
Fixed loop error
2022-04-14 10:50:00 +02:00
Gunnar Skjold
3a81e62bbe
Support for encrypted DSMR
2022-04-14 10:38:04 +02:00
Gunnar Skjold
4882916b5c
Fixed comment
2022-04-14 08:19:07 +02:00
Gunnar Skjold
1f7e43256a
Fixed detection of sagemcom
2022-04-14 08:18:51 +02:00
Gunnar Skjold
a0d3632fd7
Fixed clearing of prices on MQTT
2022-04-04 07:31:08 +02:00
Gunnar Skjold
b25564a89f
Clear all unknown prices instead of just last
2022-04-03 13:27:21 +02:00
Gunnar Skjold
191d9fa562
Added month max to mqtt
2022-04-01 20:39:22 +02:00
Gunnar Skjold
e009b4e54e
Fixed price update every hour
2022-04-01 07:58:58 +02:00
Gunnar Skjold
811625b706
Adaptations for ESP8266 for last commit
2022-03-30 19:09:50 +02:00
Gunnar Skjold
15fa452c7c
Fixed ENTSO-E for CEST fetch
2022-03-30 19:06:48 +02:00
Gunnar Skjold
e725c01597
Updated build for esp32
2022-03-30 17:38:08 +02:00
Gunnar Skjold
35b884713c
Merge branch 'agpl'
2022-03-30 17:09:54 +02:00
Gunnar Skjold
d5fc9f6fc6
Remove temp screenshot
2022-03-30 17:05:29 +02:00
Gunnar Skjold
19c8396b1c
Updated screenshot
2022-03-30 17:04:36 +02:00
Gunnar Skjold
f4622a068b
Merge pull request #256 from gskjold/dev-v2.1.0
...
Dev v2.1.0
2022-03-30 17:00:55 +02:00
Gunnar Skjold
9922862299
Fixed -127 value on last hour of day when we enter CEST
2022-03-26 17:47:33 +01:00
Gunnar Skjold
e7fc504975
Fixed prices that are not cleared after midnight?
2022-03-26 09:45:35 +01:00
Gunnar Skjold
6cdb943763
Fixed decrypt on esp32 without auth key
2022-03-26 09:31:49 +01:00
Gunnar Skjold
3e937a4e5d
Updated CI
2022-03-26 09:26:12 +01:00
Gunnar Skjold
fcd3e3ca25
Fixed firmware download for esp32-s2
2022-03-26 09:21:57 +01:00
Gunnar Skjold
772004c0a2
Added zip files to release resources, combined with flash script
2022-03-26 09:19:03 +01:00
Gunnar Skjold
c3e5ce344c
Fixed S2 build
2022-03-25 21:16:18 +01:00
Gunnar Skjold
b11b1d5e37
Default meter config to 0
2022-03-25 20:37:34 +01:00
Gunnar Skjold
b5d34990df
Fixed typ-o
2022-03-24 08:46:35 +01:00
Gunnar Skjold
a287d310ac
Added ESP32-S2 build
2022-03-24 08:38:29 +01:00
Gunnar Skjold
afe6190c46
Merge pull request #251 from kng/dev-ha
...
ha discvovery, handle unset values
2022-03-23 07:34:03 +01:00
Daniel Ekman
2125945728
ha discvovery, handle unset values
2022-03-22 11:24:38 +01:00
Gunnar Skjold
fb60127cf7
Removed test code
2022-03-20 20:17:19 +01:00
Gunnar Skjold
a07c55889f
Build fix
2022-03-20 20:11:29 +01:00
Gunnar Skjold
a675f56f9c
Restart after uploading config file, then restore, then reboot again
2022-03-20 20:02:51 +01:00
Gunnar Skjold
0590ec375d
Delete firmware file if exists after factory reset
2022-03-18 19:35:58 +01:00
Gunnar Skjold
48bd352619
Remove stat_cla property from HA discovery message if null
2022-03-18 19:19:37 +01:00
Gunnar Skjold
40016f314e
Multipliers for HAN data
2022-03-18 19:16:03 +01:00
Gunnar Skjold
b9234f6f64
Fixed HA MQTT corruption
2022-03-17 20:36:21 +01:00
Gunnar Skjold
beafcd300b
Added realtime day use to MQTT
2022-03-17 18:51:13 +01:00
Gunnar Skjold
a92524eaf8
Some adjustments for real time calculation
2022-03-17 18:47:57 +01:00
Gunnar Skjold
a60dd8a60a
Added separate buffer for HAN data
2022-03-17 18:14:31 +01:00
Gunnar Skjold
53296ccf42
Fixed update of meter state with list type 4
2022-03-16 12:46:59 +01:00
Gunnar Skjold
42a627e32e
Fixed download/upload config
2022-03-12 20:38:51 +01:00
Gunnar Skjold
c38034c69b
Merge branch 'master' into dev-v2.1.0
2022-03-12 20:06:30 +01:00
Gunnar Skjold
0ec1a8ece3
Experimenting with fw upgrade for esp8266
2022-03-12 11:16:37 +01:00
Gunnar Skjold
45275c271e
Changed to "correct" bootstrap js. Seems we have a mix, but ok
2022-03-12 11:12:49 +01:00
Gunnar Skjold
116761b46e
Fixed overflow issue
2022-03-12 09:19:01 +01:00
Gunnar Skjold
a2c13fd0da
Changed cursor for watt display
2022-03-12 09:01:08 +01:00
Gunnar Skjold
b727f84c72
Possibility to show watt instead of kw
2022-03-12 08:56:09 +01:00
Gunnar Skjold
3706625760
Changed colors for amp graph
2022-03-12 08:46:18 +01:00
Gunnar Skjold
0e1d2211ec
Added SRI to js/css resources
2022-03-12 08:40:34 +01:00
Gunnar Skjold
785bec0269
Added export to graph
2022-03-12 08:26:24 +01:00
Gunnar Skjold
2a4a199ae6
Updated python version for release action
2022-03-12 08:26:08 +01:00
Gunnar Skjold
b6b9db5431
Merge branch 'master' into dev-v2.1.0
2022-03-11 19:48:20 +01:00
Gunnar Skjold
55bdd4437a
Fixed drawing amp graph when all phases export
2022-03-11 19:44:51 +01:00
Gunnar Skjold
3948fff184
Fixed calculation of highest hour
2022-03-11 19:42:44 +01:00
Gunnar Skjold
c4b099b752
Added profile for Pow-K+
2022-03-11 19:28:28 +01:00
Gunnar Skjold
5cfcc015f4
Fixed hostname for esp32
2022-03-11 19:21:27 +01:00
Gunnar Skjold
724768afc4
Fixed MQTT problem
2022-03-11 19:16:08 +01:00
Gunnar Skjold
efc20f1da9
Merge branch 'master' into dev-v2.1.0
2022-03-11 18:58:41 +01:00
Gunnar Skjold
b071344871
Fixed reading of numbers. Added support for newer Kaifa payload
2022-03-11 18:55:01 +01:00
Gunnar Skjold
e0e98f0ec1
Logging
2022-02-28 10:45:09 +01:00
Gunnar Skjold
53d34852f1
Fixed labels for domoticz
2022-02-28 08:31:53 +01:00
Gunnar Skjold
c26073b2a3
Some adjustments to make config file download work again
2022-02-26 20:47:34 +01:00
Gunnar Skjold
b12a632618
Some memory optimization
2022-02-26 16:03:46 +01:00
Gunnar Skjold
420be1b943
Some memory optimization and configfile download fix
2022-02-26 14:57:12 +01:00
Gunnar Skjold
142d280805
Consolidated two HA discovery JSON to one
2022-02-26 14:02:26 +01:00
Gunnar Skjold
196b79e4c8
Fixed corrupted payload for HA
2022-02-26 13:57:01 +01:00
Gunnar Skjold
2ef1700cfe
Added static HA content to progmem
2022-02-22 21:33:50 +01:00
Gunnar Skjold
cbbb52d32a
Some cleanup and buffer sharing
2022-02-22 21:05:34 +01:00
Gunnar Skjold
6bded12ec5
Increased buffer size for HA payload
2022-02-20 21:20:10 +01:00
Gunnar Skjold
5ae56f265e
Some final changes before releasing for test
2022-02-20 20:10:08 +01:00
Gunnar Skjold
705b3e34d1
Swedish kamstrup frame with wh instead of wh/10
2022-02-20 19:41:29 +01:00
Gunnar Skjold
fcb4ccb462
Merge pull request #240 from mikkle/mqtt_mem_free
...
publish ESP free mem in mqtt publishSystem
2022-02-20 19:30:20 +01:00
Mikkel Troest
e0cd14e904
publish ESP free mem in mqtt publishSystem
2022-02-20 15:39:52 +01:00
Gunnar Skjold
bb6e8838b4
Adaptation to 2.1 contract
2022-02-20 11:22:14 +01:00
Gunnar Skjold
5325f8f845
Merge branch 'pr-172' into dev-v2.1.0
2022-02-20 11:17:33 +01:00
Gunnar Skjold
113b8bf820
Merge branch 'master' into dev-v2.1.0
2022-02-20 11:15:49 +01:00
Gunnar Skjold
7e41168606
Fix for unstable ESP8266 when debug is disabled
2022-02-20 10:51:19 +01:00
Gunnar Skjold
0af2378d05
Merge branch 'master' into dev-v2.1.0
2022-02-19 10:33:17 +01:00
Gunnar Skjold
7f4498c062
Send system values to MQTT on regular interval
2022-02-19 10:32:23 +01:00
Gunnar Skjold
6e9e988ff0
Fixed issue where HAN stops working when debugging is disabled
2022-02-19 10:27:24 +01:00
Gunnar Skjold
1f03013c98
Add possibility to factory reset on boot
2022-02-19 09:57:48 +01:00
Gunnar Skjold
6690e809fb
Fixed reboot issue
2022-02-19 09:57:27 +01:00
Gunnar Skjold
b41dd862b6
Merge branch 'master' into dev-v2.1.0
2022-02-19 09:08:02 +01:00
Gunnar Skjold
04c269d982
Double precision on accumulated values
2022-02-19 09:07:35 +01:00
Gunnar Skjold
f8a86058a1
Adjustments to data storage update
2022-02-12 19:54:11 +01:00
Gunnar Skjold
47dda366e3
Fixed ESP32 build
2022-02-12 11:52:06 +01:00
Gunnar Skjold
0700d22d43
Merge branch 'pull-172' into pr-172
2022-02-12 11:49:07 +01:00
Gunnar Skjold
bf633f20c4
Merge pull request #172 from kng/homeassistant
...
Homeassistant mqtt discovery, wip
2022-02-12 11:48:43 +01:00
Gunnar Skjold
297681bcff
Some adjustments to make HA autodiscover work for ESP8266
2022-02-12 11:43:31 +01:00
Gunnar Skjold
68906b54a6
Merge branch 'homeassistant' of github.com:kng/AmsToMqttBridge into pull-172
2022-02-12 11:14:58 +01:00
Gunnar Skjold
0c1d666afd
Improve graph calculation stability
2022-02-12 11:12:48 +01:00
Gunnar Skjold
18a38e4104
Some changes to source file header
2022-02-12 10:28:09 +01:00
Gunnar Skjold
ef0041caa6
Added paypal as funding option
2022-02-12 10:27:27 +01:00
Gunnar Skjold
1ce51f6c85
Added AGPLv3
2022-02-12 10:26:56 +01:00
Gunnar Skjold
c23b2a477e
Merge branch 'master' into dev-v2.1.0
2022-02-12 10:16:27 +01:00
Gunnar Skjold
0dd77dbaa8
Fixed styling for export graph
2022-02-12 10:09:03 +01:00
Gunnar Skjold
29524c2123
Reducing stack mem footprint
2022-02-10 10:35:57 +01:00
Gunnar Skjold
e2fb5e2673
Removed exception handling
2022-02-08 08:37:54 +01:00
Gunnar Skjold
751a0edca7
160mhz esp32 and some error handling in loop()
2022-02-07 21:18:27 +01:00
Gunnar Skjold
a8e62e086c
Divide current another decimal point for Kamstrup CT meters
2022-02-06 19:33:59 +01:00
Gunnar Skjold
35eb69bebb
Trying higher buffer for MQTT
2022-02-06 19:28:32 +01:00
Gunnar Skjold
5c7c0699b2
Added images
2022-02-06 11:29:19 +01:00
Gunnar Skjold
460482a6dc
Fixed voltage range for yellow ESP indicator
2022-02-06 11:28:56 +01:00
Gunnar Skjold
28db4873a0
Fixed label
2022-02-06 09:32:35 +01:00
Gunnar Skjold
98de734761
Added energy accounting to config file
2022-02-06 09:16:38 +01:00
Gunnar Skjold
b742c8f3c6
Human readable parity in config file
2022-02-05 21:52:13 +01:00
Gunnar Skjold
4cfd274e52
Upload configuration file
2022-02-05 21:44:28 +01:00
Gunnar Skjold
4f7bd0436a
Merge branch 'master' into dev-v2.1.0
2022-02-05 19:50:55 +01:00
Gunnar Skjold
7e31a60000
Support null values in the middle of the payload
2022-02-05 19:46:41 +01:00
Gunnar Skjold
793bc877fc
Support null values in the middle of the payload
2022-02-05 19:34:44 +01:00
Gunnar Skjold
5ab6de21dc
Added some documentation
2022-02-05 19:18:07 +01:00
Gunnar Skjold
7c5a5bcf65
Config file download
2022-02-05 19:17:38 +01:00
Gunnar Skjold
2e203d7713
Merge branch 'master' into dev-v2.1.0
2022-02-04 17:39:13 +01:00
Gunnar Skjold
db5e242ad8
Various changes
2022-02-04 17:36:30 +01:00
Gunnar Skjold
5be921a342
Various changes
2022-02-04 17:35:47 +01:00
Gunnar Skjold
ddd24b20aa
Started implementing loading config from FS
2022-01-30 20:53:03 +01:00
Gunnar Skjold
7c1ee20e7b
Commit hash as version
2022-01-30 11:10:30 +01:00
Gunnar Skjold
5f0adc0f10
Commit hash as version
2022-01-30 10:54:51 +01:00
Gunnar Skjold
244f78ad1a
Fixed bugs
2022-01-30 10:52:51 +01:00
Gunnar Skjold
9066af8dc7
Added list type 4 for power factor
2022-01-29 20:49:50 +01:00
Gunnar Skjold
5cfb58c2e6
Expose TX power adjustment
2022-01-29 20:34:35 +01:00
Gunnar Skjold
fb8d9e51a6
Option to send raw data frame to MQTT
2022-01-29 19:53:59 +01:00
Gunnar Skjold
77ce5d8e90
Energy accounting
2022-01-29 19:27:48 +01:00
Gunnar Skjold
8c69f9a738
Merge branch 'master' into dev-v2.1.0
2022-01-28 19:00:29 +01:00
Gunnar Skjold
dd87d70876
Free value on fuse size and production capacity
2022-01-28 18:29:50 +01:00
Gunnar Skjold
52992f09ee
Stability adjustments
2022-01-28 17:41:48 +01:00
Gunnar Skjold
e8a56d5fc7
Merge branch 'master' into dev-v2.1.0
2022-01-23 20:22:01 +01:00
Gunnar Skjold
6aa02d54c8
Improvements for ENTSO-E
2022-01-23 17:52:10 +01:00
Gunnar Skjold
9dbf9137c7
Merge branch 'master' of github.com:gskjold/AmsToMqttBridge
2022-01-21 17:57:35 +01:00
Gunnar Skjold
c0a9a01b41
Fixed uint problem with current
2022-01-21 17:57:01 +01:00
Gunnar Skjold
7b203b196f
Fixed voltage and current labels for esp8266
2022-01-21 17:50:02 +01:00
Gunnar Skjold
a72f02a779
First implementation of energy accounting
2022-01-21 17:37:23 +01:00
Gunnar Skjold
50c06e2cfe
Removed ap pin from generic ESP32
2022-01-16 19:38:35 +01:00
Gunnar Skjold
e4d4753181
Fixed incorrect labels for IT/TT current
2022-01-16 17:24:57 +01:00
Gunnar Skjold
04daf551fb
Fixed incorrect time diff for price fetch
2022-01-16 17:04:58 +01:00
Gunnar Skjold
4b51f0f235
Only update exchange rate once per day
2022-01-16 10:50:08 +01:00
Gunnar Skjold
5e4ccca663
Fetch prices between 13:30 and 14:00
2022-01-16 10:37:08 +01:00
Gunnar Skjold
6b0ec39759
Various updates
2022-01-16 09:58:13 +01:00
Gunnar Skjold
1f7d845a32
Removed debugging
2022-01-14 07:13:43 +01:00
Gunnar Skjold
6de5b719f3
Various changes
2022-01-14 07:12:08 +01:00
Daniel Ekman
f6d2bef285
reduce discovery code to single loop
2022-01-14 00:01:25 +01:00
Daniel Ekman
c444a108a5
Merge branch 'gskjold:master' into homeassistant
2022-01-13 22:50:25 +01:00
Gunnar Skjold
90859ee6b8
Cleanup
2022-01-09 20:47:33 +01:00
Gunnar Skjold
78dd856a97
Various changes
2022-01-09 20:45:25 +01:00
Gunnar Skjold
9897ccc563
Some adjustments for chrome dark mode
2022-01-08 11:19:18 +01:00
Gunnar Skjold
701e5904c5
Fixed build error on ESP8266
2022-01-08 10:39:03 +01:00
Gunnar Skjold
54ea17d345
Re-organized documents
2022-01-08 10:21:19 +01:00
Gunnar Skjold
327fed6f08
Month plot fix and some other things
2022-01-08 10:13:02 +01:00
Gunnar Skjold
8fe1a1edf2
Fixed checksum error for encrypted meters
2022-01-05 19:25:52 +01:00
Gunnar Skjold
6fd8dc0432
Fixed package timestamp for Kaifa
2022-01-03 13:52:04 +01:00
Gunnar Skjold
f586336ae3
Voltage calculation for Kaifa and other three phase meters not reporting voltage for L2
2022-01-03 09:46:53 +01:00
Gunnar Skjold
1527ee7d45
Timezone conversion for Kaifa
2022-01-03 09:05:04 +01:00
Gunnar Skjold
c543b38829
Timezone conversion for Kaifa
2022-01-03 09:00:19 +01:00
Gunnar Skjold
6d12d7120c
Increase accumulated values to 3 decimals
2022-01-03 08:41:58 +01:00
Gunnar Skjold
c1d4ba772e
Added extra char for string terminator to wifi config
2022-01-03 08:24:10 +01:00
Gunnar Skjold
a03d4113e7
Added checksum verification for Mbus payload
2022-01-03 08:23:49 +01:00
Gunnar Skjold
8751b6325d
Updated example ini
2021-12-28 17:30:19 +01:00
Gunnar Skjold
ff02dd43a9
Deleted internal Timezone lib
2021-12-27 14:15:06 +01:00
Gunnar Skjold
b772fb6323
Issue template config
2021-12-27 14:14:24 +01:00
Daniel Ekman
586c0cba25
include supply volt and temp
2021-12-23 17:34:28 +01:00
Daniel Ekman
18bc6753db
publish all disscovery params
2021-12-22 20:20:21 +01:00
Daniel Ekman
b79e6112b1
move energy to separate topic
2021-12-22 17:10:10 +01:00
Gunnar Skjold
f5acfce578
Fixed build error
2021-12-22 09:26:03 +01:00
Gunnar Skjold
4b902e2544
Added some defaults for NTP and DNS
2021-12-22 08:09:46 +01:00
Daniel Ekman
2e4e4328f2
first working discovery
2021-12-21 23:17:29 +01:00
Daniel Ekman
03089e92cb
basic stuff implemented
2021-12-21 20:40:17 +01:00
Daniel Ekman
86939d4890
topic contains all fields, null if not used
2021-12-21 15:56:09 +01:00
Daniel Ekman
d7d25083dc
flat data messages
2021-12-21 14:21:02 +01:00
Daniel Ekman
92e8beadc0
intial test with HA, copy of json
2021-12-21 13:07:07 +01:00
Gunnar Skjold
217247b28e
Temperature sensor graph sort
2021-12-19 10:23:18 +01:00
Gunnar Skjold
4828f5a727
Temperature graph
2021-12-19 09:57:51 +01:00
Gunnar Skjold
062a3634a9
Fixed entso-e debugging
2021-12-19 09:17:57 +01:00
Gunnar Skjold
376cd0cf90
Fixed NULL access
2021-12-19 09:15:06 +01:00
Gunnar Skjold
2a20893a58
Fixed real time calculation issues
2021-12-19 09:14:31 +01:00
Gunnar Skjold
f3dba112de
Merge branch 'master' of github.com:gskjold/AmsToMqttBridge
2021-12-18 18:30:22 +01:00
Gunnar Skjold
b037d6bb64
Try at least twice before showing ESP as red
2021-12-18 18:25:31 +01:00
Gunnar Skjold
6f7eacddff
Trying to get ESP32S2 to work
2021-12-18 18:24:58 +01:00
Gunnar Skjold
4185411315
Merge pull request #169 from kng/master
...
Change time.h to timelib.h for 32bit to compile
2021-12-18 17:21:19 +01:00
Daniel Ekman
2a1b5a5f6d
Change time.h to timelib.h for 32bit to compile
2021-12-18 17:10:53 +01:00
Gunnar Skjold
246a4f96fe
Merge pull request #168 from kng/master
...
Assignment error in meter types
2021-12-18 15:43:09 +01:00
Daniel Ekman
c7d235b367
Assignment error in meter types
2021-12-18 15:37:30 +01:00
Gunnar Skjold
c5c8fbc2a0
Trying timezone from repo again
2021-12-18 15:25:06 +01:00
Gunnar Skjold
8adf591c4e
Fixed timelib
2021-12-18 15:20:15 +01:00
Gunnar Skjold
aa893f7ede
Fixed bug in price fetch
2021-12-18 15:17:34 +01:00
Gunnar Skjold
f8b1725e94
Revert lib changes
2021-12-18 14:41:58 +01:00
Gunnar Skjold
ae7e3d11d5
Merge branch 'master' of github.com:gskjold/AmsToMqttBridge
2021-12-18 14:33:59 +01:00
Gunnar Skjold
73b20a0766
Merge pull request #167 from kng/master
...
Libdeps updated to avoid conflict with time.h
2021-12-18 14:29:58 +01:00
Daniel Ekman
d8cf961258
Libdeps updated to avoid conflict with time.h
2021-12-18 13:55:57 +01:00
Gunnar Skjold
bccd19812d
Added power factor to MQTT JSON
2021-12-16 11:37:00 +01:00
Gunnar Skjold
6954ff5432
Merge pull request #163 from mikkle/pf-mqtt-cp-fix
...
Fix c/p error in mqtt powerfactor publishing
2021-12-16 11:26:01 +01:00
Mikkel Troest
6200f31b83
Fix c/p error in mqtt powerfactor publishing
2021-12-16 10:36:38 +01:00
Gunnar Skjold
5408b3c2a9
Make sure temperatures are read just after receiving HAN data
2021-12-13 20:57:17 +01:00
Gunnar Skjold
bd0b3ebb26
Removed debugging
2021-12-12 10:38:40 +01:00
Gunnar Skjold
895a9bc6b1
Fixed api key overwrite
2021-12-12 10:36:50 +01:00
Gunnar Skjold
ff935fc920
Specify that prices only work for ESP32
2021-12-12 08:36:23 +01:00
Gunnar Skjold
3833421e5f
Fixed "new version" announcement
2021-12-10 19:09:24 +01:00
Gunnar Skjold
ebdc357a47
Check for scaling and use if available
2021-12-10 18:46:57 +01:00
Gunnar Skjold
7da617e8c2
Merge pull request #154 from gskjold/dev-1.6.0
...
v2.0
2021-12-10 08:52:10 +01:00
Gunnar Skjold
0b86761d2c
Fixed a couple of things before release
2021-12-10 08:38:48 +01:00
Gunnar Skjold
d697f7e37f
Final changes before 2.0
2021-12-10 08:19:48 +01:00
Gunnar Skjold
db859e3ff5
Fixed readme
2021-12-08 21:06:52 +01:00
Gunnar Skjold
94d22957bd
Removed old screenshot
2021-12-08 21:06:00 +01:00
Gunnar Skjold
1ebaf443cc
Updated readme
2021-12-08 21:05:42 +01:00
Gunnar Skjold
a336f711b0
Fixed day graph
2021-12-08 20:35:53 +01:00
Gunnar Skjold
e6d3b47d4f
Some adjustment to data storage
2021-12-07 19:34:34 +01:00
Gunnar Skjold
eb479f8216
More adaptations for Austian meters
2021-12-07 19:07:43 +01:00
Gunnar Skjold
38cba4e8da
Various fixes
2021-12-06 19:33:40 +01:00
Gunnar Skjold
bc6d45ecf2
Fixed WiFi instability?
2021-12-06 16:58:55 +01:00
Gunnar Skjold
097131d7fb
Some changes
2021-12-06 10:47:42 +01:00
Gunnar Skjold
2107ca50e4
More changes for Austrian meters, untested
2021-12-06 10:47:08 +01:00
Gunnar Skjold
178f603937
Fix
2021-12-05 20:14:46 +01:00
Gunnar Skjold
21687368c6
Preparing for austrian meters
2021-12-05 20:09:34 +01:00
Gunnar Skjold
6054e900e6
Experimenting
2021-12-05 13:08:34 +01:00
Gunnar Skjold
3da5275624
Fixed merge problem
2021-12-05 12:21:21 +01:00
Gunnar Skjold
3fda2cfe7a
Removed test code
2021-12-05 12:16:13 +01:00
Gunnar Skjold
2bb651f95c
Merge branch 'master' into dev-1.6.0
2021-12-05 12:15:39 +01:00
Gunnar Skjold
e2442a26ee
Trying to figure out esp8266 wifi reconnect
2021-12-05 12:07:34 +01:00
Gunnar Skjold
cbd2ab4a7a
Trying to figure out esp8266 wifi reconnect
2021-12-05 12:07:20 +01:00
Gunnar Skjold
76f8e2c343
2.0 development
2021-12-04 15:41:13 +01:00
Gunnar Skjold
ab101c8622
Some changes after testing
2021-11-30 08:01:20 +01:00
Gunnar Skjold
f425abb52d
Added missing file from last commit
2021-11-27 20:29:18 +01:00
Gunnar Skjold
dc5bfff655
Merge branch 'master' into dev-1.6.0
2021-11-27 20:23:35 +01:00
Gunnar Skjold
eb59245118
Added usage plots and ADC reading for Vcc
2021-11-27 20:16:26 +01:00
Gunnar Skjold
d18fd27a24
Fixed accumulated values from Kaifa 1p
2021-11-23 20:55:55 +01:00
Gunnar Skjold
6f09f523e4
Added possibility to upgrade from GUI if there is enough RAM for SSL
2021-11-18 20:42:13 +01:00
Gunnar Skjold
e78d59c31a
Different menu for ESP8266 and ESP32
2021-11-18 20:28:29 +01:00
Gunnar Skjold
e7f3217d7b
Added support for power factor
2021-11-18 20:20:51 +01:00
Gunnar Skjold
ab534ce60a
Ignore firmware update if AP button is pressed
2021-11-18 19:43:48 +01:00
Gunnar Skjold
933246eae8
Changed from SPIFFS to LittleFS
2021-11-18 19:40:20 +01:00
Gunnar Skjold
5c38d1cf3e
Fixes after testing
2021-11-18 19:06:33 +01:00
Gunnar Skjold
580085f717
Fixed kamstrup list version
2021-11-17 21:47:00 +01:00
Gunnar Skjold
9831d4aa78
Removed buffer size
2021-11-17 21:46:37 +01:00
Gunnar Skjold
a3561d5c58
Fixed free mem formatting bug
2021-11-17 20:50:30 +01:00
Gunnar Skjold
2a524cd0ac
Fixed Kamstrup bug
2021-11-17 20:42:45 +01:00
Gunnar Skjold
254e010594
Fixed save crash
2021-11-16 20:40:21 +01:00
Gunnar Skjold
24025d6785
Added support for IEC62056-21
2021-11-16 20:07:47 +01:00
Gunnar Skjold
4c92e592d6
Added support for uart_swap for ESP8266
2021-11-08 12:05:48 +01:00
Gunnar Skjold
f192ddae81
Some changes while testing
2021-11-06 21:02:38 +01:00
Gunnar Skjold
1cd2446365
Some modifications to support timestamp from all meters
2021-11-06 19:44:50 +01:00
Gunnar Skjold
6d26102b8e
New meter config
2021-11-06 19:30:58 +01:00
Gunnar Skjold
8e9da8f255
First step in implementing a new DLMS parser
2021-11-06 16:56:02 +01:00
Gunnar Skjold
72bdb6e363
Update issue templates
2021-11-01 07:14:54 +01:00
Gunnar Skjold
6df942f488
Revert time version update
2021-10-31 09:37:58 +01:00
Gunnar Skjold
1e323ac3b9
Various changes for version updates and some debugging for upload
2021-10-31 09:33:25 +01:00
Gunnar Skjold
05bdbaf1f5
Fixed error
2021-10-30 18:42:59 +02:00
Gunnar Skjold
6cca25788e
Fixed copy/paste error
2021-10-23 10:45:57 +02:00
Gunnar Skjold
e929f87ea9
Fixed decimals in json
2021-10-23 10:38:53 +02:00
Gunnar Skjold
21a4102553
Changes for correct time conversion
2021-10-23 10:05:14 +02:00
Gunnar Skjold
768645fc0a
Added more decimals in data.json
2021-10-23 10:04:52 +02:00
Gunnar Skjold
c670549dea
Warning for BUS powered devices on firmware upgrade
2021-10-23 09:21:53 +02:00
Gunnar Skjold
147b2ca33e
Fixed build error
2021-10-23 09:07:07 +02:00
Gunnar Skjold
c645b82ed3
Fixed voltage and amp meters
2021-10-23 09:04:00 +02:00
Gunnar Skjold
26bb8a0fea
Support two phase power calculation
2021-10-23 08:59:16 +02:00
Gunnar Skjold
507ed13770
Added GPIO designation to UART in dropdown
2021-10-23 08:40:40 +02:00
Gunnar Skjold
a0f53a0c52
Partial fix of dead gauges
2021-10-21 21:17:03 +02:00
Gunnar Skjold
13bbc81b7f
Clear debug config on setup if not already set
2021-09-23 20:56:24 +02:00
Gunnar Skjold
7412ba2697
Removed temp sensor update if no sensors were found
2021-09-23 20:30:22 +02:00
Gunnar Skjold
dce7b7e64b
Support for long MQTT username and password
2021-09-23 19:28:55 +02:00
Gunnar Skjold
7627d6c369
Updated readme
2021-09-23 18:48:58 +02:00
Gunnar Skjold
9fc9adea1c
Fixed crash when enabling substitute values in meter config
2021-09-23 18:30:15 +02:00
Gunnar Skjold
46df07fe40
Fixed build error on ESP32
2021-09-23 18:20:54 +02:00
Gunnar Skjold
0aeb5555e7
Fixed long web passwords
2021-09-23 18:10:16 +02:00
Gunnar Skjold
181fe3c909
Removed meter from setup
2021-09-23 17:36:43 +02:00
Gunnar Skjold
867d6a4ef8
Added profiles for Pow board
2021-09-23 17:34:21 +02:00
Gunnar Skjold
d52216a73e
Moved hardware page to Wiki
2021-09-23 17:28:51 +02:00
Gunnar Skjold
d70b41a454
Added images for Pow
2021-09-23 17:25:52 +02:00
Gunnar Skjold
332c366561
Renamed kamstrup meters
2021-09-22 11:44:59 +02:00
Gunnar Skjold
b572ad97f8
Added Kamstrup document
2021-09-22 11:42:22 +02:00
Gunnar Skjold
aa307f8690
Fixed incorrect value for accumulated export
2021-09-22 11:40:48 +02:00
Gunnar Skjold
19223312b5
Fixed danish KAmstrup
2021-09-13 10:14:47 +02:00
Gunnar Skjold
74bc5aa7a0
Fixed build
2021-09-13 10:14:28 +02:00
Gunnar Skjold
e66e8a96ff
Added some frames as documentation
2021-09-13 08:10:39 +02:00
Gunnar Skjold
ce95360a64
Minor fix
2021-09-13 08:08:39 +02:00
Gunnar Skjold
7802aeaab1
Removed unnecessary config for arduinojson
2021-09-13 08:07:38 +02:00
Gunnar Skjold
37ce3566bf
Fixed config clear
2021-09-13 08:07:03 +02:00
Gunnar Skjold
606bac100a
Cleanup
2021-03-24 09:37:46 +01:00
Gunnar Skjold
be569d1802
Fixed buffer for JSON generation
2021-03-17 20:36:40 +01:00
Gunnar Skjold
3e21105b2d
Fixed prices in JSON handler
2021-03-17 20:33:11 +01:00
Gunnar Skjold
9946827431
Fixed cheapest price calculation
2021-03-17 20:17:36 +01:00
Gunnar Skjold
90d03ca77f
Retain flag for prices
2021-03-16 11:44:01 +01:00
Gunnar Skjold
7727b17122
Fixed publishing of prices
2021-03-16 11:02:59 +01:00
Gunnar Skjold
fbc4c8c502
Merge pull request #101 from gskjold/dev-v1.5.0
...
Dev v1.5.0
2021-03-10 19:22:23 +01:00
Gunnar Skjold
5d6a4ea0a4
Updated readme
2021-03-10 19:15:00 +01:00
Gunnar Skjold
91ce486bde
Updated readme
2021-03-10 19:14:22 +01:00
Gunnar Skjold
523139749e
Auto install minifier
2021-03-10 19:14:12 +01:00
Gunnar Skjold
5b9f3b7aed
Minor changes after testing
2021-03-10 18:33:45 +01:00
Gunnar Skjold
af76243761
Retain flag for accumulated values
2021-03-10 17:45:16 +01:00
Gunnar Skjold
605dc4901c
Fixed incorrect check for 32/35 A main fuse
2021-03-10 17:45:02 +01:00
Gunnar Skjold
54fb950513
Changes after testing
2021-01-22 08:01:23 +01:00
Gunnar Skjold
ff84278edf
Some changes after testing
2021-01-20 07:41:09 +01:00
Gunnar Skjold
f15cf5d75e
Some changes after testing
2021-01-18 20:32:51 +01:00
Gunnar Skjold
33070af111
Refactored MQTT payload handling into separate classes
2021-01-17 20:11:04 +01:00
Gunnar Skjold
53573184f3
Simplified temperature.json
2021-01-17 15:53:56 +01:00
Gunnar Skjold
decc4788a7
Simplified code that generates data.json
2021-01-17 15:08:01 +01:00
Gunnar Skjold
f9597c786e
Changed to BearSSL for meter decryption on ESP8266 + some minor changes
2021-01-17 12:34:57 +01:00
Gunnar Skjold
af8f5a7c24
Memory optimization and bugfix
2021-01-16 16:02:39 +01:00
Gunnar Skjold
a830a52863
Stripped HTML to improve stability
2021-01-14 20:03:49 +01:00
Gunnar Skjold
037bac24de
Changes in user interface
2021-01-14 16:19:00 +01:00
Gunnar Skjold
837c3cf802
Taking timezone into account when calculating midnight
2021-01-11 20:21:36 +01:00
Gunnar Skjold
75956c087c
Closing http connections after receiving data
2021-01-11 09:49:25 +01:00
Gunnar Skjold
88528b4099
Added reboot and cleaned up a bit in UI
2021-01-10 22:30:55 +01:00
Gunnar Skjold
6176d34e84
Link to documentation
2021-01-10 22:03:02 +01:00
Gunnar Skjold
f2dda26bbb
Added support for retrieving energy price from ENTSO-E API
2021-01-10 20:54:25 +01:00
Gunnar Skjold
402ecf67d7
Merge branch 'master' into dev-v1.5.0
2021-01-09 11:25:31 +01:00
Gunnar Skjold
a83a6c1c53
Fixed release
2021-01-09 11:21:01 +01:00
Gunnar Skjold
5beb13894c
Initial implementation of supporting timezone in timestamp
2021-01-09 11:11:49 +01:00
Gunnar Skjold
c3fa618ab2
Fixed build problem
2021-01-09 09:50:20 +01:00
Gunnar Skjold
7713ae8566
Trying to fix GitHub Actions build issue
2021-01-09 09:36:20 +01:00
Gunnar Skjold
7ae860ec72
Fixed incorrect reading of analog temperature
2021-01-09 09:33:09 +01:00
Gunnar Skjold
376008a735
Merge pull request #96 from kallemooo/fixFromHex
...
Changed fromHex() to use an supplied buffer
2021-01-04 09:58:32 +01:00
Karl Thorén
feed10184b
Changed fromHex() to use an supplied buffer
...
Solves the problem with returning a pointer to local variable.
Signed-off-by: Karl Thorén <karl.h.thoren@gmail.com >
2020-12-27 16:29:53 +01:00
Gunnar Skjold
59ca29f6a8
Update README.md
2020-09-25 06:46:16 +02:00
Gunnar Skjold
644a3fa40b
Fixed factory reset
2020-09-05 20:03:06 +02:00
Gunnar Skjold
a2c1c8fc61
Updated ESP32 flash procedure
2020-09-05 19:27:36 +02:00
Gunnar Skjold
b823f029ea
Updated readme
2020-09-05 19:12:59 +02:00
Gunnar Skjold
fd907deec1
Merge pull request #87 from gskjold/dev-v1.4.0
...
Dev v1.4.0
2020-09-05 19:05:01 +02:00
Gunnar Skjold
c1b56e25ad
Minor changes
2020-09-05 18:59:52 +02:00
Gunnar Skjold
5491088cec
Cleared out some unnecessary files from mbedtls lib
2020-09-05 11:14:00 +02:00
Gunnar Skjold
04271accc1
Dynamic temperature page
2020-09-05 11:10:36 +02:00
Gunnar Skjold
a332e38b97
Some cleanup
2020-09-05 09:40:07 +02:00
Gunnar Skjold
17bd85ebd0
Added more debugging code. Also some changes after testing
2020-09-04 07:25:11 +02:00
Gunnar Skjold
4207216770
Some changes for mbedtls when building ESP32
2020-08-28 21:20:11 +02:00
Gunnar Skjold
02491e074b
Added comment
2020-08-28 20:33:46 +02:00
Gunnar Skjold
e79a0585f0
Some changes during testing
2020-08-28 19:58:33 +02:00
Gunnar Skjold
859220d33f
Added missing getter
2020-08-28 17:55:07 +02:00
Gunnar Skjold
5d47105951
Added support for TMP236 analog temp sensor
2020-08-28 17:46:34 +02:00
Gunnar Skjold
e71f937856
Some changes during testing
2020-08-06 13:11:31 +02:00
Gunnar Skjold
d730aac33b
Send temperature updates to MQTT
2020-08-05 20:33:49 +02:00
Gunnar Skjold
e121ec75d8
Support multiple temperature sensors
2020-08-05 19:55:16 +02:00
Gunnar Skjold
6479fd6a63
Splitted system config into Web, NTP, GPIO and Debugging
2020-08-05 13:45:10 +02:00
Gunnar Skjold
603f2925ce
Removing mbedtls code in HanReader lib
2020-07-31 11:25:45 +02:00
Gunnar Skjold
1284f3f848
Using internal mbedtls lib for encrypted meters. Next up, find out how to modify config.h when using external lib.
2020-07-31 11:19:23 +02:00
Gunnar Skjold
620e355a27
Support encrypted meters and added vcc offset
2020-07-31 10:15:11 +02:00
Gunnar Skjold
47ddf57547
Merge branch 'master' into dev-v1.4.0
2020-07-26 11:24:43 +02:00
Gunnar Skjold
fcbfe4d96f
Changes to make substituted I2 correct when exporting power
2020-07-25 09:17:39 +02:00
Gunnar Skjold
d789d6ff3b
Reduced number of build targets
2020-07-25 09:15:05 +02:00
Gunnar Skjold
b4f18de030
Made base64 work for both platforms
2020-07-25 08:48:51 +02:00
Gunnar Skjold
00d5d215cd
Switched to internal base64
2020-07-25 08:45:31 +02:00
Gunnar Skjold
8de5a58a6b
Changed dependency for Base64
2020-07-06 19:17:45 +02:00
Gunnar Skjold
012794e682
Make web content minifier optional
2020-07-06 19:14:37 +02:00
Gunnar Skjold
38eb2d8c19
Merge pull request #79 from gskjold/dev-v1.3.0
...
Dev v1.3.0
2020-06-06 20:30:47 +02:00
Gunnar Skjold
d95137adbc
Support for Kamstrup IT meters
2020-05-28 18:44:38 +02:00
Gunnar Skjold
cde3f80fca
Ensure that GPIO is correctly set after setup
2020-05-28 14:19:03 +02:00
Gunnar Skjold
cdc012743f
Changes for building on GitHub actions for all branches
2020-05-27 08:38:59 +02:00
Gunnar Skjold
23c90315a5
Some changes before public testing
2020-05-24 17:14:16 +02:00
Gunnar Skjold
8d938f111c
Fixed mDNS
2020-05-24 16:30:51 +02:00
Gunnar Skjold
cff6c02d57
Some cleanup and changes. Trying to get self-update to work, no luck
2020-05-22 22:26:31 +02:00
Gunnar Skjold
0c92f7401c
Removed unused code
2020-05-22 17:24:17 +02:00
Gunnar Skjold
195a0d4e77
Merge branch 'dev-v1.3.0' of github.com:gskjold/AmsToMqttBridge into dev-v1.3.0
2020-05-22 17:23:41 +02:00
Gunnar Skjold
43f50e0e0a
Check for updates from GitHub and minor changes during testing
2020-05-22 17:23:38 +02:00
Gunnar Skjold
f2f20afd9c
Merge pull request #76 from atlej68/dev-1.3.0-test
...
dev-1.3.0-testing: Timezone for esp32 and minor domoticz fix.
2020-05-22 17:22:54 +02:00
Atle Johansen
f22cfbb223
Domoticz: make config save values, cleanup.
2020-05-16 18:39:23 +02:00
Atle Johansen
803c5116bd
alt. to Tz.h for esp32 (Tz.h not avail. for esp32)
2020-05-16 17:04:28 +02:00
Gunnar Skjold
a542fbc931
Yellow flash for AP mode if RGB LED is configured
2020-05-16 10:20:27 +02:00
Gunnar Skjold
85a70016fa
Checking for new version on GitHub
2020-05-14 21:13:13 +02:00
Gunnar Skjold
778daf8645
Fixed som HTML and JS problems. Removed external NTP library and using espressif internal NTP client instead
2020-05-10 12:29:00 +02:00
Gunnar Skjold
efa99f970c
Factory reset and splitted HTML into head, content and footer files to reduce memory footprint while parsing HTML templates
2020-05-10 11:51:00 +02:00
Gunnar Skjold
953f2d4110
Some modifications to increase stability
2020-05-08 22:58:16 +02:00
Gunnar Skjold
c3c0ca0a1b
Added option to substitute missing I2 for Aidon IT meters. Also cleaned up some more UI
2020-05-04 16:07:23 +02:00
Gunnar Skjold
dc83853d2e
Fixed some GPIO and Vcc configuration issues
2020-05-03 21:27:19 +02:00
Gunnar Skjold
f5123e9aa1
UI cleanup and added devkit board to initial setup
2020-05-03 21:01:58 +02:00
Gunnar Skjold
2da69dd451
Merge branch 'dev-v1.3.0' of github.com:gskjold/AmsToMqttBridge into dev-v1.3.0
2020-05-03 16:49:28 +02:00
Gunnar Skjold
2858123c1b
Added configuration of GPIO in UI. Added initial setup page in AP mode. Major changes in storing configuration.
2020-05-03 16:29:38 +02:00
Gunnar Skjold
9d4488f8df
Merge pull request #70 from atlej68/add_domoticz
...
Add domoticz
2020-05-03 16:28:05 +02:00
Gunnar Skjold
f78c8e3582
Merge pull request #69 from atlej68/add_devkit
...
Add devkit boards
2020-05-03 16:27:45 +02:00
Atle Johansen
431d6714b5
fix typo
2020-05-01 15:46:16 +02:00
Atle Johansen
550a3c1a0b
reverse local change
2020-05-01 15:24:17 +02:00
Atle Johansen
b6f5e72638
merge with 1..3.0 and implementation of comments
2020-05-01 15:22:39 +02:00
Atle Johansen
958ff37d7d
Merge remote-tracking branch 'upstream/dev-v1.3.0' into add_domoticz
2020-05-01 14:21:55 +02:00
Gunnar Skjold
1ea9da22c7
Merge pull request #68 from stenjo/feature/fullreport
...
Implementation of MQTT RAW full format
2020-05-01 12:16:06 +02:00
Gunnar Skjold
0c93c52e3d
Implemented support for MQTT SSL and cleaned up necessary code
2020-05-01 12:10:08 +02:00
Atle Johansen
41784511e9
Add config for direct MQTT messages to Domoticz
2020-04-30 18:56:21 +02:00
Atle Johansen
a78fdc0b59
Add devkit boards
2020-04-30 18:28:12 +02:00
Gunnar Skjold
cc032fdf29
Implemented upload of certificates for MQTT SSL
2020-04-29 21:04:42 +02:00
Sten Otto Johnsen
f696e0b59b
Removed checksum change
2020-04-24 12:15:25 +02:00
Sten Otto Johnsen
f67f12a188
Adding full report on raw data
2020-04-24 00:05:12 +02:00
Gunnar Skjold
719ed56e21
Merge pull request #66 from gskjold/dev-v1.2.3
...
Dev v1.2.3
2020-04-19 20:23:05 +02:00
Gunnar Skjold
cc72d0e0b3
Uncommited changes
2020-04-18 19:18:39 +02:00
Gunnar Skjold
ab175ec9ec
Added correct conversion for int8, int16 and uint32
2020-04-18 11:04:43 +02:00
Gunnar Skjold
398407350c
Fixed typ-o in MQTT topic for temperature and moved voltage bootup check into compiler option SELF_POWERED
2020-04-10 08:52:56 +02:00
Gunnar Skjold
5e33a15e85
Fixed build file
2020-04-09 08:58:56 +02:00
Gunnar Skjold
7f51534e91
Fixed page title on reboot page
2020-04-09 08:56:50 +02:00
Gunnar Skjold
0f5af6b274
Fixed ESP32 crash with RemoteDebug and unformatted SPIFFS. Added battery voltage for Lolin D32 and moved ESP_VCC_CALIB_FACTOR to cover all boards
2020-04-09 08:44:25 +02:00
Gunnar Skjold
7886ce668e
Fixed build file?
2020-04-07 21:16:31 +02:00
Gunnar Skjold
0f4848c872
Added missing dep
2020-04-07 20:56:49 +02:00
Gunnar Skjold
6911d203ca
Merge pull request #56 from gskjold/dev-v1.2
...
Version 1.2
2020-04-07 20:53:39 +02:00
Gunnar Skjold
e96b5bbf1b
Changes during testing
2020-03-30 21:14:58 +02:00
Gunnar Skjold
8457db50f6
Merge branch 'master' into dev-v1.2
2020-03-30 20:12:13 +02:00
Gunnar Skjold
279c5f8321
Fixed actions script
2020-03-30 07:28:02 +02:00
Gunnar Skjold
889b9153fa
Increased limit for ArduinoJson positive exponentiation
2020-03-30 07:05:34 +02:00
Gunnar Skjold
0de1d0bb6f
Changed accumulated values for Kaifa
2020-03-30 07:02:42 +02:00
Gunnar Skjold
bf13965a9e
Various changes during testing
2020-03-26 20:55:23 +01:00
Gunnar Skjold
7b52efd332
Fix missing release version on files
2020-03-25 20:37:15 +01:00
Gunnar Skjold
c936f605d6
Fixes #45
2020-03-25 20:21:39 +01:00
Gunnar Skjold
9d0ceb9ca8
Fixes problem with release
2020-03-25 20:07:23 +01:00
Gunnar Skjold
b33273e3cc
Fixes #47
2020-03-25 20:06:42 +01:00
Gunnar Skjold
d9b45d037b
Some changes during testing
2020-03-24 21:19:09 +01:00
Gunnar Skjold
8c75a9530e
Default config for ESP32
2020-03-24 20:26:13 +01:00
Gunnar Skjold
73d00f786a
Added remote debugging
2020-03-24 20:17:44 +01:00
Gunnar Skjold
ab016fff93
Merge pull request #54 from Allram/master
...
Increased MQTT buffer to work with Aidon 6525 meters
2020-03-24 20:11:00 +01:00
Vegard Fladby
a215aa7766
Increased MQTT buffer to work with Aidon 6525 meters
2020-03-24 19:49:40 +01:00
Gunnar Skjold
d747c84a14
Added DNS to static IP config. Added hostname to config. Added mDNS
2020-03-22 15:08:17 +01:00
Gunnar Skjold
26634f96b0
Added firmware upload from UI
2020-03-22 11:54:27 +01:00
Gunnar Skjold
97669cf4ad
When using raw payload with MQTT, only update if changed
2020-03-10 18:57:25 +01:00
Gunnar Skjold
e12980db11
Added option to send data as raw values to MQTT
2020-03-10 18:43:18 +01:00
Gunnar Skjold
732639814b
Reduce resolution of "up" in JSON from millis to seconds
2020-03-10 17:46:18 +01:00
Gunnar Skjold
c07c2e66d6
Fixed uptime rollover in UI
2020-03-08 19:47:47 +01:00
Gunnar Skjold
9b70802450
Fixed conversion of date and time from meter to account for CET/CEST
2020-03-08 18:37:10 +01:00
Gunnar Skjold
30d73c3a6e
Updated documentation
2020-03-01 13:24:06 +01:00
Gunnar Skjold
bd905c3595
Merge pull request #44 from gskjold/dev-v1.1.0
...
Dev v1.1.0
2020-03-01 12:56:12 +01:00
Gunnar Skjold
1a2e70b1fb
Merge pull request #42 from ArnieO/dev-v1.1.0
...
Dev v1.1.0 Optional ESP8266 Vcc calibration factor in *.ini file
2020-03-01 12:53:56 +01:00
Gunnar Skjold
d6da7b2715
Merge branch 'dev-v1.1.0' of github.com:gskjold/AmsToMqttBridge into dev-v1.1.0
2020-03-01 09:41:18 +01:00
Gunnar Skjold
059a430f9a
Fixed problem with AP mode with INVALID_BUTTON_PIN set
2020-03-01 09:39:58 +01:00
Gunnar Skjold
8ade50c2a6
Initialize all meter data to 0. Removed calculations for i2
2020-02-26 09:06:29 +01:00
Gunnar Skjold
5b94d8ff61
Added calculated value for L2 current when missing from Aidon
2020-02-25 14:08:04 +01:00
ArnieO
232b9c279d
Optional Vcc calibration factor defined in *.ino
2020-02-24 20:05:34 +01:00
ArnieO
9b6a6af6ec
Merge remote-tracking branch 'upstream/dev-v1.1.0' into dev-v1.1.0
2020-02-24 13:32:26 +01:00
Gunnar Skjold
9671e1eba3
Fixed bug where UI showed stalled HAN when exporting power. Also, maybe fixed issue with Vcc precision in UI?
2020-02-24 12:01:51 +01:00
Gunnar Skjold
78e531a7e9
Changed term for production and consumption when local production is defined
2020-02-24 07:47:39 +01:00
Gunnar Skjold
478d63505d
Allow compiling when RGB is not defined
2020-02-24 07:47:12 +01:00
Gunnar Skjold
d8dfaaa730
Version hardening
2020-02-24 07:46:48 +01:00
Gunnar Skjold
f311b70b37
Merge branch 'master' into dev-v1.1.0
2020-02-24 07:17:48 +01:00
Gunnar Skjold
52bc2b14c9
Some changes after testing
2020-02-23 20:31:10 +01:00
ArnieO
2ddfc16d6a
Updated comment for rgbled() function
2020-02-23 17:12:26 +01:00
Gunnar Skjold
51ab4a7f07
Reducing precision on temperature and vcc in json to reduce length
2020-02-23 11:34:25 +01:00
Gunnar Skjold
e90a30bfde
Implemented blinking for red LED on error
2020-02-22 17:23:56 +01:00
Gunnar Skjold
a63e6962d3
Merge pull request #38 from ArnieO/dev-v1.1.0
...
Added code for optional RGB LED
2020-02-22 16:42:19 +01:00
Gunnar Skjold
951ccf7de5
Merge branch 'dev-v1.1.0' into dev-v1.1.0
2020-02-22 16:42:04 +01:00
Gunnar Skjold
001e3376df
Merge pull request #39 from gskjold/dev-v1.1.0-mqttraw
...
Merged code preparations for other MQTT payload formats
2020-02-22 16:37:29 +01:00
Gunnar Skjold
9e4bf93f0a
Some changes to reduce dlms read errors
2020-02-22 12:29:04 +01:00
ArnieO
e5ac823f69
Changed mqtt buffer to 384, JSON buffer to <512>
2020-02-21 23:29:01 +01:00
Gunnar Skjold
73fd228e2f
Merge branch 'dev-v1.1.0' into dev-v1.1.0-mqttraw
2020-02-21 20:58:17 +01:00
Gunnar Skjold
fdac8f88af
Minor optimization
2020-02-21 20:52:55 +01:00
Gunnar Skjold
9c8552869c
Preparations for selectable MQTT payload format
2020-02-21 20:51:55 +01:00
ArnieO
be75b013c0
Added code for RGB LED
2020-02-21 19:13:44 +01:00
ArnieO
79274e490d
Added code for RGB LED
2020-02-21 18:53:05 +01:00
ArnieO
47293eebe4
Added code for RGB LED
2020-02-21 18:38:28 +01:00
Gunnar Skjold
90b62638ed
Dependency hardening
2020-02-20 20:36:12 +01:00
Gunnar Skjold
78e766156d
Minimizing calls to web server
2020-02-18 21:33:41 +01:00
Gunnar Skjold
4b32af69a7
Fixed typo
2020-02-18 07:37:42 +01:00
Gunnar Skjold
916b5550d9
Fixed typo
2020-02-18 07:25:10 +01:00
Gunnar Skjold
48016240f9
Some cleanup after testing with ESP32
2020-02-17 20:06:52 +01:00
Gunnar Skjold
518b408205
Minor changes to fix build
2020-02-17 17:23:18 +01:00
Gunnar Skjold
73a0359597
Minor changes to fix build
2020-02-17 17:21:34 +01:00
Gunnar Skjold
bbe82f9cdc
Added a small delay that helped smooth the voltage on a HAN powered device. No more sudden reboots
2020-02-16 21:45:58 +01:00
Gunnar Skjold
4786735d4c
Support older config versions. Fixed css for AP mode. Some cleanup and changes to preserve power
2020-02-16 20:09:29 +01:00
Gunnar Skjold
227eb7b6ff
Now using external base64 lib. Also updated some previously commited errors
2020-02-16 16:03:01 +01:00
Gunnar Skjold
00edd94033
Fixed some bugs from late night coding
2020-02-16 15:46:01 +01:00
Gunnar Skjold
ccd818e1ab
Merge branch 'master' into dev-v1.1.0
2020-02-16 15:28:47 +01:00
Gunnar Skjold
fc42fb22d8
Merge pull request #33 from gskjold/dev-v1.0.1
...
Dev v1.0.1
2020-02-16 14:49:36 +01:00
Gunnar Skjold
f6066fbbf3
Cleanup and fix bugs found during testing
2020-02-15 22:13:04 +01:00
Gunnar Skjold
9c09740a41
Production graph and fixed vcc value
2020-02-15 21:04:18 +01:00
Gunnar Skjold
4e24e2949a
Updated featheresp32 config to use Serial2 for Mbus
2020-02-15 18:01:10 +01:00
Gunnar Skjold
eff00f1fe0
Only show temp if sensor is attached. Added common functions to get temp and vcc
2020-02-14 21:48:03 +01:00
Gunnar Skjold
f484f3eb0e
Merge branch 'dev-v1.0.1' into dev-v1.1.0
2020-02-14 20:19:15 +01:00
Gunnar Skjold
b2174dd521
If debug mode and HW_ROARFRED, use software serial to set upp RX for HAN with 2400 and TX for debugging with 115200
2020-02-14 20:14:30 +01:00
Gunnar Skjold
fe79a96827
Added change to allow auto modem sleep
2020-02-14 19:52:15 +01:00
Gunnar Skjold
517a40b0a6
Finalized new configuration menu and moved AP button trigger from setup to loop
2020-02-14 19:49:25 +01:00
Gunnar Skjold
75f3c8c592
Merge branch 'dev-v1.0.1' into dev-v1.1.0
2020-02-14 16:07:54 +01:00
Gunnar Skjold
554cc7c023
Added date and time from meter as rtc in json
2020-02-14 16:03:52 +01:00
Gunnar Skjold
6d0c722c98
Using kwh and kvarh as standard for accumulated numbers from kamstrup
2020-02-14 12:25:40 +01:00
Gunnar Skjold
d2f93c07bd
Not sure if this does anything, but increased json and mqtt limits to see if Kamstrup list 3 is received
2020-02-13 20:50:13 +01:00
Gunnar Skjold
d63516fd49
Deleted autosave
2020-02-13 20:41:08 +01:00
Gunnar Skjold
c114b777c7
Minor changes to UI
2020-02-13 20:40:33 +01:00
Gunnar Skjold
a06729b535
Bugfix for previous commit
2020-02-12 20:11:55 +01:00
Gunnar Skjold
0ea21991ea
Continued work with v1.1.0
...
- Merge branch 'low_power' into dev-v1.1.0
- Corrected accumulated import/export from Aidon
- Added VCC and RSSI to MQTT messages
Changes in UI:
- New top navbar
- Show VCC and WiFi information
- Show MQTT error messages
- Show ESP, HAN, WiFi and MQTT status badge
- Show accumulated Import/export
2020-02-12 19:55:06 +01:00
Gunnar Skjold
1994f16b82
Merge branch 'dev-v1.0.1' into dev-v1.1.0
2020-02-12 16:41:04 +01:00
Gunnar Skjold
b6efae656f
Expose export power in JSON
2020-02-12 16:40:51 +01:00
Gunnar Skjold
fa0f93cefe
Switched to reactive import for Q
2020-02-12 13:25:36 +01:00
Gunnar Skjold
058dc658c1
Switched to reactive import for Q
2020-02-12 13:16:49 +01:00
Gunnar Skjold
f6df84bf9a
Auto detect meter type
2020-02-11 18:40:38 +01:00
Gunnar Skjold
4b9cb27e58
Disable web security if AP mode is triggered
2020-02-11 17:32:18 +01:00
Gunnar Skjold
5f14517258
Minor changes after testing MQTT reconnect
2020-02-11 17:25:52 +01:00
Gunnar Skjold
ad820fff01
Allow other services to get resources while trying to connect to mqtt
2020-02-11 11:04:37 +01:00
Gunnar Skjold
6d3d4adc7e
Merge branch 'master' into low_power
2020-02-09 13:45:27 +01:00
Gunnar Skjold
99a23b3bf7
Cropped webui image
2020-02-09 13:19:48 +01:00
Gunnar Skjold
15e861ce70
Added AP mode pin for both Wemos D1 and D32
2020-02-09 12:18:08 +01:00
Gunnar Skjold
fdfadb9bf9
Updated Aidon parser with support for 3 phase IT/TT system
2020-02-08 18:23:56 +01:00
Gunnar Skjold
388d35c390
Updated documentation
2020-02-07 23:12:27 +01:00
Gunnar Skjold
e466a45b5c
Fixed missing check in checkbox when configuration opened in firefox
2020-02-07 22:33:55 +01:00
Gunnar Skjold
2e7b9e8e43
Fixed missing check in checkbox when configuration opened in firefox
2020-02-07 22:26:17 +01:00
Gunnar Skjold
deb2148e9a
Software serial for development boards. Added a few extra boards
2020-02-07 17:27:58 +01:00
Gunnar Skjold
27cb5dd833
Trying a large sleep when cap is not charged
2020-02-06 19:15:06 +01:00
Gunnar Skjold
7e6ac860fd
Merge branch 'master' into low_power
2020-02-06 19:02:14 +01:00
Gunnar Skjold
3a7f6078f4
Use builtin LED for Lolin D32
2020-02-06 19:02:05 +01:00
Gunnar Skjold
dbc551a41d
Moved configuration object to main file and load the config before start. Fixed issue where partiy is switched for Kamstrup half way when in debug mode
2020-02-05 20:43:37 +01:00
Gunnar Skjold
9bb596aab1
Reverted what was intended as support for earlier configuration versions.
2020-02-02 08:15:49 +01:00
Gunnar Skjold
4a3d22e75c
Fixed script to generate webroot header files
2020-02-01 09:57:43 +01:00
Gunnar Skjold
d68ffc827d
Trigger build on changes in scripts and web
2020-02-01 09:56:14 +01:00
Gunnar Skjold
20c62a63cf
Fixed script to generate webroot header files
2020-02-01 09:54:58 +01:00
Gunnar Skjold
8f85b43fc3
Made MQTT optional
2020-02-01 09:52:37 +01:00
Gunnar Skjold
57d8603790
Added option for electric distribution system (230/400)
2020-01-31 21:30:20 +01:00
Gunnar Skjold
fc1f1554d8
Extracted webroot into usable files
2020-01-31 21:08:27 +01:00
Gunnar Skjold
70ed0b538a
Merge branch 'master' into low_power
2020-01-29 21:00:10 +01:00
Gunnar Skjold
ced6f125fd
Trigger build on changing ini file
2020-01-29 20:58:09 +01:00
Gunnar Skjold
f76cacf835
Trigger build on changing ini file
2020-01-29 20:56:31 +01:00
Gunnar Skjold
a8205edae9
Fixed build after merge
2020-01-29 20:53:52 +01:00
Gunnar Skjold
0a317450f6
Merge branch 'master' into low_power
2020-01-29 20:51:28 +01:00
Gunnar Skjold
e9ed6d825a
Merge pull request #14 from gskjold/issue-9
...
New web interface that is always available
2020-01-29 20:50:26 +01:00
Gunnar Skjold
a6751c787c
Merge branch 'issue-9' into low_power
2020-01-29 20:39:07 +01:00
Gunnar Skjold
378dbbcc99
Only show phases with power, and always deliver volts and amps to frontend
2020-01-29 20:38:53 +01:00
Gunnar Skjold
aed56b0b56
Merge branch 'issue-9' into low_power
2020-01-28 21:19:01 +01:00
Gunnar Skjold
36b37eb2a6
Calculate max power when receiving json from reader
2020-01-28 21:18:48 +01:00
Gunnar Skjold
550b216ba6
Merge branch 'issue-9' into low_power
2020-01-28 21:12:00 +01:00
Gunnar Skjold
7e4047096b
Stripped away bootstrap css and created a smaller boot.css as replacement. Load real bootstrap from CDN. Added HTML only (non-js) view of data
2020-01-28 21:10:54 +01:00
Gunnar Skjold
7fdedd8bcf
Forgot some changes
2020-01-28 19:20:50 +01:00
Gunnar Skjold
f693869bd4
Merge branch 'master' into issue-9
2020-01-28 19:18:13 +01:00
Gunnar Skjold
3312f88804
Some changes to make it compile for both ESP8266 and ESP32
2020-01-28 18:17:20 +01:00
Gunnar Skjold
50faaca559
Moved Base64 lib
2020-01-24 14:54:42 +01:00
Gunnar Skjold
bf44849ecf
Added base64 lib directly into this project to fix build problem with esp32
2020-01-24 14:52:14 +01:00
Gunnar Skjold
4bfd9dee9a
Merge pull request #10 from gskjold/issue-6
...
Make the configuration page available all the time
2020-01-24 14:47:29 +01:00
Gunnar Skjold
32d58fdd71
Stripped jquery and full bootstrap from image
2020-01-23 19:45:29 +01:00
Gunnar Skjold
aef78962fb
Some modifications to reduce power consumption i AP mode
2020-01-23 18:47:02 +01:00
Gunnar Skjold
8ee713b616
Included some code from @dakarym to support the self powered board for testing
2020-01-22 15:26:07 +01:00
Gunnar Skjold
0fa3e3585a
Finalized live update of meter data in web gui
2020-01-19 21:37:56 +01:00
Gunnar Skjold
a88291c0f0
Implemented new user interface and prepared for live view
2020-01-17 21:49:36 +01:00
Gunnar Skjold
ac1609bfac
Merge branch 'issue-6' into issue-9
2020-01-17 19:17:44 +01:00
Gunnar Skjold
22d5839d60
Added HTML, CSS and JS for new user interface
2020-01-17 14:41:02 +01:00
Gunnar Skjold
8f0932f1f1
Added configurable basic auth to web server
2020-01-15 21:22:06 +01:00
Gunnar Skjold
aeb161455e
Enable config page on runtime with populated form
2020-01-15 20:17:06 +01:00
Gunnar Skjold
568180d7b2
Update release.yml
2019-12-12 19:49:22 +01:00
Gunnar Skjold
0d99da6c9a
Update build.yml
2019-12-12 19:48:22 +01:00