Compare commits

...

1193 Commits
v1.5.1 ... main

Author SHA1 Message Date
Gunnar Skjold
fdfa6c1b52
Fixed MQTT JSON for prices (#1116) 2026-01-01 20:07:48 +01:00
Gunnar Skjold
4f1790a464
Added support for Iskraemeco IE.5 in Croatia (#1107)
* Added support for Croation Iskra

* Temp removed meterid

* Fixed HDLC block decoding

* Fixed context length

* Changing some stuff back

* Change some stuff back

* Final test

* Added debugging

* Updated selector for iskra dataformat

* Added fake test frame
2025-12-30 10:12:31 +01:00
Gunnar Skjold
ca4cef5233
Fixed empty timestamp in Home-Assistant JSON (#1105)
* Nullable timestamps for HA JSON

* Nullable timestamps for MQTT JSON
2025-12-30 10:05:39 +01:00
Gunnar Skjold
a0d7fd0d95
Fixed extraction of negative prices from server (#1104) 2025-12-30 10:04:55 +01:00
Gunnar Skjold
489dbf9254
Fixed IPv6 formatting (#1106) 2025-12-30 10:04:30 +01:00
Gunnar Skjold
a81aa11558
Added support for frames without checksum (#1108) 2025-12-29 13:25:36 +01:00
Gunnar Skjold
2e4a0fc0a3
Fixed price shift for non-CET price area (#1090)
* Fixed non-CET price presentation

* Added compiled version

* Updated fix for non cet

* Fixed! I think...
2025-12-11 11:42:17 +01:00
Gunnar Skjold
fc6e9e8085
Fixed ESP8266 memory issue with price decoding (#1089) 2025-12-11 11:37:52 +01:00
Gunnar Skjold
ad73821f1c
Disable auto buffer size for HAN on ESP8266 (#1086) 2025-12-11 11:34:46 +01:00
Gunnar Skjold
98bf5b958f
Fixed float infinity issue (#1087) 2025-12-11 11:34:15 +01:00
Gunnar Skjold
f323c5a4f6
Fixed building without remote debug (#1084) 2025-12-09 12:19:00 +01:00
Gunnar Skjold
ea91248e67
Changed MQTT client timeout setting for ESP8266 (#1077) 2025-12-05 15:37:23 +01:00
Gunnar Skjold
271ce2081f
Fixed reboot loop for some meters (#1075) 2025-12-05 10:02:59 +01:00
Gunnar Skjold
8438020dbd
Feature: Dump hex data from meter to MQTT (#1071)
* Send raw data debug to MQTT

* Publish hexdump to /data

* Sensor for /data, but it doesnt work
2025-12-01 14:02:07 +01:00
Gunnar Skjold
9252a810df
Improve power stability when using MQTT (#1070)
* Changes to improve MQTT and power stability

* Re-added the memory leak fix

* Re-added the memory leak fix

* Stop client before deleting

* Fixed potential nullpointer
2025-12-01 10:01:20 +01:00
Gunnar Skjold
c0c696a55c
Fixed default MQTT subscription (#1065) 2025-11-27 09:37:06 +01:00
Gunnar Skjold
ef70d39f70
Fixed what hours the fixed price is applied to (#1069) 2025-11-27 09:36:10 +01:00
Gunnar Skjold
1cf890dc26
Improvements for 2.5.0-rc3 (#1064)
* Various changes for 2.5.0-rc3

* Changed to official amsleser wiki
2025-11-21 12:40:13 +01:00
Gunnar Skjold
9d307e3192
Fixed premature cut on version string if release candidate (#1061) 2025-11-21 08:22:55 +01:00
Gunnar Skjold
61f0356a10
Added option to select firmware channel (#1060) 2025-11-13 15:14:52 +01:00
Gunnar Skjold
c648546b61
Added support for 15 minute price resolution (#1031)
* 15min prices WIP

* WIP more changes for 15min prices

* More work on 15min pricing

* Fixed some errors

* Some changes after testing

* Graphical changes for 15min pricing

* Adjustments on MQTT handlers after switching to 15min prices

* Reverted some MQTT changes

* Adapted HA integration for 15min pricing

* Adapted JSON payload for 15min

* Adjustments during testing

* Set default price interval

* Fixed refresh of price graph when data changes

* Bugfixes

* Fixed some issues with raw payload

* Adjustments for meter timestamp from Kamstrup

* Updated readme

* Added detailed breakdown of payloads coming from Norwegian meters

* Minor changes relating to price

* Fixed byte alignment on price config

* Changes to support RC upgraders
2025-11-13 15:10:54 +01:00
Gunnar Skjold
ffd8d46f2e
Automatic reboot when MQTT is lost (#1058)
* Fixing board type overwrite, zmartcharge default issues and disabling entsoe

* Fixed Zmartcharge configuration issue

* Option to auto reboot if MQTT connection is lost
2025-11-06 18:26:40 +01:00
Gunnar Skjold
eefbc08222
Updated release workflow (#1054)
* Added workflow to release RC versions

* Added missing config to build file

* Made S3 bucket configurable from repo

* Updated release workflow
2025-11-04 13:40:54 +01:00
Gunnar Skjold
1a5b9542f4
Include device information when asking for new version (#1052) 2025-10-30 15:54:57 +01:00
Gunnar Skjold
19ff70782f
Update for L&G in Austria (#1049)
* Fixing board type overwrite, zmartcharge default issues and disabling entsoe

* Fixed Zmartcharge configuration issue

* Support for LNG2 with 11 data points instead of 14
2025-10-23 08:17:25 +02:00
Gunnar Skjold
0dfd2d9022
Various bug fixes (#1041)
* Fixing board type overwrite, zmartcharge default issues and disabling entsoe

* Fixed Zmartcharge configuration issue
2025-10-16 08:50:03 +02:00
Gunnar Skjold
7a4ab77a83
Tooltip added to bar charts (#1022) 2025-10-02 13:55:31 +02:00
Gunnar Skjold
46cd8c6e68
Added hour to tariff peaks (#1028)
* Added hour to tariff peaks

* Some adjustments
2025-10-02 13:51:58 +02:00
Gunnar Skjold
c307103605
Added unique ID to HA firmware upgrade entity (#1027) 2025-10-02 13:23:36 +02:00
Gunnar Skjold
d9ec111458
Fixed duplicate deviceuid in HA when using ethernet (#1025) 2025-10-02 13:13:16 +02:00
Gunnar Skjold
e3a1aa78a9
Added tariff peaks and total month to MQTT JSON payload (#1026)
* Added tariff peaks to MQTT JSON payload

* Bugfix after testing
2025-10-02 13:11:28 +02:00
Gunnar Skjold
b06aa5f71b
Improve power saving (#1024)
* Limit tasks in loop based on voltage

* Updated disconnect voltage limit

* Fixed 8266 build
2025-10-02 12:59:47 +02:00
Gunnar Skjold
6a75b0fe71
Command to request day or month plot data via MQTT (#1023) 2025-10-02 12:56:25 +02:00
Gunnar Skjold
e11fac3d11
Added deploy action for Localazy translations (#1014)
* Added deploy action for Localazy translations

* Fixed yml
2025-09-25 14:03:51 +02:00
Gunnar Skjold
031422f783
Show error when unknown data was received (#1013) 2025-09-25 12:20:31 +02:00
Gunnar Skjold
2ff8fddc14
Fixed incorrect enable state for ZmartCharge when no config (#1012) 2025-09-25 12:05:18 +02:00
Gunnar Skjold
e5d260ae3e
Zmartcharge support (#1007)
* ZC initial implementation

* ZmartCharge

* Fixed zc bug

* Adjustments to ZmartCharge connection
2025-09-25 11:38:05 +02:00
Gunnar Skjold
633671851e
Fixed Kamstrup timestamp parsing (#1011)
* Fixed kamstrup timestamp deviation

* Fixed check for time zone
2025-09-25 10:47:47 +02:00
Gunnar Skjold
69da9f9d48
Only allow board type overwrite from config if not set (#1010) 2025-09-25 10:47:35 +02:00
Gunnar Skjold
19f78126d6
Auto enable price fetch when region is changed (#1009) 2025-09-25 10:47:22 +02:00
Gunnar Skjold
d3cc92949a
Trim leading and trailing whitespace (#1008) 2025-09-25 10:46:26 +02:00
Gunnar Skjold
f1089faab5
Maintian "no config" state after vendor config (#999) 2025-09-25 10:46:02 +02:00
Gunnar Skjold
4a3ad6ab9b
Fixed /setup redirect after /vendor (#998) 2025-09-25 10:44:17 +02:00
Falke Carlsen
86449949c5
refactor: fix 'boundry' typo to 'boundary' (#982) 2025-09-25 10:43:57 +02:00
Gunnar Skjold
9bd9826835
Added GPIO 20 and 21 for ESP32-C3 (#979)
* Added GPIO 20 and 21 for C3

* Updated webapp after changing GPIO for C3
2025-09-25 10:39:55 +02:00
ArnieO
94ff9d6da7
Added Omnipower frame (#1002)
Kamstrup Omnipower frames from Bornholm, DK - with two decimals on the voltage reading. The customary is voltage without decimals. 
Received 9-sep-25.
2025-09-09 17:25:50 +02:00
ArnieO
9518d1811b
Uploaded new *.raw file (#995)
From Landis&Gyr E350, HAN-NVE, Norway. Meter owner: https://klive.no/
2025-08-22 15:28:09 +02:00
ArnieO
983426b36c
Add Poland docs (#987)
* Create Poland/Stoen folder structure

* Add PDF documents
2025-07-29 09:18:45 +02:00
Gunnar Skjold
bcb3c3b2ec
Fixed price config with no dates (#974) 2025-06-05 11:47:36 +02:00
Gunnar Skjold
9fd383c1ef
Updated release title (#973) 2025-06-05 08:05:50 +02:00
dependabot[bot]
a931f4cef8
Bump vite from 4.5.9 to 4.5.14 in /lib/SvelteUi/app (#972)
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.9 to 4.5.14.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.14/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.14/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 4.5.14
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-06-05 07:42:29 +02:00
Gunnar Skjold
fddecaab39
Added meter multipliers to config file (#971) 2025-06-05 07:42:12 +02:00
Gunnar Skjold
e5eab82d68
Use list type 4 when phase power is included in Slovenian format (#967) 2025-06-05 07:41:50 +02:00
Gunnar Skjold
8ae1d46b2a
Fixed DSMR timestamp parsing (#966)
* Fixed DSMR parsing and added support for more formats

* Add current time as package timestamp for DSMR
2025-06-05 07:41:36 +02:00
Gunnar Skjold
99ccb03b45
Added per phase power for L&G (#965)
* Added phase power parsing for Austrian L&G

* Use list type 4 when L&G phase power is present
2025-06-05 07:41:19 +02:00
Gunnar Skjold
b8f2d501a5
Increased kwh resultion in plot json (#961) 2025-06-05 07:40:57 +02:00
Gunnar Skjold
e042806619
Fixed multiplier problem for some L&G meters (#960) 2025-06-05 07:40:44 +02:00
Gunnar Skjold
16f9ed7ecb
Fixed hour skew on price modifier (#959)
* Use local timezone in price config

* Additional changes for previous commit

* Use CET/CEST for energy prices collected from server
2025-06-05 07:40:29 +02:00
Gunnar Skjold
3eaefefd26
Fixed price modifier date inclusion (#958)
* Support price config end before start

* More changes to fix price modifiers

* More changes to fix price modifiers
2025-06-05 07:40:09 +02:00
Gunnar Skjold
03c8c3ddbc
Fixed release name (#953) 2025-06-05 07:39:36 +02:00
dependabot[bot]
08371b9078
Bump http-proxy-middleware from 2.0.7 to 2.0.9 in /lib/SvelteUi/app (#950)
Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.7 to 2.0.9.
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases)
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.9/CHANGELOG.md)
- [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.7...v2.0.9)

---
updated-dependencies:
- dependency-name: http-proxy-middleware
  dependency-version: 2.0.9
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-06-05 07:39:14 +02:00
Gunnar Skjold
a6ae25f3e7
Changed way of creating release (#944) 2025-03-24 10:51:07 +01:00
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
417 changed files with 117693 additions and 12578 deletions

View File

@ -0,0 +1,31 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
{
"name": "amsreader-devcontainer",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/base:jammy",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "19",
"pnpmVersion": "none",
"nvmVersion": "latest"
},
"ghcr.io/devcontainers/features/python:1": {
"version": "3.9"
}
},
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": ".devcontainer/postCreateCommand.sh",
// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"platformio.platformio-ide",
"ms-vscode.cpptools",
"svelte.svelte-vscode"
]
}
}
}

View File

@ -0,0 +1,18 @@
#!/bin/bash
set -e
# Upgrade pip
python -m pip install --upgrade pip
# Install Python packages
pip install -U platformio css_html_js_minify
# Navigate to the Svelte app directory
cd lib/SvelteUi/app
# Install npm dependencies and build the app
npm ci
npm run build
# Return to the previous directory
cd -

3
.gitattributes vendored Normal file
View File

@ -0,0 +1,3 @@
* text=auto eol=lf
*.{cmd,[cC][mM][dD]} text eol=crlf
*.{bat,[bB][aA][tT]} text eol=crlf

1
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1 @@
custom: ["https://amsleser.no"]

43
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,43 @@
---
name: Bug report
about: Report a bug
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Hardware information:**
- Country: [e.g. Norway]
- Meter: [e.g. Aidon]
- Encryption enabled [yes/no]
- AMS reader: [e.g. Pow-U, ESP32 etc]
- M-bus adapter (if applicable):
**Relevant firmware information:**
- Version: [e.g. 2.1.0]
- MQTT: [yes/no]
- MQTT payload type: [e.g. JSON]
- HAN GPIO: [e.g. GPIO5]
- HAN baud and parity: [e.g. 2400 8E1]
- Temperature sensors [e.g. 3xDS18B20]
- ENTSO-E API enabled: [yes/no]
**Additional context**
Add any other context about the problem here.

8
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Meter configuration
url: https://github.com/UtilitechAS/amsreader-firmware/wiki/Known-hardware-configurations
about: Please check your meter configuration here first.
- name: Frequently asked questions
url: https://github.com/UtilitechAS/amsreader-firmware/wiki/FAQ
about: Please check frequently asked questions first.

View File

@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

27
.github/ISSUE_TEMPLATE/support.md vendored Normal file
View File

@ -0,0 +1,27 @@
---
name: Support
about: Request support
title: ''
labels: ''
assignees: ''
---
**Describe your problem**
A clear and concise description of what the problem is.
**Hardware information:**
- Country: [e.g. Norway]
- Meter: [e.g. Aidon]
- Encryption enabled [yes/no]
- AMS reader: [e.g. Pow-U, ESP32 etc]
- M-bus adapter (if applicable):
**Relevant firmware information:**
- Version: [e.g. 2.1.0]
- MQTT: [yes/no]
- MQTT payload type: [e.g. JSON]
- HAN GPIO: [e.g. GPIO5]
- HAN baud and parity: [e.g. 2400 8E1]
- Temperature sensors [e.g. 3xDS18B20]
- ENTSO-E API enabled: [yes/no]

View File

@ -8,6 +8,7 @@ on:
- scripts/**
- web/**
- platformio.ini
- .github/workflows/**
branches:
- '*'
tags:
@ -21,28 +22,45 @@ jobs:
steps:
- name: Check out code from repo
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Inject secrets into ini file
run: |
sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
sed -i 's/NO_AMS2MQTT_SC_KEY/AMS2MQTT_SC_KEY=\\"${{secrets.AMS2MQTT_SC_KEY}}\\"/g' platformio.ini
sed -i 's/NO_ENERGY_SPEEDOMETER_USER/ENERGY_SPEEDOMETER_USER=\\"${{secrets.ENERGY_SPEEDOMETER_USER}}\\"/g' platformio.ini
sed -i 's/NO_ENERGY_SPEEDOMETER_PASS/ENERGY_SPEEDOMETER_PASS=\\"${{secrets.ENERGY_SPEEDOMETER_PASS}}\\"/g' platformio.ini
- name: Cache Python dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('platformio.ini') }}
- name: Cache PlatformIO dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.pio/libdeps
key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
- name: Set up Python 3.7
uses: actions/setup-python@v1
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio css_html_js_minify
- name: Configure build targets
run: echo "[platformio]\ndefault_envs = hw1esp12e, esp12e, esp32" > platformio-user.ini
- name: Set up node
uses: actions/setup-node@v4
with:
node-version: '19.x'
- name: Build with node
run: |
cd lib/SvelteUi/app
npm ci
npm run build
cd -
env:
CI: true
- name: PlatformIO lib install
run: pio lib install
run: pio pkg install
- name: PlatformIO run
run: pio run

41
.github/workflows/localazy.yml vendored Normal file
View File

@ -0,0 +1,41 @@
name: Deploy language files from localazy
on:
workflow_dispatch:
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Check out code from repo
uses: actions/checkout@v4
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '22.x'
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-north-1
- name: Generate localazy-keys.json
run: |
echo '{"writeKey": "", "readKey": "${{secrets.LOCALAZY_READ_KEY}}"}' > localazy/localazy-keys.json
- name: Create localazy language folder
run: mkdir -p localazy/language
- name: Install Localazy CLI
run: npm install -g @localazy/cli
- name: Download translations
working-directory: localazy
run: localazy download -k localazy-keys.json
- name: Upload translations to S3
run: aws s3 sync ./localazy/language/ s3://${{ secrets.AWS_S3_BUCKET }}/language/

85
.github/workflows/prerelease.yml vendored Normal file
View File

@ -0,0 +1,85 @@
name: Release candidate build and upload
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
jobs:
prepare:
runs-on: ubuntu-latest
steps:
- name: Check out code from repo
uses: actions/checkout@v4
- name: Get release version for filenames
id: release_tag
env:
GITHUB_REF: ${{ github.ref }}
run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
- name: Create release with release notes
id: create_release
uses: ncipollo/release-action@v1
with:
name: Release candidate v${{ steps.release_tag.outputs.tag }}
prerelease: true
outputs:
version: ${{ steps.release_tag.outputs.tag }}
upload_url: ${{ steps.create_release.outputs.upload_url }}
esp32s2:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32s2
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
subfolder: /rc
esp32s3:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32s3
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
subfolder: /rc
esp32c3:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32c3
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
subfolder: /rc
esp32:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
subfolder: /rc
esp32solo:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32solo
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
subfolder: /rc
esp8266:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp8266
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
subfolder: /rc
is_esp32: false

136
.github/workflows/release-deploy-env.yml vendored Normal file
View File

@ -0,0 +1,136 @@
name: Build with env and deploy
on:
workflow_call:
inputs:
env:
description: 'The environment to build for'
required: true
type: string
upload_url:
description: 'The upload URL for the release assets'
required: true
type: string
version:
description: 'The version tag for the release assets'
required: true
type: string
subfolder:
description: 'The subfolder in S3 to upload the binary to'
required: false
type: string
default: ''
is_esp32:
description: 'Whether the build is for ESP32 based firmware'
required: false
type: boolean
default: true
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Check out code from repo
uses: actions/checkout@v4
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-north-1
- name: Cache Python dependencies
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('platformio.ini') }}
- name: Cache PlatformIO dependencies
uses: actions/cache@v4
with:
path: ~/.pio/libdeps
key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Inject secrets into ini file
run: |
sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
sed -i 's/NO_AMS2MQTT_SC_KEY/AMS2MQTT_SC_KEY=\\"${{secrets.AMS2MQTT_SC_KEY}}\\"/g' platformio.ini
sed -i 's/NO_ENERGY_SPEEDOMETER_USER/ENERGY_SPEEDOMETER_USER=\\"${{secrets.ENERGY_SPEEDOMETER_USER}}\\"/g' platformio.ini
sed -i 's/NO_ENERGY_SPEEDOMETER_PASS/ENERGY_SPEEDOMETER_PASS=\\"${{secrets.ENERGY_SPEEDOMETER_PASS}}\\"/g' platformio.ini
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio css_html_js_minify
- name: Set up node
uses: actions/setup-node@v4
with:
node-version: '19.x'
- name: Build with node
run: |
cd lib/SvelteUi/app
npm ci
npm run build
cd -
env:
CI: false
- name: PlatformIO lib install
run: pio lib install
- name: Build firmware
env:
GITHUB_TAG: v${{ inputs.version }}
run: pio run -e ${{ inputs.env }}
- name: Create zip file
run: /bin/sh scripts/${{ inputs.env }}/mkzip.sh
- name: Upload binary to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ inputs.upload_url }}
asset_path: .pio/build/${{ inputs.env }}/firmware.bin
asset_name: ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.bin
asset_content_type: application/octet-stream
- name: Upload zip to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ inputs.upload_url }}
asset_path: ${{ inputs.env }}.zip
asset_name: ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.zip
asset_content_type: application/zip
- name: Create MD5 checksum file
run: md5sum .pio/build/${{ inputs.env }}/firmware.bin | cut -z -d ' ' -f 1 > firmware.md5
- name: Upload binary to S3
run: aws s3 cp .pio/build/${{ inputs.env }}/firmware.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.bin
- name: Upload MD5 checksum to S3
run: aws s3 cp firmware.md5 s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.md5
- name: Upload bootloader to S3
if: ${{ inputs.is_esp32 }}
run: aws s3 cp .pio/build/${{ inputs.env }}/bootloader.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-bootloader.bin
- name: Upload partition table to S3
if: ${{ inputs.is_esp32 }}
run: aws s3 cp .pio/build/${{ inputs.env }}/partitions.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-partitions.bin
- name: Upload app0 to S3
if: ${{ inputs.is_esp32 }}
run: aws s3 cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-app0.bin

View File

@ -1,84 +1,79 @@
name: Release
name: Release build and upload
on:
push:
tags:
- 'v*.*.*'
- 'v[0-9]+.[0-9]+.[0-9]+'
jobs:
build:
prepare:
runs-on: ubuntu-latest
steps:
- name: Check out code from repo
uses: actions/checkout@v1
- name: Get release version for filenames
id: release_tag
env:
GITHUB_REF: ${{ github.ref }}
run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
- name: Get release version for code
env:
GITHUB_REF: ${{ github.ref }}
run: echo "GITHUB_TAG=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
- name: Cache Python dependencies
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('platformio.ini') }}
- name: Cache PlatformIO dependencies
uses: actions/cache@v1
with:
path: ~/.pio/libdeps
key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio css_html_js_minify
- name: PlatformIO lib install
run: pio lib install
- name: PlatformIO run
run: pio run
- name: Create Release
id: create_release
uses: actions/create-release@v1.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: false
- name: Upload esp8266 binary to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .pio/build/esp8266/firmware.bin
asset_name: ams2mqtt-esp8266-${{ steps.release_tag.outputs.tag }}.bin
asset_content_type: application/octet-stream
- name: Upload esp32 binary to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .pio/build/esp32/firmware.bin
asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.bin
asset_content_type: application/octet-stream
- name: Upload esp32 partitions to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .pio/build/esp32/partitions.bin
asset_name: ams2mqtt-esp32-partitions-${{ steps.release_tag.outputs.tag }}.bin
asset_content_type: application/octet-stream
- name: Check out code from repo
uses: actions/checkout@v4
- name: Get release version for filenames
id: release_tag
env:
GITHUB_REF: ${{ github.ref }}
run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
- name: Create release with release notes
id: create_release
uses: ncipollo/release-action@v1
with:
name: Release v${{ steps.release_tag.outputs.tag }}
generateReleaseNotes: true
outputs:
version: ${{ steps.release_tag.outputs.tag }}
upload_url: ${{ steps.create_release.outputs.upload_url }}
esp32s2:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32s2
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
esp32s3:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32s3
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
esp32c3:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32c3
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
esp32:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
esp32solo:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp32solo
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
esp8266:
needs: prepare
uses: ./.github/workflows/release-deploy-env.yml
secrets: inherit
with:
env: esp8266
version: ${{ needs.prepare.outputs.version }}
upload_url: ${{ needs.prepare.outputs.upload_url }}
is_esp32: false

11
.gitignore vendored
View File

@ -1,4 +1,5 @@
.vs/
.idea/
[Dd]ebug/
[Rr]elease/
**/__vm/
@ -7,8 +8,16 @@
.vscode
.pio
platformio-user.ini
/src/version.h
/lib/FirmwareVersion/src/generated_version.h
/src/web/root
/src/AmsToMqttBridge.ino.cpp
/test
/web/test.html
/sdkconfig
/.tmp
/*.zip
node_modules
/gui/dist
/scripts/*dev
localazy-keys.json
localazy/language

44
LICENSE Normal file
View File

@ -0,0 +1,44 @@
Fair Source License, version 0.9
Copyright (C) 2023 Utilitech AS
Licensor: Utilitech AS
Software: AMS reader
Use Limitation: 5 users
License Grant. Licensor hereby grants to each recipient of the
Software ("you") a non-exclusive, non-transferable, royalty-free and
fully-paid-up license, under all of the Licensor's copyright and
patent rights, to use, copy, distribute, prepare derivative works of,
publicly perform and display the Software, subject to the Use
Limitation and the conditions set forth below.
Use Limitation. The license granted above allows use by up to the
number of users per entity set forth above (the "Use Limitation"). For
determining the number of users, "you" includes all affiliates,
meaning legal entities controlling, controlled by, or under common
control with you. If you exceed the Use Limitation, your use is
subject to payment of Licensor's then-current list price for licenses.
Conditions. Redistribution in source code or other forms must include
a copy of this license document to be provided in a reasonable
manner. Any redistribution of the Software is only allowed subject to
this license.
Trademarks. This license does not grant you any right in the
trademarks, service marks, brand names or logos of Licensor.
DISCLAIMER. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OR
CONDITION, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. LICENSORS HEREBY DISCLAIM ALL LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE.
Termination. If you violate the terms of this license, your rights
will terminate automatically and will not be reinstated without the
prior written consent of Licensor. Any such termination will not
affect the right of others who may have received copies of the
Software from you.

View File

@ -1,17 +1,15 @@
# AMS <-> MQTT Bridge
Orignally designed and coded by [@roarfred](https://github.com/roarfred), see the original repo at [roarfred/AmsToMqttBridge](https://github.com/roarfred/AmsToMqttBridge)
# AMS Reader
This code is designed to decode data from electric smart meters installed in many countries in Europe these days. The data is presented in a graphical web interface and can also send the data to a MQTT broker which makes it suitable for home automation project. Originally it was only designed to work with Norwegian meters, but has since been adapter to read any IEC-62056-7-5 or IEC-62056-21 compliant meters.
This repository contains the code and schematics necessary to build a device to receive and convert data from AMS electrical meters installed in Norway. The code can be used on both ESP8266 and ESP32, both as custom build devices or built from readily available development modules. It reads data from the HAN port of the meter and sends this to a configured MQTT bus.
Later development have added Energy usage graph for both day and month, as well as future energy price. The code can run on any ESP8266 or ESP32 hardware which you can read more about in the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki). If you don't have the knowledge to set up a ESP device yourself, or you would like to support our work, please have a look at our shop at [amsleser.no](https://www.amsleser.no/).
There is a web interface available on runtime, showing meter data in real time.
<img src="webui.jpg">
<img src="images/dashboard.png">
## Hardware options
Look in [hardware section](/hardware) for more details about supported hardware
## Installing pre-built firmware
If you have a device already running this firmware and you for some reason need to upgrade via USB port, you can use a [this web-based tool](https://www.amsleser.cloud/flasher)
## Setting up your device
Go to the [WiKi](https://github.com/gskjold/AmsToMqttBridge/wiki) for information on how to set up your own device.
If you are using a development board and want to flash a pre-built firmware manually, get the necessary files from the [release](https://github.com/UtilitechAS/amsreader-firmware/releases) section and visit the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki) and have a look at the [Flashing](https://github.com/UtilitechAS/amsreader-firmware/wiki/flashinghttps://github.com/UtilitechAS/amsreader-firmware/wiki/flashing) section
## Building this project with PlatformIO
To build this project, you need [PlatformIO](https://platformio.org/) installed.
@ -22,4 +20,13 @@ It is recommended to use Visual Studio Code with the PlatformIO plugin for devel
[PlatformIO vscode plugin](https://platformio.org/install/ide?install=vscode)
Copy the ```platformio-user.ini-example``` to ```platformio-user.ini``` and customize to your preference. The code will adapt to the platform and board set in your profile.
For development purposes, copy the ```platformio-user.ini-example``` to ```platformio-user.ini``` and customize to your preference. The code will adapt to the platform and board set in your profile.
## Licensing
Initially, this project began as a hobby, consuming countless hours of our spare time. However, the time required to support this project has expanded beyond the scope of a hobby. As a result, we established Utilitech, a company dedicated to maintaining the software and hardware for this project as part of our regular work.
To ensure the sustainability of our venture, we have opted to license our software under the [Fair Source License] (https://fair.io). This approach allows the software to remain free for personal use, while also ensuring full transparency of our codes inner workings. It also prevents competitors from exploiting our work without contributing to the maintenance of the code or providing technical support to end users.
For more information, please refer to our [LICENSE](/LICENSE) file.
If your usage falls outside the scope of this license and you require a separate license, please contact us at [post@utilitech.no](mailto:post@utilitech.no) for further details.

7
custom_partition.csv Normal file
View File

@ -0,0 +1,7 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x1D0000,
app1, app, ota_1, 0x1E0000,0x1D0000,
spiffs, data, spiffs, 0x3B0000,0x40000,
coredump, data, coredump,0x3F0000,0x10000,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 app0 app ota_0 0x10000 0x1D0000
5 app1 app ota_1 0x1E0000 0x1D0000
6 spiffs data spiffs 0x3B0000 0x40000
7 coredump data coredump 0x3F0000 0x10000

Binary file not shown.

View File

@ -0,0 +1,32 @@
1.1.1.8.0.255 - Active+ Energy
1.1.2.8.0.255 - Active- Energy
1.1.3.8.0.255 - Reactive+ Energy
1.1.4.8.0.255 - Reactive- Energy
1.1.0.0.1.255 - Meter number 1
1.1.1.7.0.255 - Active+ Instantaneous value
1.1.2.7.0.255 - Active- Instantaneous value
1.1.3.7.0.255 - Reactive+ Instantaneous value
1.1.4.7.0.255 - Reactive- Instantaneous value
0.1.1.0.0.255 - Current date/time
1.1.32.7.0.255 - L1 Voltage Instantaneous value
1.1.52.7.0.255 - L2 Voltage Instantaneous value
1.1.72.7.0.255 - L3 Voltage Instantaneous value
1.1.31.7.0.255 - L1 Current Instantaneous value
1.1.51.7.0.255 - L2 Current Instantaneous value
1.1.71.7.0.255 - L3 Current Instantaneous value
1.1.21.7.0.255 - L1 Active+ Instantaneous value
1.1.41.7.0.255 - L2 Active+ Instantaneous value
1.1.61.7.0.255 - L3 Active+ Instantaneous value
1.1.33.7.0.255 - L1 (cos.phi) (PF) Instantaneous value
1.1.53.7.0.255 - L2 (cos.phi) (PF) Instantaneous value
1.1.73.7.0.255 - L3 (cos.phi) (PF) Instantaneous value
1.1.13.7.0.255 - Avegage (cos.phi) (PF) Inst. value
1.1.22.7.0.255 - L1 Active- Instantaneous value
1.1.42.7.0.255 - L2 Active- Instantaneous value
1.1.62.7.0.255 - L3 Active- Instantaneous value
1.1.22.8.0.255 - L1 Active- Energy
1.1.42.8.0.255 - L2 Active- Energy
1.1.62.8.0.255 - L3 Active- Energy
1.1.21.8.0.255 - L1 Active+ Energy
1.1.41.8.0.255 - L2 Active+ Energy
1.1.61.8.0.255 - L3 Active+ Energy

View File

@ -0,0 +1,112 @@
<GatewayRequest>
<NetworkId Value="231" />
<PhysicalDeviceAddress Value="" />
<DataNotification>
<LongInvokeIdAndPriority Value="40000000" />
<DateTime Value="" />
<NotificationBody>
<DataValue>
<Structure Qty="41" >
<String Value="Kamstrup_V0001" />
<!--1.1.1.8.0.255-->
<OctetString Value="0101010800FF" />
<UInt32 Value="001194CA" />
<!--1.1.2.8.0.255-->
<OctetString Value="0101020800FF" />
<UInt32 Value="00000000" />
<!--1.1.3.8.0.255-->
<OctetString Value="0101030800FF" />
<UInt32 Value="0000127E" />
<!--1.1.4.8.0.255-->
<OctetString Value="0101040800FF" />
<UInt32 Value="0009550E" />
<!--1.1.0.0.1.255-->
<OctetString Value="0101000001FF" />
<UInt32 Value="0144ADE1" />
<!--1.1.1.7.0.255-->
<OctetString Value="0101010700FF" />
<UInt32 Value="00000531" />
<!--1.1.2.7.0.255-->
<OctetString Value="0101020700FF" />
<UInt32 Value="00000000" />
<!--1.1.3.7.0.255-->
<OctetString Value="0101030700FF" />
<UInt32 Value="00000000" />
<!--1.1.4.7.0.255-->
<OctetString Value="0101040700FF" />
<UInt32 Value="00000054" />
<!--0.1.1.0.0.255-->
<OctetString Value="0001010000FF" />
<!--2020-05-12 10:24:50-->
<OctetString Value="07E4050C020A1832FF800080" />
<!--1.1.32.7.0.255-->
<OctetString Value="0101200700FF" />
<UInt16 Value="00E4" />
<!--1.1.52.7.0.255-->
<OctetString Value="0101340700FF" />
<UInt16 Value="00E5" />
<!--1.1.72.7.0.255-->
<OctetString Value="0101480700FF" />
<UInt16 Value="00E3" />
<!--1.1.31.7.0.255-->
<OctetString Value="01011F0700FF" />
<UInt32 Value="0000004B" />
<!--1.1.51.7.0.255-->
<OctetString Value="0101330700FF" />
<UInt32 Value="00000070" />
<!--1.1.71.7.0.255-->
<OctetString Value="0101470700FF" />
<UInt32 Value="000001E4" />
<!--1.1.21.7.0.255-->
<OctetString Value="0101150700FF" />
<UInt32 Value="00000070" />
<!--1.1.41.7.0.255-->
<OctetString Value="0101290700FF" />
<UInt32 Value="000000B5" />
<!--1.1.61.7.0.255-->
<OctetString Value="01013D0700FF" />
<UInt32 Value="0000040C" />
<!--1.1.33.7.0.255-->
<OctetString Value="0101210700FF" />
<UInt16 Value="004D" />
<!--1.1.53.7.0.255-->
<OctetString Value="0101350700FF" />
<UInt16 Value="004E" />
<!--1.1.73.7.0.255-->
<OctetString Value="0101490700FF" />
<UInt16 Value="0062" />
<!--1.1.13.7.0.255-->
<OctetString Value="01010D0700FF" />
<UInt16 Value="0063" />
<!--1.1.22.7.0.255-->
<OctetString Value="0101160700FF" />
<UInt32 Value="00000000" />
<!--1.1.42.7.0.255-->
<OctetString Value="01012A0700FF" />
<UInt32 Value="00000000" />
<!--1.1.62.7.0.255-->
<OctetString Value="01013E0700FF" />
<UInt32 Value="00000000" />
<!--1.1.22.8.0.255-->
<OctetString Value="0101160800FF" />
<UInt32 Value="00000000" />
<!--1.1.42.8.0.255-->
<OctetString Value="01012A0800FF" />
<UInt32 Value="00000000" />
<!--1.1.62.8.0.255-->
<OctetString Value="01013E0800FF" />
<UInt32 Value="00000000" />
<!--1.1.21.8.0.255-->
<OctetString Value="0101150800FF" />
<UInt32 Value="000A8F97" />
<!--1.1.41.8.0.255-->
<OctetString Value="0101290800FF" />
<UInt32 Value="0004C152" />
<!--1.1.61.8.0.255-->
<OctetString Value="01013D0800FF" />
<UInt32 Value="000243DF" />
</Structure>
</DataValue>
</NotificationBody>
</DataNotification>
</GatewayRequest>

BIN
doc/Encrypted payload.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
doc/M-Bus_DOC48.PDF Normal file

Binary file not shown.

Binary file not shown.

18
doc/Norway/Aidon_OBIS.txt Normal file
View File

@ -0,0 +1,18 @@
1.1.0.2.129.255 - List version identifier
0.0.96.1.0.255 - Meter ID
0.0.96.1.7.255 - Meter Model
1.0.1.7.0.255 - Active+ Instantaneous value
1.0.2.7.0.255 - Active- Instantaneous value
1.0.3.7.0.255 - Reactive+ Instantaneous value
1.0.4.7.0.255 - Reactive- Instantaneous value
1.0.31.7.0.255 - L1 Current Instantaneous value
1.0.51.7.0.255 - L2 Current Instantaneous value
1.0.71.7.0.255 - L3 Current Instantaneous value
1.0.32.7.0.255 - L1 Voltage Instantaneous value
1.0.52.7.0.255 - L2 Voltage Instantaneous value
1.0.72.7.0.255 - L3 Voltage Instantaneous value
0.0.1.0.0.255 - Current date/time
1.0.1.8.0.255 - Active+ Energy
1.0.2.8.0.255 - Active- Energy
1.0.3.8.0.255 - Reactive+ Energy
1.0.4.8.0.255 - Reactive- Energy

119
doc/Norway/Aidon_data.xml Normal file
View File

@ -0,0 +1,119 @@
<GatewayRequest>
<NetworkId Value="231" />
<PhysicalDeviceAddress Value="" />
<DataNotification>
<LongInvokeIdAndPriority Value="40000000" />
<DateTime Value="" />
<NotificationBody>
<DataValue>
<Array Qty="0D" >
<Structure Qty="02" >
<!--1.1.0.2.129.255-->
<OctetString Value="0101000281FF" />
<String Value="AIDON_V0001" />
</Structure>
<Structure Qty="02" >
<!--0.0.96.1.0.255-->
<OctetString Value="0000600100FF" />
<String Value="0000000000000000" />
</Structure>
<Structure Qty="02" >
<!--0.0.96.1.7.255-->
<OctetString Value="0000600107FF" />
<String Value="6534" />
</Structure>
<Structure Qty="03" >
<!--1.0.1.7.0.255-->
<OctetString Value="0100010700FF" />
<UInt32 Value="00000339" />
<Structure Qty="02" >
<Int8 Value="00" />
<Enum Value="1B" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.2.7.0.255-->
<OctetString Value="0100020700FF" />
<UInt32 Value="00000000" />
<Structure Qty="02" >
<Int8 Value="00" />
<Enum Value="1B" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.3.7.0.255-->
<OctetString Value="0100030700FF" />
<UInt32 Value="00000000" />
<Structure Qty="02" >
<Int8 Value="00" />
<Enum Value="1D" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.4.7.0.255-->
<OctetString Value="0100040700FF" />
<UInt32 Value="00000251" />
<Structure Qty="02" >
<Int8 Value="00" />
<Enum Value="1D" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.31.7.0.255-->
<OctetString Value="01001F0700FF" />
<Int16 Value="0012" />
<Structure Qty="02" >
<Int8 Value="FF" />
<Enum Value="21" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.51.7.0.255-->
<OctetString Value="0100330700FF" />
<Int16 Value="0003" />
<Structure Qty="02" >
<Int8 Value="FF" />
<Enum Value="21" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.71.7.0.255-->
<OctetString Value="0100470700FF" />
<Int16 Value="0016" />
<Structure Qty="02" >
<Int8 Value="FF" />
<Enum Value="21" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.32.7.0.255-->
<OctetString Value="0100200700FF" />
<UInt16 Value="08FE" />
<Structure Qty="02" >
<Int8 Value="FF" />
<Enum Value="23" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.52.7.0.255-->
<OctetString Value="0100340700FF" />
<UInt16 Value="08F8" />
<Structure Qty="02" >
<Int8 Value="FF" />
<Enum Value="23" />
</Structure>
</Structure>
<Structure Qty="03" >
<!--1.0.72.7.0.255-->
<OctetString Value="0100480700FF" />
<UInt16 Value="08F7" />
<Structure Qty="02" >
<Int8 Value="FF" />
<Enum Value="23" />
</Structure>
</Structure>
</Array>
</DataValue>
</NotificationBody>
</DataNotification>
</GatewayRequest>

BIN
doc/Norway/Kaifa.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 KiB

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@

BIN
doc/Sweden/Aidon-RJ12.pdf Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

30
frames/Aidon-Sweden.raw Normal file
View File

@ -0,0 +1,30 @@
7E A2 43 41 08 83 13 85 EB E6 E7 00 0F 40 00 00 00 00
01 1B
02 02 09 06 00 00 01 00 00 FF 09 0C 07 E5 0C 0A 05 10 39 00 FF 80 00 FF
02 03 09 06 01 00 01 07 00 FF 06 00 00 07 E5 02 02 0F 00 16 1B
02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B
02 03 09 06 01 00 03 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D
02 03 09 06 01 00 04 07 00 FF 06 00 00 02 48 02 02 0F 00 16 1D
02 03 09 06 01 00 1F 07 00 FF 10 00 09 02 02 0F FF 16 21
02 03 09 06 01 00 33 07 00 FF 10 00 25 02 02 0F FF 16 21
02 03 09 06 01 00 47 07 00 FF 10 00 2E 02 02 0F FF 16 21
02 03 09 06 01 00 20 07 00 FF 12 08 E3 02 02 0F FF 16 23
02 03 09 06 01 00 34 07 00 FF 12 08 D8 02 02 0F FF 16 23
02 03 09 06 01 00 48 07 00 FF 12 08 DF 02 02 0F FF 16 23
02 03 09 06 01 00 15 07 00 FF 06 00 00 00 D5 02 02 0F 00 16 1B
02 03 09 06 01 00 16 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B
02 03 09 06 01 00 17 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D
02 03 09 06 01 00 18 07 00 FF 06 00 00 00 36 02 02 0F 00 16 1D
02 03 09 06 01 00 29 07 00 FF 06 00 00 03 0C 02 02 0F 00 16 1B
02 03 09 06 01 00 2A 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B
02 03 09 06 01 00 2B 07 00 FF 06 00 00 01 21 02 02 0F 00 16 1D
02 03 09 06 01 00 2C 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D
02 03 09 06 01 00 3D 07 00 FF 06 00 00 03 F9 02 02 0F 00 16 1B
02 03 09 06 01 00 3E 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B
02 03 09 06 01 00 3F 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D
02 03 09 06 01 00 40 07 00 FF 06 00 00 00 E9 02 02 0F 00 16 1D
02 03 09 06 01 00 01 08 00 FF 06 03 C2 5A 64 02 02 0F 00 16 1E
02 03 09 06 01 00 02 08 00 FF 06 00 00 00 00 02 02 0F 00 16 1E
02 03 09 06 01 00 03 08 00 FF 06 00 04 5D 06 02 02 0F 00 16 20
02 03 09 06 01 00 04 08 00 FF 06 00 B4 9D 89 02 02 0F 00 16 20
1C 90 7E

89
frames/Aidon-TN-3p.raw Normal file
View File

@ -0,0 +1,89 @@
T FF FF DA SA SA C HC HC LD LS LQ AT AI AI AI AI AD
7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 08 64 02 02 0F 00 16 1B E1
7E A1 1E 41 08 83 13 EE EE E6 E7 00 0F 40 00 00 00 00 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B 41 49 44 4F 4E 5F 56 30 30 30 31 02 02 09 06 00 00 60 01 00 FF 0A 10 37 33 35 39 39 39 32 38 39 30 34 39 37 39 39 37 02 02 09 06 00 00 60 01 07 FF 0A 04 36 35 33 34 02 03 09 06 01 00 01 07 00 FF 06 00 00 08 6C 02 02 0F 00 16 1B 02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF 06 00 00 02 09 02 02 0F 00 16 1D 02 03 09 06 01 00 1F 07 00 FF 10 00 41 02 02 0F FF 16 21 02 03 09 06 01 00 33 07 00 FF 10 00 13 02 02 0F FF 16 21 02 03 09 06 01 00 47 07 00 FF 10 00 0E 02 02 0F FF 16 21 02 03 09 06 01 00 20 07 00 FF 12 08 F2 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00 FF 12 08 D1 02 02 0F FF 16 23 02 03 09 06 01 00 48 07 00 FF 12 08 E8 02 02 0F FF 16 23 8B
7E A1 8A 41 08 83 13 EB FD E6 E7 00 0F 40 00 00 00 00 01 12 02 02 09 06 01 01 00 02 81 FF 0A 0B 41 49 44 4F 4E 5F 56 30 30 30 31 02 02 09 06 00 00 60 01 00 FF 0A 10 37 33 35 39 39 39 32 38 39 30 34 39 37 39 39 37 02 02 09 06 00 00 60 01 07 FF 0A 04 36 35 33 34 02 03 09 06 01 00 01 07 00 FF 06 00 00 03 9A 02 02 0F 00 16 1B 02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF 06 00 00 02 0E 02 02 0F 00 16 1D 02 03 09 06 01 00 1F 07 00 FF 10 00 11 02 02 0F FF 16 21 02 03 09 06 01 00 33 07 00 FF 10 00 10 02 02 0F FF 16 21 02 03 09 06 01 00 47 07 00 FF 10 00 0E 02 02 0F FF 16 21 02 03 09 06 01 00 20 07 00 FF 12 08 F4 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00 FF 12 08 CD 02 02 0F FF 16 23 02 03 09 06 01 00 48 07 00 FF 12 08 DC 02 02 0F FF 16 23 02 02 09 06 00 00 01 00 00 FF 09 0C 07 E5 03 18 03 08 00 00 FF 00 00 00 02 03 09 06 01 00 01 08 00 FF 06 00 47 F0 34 02 02 0F 01 16 1E 02 03 09 06 01 00 02 08 00 FF 06 00 00 00 00 02 02 0F 01 16 1E 02 03 09 06 01 00 03 08 00 FF 06 00 00 21 9E 02 02 0F 01 16 20 02 03 09 06 01 00 04 08 00 FF 06 00 08 E0 21 02 02 0F 01 16 20 57
7E A1 8A 41 08 83 13 EB FD E6 E7 00
0F
40 00 00 00 00
01 12
02 02 09 06 01 01 00 02 81 FF 0A 0B 41 49 44 4F 4E 5F 56 30 30 30 31
02 02 09 06 00 00 60 01 00 FF 0A 10 37 33 35 39 39 39 32 38 39 30 34 39 37 39 39 37
02 02 09 06 00 00 60 01 07 FF 0A 04 36 35 33 34
02 03 09 06 01 00 01 07 00 FF 06 00 00 09 6D 02 02 0F 00 16 1B
02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B
02 03 09 06 01 00 03 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D
02 03 09 06 01 00 04 07 00 FF 06 00 00 02 5B 02 02 0F 00 16 1D
Object with three values Value Object with two values
| Obis code | | Scaling
| | | | | Unit
02 03 09 06 01 00 1F 07 00 FF 10 00 11 02 02 0F FF 16 21
02 03 09 06 01 00 33 07 00 FF 10 00 03 02 02 0F FF 16 21
02 03 09 06 01 00 47 07 00 FF 10 00 5A 02 02 0F FF 16 21
02 03 09 06 01 00 20 07 00 FF 12 09 04 02 02 0F FF 16 23
02 03 09 06 01 00 34 07 00 FF 12 09 02 02 02 0F FF 16 23
02 03 09 06 01 00 48 07 00 FF 12 08 EC 02 02 0F FF 16 23
02 02 09 06 00 00 01 00 00 FF 09 0C 07 E5 0A 1F 00 14 00 00 FF 00 00 00
02 03 09 06 01 00 01 08 00 FF 06 00 56 9F 52 02 02 0F 01 16 1E
02 03 09 06 01 00 02 08 00 FF 06 00 00 00 00 02 02 0F 01 16 1E
02 03 09 06 01 00 03 08 00 FF 06 00 00 22 D0 02 02 0F 01 16 20
02 03 09 06 01 00 04 08 00 FF 06 00 0A F5 EC 02 02 0F 01 16 20
51 D7
7E
Received 21.09.24 20:00:10:
(V) 7E A1 8A 41 08 83 13 EB FD E6 E7 00 0F 40 00 00
(V) 00 00 01 12 02 02 09 06 01 01 00 02 81 FF 0A 0B
(V) 41 49 44 4F 4E 5F 56 30 30 30 31 02 02 09 06 00
(V) 00 60 01 00 FF 0A 10 37 33 35 39 39 39 32 38 39
(V) 30 34 39 37 39 39 37 02 02 09 06 00 00 60 01 07
(V) FF 0A 04 36 35 33 34 02 03 09 06 01 00 01 07 00
(V) FF 06 00 00 02 71 02 02 0F 00 16 1B 02 03 09 06
(V) 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16
(V) 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 00
(V) 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF
(V) 06 00 00 01 F0 02 02 0F 00 16 1D 02 03 09 06 01
(V) 00 1F 07 00 FF 10 00 06 02 02 0F FF 16 21 02 03
(V) 09 06 01 00 33 07 00 FF 10 00 05 02 02 0F FF 16
(V) 21 02 03 09 06 01 00 47 07 00 FF 10 00 17 02 02
(V) 0F FF 16 21 02 03 09 06 01 00 20 07 00 FF 12 09
(V) 3F 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00
(V) FF 12 09 36 02 02 0F FF 16 23 02 03 09 06 01 00
(V) 48 07 00 FF 12 09 22 02 02 0F FF 16 23 02 02 09
(V) 06 00 00 01 00 00 FF 09 0C 07 E8 09 15 06 13 00
(V) 00 FF 00 00 00 02 03 09 06 01 00 01 08 00 FF 06
(V) 00 8D 98 13 02 02 0F 01 16 1E 02 03 09 06 01 00
(V) 02 08 00 FF 06 00 00 00 00 02 02 0F 01 16 1E 02
(V) 03 09 06 01 00 03 08 00 FF 06 00 00 29 6E 02 02
(V) 0F 01 16 20 02 03 09 06 01 00 04 08 00 FF 06 00
(V) 13 F2 06 02 02 0F 01 16 20 C8 1D 7E
Received 27.10.24 11:00:13:
(V) 7E A1 8A 41 08 83 13 EB FD E6 E7 00 0F 40 00 00
(V) 00 00 01 12 02 02 09 06 01 01 00 02 81 FF 0A 0B
(V) 41 49 44 4F 4E 5F 56 30 30 30 31 02 02 09 06 00
(V) 00 60 01 00 FF 0A 10 37 33 35 39 39 39 32 38 39
(V) 30 34 39 37 39 39 37 02 02 09 06 00 00 60 01 07
(V) FF 0A 04 36 35 33 34 02 03 09 06 01 00 01 07 00
(V) FF 06 00 00 02 AA 02 02 0F 00 16 1B 02 03 09 06
(V) 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16
(V) 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 00
(V) 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF
(V) 06 00 00 01 CC 02 02 0F 00 16 1D 02 03 09 06 01
(V) 00 1F 07 00 FF 10 00 02 02 02 0F FF 16 21 02 03
(V) 09 06 01 00 33 07 00 FF 10 00 0B 02 02 0F FF 16
(V) 21 02 03 09 06 01 00 47 07 00 FF 10 00 16 02 02
(V) 0F FF 16 21 02 03 09 06 01 00 20 07 00 FF 12 09
(V) 2F 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00
(V) FF 12 09 00 02 02 0F FF 16 23 02 03 09 06 01 00
(V) 48 07 00 FF 12 09 0F 02 02 0F FF 16 23 02 02 09
(V) 06 00 00 01 00 00 FF 09 0C 07 E8 0A 1B 00 0B 00
(V) 00 FF 00 00 00 02 03 09 06 01 00 01 08 00 FF 06
(V) 00 8F 25 6F 02 02 0F 01 16 1E 02 03 09 06 01 00
(V) 02 08 00 FF 06 00 00 00 00 02 02 0F 01 16 1E 02
(V) 03 09 06 01 00 03 08 00 FF 06 00 00 29 8D 02 02
(V) 0F 01 16 20 02 03 09 06 01 00 04 08 00 FF 06 00
(V) 14 44 26 02 02 0F 01 16 20 84 09 7E

14
frames/EGM5G35.txt Normal file
View File

@ -0,0 +1,14 @@
2F 45 47 4D 35 47 33 35 // DSMR Identifier
0D 0A // CRLF
0D 0A // CRLF
00 // System title, blank
82 // Two-byte length follows
02 30 // 560 bytes
30 // Security tag 0011 0000, 0=Compression off, 0=Unicast, 1=Encryption, 1=Authentication, 0000= Security Suite ID
00 00 00 00 // Frame counter, blank
// Encrypted payload follows (560 - security tag - frame counter = 555 bytes)
30 10 73 D6 59 85 96 B0 2A 8B CC E7 33 AD 19 A3 A5 4A 4D 0E 3A CE F6 33 DB 57 0A 45 9A C3 5B F0 D4 C0 AA 15 B9 93 B0 E8 67 85 EC 22 CA 40 8C D7 1A B5 62 AE DF 0F 48 EA D9 E6 56 FB 84 B3 7B 47 C6 29 12 F1 EE BB 22 88 26 75 5C F8 A2 20 F4 93 F3 64 CA 7C C6 60 32 62 B0 7F F9 7F 71 0A 9F DF AB 61 89 6A 9A 10 B1 DF 94 2C 74 8F 51 B6 09 5C F2 45 6C 38 54 52 FE B6 CB 1F 42 F2 93 DC 57 BE EE 5A 0D F8 1F 53 55 0E 21 EF 46 0A 72 74 CA AB D8 9C A9 05 9E FD 54 5E CC 7B 71 40 E1 22 B2 25 5C D5 63 80 BD 97 6E 54 4B 24 A6 58 1F 79 1F 45 C7 DF C0 83 3B 7F 1E C7 43 B9 26 F6 EB 6E F2 B1 7C 99 3A 91 EA 39 72 E5 FB 72 B1 E1 24 AF 9D 19 8A 6C 50 69 97 90 D3 3D 68 97 57 C2 EC 49 EF 12 1D 11 44 46 70 46 88 88 98 37 6F B0 93 FC D2 3F 37 66 1C C7 F0 93 E3 AF 4D 3C BE 41 8E B9 48 77 A9 92 5B 42 0A 96 E5 34 4D 30 56 90 5A 08 03 CC 41 78 58 79 FD 89 82 E0 46 3D 66 AA 42 85 F4 A8 46 2D 4A E4 81 12 40 68 D6 F5 F9 11 5A 94 51 21 3C 9F 4F F7 FE B3 B5 BF 1E D2 12 CF B9 FB 28 D0 B4 82 9E 11 D8 1C FC E3 36 EC DE 8A 7C 83 76 F7 EB 3D 2C 4A B7 7F 75 91 F1 F5 18 D4 70 6A C9 3E 3D 3F 9E 0F C6 0F A7 E7 20 11 03 E7 75 4E 40 F1 5E BA 86 30 6D C0 28 C4 14 47 DF 6A EF CC FE E4 B6 23 58 2B 9D 4F BF 6A A8 93 84 F4 CD 4D FF 47 B5 C4 81 D2 DA D3 6B C3 F4 1D C4 6E E1 9B 24 30 91 7B 33 57 67 B6 E4 93 FE 8B 5B AE 8A 0D 81 DE A5 C3 3F 82 9A CE E2 BA 6D 50 39 FC 99 E6 7A 7B B4 E9 A9 84 78 AF 2D 4C D2 15 53 6B 98 2B 1F C8 3D 57 9E 49 68 40 0C D3 4A 9E D6 4F 1F 12 50 84 32 AD 62 C6 D3 42 34 46 66 65 56 49 81 F4 BC 8E C6 75 77 11 1F 29 BB 80 20 23 0A 80 D5 31 50 16 89 6F 07 4A 25 BE F0 4B 60 36 87 AE A6 2A 53 79 22 15 A5 2A C7 1D 15 7B 87 DD B5 07 3D 1C 28 C1 B6 51 47 2F 39 DE D9 B9 29 B6 78
21 // End of DSMR (!)
46 45 30 43 // FE0C - Checksum
0D 0A // CRLF

213
frames/Kaifa-TN-3p.raw Normal file
View File

@ -0,0 +1,213 @@
T FF FF DA SA SA C HC HC LD LS LQ AT AI AI AI AI AD
7E A0 27 01 02 01 10 5A 87 E6 E7 00 0F 40 00 00 00 09 0C 07 E5 03 17 02 13 1A 3A FF 80 00 00
02 01 // Frame type and size
06 00 00 0B F3 // Active power
5B 05 7E // CRC and end tag
T FF FF DA SA SA C HC HC LD LS LQ AT AI AI AI AI AD
7E A0 78 01 02 01 10 C4 98 E6 E7 00 0F 40 00 00 00 09 0C 07 E5 03 17 02 13 1B 00 FF 80 00 00
02 0D // Frame type and size
09 07 4B 46 4D 5F 30 30 31 // List version
09 10 XX XX XX XX XX XX XX XX XX XX 35 33 34 34 39 33 // Meter ID
09 07 4D 41 33 30 34 48 34 // Meter type
06 00 00 0C 21 // Active import
06 00 00 00 00 // Active export
06 00 00 00 00 // Reactive import
06 00 00 01 9F // Reactive export
06 00 00 0B F3 // I1
06 00 00 05 0B // I2
06 00 00 25 11 // I3
06 00 00 09 44 // U1
06 00 00 09 49 // U2
06 00 00 09 39 // U3
C9 95 7E // CRC and end tag
7E A0 9A 01 02 01 10 AA A5 E6 E7 00 0F 40 00 00 00 09 0C 07 E5 03 17 02 13 00 0A FF 80 00 00
02 12 09 07 4B 46 4D 5F 30 30 31
09 10 XX XX XX XX XX XX XX XX XX XX 35 33 34 34 39 33
09 07 4D 41 33 30 34 48 34
06 00 00 09 99
06 00 00 00 00 06 00 00 00 00 06 00 00 01 67 06 00 00 03 BF 06 00 00 05 05
06 00 00 24 34 06 00 00 09 45 06 00 00 09 4F 06 00 00 09 3B
09 0C 07 E5 03 17 02 13 00 0A FF 80 00 00 06 01 34 3B 5D 06 00 00 00 00 06 00 00 09 36 06 00 3C 7A 98 DA 15 7E
7E A0 79 01 02 01 10 80 93 E6 E7 00 0F 40 00 00 00 09 0C 07 E1 09 0E 04 15 1F 14 FF 80 00 00 02 0D 09 07 4B 46 4D 5F 30 30 31 09 10 36 39 37 30 36 33 31 34 30 31 37 35 33 39 38 35 09 08 4D 41 33 30 34 48 33 45 06 00 00 04 0C 06 00 00 00 00 06 00 00 00 00 06 00 00 00 4E 06 00 00 07 C1 06 00 00 0C 9E 06 00 00 0D 7E 06 00 00 09 5F 06 00 00 00 00 06 00 00 09 66 87 96 7E
01.10.24 19:00 ish:
(D) READY to update (internal clock 16:59:58 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
(V) HDLC frame:
(V) 7E A0 78 01 02 01 10 C4 98 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 00 FF 80 00 00 02
(V) 0D 09 07 4B 46 4D 5F 30 30 31 09 10 36 39 37 30
(V) 36 33 31 34 30 37 32 36 32 39 38 36 09 07 4D 41
(V) 33 30 34 48 34 06 00 00 13 C0 06 00 00 00 00 06
(V) 00 00 00 00 06 00 00 01 D5 06 00 00 4C DF 06 00
(V) 00 05 0C 06 00 00 03 9B 06 00 00 09 34 06 00 00
(V) 09 69 06 00 00 09 59 18 EB 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 00 FF 80 00 00 02 0D 09 07 4B 46 4D 5F 30 30
(V) 31 09 10 36 39 37 30 36 33 31 34 30 37 32 36 32
(V) 39 38 36 09 07 4D 41 33 30 34 48 34 06 00 00 13
(V) C0 06 00 00 00 00 06 00 00 00 00 06 00 00 01 D5
(V) 06 00 00 4C DF 06 00 00 05 0C 06 00 00 03 9B 06
(V) 00 00 09 34 06 00 00 09 69 06 00 00 09 59
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 00 FF
(V) 80 00 00 02 0D 09 07 4B 46 4D 5F 30 30 31 09 10
(V) 36 39 37 30 36 33 31 34 30 37 32 36 32 39 38 36
(V) 09 07 4D 41 33 30 34 48 34 06 00 00 13 C0 06 00
(V) 00 00 00 06 00 00 00 00 06 00 00 01 D5 06 00 00
(V) 4C DF 06 00 00 05 0C 06 00 00 03 9B 06 00 00 09
(V) 34 06 00 00 09 69 06 00 00 09 59
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 0D 09 07 4B 46 4D 5F 30 30 31 09 10 36 39 37
(V) 30 36 33 31 34 30 37 32 36 32 39 38 36 09 07 4D
(V) 41 33 30 34 48 34 06 00 00 13 C0 06 00 00 00 00
(V) 06 00 00 00 00 06 00 00 01 D5 06 00 00 4C DF 06
(V) 00 00 05 0C 06 00 00 03 9B 06 00 00 09 34 06 00
(V) 00 09 69 06 00 00 09 59
(V) DLMS
(D) READY to update (internal clock 17:00:01 UTC, meter clock: 00:00:00, list type 2, est: 1, using clock: 1)
(V) HDLC frame:
(V) 7E A0 27 01 02 01 10 5A 87 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 02 FF 80 00 00 02
(V) 01 06 00 00 13 C1 56 F5 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 02 FF 80 00 00 02 01 06 00 00 13 C1
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 02 FF
(V) 80 00 00 02 01 06 00 00 13 C1
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 01 06 00 00 13 C1
(V) DLMS
(D) READY to update (internal clock 17:00:02 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
(V) HDLC frame:
(V) 7E A0 27 01 02 01 10 5A 87 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 04 FF 80 00 00 02
(V) 01 06 00 00 13 BC F9 5A 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 04 FF 80 00 00 02 01 06 00 00 13 BC
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 04 FF
(V) 80 00 00 02 01 06 00 00 13 BC
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 01 06 00 00 13 BC
(V) DLMS
(D) READY to update (internal clock 17:00:04 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
(V) HDLC frame:
(V) 7E A0 27 01 02 01 10 5A 87 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 06 FF 80 00 00 02
(V) 01 06 00 00 13 BC 42 58 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 06 FF 80 00 00 02 01 06 00 00 13 BC
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 06 FF
(V) 80 00 00 02 01 06 00 00 13 BC
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 01 06 00 00 13 BC
(V) DLMS
(D) READY to update (internal clock 17:00:06 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
(V) HDLC frame:
(V) 7E A0 27 01 02 01 10 5A 87 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 08 FF 80 00 00 02
(V) 01 06 00 00 13 BB DC 21 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 08 FF 80 00 00 02 01 06 00 00 13 BB
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 08 FF
(V) 80 00 00 02 01 06 00 00 13 BB
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 01 06 00 00 13 BB
(V) DLMS
(D) READY to update (internal clock 17:00:08 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
(V) HDLC frame:
(V) 7E A0 9A 01 02 01 10 AA A5 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 0A FF 80 00 00 02
(V) 12 09 07 4B 46 4D 5F 30 30 31 09 10 36 39 37 30
(V) 36 33 31 34 30 37 32 36 32 39 38 36 09 07 4D 41
(V) 33 30 34 48 34 06 00 00 13 C0 06 00 00 00 00 06
(V) 00 00 00 00 06 00 00 01 D5 06 00 00 4C DD 06 00
(V) 00 05 0E 06 00 00 03 90 06 00 00 09 34 06 00 00
(V) 09 69 06 00 00 09 59 09 0C 07 E8 0A 01 02 13 00
(V) 0A FF 80 00 00 06 02 8E 4B 5E 06 00 00 00 00 06
(V) 00 97 35 DE 06 00 08 97 2F FA E5 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 0A FF 80 00 00 02 12 09 07 4B 46 4D 5F 30 30
(V) 31 09 10 36 39 37 30 36 33 31 34 30 37 32 36 32
(V) 39 38 36 09 07 4D 41 33 30 34 48 34 06 00 00 13
(V) C0 06 00 00 00 00 06 00 00 00 00 06 00 00 01 D5
(V) 06 00 00 4C DD 06 00 00 05 0E 06 00 00 03 90 06
(V) 00 00 09 34 06 00 00 09 69 06 00 00 09 59 09 0C
(V) 07 E8 0A 01 02 13 00 0A FF 80 00 00 06 02 8E 4B
(V) 5E 06 00 00 00 00 06 00 97 35 DE 06 00 08 97 2F
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 0A FF
(V) 80 00 00 02 12 09 07 4B 46 4D 5F 30 30 31 09 10
(V) 36 39 37 30 36 33 31 34 30 37 32 36 32 39 38 36
(V) 09 07 4D 41 33 30 34 48 34 06 00 00 13 C0 06 00
(V) 00 00 00 06 00 00 00 00 06 00 00 01 D5 06 00 00
(V) 4C DD 06 00 00 05 0E 06 00 00 03 90 06 00 00 09
(V) 34 06 00 00 09 69 06 00 00 09 59 09 0C 07 E8 0A
(V) 01 02 13 00 0A FF 80 00 00 06 02 8E 4B 5E 06 00
(V) 00 00 00 06 00 97 35 DE 06 00 08 97 2F
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 12 09 07 4B 46 4D 5F 30 30 31 09 10 36 39 37
(V) 30 36 33 31 34 30 37 32 36 32 39 38 36 09 07 4D
(V) 41 33 30 34 48 34 06 00 00 13 C0 06 00 00 00 00
(V) 06 00 00 00 00 06 00 00 01 D5 06 00 00 4C DD 06
(V) 00 00 05 0E 06 00 00 03 90 06 00 00 09 34 06 00
(V) 00 09 69 06 00 00 09 59 09 0C 07 E8 0A 01 02 13
(V) 00 0A FF 80 00 00 06 02 8E 4B 5E 06 00 00 00 00
(V) 06 00 97 35 DE 06 00 08 97 2F
(V) DLMS
(D) READY to update (internal clock 17:00:12 UTC, meter clock: 17:00:10, list type 3, est: 1, using clock: 0)
(D) Updating data storage using actual data
(D) Clearing hours from 16 to 17
(D) Clearing days from 1 to 1
(D) Day is not happy
(D) - normal
(I) Saving data
(I) Saving energy accounting
(W) Used 1249ms to read HAN port (true)
(V) HDLC frame:
(V) 7E A0 27 01 02 01 10 5A 87 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 0C FF 80 00 00 02
(V) 01 06 00 00 13 BC 15 50 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 0C FF 80 00 00 02 01 06 00 00 13 BC
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 0C FF
(V) 80 00 00 02 01 06 00 00 13 BC
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 01 06 00 00 13 BC
(V) DLMS
(D) NOT Ready to update (internal clock 17:00:12 UTC, meter clock: 00:00:00, list type 1, est: 0)
(V) HDLC frame:
(V) 7E A0 27 01 02 01 10 5A 87 E6 E7 00 0F 40 00 00
(V) 00 09 0C 07 E8 0A 01 02 13 00 0E FF 80 00 00 02
(V) 01 06 00 00 13 B7 7D EC 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13
(V) 00 0E FF 80 00 00 02 01 06 00 00 13 B7
(V) DLMS frame:
(V) 0F 40 00 00 00 09 0C 07 E8 0A 01 02 13 00 0E FF
(V) 80 00 00 02 01 06 00 00 13 B7
(D) Received valid DLMS at 31
(V) Using application data:
(V) 02 01 06 00 00 13 B7

51
frames/Kamstrup-1p.raw Normal file
View File

@ -0,0 +1,51 @@
7E A0 BA 2B 21 13 ED AA E6 E7 00 0F 00 00 00 00
0C 07 E6 02 05 06 0D 00 0A FF 80 00 00
02 19
0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31
09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37
09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30
09 06 01 01 01 07 00 FF 06 00 00 02 68
09 06 01 01 02 07 00 FF 06 00 00 00 00
09 06 01 01 03 07 00 FF 06 00 00 00 53
09 06 01 01 04 07 00 FF 06 00 00 00 00
09 06 01 01 1F 07 00 FF 06 00 00 01 22
00 00 00 00
09 06 01 01 20 07 00 FF 12 00 E2
00 00 00 00
05 D8 7E
7E A0 BA 2B 21 13 ED AA E6 E7 00 0F 00 00 00 00
0C 07 E6 02 05 06 0D 00 14 FF 80 00 00
02 19
0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31
09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37
09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30
09 06 01 01 01 07 00 FF 06 00 00 02 68
09 06 01 01 02 07 00 FF 06 00 00 00 00
09 06 01 01 03 07 00 FF 06 00 00 00 53
09 06 01 01 04 07 00 FF 06 00 00 00 00
09 06 01 01 1F 07 00 FF 06 00 00 01 23
00 00 00 00
09 06 01 01 20 07 00 FF 12 00 E1
00 00 00 00
8E 5E 7E
7E A1 04 2B 21 13 77 6E E6 E7 00 0F 00 00 00 00
0C 07 E6 02 05 06 0D 00 19 FF 80 00 00
02 23 0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31
09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37
09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30
09 06 01 01 01 07 00 FF 06 00 00 02 6B
09 06 01 01 02 07 00 FF 06 00 00 00 00
09 06 01 01 03 07 00 FF 06 00 00 00 54
09 06 01 01 04 07 00 FF 06 00 00 00 00
09 06 01 01 1F 07 00 FF 06 00 00 01 25
00 00 00 00
09 06 01 01 20 07 00 FF 12 00 E1
00 00 00 00
09 06 00 01 01 00 00 FF 09 0C 07 E6 02 05 06 0D 00 19 FF 80 00 00
09 06 01 01 01 08 00 FF 06 00 12 CF 93
09 06 01 01 02 08 00 FF 06 00 00 00 00
09 06 01 01 03 08 00 FF 06 00 00 8C CE
09 06 01 01 04 08 00 FF 06 00 05 E5 04
7F E9 7E

View File

@ -0,0 +1,23 @@
7E A1 2C 2B 21 13 FC 04 E6 E7 00 0F 00 00 00 00
0C 07 E6 02 12 05 16 00 23 FF 80 00 00
02 23
0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31
09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 33 33 31 33 32 33 35 32 36
09 06 01 01 60 01 01 FF 0A 12 36 38 34 31 31 33 31 42 4E 32 34 35 31 30 31 30 39 32
09 06 01 01 01 07 00 FF 06 00 00 08 DD
09 06 01 01 02 07 00 FF 06 00 00 00 00
09 06 01 01 03 07 00 FF 06 00 00 00 00
09 06 01 01 04 07 00 FF 06 00 00 01 90
09 06 01 01 1F 07 00 FF 06 00 00 01 1F
09 06 01 01 33 07 00 FF 06 00 00 02 57
09 06 01 01 47 07 00 FF 06 00 00 00 6A
09 06 01 01 20 07 00 FF 12 00 F1
09 06 01 01 34 07 00 FF 12 00 F0
09 06 01 01 48 07 00 FF 12 00 F3
09 06 00 01 01 00 00 FF 09 0C 07 E6 02 12 05 16 00 23 FF 80 00 00
09 06 01 01 01 08 00 FF 06 01 E8 7F 4E
09 06 01 01 02 08 00 FF 06 00 00 00 00
09 06 01 01 03 08 00 FF 06 00 58 71 8B
09 06 01 01 04 08 00 FF 06 00 10 60 23
B8 1C
7E

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,51 @@
# After decode:
7E
A1 E9 // Frame type and size
41 03 13 C6 37 E6 E7 00
DB // Encrypted
08 4B 41 4D 45 01 AC 4D 6E // System title
82 // Prefix for 2-byte length
01 D0 // Length 464
30 // Security tag 0011 0000, 0=Compression off, 0=Unicast, 1=Encryption, 1=Authentication, 0000= Security Suite ID
00 00 A3 2F // Frame counter
// Decrypted frame below
0F 00 00 00 00
0C 07 E4 05 0C 02 0A 19 00 FF 80 00 80 // Package timestamp
02 41
0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 - List ID
09 06 01 01 01 08 00 FF 06 00 11 94 CA - Active+ Energy
09 06 01 01 02 08 00 FF 06 00 00 00 00 - Active- Energy
09 06 01 01 03 08 00 FF 06 00 00 12 7E - Reactive+ Energy
09 06 01 01 04 08 00 FF 06 00 09 55 0E - Reactive- Energy
09 06 01 01 00 00 01 FF 06 01 44 AD E1 - Electricity ID?
09 06 01 01 01 07 00 FF 06 00 00 05 CC - Active+ Instantaneous value
09 06 01 01 02 07 00 FF 06 00 00 00 00 - Active- Instantaneous value
09 06 01 01 03 07 00 FF 06 00 00 00 00 - Reactive+ Instantaneous value
09 06 01 01 04 07 00 FF 06 00 00 00 17 - Reactive- Instantaneous value
09 06 00 01 01 00 00 FF 09 0C 07 E4 05 0C 02 0A 19 00 FF 80 00 80 - Current date/time
09 06 01 01 20 07 00 FF 12 00 E5 - L1 Voltage Instantaneous value
09 06 01 01 34 07 00 FF 12 00 E5 - L2 Voltage Instantaneous value
09 06 01 01 48 07 00 FF 12 00 E3 - L3 Voltage Instantaneous value
09 06 01 01 1F 07 00 FF 06 00 00 00 4B - L1 Current Instantaneous value
09 06 01 01 33 07 00 FF 06 00 00 00 AA - L2 Current Instantaneous value
09 06 01 01 47 07 00 FF 06 00 00 01 E4 - L3 Current Instantaneous value
09 06 01 01 15 07 00 FF 06 00 00 00 71 - L1 Active+ Instantaneous value
09 06 01 01 29 07 00 FF 06 00 00 01 54 - L2 Active+ Instantaneous value
09 06 01 01 3D 07 00 FF 06 00 00 04 07 - L3 Active+ Instantaneous value
09 06 01 01 21 07 00 FF 12 00 4D - L1 (cos.phi) (PF) Instantaneous value
09 06 01 01 35 07 00 FF 12 00 5F - L2 (cos.phi) (PF) Instantaneous value
09 06 01 01 49 07 00 FF 12 00 62 - L3 (cos.phi) (PF) Instantaneous value
09 06 01 01 0D 07 00 FF 12 00 63 - Avegage (cos.phi) (PF) Inst. value
09 06 01 01 16 07 00 FF 06 00 00 00 00 - L1 Active- Instantaneous value
09 06 01 01 2A 07 00 FF 06 00 00 00 00 - L2 Active- Instantaneous value
09 06 01 01 3E 07 00 FF 06 00 00 00 00 - L3 Active- Instantaneous value
09 06 01 01 16 08 00 FF 06 00 00 00 00 - L1 Active- Energy
09 06 01 01 2A 08 00 FF 06 00 00 00 00 - L2 Active- Energy
09 06 01 01 3E 08 00 FF 06 00 00 00 00 - L3 Active- Energy
09 06 01 01 15 08 00 FF 06 00 0A 8F 97 - L1 Active+ Energy
09 06 01 01 29 08 00 FF 06 00 04 C1 53 - L2 Active+ Energy
09 06 01 01 3D 08 00 FF 06 00 02 43 E0 - L3 Active+ Energy
5B C3 CD 5E 79 18 18 DA 9F 97 85 FF 5A 84 7E

18
frames/Kamstup-TN-3p.raw Normal file
View File

@ -0,0 +1,18 @@
7E A0 E2 2B 21 13 23 9A E6 E7 00 0F 00 00 00 00
0C 07 E5 0B 11 03 0B 32 00 FF 80 00 00
02 19
0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 - List ID
09 06 01 01 00 00 05 FF 0A 10 XX XX XX XX XX XX XX XX XX XX XX XX XX XX XX XX - Meter ID
09 06 01 01 60 01 01 FF 0A 12 36 38 34 31 31 33 31 42 4E 32 34 33 31 30 31 30 34 30 - Meter model
09 06 01 01 01 07 00 FF 06 00 00 05 E6 - Active+
09 06 01 01 02 07 00 FF 06 00 00 00 00 - Active-
09 06 01 01 03 07 00 FF 06 00 00 00 00 - Reactive+
09 06 01 01 04 07 00 FF 06 00 00 01 92 - Reactive-
09 06 01 01 1F 07 00 FF 06 00 00 00 A1 - L1 current
09 06 01 01 33 07 00 FF 06 00 00 00 C1 - L2 current
09 06 01 01 47 07 00 FF 06 00 00 01 8E - L3 current
09 06 01 01 20 07 00 FF 12 00 EB - L1 voltage
09 06 01 01 34 07 00 FF 12 00 EC - L2 voltage
09 06 01 01 48 07 00 FF 12 00 EC - L3 voltage
EF 5F 7E

682
frames/L&G-E350_Norway.raw Normal file
View File

@ -0,0 +1,682 @@
*** Remote debug - over telnet - for ESP32 - version 3.0.5
* Host name: ams-e603 IP:10.10.10.62 Mac address:D8:3B:DA:C4:03:E6
* Free Heap RAM: 87952
* ESP SDK version: 4.4.5.230722
******************************************************
* Commands:
? or help -> display these help of commands
q -> quit (close this connection)
m -> display memory available
v -> set debug level to verbose
d -> set debug level to debug
i -> set debug level to info
w -> set debug level to warning
e -> set debug level to errors
s -> set debug silence on/off
l -> show debug level
t -> show time (millis)
profiler:
p -> show time between actual and last message (in millis)
p min -> show only if time is this minimal
P time -> set debug level to profiler
c -> show colors
filter:
filter <string> -> show only debugs with this
nofilter -> disable the filter
* Please type the command and press enter to execute.(? or h for this help)
***
(V) HDLC frame:
(V) 7E A1 1E 41 08 83 13 EE EE E6 E7 00 0F 40 00 00
(V) 00 00 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B
(V) 45 4D 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00
(V) 00 60 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00
(V) 00 00 00 00 00 00 00 02 02 09 06 00 00 60 01 07
(V) FF 0A 04 5A 46 46 31 02 03 09 06 01 00 01 07 00
(V) FF 06 00 00 24 F4 02 02 0F 00 16 1B 02 03 09 06
(V) 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16
(V) 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 31
(V) 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF
(V) 06 00 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01
(V) 00 1F 07 00 FF 10 0C 6C 02 02 0F FE 16 21 02 03
(V) 09 06 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16
(V) 21 02 03 09 06 01 00 47 07 00 FF 10 0D 68 02 02
(V) 0F FE 16 21 02 03 09 06 01 00 20 07 00 FF 12 09
(V) 2E 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00
(V) FF 12 00 00 02 02 0F FF 16 23 02 03 09 06 01 00
(V) 48 07 00 FF 12 09 10 02 02 0F FF 16 23 2F AF 7E
(V)
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 0D 02 02 09 06 01
(V) 01 00 02 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31
(V) 5F 31 02 02 09 06 00 00 60 01 00 FF 0A 10 31 33
(V) 39 34 33 35 39 37 00 00 00 00 00 00 00 00 02 02
(V) 09 06 00 00 60 01 07 FF 0A 04 5A 46 46 31 02 03
(V) 09 06 01 00 01 07 00 FF 06 00 00 24 F4 02 02 0F
(V) 00 16 1B 02 03 09 06 01 00 02 07 00 FF 06 00 00
(V) 00 00 02 02 0F 00 16 1B 02 03 09 06 01 00 03 07
(V) 00 FF 06 00 00 00 31 02 02 0F 00 16 1D 02 03 09
(V) 06 01 00 04 07 00 FF 06 00 00 00 00 02 02 0F 00
(V) 16 1D 02 03 09 06 01 00 1F 07 00 FF 10 0C 6C 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 33 07 00 FF 10
(V) 00 00 02 02 0F FE 16 21 02 03 09 06 01 00 47 07
(V) 00 FF 10 0D 68 02 02 0F FE 16 21 02 03 09 06 01
(V) 00 20 07 00 FF 12 09 2E 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 34 07 00 FF 12 00 00 02 02 0F FF 16
(V) 23 02 03 09 06 01 00 48 07 00 FF 12 09 10 02 02
(V) 0F FF 16 23
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 0D 02 02 09 06 01 01 00 02
(V) 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31 5F 31 02
(V) 02 09 06 00 00 60 01 00 FF 0A 10 31 33 39 34 33
(V) 35 39 37 00 00 00 00 00 00 00 00 02 02 09 06 00
(V) 00 60 01 07 FF 0A 04 5A 46 46 31 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 F4 02 02 0F 00 16 1B
(V) 02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02
(V) 02 0F 00 16 1B 02 03 09 06 01 00 03 07 00 FF 06
(V) 00 00 00 31 02 02 0F 00 16 1D 02 03 09 06 01 00
(V) 04 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D 02
(V) 03 09 06 01 00 1F 07 00 FF 10 0C 6C 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 33 07 00 FF 10 00 00 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 47 07 00 FF 10
(V) 0D 68 02 02 0F FE 16 21 02 03 09 06 01 00 20 07
(V) 00 FF 12 09 2E 02 02 0F FF 16 23 02 03 09 06 01
(V) 00 34 07 00 FF 12 00 00 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 48 07 00 FF 12 09 10 02 02 0F FF 16
(V) 23
(D) Received valid DLMS at 18 +267
(V) Using application data:
(V) 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B 45 4D
(V) 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00 00 60
(V) 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00 00 00
(V) 00 00 00 00 00 02 02 09 06 00 00 60 01 07 FF 0A
(V) 04 5A 46 46 31 02 03 09 06 01 00 01 07 00 FF 06
(V) 00 00 24 F4 02 02 0F 00 16 1B 02 03 09 06 01 00
(V) 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B 02
(V) 03 09 06 01 00 03 07 00 FF 06 00 00 00 31 02 02
(V) 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF 06 00
(V) 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01 00 1F
(V) 07 00 FF 10 0C 6C 02 02 0F FE 16 21 02 03 09 06
(V) 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16 21 02
(V) 03 09 06 01 00 47 07 00 FF 10 0D 68 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 20 07 00 FF 12 09 2E 02
(V) 02 0F FF 16 23 02 03 09 06 01 00 34 07 00 FF 12
(V) 00 00 02 02 0F FF 16 23 02 03 09 06 01 00 48 07
(V) 00 FF 12 09 10 02 02 0F FF 16 23
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:06 UTC, meter clock: 00:00:00, list type 2, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 F4 02 02 0F 00 16 1B A7 7F 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 F4 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 F4 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) F4 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:07 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 F4 02 02 0F 00 16 1B A7 7F 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 F4 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 F4 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) F4 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:10 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 E0 02 02 0F 00 16 1B 18 A5 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 E0 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 E0 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) E0 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:12 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A1 1E 41 08 83 13 EE EE E6 E7 00 0F 40 00 00
(V) 00 00 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B
(V) 45 4D 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00
(V) 00 60 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00
(V) 00 00 00 00 00 00 00 02 02 09 06 00 00 60 01 07
(V) FF 0A 04 00 00 00 00 02 03 09 06 01 00 01 07 00
(V) FF 06 00 00 24 E0 02 02 0F 00 16 1B 02 03 09 06
(V) 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16
(V) 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 28
(V) 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF
(V) 06 00 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01
(V) 00 1F 07 00 FF 10 0C 68 02 02 0F FE 16 21 02 03
(V) 09 06 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16
(V) 21 02 03 09 06 01 00 47 07 00 FF 10 0D 5D 02 02
(V) 0F FE 16 21 02 03 09 06 01 00 20 07 00 FF 12 09
(V) 2E 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00
(V) FF 12 00 00 02 02 0F FF 16 23 02 03 09 06 01 00
(V) 48 07 00 FF 12 09 10 02 02 0F FF 16 23 AE 9D 7E
(V)
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 0D 02 02 09 06 01
(V) 01 00 02 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31
(V) 5F 31 02 02 09 06 00 00 60 01 00 FF 0A 10 31 33
(V) 39 34 33 35 39 37 00 00 00 00 00 00 00 00 02 02
(V) 09 06 00 00 60 01 07 FF 0A 04 00 00 00 00 02 03
(V) 09 06 01 00 01 07 00 FF 06 00 00 24 E0 02 02 0F
(V) 00 16 1B 02 03 09 06 01 00 02 07 00 FF 06 00 00
(V) 00 00 02 02 0F 00 16 1B 02 03 09 06 01 00 03 07
(V) 00 FF 06 00 00 00 28 02 02 0F 00 16 1D 02 03 09
(V) 06 01 00 04 07 00 FF 06 00 00 00 00 02 02 0F 00
(V) 16 1D 02 03 09 06 01 00 1F 07 00 FF 10 0C 68 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 33 07 00 FF 10
(V) 00 00 02 02 0F FE 16 21 02 03 09 06 01 00 47 07
(V) 00 FF 10 0D 5D 02 02 0F FE 16 21 02 03 09 06 01
(V) 00 20 07 00 FF 12 09 2E 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 34 07 00 FF 12 00 00 02 02 0F FF 16
(V) 23 02 03 09 06 01 00 48 07 00 FF 12 09 10 02 02
(V) 0F FF 16 23
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 0D 02 02 09 06 01 01 00 02
(V) 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31 5F 31 02
(V) 02 09 06 00 00 60 01 00 FF 0A 10 31 33 39 34 33
(V) 35 39 37 00 00 00 00 00 00 00 00 02 02 09 06 00
(V) 00 60 01 07 FF 0A 04 00 00 00 00 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 E0 02 02 0F 00 16 1B
(V) 02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02
(V) 02 0F 00 16 1B 02 03 09 06 01 00 03 07 00 FF 06
(V) 00 00 00 28 02 02 0F 00 16 1D 02 03 09 06 01 00
(V) 04 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D 02
(V) 03 09 06 01 00 1F 07 00 FF 10 0C 68 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 33 07 00 FF 10 00 00 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 47 07 00 FF 10
(V) 0D 5D 02 02 0F FE 16 21 02 03 09 06 01 00 20 07
(V) 00 FF 12 09 2E 02 02 0F FF 16 23 02 03 09 06 01
(V) 00 34 07 00 FF 12 00 00 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 48 07 00 FF 12 09 10 02 02 0F FF 16
(V) 23
(D) Received valid DLMS at 18 +267
(V) Using application data:
(V) 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B 45 4D
(V) 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00 00 60
(V) 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00 00 00
(V) 00 00 00 00 00 02 02 09 06 00 00 60 01 07 FF 0A
(V) 04 00 00 00 00 02 03 09 06 01 00 01 07 00 FF 06
(V) 00 00 24 E0 02 02 0F 00 16 1B 02 03 09 06 01 00
(V) 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B 02
(V) 03 09 06 01 00 03 07 00 FF 06 00 00 00 28 02 02
(V) 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF 06 00
(V) 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01 00 1F
(V) 07 00 FF 10 0C 68 02 02 0F FE 16 21 02 03 09 06
(V) 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16 21 02
(V) 03 09 06 01 00 47 07 00 FF 10 0D 5D 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 20 07 00 FF 12 09 2E 02
(V) 02 0F FF 16 23 02 03 09 06 01 00 34 07 00 FF 12
(V) 00 00 02 02 0F FF 16 23 02 03 09 06 01 00 48 07
(V) 00 FF 12 09 10 02 02 0F FF 16 23
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:16 UTC, meter clock: 00:00:00, list type 2, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 E0 02 02 0F 00 16 1B 18 A5 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 E0 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 E0 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) E0 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:17 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 A4 02 02 0F 00 16 1B 68 0D 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) A4 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:20 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 A4 02 02 0F 00 16 1B 68 0D 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) A4 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:22 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A1 1E 41 08 83 13 EE EE E6 E7 00 0F 40 00 00
(V) 00 00 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B
(V) 45 4D 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00
(V) 00 60 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00
(V) 00 00 00 00 00 00 00 02 02 09 06 00 00 60 01 07
(V) FF 0A 04 5A 46 46 31 02 03 09 06 01 00 01 07 00
(V) FF 06 00 00 24 A4 02 02 0F 00 16 1B 02 03 09 06
(V) 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16
(V) 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 31
(V) 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF
(V) 06 00 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01
(V) 00 1F 07 00 FF 10 0C 6E 02 02 0F FE 16 21 02 03
(V) 09 06 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16
(V) 21 02 03 09 06 01 00 47 07 00 FF 10 0D 5C 02 02
(V) 0F FE 16 21 02 03 09 06 01 00 20 07 00 FF 12 09
(V) 38 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00
(V) FF 12 00 00 02 02 0F FF 16 23 02 03 09 06 01 00
(V) 48 07 00 FF 12 09 10 02 02 0F FF 16 23 4A DF 7E
(V)
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 0D 02 02 09 06 01
(V) 01 00 02 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31
(V) 5F 31 02 02 09 06 00 00 60 01 00 FF 0A 10 31 33
(V) 39 34 33 35 39 37 00 00 00 00 00 00 00 00 02 02
(V) 09 06 00 00 60 01 07 FF 0A 04 5A 46 46 31 02 03
(V) 09 06 01 00 01 07 00 FF 06 00 00 24 A4 02 02 0F
(V) 00 16 1B 02 03 09 06 01 00 02 07 00 FF 06 00 00
(V) 00 00 02 02 0F 00 16 1B 02 03 09 06 01 00 03 07
(V) 00 FF 06 00 00 00 31 02 02 0F 00 16 1D 02 03 09
(V) 06 01 00 04 07 00 FF 06 00 00 00 00 02 02 0F 00
(V) 16 1D 02 03 09 06 01 00 1F 07 00 FF 10 0C 6E 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 33 07 00 FF 10
(V) 00 00 02 02 0F FE 16 21 02 03 09 06 01 00 47 07
(V) 00 FF 10 0D 5C 02 02 0F FE 16 21 02 03 09 06 01
(V) 00 20 07 00 FF 12 09 38 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 34 07 00 FF 12 00 00 02 02 0F FF 16
(V) 23 02 03 09 06 01 00 48 07 00 FF 12 09 10 02 02
(V) 0F FF 16 23
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 0D 02 02 09 06 01 01 00 02
(V) 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31 5F 31 02
(V) 02 09 06 00 00 60 01 00 FF 0A 10 31 33 39 34 33
(V) 35 39 37 00 00 00 00 00 00 00 00 02 02 09 06 00
(V) 00 60 01 07 FF 0A 04 5A 46 46 31 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(V) 02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02
(V) 02 0F 00 16 1B 02 03 09 06 01 00 03 07 00 FF 06
(V) 00 00 00 31 02 02 0F 00 16 1D 02 03 09 06 01 00
(V) 04 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D 02
(V) 03 09 06 01 00 1F 07 00 FF 10 0C 6E 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 33 07 00 FF 10 00 00 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 47 07 00 FF 10
(V) 0D 5C 02 02 0F FE 16 21 02 03 09 06 01 00 20 07
(V) 00 FF 12 09 38 02 02 0F FF 16 23 02 03 09 06 01
(V) 00 34 07 00 FF 12 00 00 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 48 07 00 FF 12 09 10 02 02 0F FF 16
(V) 23
(D) Received valid DLMS at 18 +267
(V) Using application data:
(V) 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B 45 4D
(V) 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00 00 60
(V) 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00 00 00
(V) 00 00 00 00 00 02 02 09 06 00 00 60 01 07 FF 0A
(V) 04 5A 46 46 31 02 03 09 06 01 00 01 07 00 FF 06
(V) 00 00 24 A4 02 02 0F 00 16 1B 02 03 09 06 01 00
(V) 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B 02
(V) 03 09 06 01 00 03 07 00 FF 06 00 00 00 31 02 02
(V) 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF 06 00
(V) 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01 00 1F
(V) 07 00 FF 10 0C 6E 02 02 0F FE 16 21 02 03 09 06
(V) 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16 21 02
(V) 03 09 06 01 00 47 07 00 FF 10 0D 5C 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 20 07 00 FF 12 09 38 02
(V) 02 0F FF 16 23 02 03 09 06 01 00 34 07 00 FF 12
(V) 00 00 02 02 0F FF 16 23 02 03 09 06 01 00 48 07
(V) 00 FF 12 09 10 02 02 0F FF 16 23
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:26 UTC, meter clock: 00:00:00, list type 2, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 B8 02 02 0F 00 16 1B 3B 09 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) B8 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:27 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 B8 02 02 0F 00 16 1B 3B 09 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) B8 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:29 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 B8 02 02 0F 00 16 1B 3B 09 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) B8 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:32 UTC, meter clock: 00:00:00, list type 1, est: 1)
q(V) HDLC frame:
(V) 7E A1 1E 41 08 83 13 EE EE E6 E7 00 0F 40 00 00
(V) 00 00 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B
(V) 45 4D 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00
(V) 00 60 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00
(V) 00 00 00 00 00 00 00 02 02 09 06 00 00 60 01 07
(V) FF 0A 04 5A 46 46 31 02 03 09 06 01 00 01 07 00
(V) FF 06 00 00 24 A4 02 02 0F 00 16 1B 02 03 09 06
(V) 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16
(V) 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 46
(V) 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF
(V) 06 00 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01
(V) 00 1F 07 00 FF 10 0C 67 02 02 0F FE 16 21 02 03
(V) 09 06 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16
(V) 21 02 03 09 06 01 00 47 07 00 FF 10 0D 5D 02 02
(V) 0F FE 16 21 02 03 09 06 01 00 20 07 00 FF 12 09
(V) 2E 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00
(V) FF 12 00 00 02 02 0F FF 16 23 02 03 09 06 01 00
(V) 48 07 00 FF 12 09 06 02 02 0F FF 16 23 3A 49 7E
(V)
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 0D 02 02 09 06 01
(V) 01 00 02 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31
(V) 5F 31 02 02 09 06 00 00 60 01 00 FF 0A 10 31 33
(V) 39 34 33 35 39 37 00 00 00 00 00 00 00 00 02 02
(V) 09 06 00 00 60 01 07 FF 0A 04 5A 46 46 31 02 03
(V) 09 06 01 00 01 07 00 FF 06 00 00 24 A4 02 02 0F
(V) 00 16 1B 02 03 09 06 01 00 02 07 00 FF 06 00 00
(V) 00 00 02 02 0F 00 16 1B 02 03 09 06 01 00 03 07
(V) 00 FF 06 00 00 00 46 02 02 0F 00 16 1D 02 03 09
(V) 06 01 00 04 07 00 FF 06 00 00 00 00 02 02 0F 00
(V) 16 1D 02 03 09 06 01 00 1F 07 00 FF 10 0C 67 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 33 07 00 FF 10
(V) 00 00 02 02 0F FE 16 21 02 03 09 06 01 00 47 07
(V) 00 FF 10 0D 5D 02 02 0F FE 16 21 02 03 09 06 01
(V) 00 20 07 00 FF 12 09 2E 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 34 07 00 FF 12 00 00 02 02 0F FF 16
(V) 23 02 03 09 06 01 00 48 07 00 FF 12 09 06 02 02
(V) 0F FF 16 23
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 0D 02 02 09 06 01 01 00 02
(V) 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31 5F 31 02
(V) 02 09 06 00 00 60 01 00 FF 0A 10 31 33 39 34 33
(V) 35 39 37 00 00 00 00 00 00 00 00 02 02 09 06 00
(V) 00 60 01 07 FF 0A 04 5A 46 46 31 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(V) 02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02
(V) 02 0F 00 16 1B 02 03 09 06 01 00 03 07 00 FF 06
(V) 00 00 00 46 02 02 0F 00 16 1D 02 03 09 06 01 00
(V) 04 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D 02
(V) 03 09 06 01 00 1F 07 00 FF 10 0C 67 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 33 07 00 FF 10 00 00 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 47 07 00 FF 10
(V) 0D 5D 02 02 0F FE 16 21 02 03 09 06 01 00 20 07
(V) 00 FF 12 09 2E 02 02 0F FF 16 23 02 03 09 06 01
(V) 00 34 07 00 FF 12 00 00 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 48 07 00 FF 12 09 06 02 02 0F FF 16
(V) 23
(D) Received valid DLMS at 18 +267
(V) Using application data:
(V) 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B 45 4D
(V) 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00 00 60
(V) 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00 00 00
(V) 00 00 00 00 00 02 02 09 06 00 00 60 01 07 FF 0A
(V) 04 5A 46 46 31 02 03 09 06 01 00 01 07 00 FF 06
(V) 00 00 24 A4 02 02 0F 00 16 1B 02 03 09 06 01 00
(V) 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B 02
(V) 03 09 06 01 00 03 07 00 FF 06 00 00 00 46 02 02
(V) 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF 06 00
(V) 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01 00 1F
(V) 07 00 FF 10 0C 67 02 02 0F FE 16 21 02 03 09 06
(V) 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16 21 02
(V) 03 09 06 01 00 47 07 00 FF 10 0D 5D 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 20 07 00 FF 12 09 2E 02
(V) 02 0F FF 16 23 02 03 09 06 01 00 34 07 00 FF 12
(V) 00 00 02 02 0F FF 16 23 02 03 09 06 01 00 48 07
(V) 00 FF 12 09 06 02 02 0F FF 16 23
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:36 UTC, meter clock: 00:00:00, list type 2, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 A4 02 02 0F 00 16 1B 68 0D 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) A4 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:37 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 A4 02 02 0F 00 16 1B 68 0D 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 A4 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) A4 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:39 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 D5 02 02 0F 00 16 1B F1 83 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 D5 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 D5 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) D5 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:42 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A1 1E 41 08 83 13 EE EE E6 E7 00 0F 40 00 00
(V) 00 00 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B
(V) 45 4D 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00
(V) 00 60 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00
(V) 00 00 00 00 00 00 00 02 02 09 06 00 00 60 01 07
(V) FF 0A 04 5A 46 46 31 02 03 09 06 01 00 01 07 00
(V) FF 06 00 00 24 D5 02 02 0F 00 16 1B 02 03 09 06
(V) 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16
(V) 1B 02 03 09 06 01 00 03 07 00 FF 06 00 00 00 3C
(V) 02 02 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF
(V) 06 00 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01
(V) 00 1F 07 00 FF 10 0C 77 02 02 0F FE 16 21 02 03
(V) 09 06 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16
(V) 21 02 03 09 06 01 00 47 07 00 FF 10 0D 5F 02 02
(V) 0F FE 16 21 02 03 09 06 01 00 20 07 00 FF 12 09
(V) 2E 02 02 0F FF 16 23 02 03 09 06 01 00 34 07 00
(V) FF 12 00 00 02 02 0F FF 16 23 02 03 09 06 01 00
(V) 48 07 00 FF 12 09 06 02 02 0F FF 16 23 4A 9D 7E
(V)
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 0D 02 02 09 06 01
(V) 01 00 02 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31
(V) 5F 31 02 02 09 06 00 00 60 01 00 FF 0A 10 31 33
(V) 39 34 33 35 39 37 00 00 00 00 00 00 00 00 02 02
(V) 09 06 00 00 60 01 07 FF 0A 04 5A 46 46 31 02 03
(V) 09 06 01 00 01 07 00 FF 06 00 00 24 D5 02 02 0F
(V) 00 16 1B 02 03 09 06 01 00 02 07 00 FF 06 00 00
(V) 00 00 02 02 0F 00 16 1B 02 03 09 06 01 00 03 07
(V) 00 FF 06 00 00 00 3C 02 02 0F 00 16 1D 02 03 09
(V) 06 01 00 04 07 00 FF 06 00 00 00 00 02 02 0F 00
(V) 16 1D 02 03 09 06 01 00 1F 07 00 FF 10 0C 77 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 33 07 00 FF 10
(V) 00 00 02 02 0F FE 16 21 02 03 09 06 01 00 47 07
(V) 00 FF 10 0D 5F 02 02 0F FE 16 21 02 03 09 06 01
(V) 00 20 07 00 FF 12 09 2E 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 34 07 00 FF 12 00 00 02 02 0F FF 16
(V) 23 02 03 09 06 01 00 48 07 00 FF 12 09 06 02 02
(V) 0F FF 16 23
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 0D 02 02 09 06 01 01 00 02
(V) 81 FF 0A 0B 45 4D 42 52 49 51 5F 56 31 5F 31 02
(V) 02 09 06 00 00 60 01 00 FF 0A 10 31 33 39 34 33
(V) 35 39 37 00 00 00 00 00 00 00 00 02 02 09 06 00
(V) 00 60 01 07 FF 0A 04 5A 46 46 31 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 D5 02 02 0F 00 16 1B
(V) 02 03 09 06 01 00 02 07 00 FF 06 00 00 00 00 02
(V) 02 0F 00 16 1B 02 03 09 06 01 00 03 07 00 FF 06
(V) 00 00 00 3C 02 02 0F 00 16 1D 02 03 09 06 01 00
(V) 04 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1D 02
(V) 03 09 06 01 00 1F 07 00 FF 10 0C 77 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 33 07 00 FF 10 00 00 02
(V) 02 0F FE 16 21 02 03 09 06 01 00 47 07 00 FF 10
(V) 0D 5F 02 02 0F FE 16 21 02 03 09 06 01 00 20 07
(V) 00 FF 12 09 2E 02 02 0F FF 16 23 02 03 09 06 01
(V) 00 34 07 00 FF 12 00 00 02 02 0F FF 16 23 02 03
(V) 09 06 01 00 48 07 00 FF 12 09 06 02 02 0F FF 16
(V) 23
(D) Received valid DLMS at 18 +267
(V) Using application data:
(V) 01 0D 02 02 09 06 01 01 00 02 81 FF 0A 0B 45 4D
(V) 42 52 49 51 5F 56 31 5F 31 02 02 09 06 00 00 60
(V) 01 00 FF 0A 10 31 33 39 34 33 35 39 37 00 00 00
(V) 00 00 00 00 00 02 02 09 06 00 00 60 01 07 FF 0A
(V) 04 5A 46 46 31 02 03 09 06 01 00 01 07 00 FF 06
(V) 00 00 24 D5 02 02 0F 00 16 1B 02 03 09 06 01 00
(V) 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B 02
(V) 03 09 06 01 00 03 07 00 FF 06 00 00 00 3C 02 02
(V) 0F 00 16 1D 02 03 09 06 01 00 04 07 00 FF 06 00
(V) 00 00 00 02 02 0F 00 16 1D 02 03 09 06 01 00 1F
(V) 07 00 FF 10 0C 77 02 02 0F FE 16 21 02 03 09 06
(V) 01 00 33 07 00 FF 10 00 00 02 02 0F FE 16 21 02
(V) 03 09 06 01 00 47 07 00 FF 10 0D 5F 02 02 0F FE
(V) 16 21 02 03 09 06 01 00 20 07 00 FF 12 09 2E 02
(V) 02 0F FF 16 23 02 03 09 06 01 00 34 07 00 FF 12
(V) 00 00 02 02 0F FF 16 23 02 03 09 06 01 00 48 07
(V) 00 FF 12 09 06 02 02 0F FF 16 23
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:46 UTC, meter clock: 00:00:00, list type 2, est: 1)
qq(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 D5 02 02 0F 00 16 1B F1 83 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 D5 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 D5 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) D5 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:47 UTC, meter clock: 00:00:00, list type 1, est: 1)
q
* Debug: Command received: qqqqq
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 B8 02 02 0F 00 16 1B 3B 09 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) B8 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:49 UTC, meter clock: 00:00:00, list type 1, est: 1)
(V) HDLC frame:
(V) 7E A0 2A 41 08 83 13 04 13 E6 E7 00 0F 40 00 00
(V) 00 00 01 01 02 03 09 06 01 00 01 07 00 FF 06 00
(V) 00 24 B8 02 02 0F 00 16 1B 3B 09 7E
(V) LLC frame:
(V) E6 E7 00 0F 40 00 00 00 00 01 01 02 03 09 06 01
(V) 00 01 07 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(V)
(V) DLMS frame:
(V) 0F 40 00 00 00 00 01 01 02 03 09 06 01 00 01 07
(V) 00 FF 06 00 00 24 B8 02 02 0F 00 16 1B
(D) Received valid DLMS at 18 +23
(V) Using application data:
(V) 01 01 02 03 09 06 01 00 01 07 00 FF 06 00 00 24
(V) B8 02 02 0F 00 16 1B
(V) DLMS
(D) NOT Ready to update (internal clock 12:32:51 UTC, meter clock: 00:00:00, list type 1, est: 1)
q
* Debug: Command received: q
* Closing client connection ...

45
frames/austria.raw Normal file
View File

@ -0,0 +1,45 @@
// HDLC header
68
01 01 // Format (0x00) and total length (257)
68 // Start
53 // Control field
FF // Address (Broadcast address)
// LLC
00 // Control information field
01 // Source SAP
67 // Destination SAP
DB // Encrypted
08 53 41 47 59 05 E6 D9 FD // System title
81 // Prefix for 1-byte length
F8 // Length (248), starting from 0xDB and including end byte
20 // Security tag 0010 0000, 0=Compression off, 0=Unicast, 1=Encryption, 0=No auth, 0000= Security Suite ID
00 72 00 76 // Frame counter
68 01 01 68
53 FF 10 01 67
DB
08 53 41 47 59 05 E6 D9 FD
81 F8
20
00 01 A0 E0
0F 80 3E 37 71
0C 07 E5 0C 1B 01 0E 00 2D 00 FF C4 02 // Frame timestamp
02 23 // 35 items
09 0C 07 E5 0C 1B 01 0E 00 2D 00 FF C4 02 // Meter timestamp
09 06 01 00 01 08 00 FF 06 00 43 3D 0A 02 02 0F 00 16 1E
09 06 01 00 02 08 00 FF 06 00 00 01 03 02 02 0F 00 16 1E
09 06 01 00 01 07 00 FF 06 00 00 01 FE 02 02 0F 00 16 1B
09 06 01 00 02 07 00 FF 06 00 00 00 00 02 02 0F 00 16 1B
09 06 01 00 20 07 00 FF 12 09 34 02 02 0F FF 16 23
09 06 01 00 34 07 00 FF 12 09 34 02 02 0F FF 16 23
09 06 01 00 48 07 00 FF 12 09 2D 02 02 0F FF 16 23
09 06 01 00 1F 07 00 FF 12 00 63 02 02 0F FE 16 21
09 06 01 00 33 07 00 FF 12 00 3F 02 02 0F FE 16 21
09 06 01 00 47 07 00 FF 12 00 54 02 02 0F FE 16 21
09 06 01 00 0D 07 00 FF 10 03 CF 02 02 0F FD 16 FF // Power factor
09 0C 31 37 38 32 31 30 30 31 35 31 36 35 // Meter ID
01 67

32
frames/decoding.txt Normal file
View File

@ -0,0 +1,32 @@
T = Tag
FF = Frame format (4 bit type, 1 bit segmentation, 11 bit frame length)
DA = Destination Address (1-4 bytes, LSB=1 terminates)
SA = Source address (1-4 bytes, LSB=1 terminates)
C = Control (1 byte)
HC = HCS (2 bytes)
LD = LLC Destination
LS = LLC Remote
LQ = LLC Quality
AT = Tag (0x0F = unencrypted, 0xDB = encrypted) Not really documented that well...
AI = Invoke ID and priority (4 bytes)
AD = Date and time
AS = System title
CT = Cipher frame tag ? Undocumented
CL = Lenght of Cipher frame. Length of payload will be this number - 5 (control and counter in start) - 12 (GCM tag appended after payload)
CC = Security control
CO = Invocation counter
Security control bits
01234567
00110000 (0x30)
0 = read acces
1 = write access
2 = Authenticated req
3 = Encrypted req
4 = Digitally signed req
5 = Authenticated res
6 = Encrypted res
7 = Digitally signed res

1
frames/dsmr.raw Normal file
View File

@ -0,0 +1 @@
2F454C4C355C3235333833333633355F410D0A0D0A302D303A312E302E302832343132313232303133343857290D0A312D303A312E382E302830303034373532322E3237382A6B5768290D0A312D303A322E382E302830303030303030302E3030312A6B5768290D0A312D303A332E382E302830303030303035392E3033392A6B76617268290D0A312D303A342E382E302830303031323537302E3937362A6B76617268290D0A312D303A312E372E3028303030312E3233312A6B57290D0A312D303A322E372E3028303030302E3030302A6B57290D0A312D303A332E372E3028303030302E3030302A6B766172290D0A312D303A342E372E3028303030302E3435312A6B766172290D0A312D303A32312E372E3028303030302E3337362A6B57290D0A312D303A34312E372E3028303030302E3832342A6B57290D0A312D303A36312E372E3028303030302E3033302A6B57290D0A312D303A32322E372E3028303030302E3030302A6B57290D0A312D303A34322E372E3028303030302E3030302A6B57290D0A312D303A36322E372E3028303030302E3030302A6B57290D0A312D303A32332E372E3028303030302E3030302A6B766172290D0A312D303A34332E372E3028303030302E3030302A6B766172290D0A312D303A36332E372E3028303030302E3030302A6B766172290D0A312D303A32342E372E3028303030302E3037322A6B766172290D0A312D303A34342E372E3028303030302E3334392A6B766172290D0A312D303A36342E372E3028303030302E3032392A6B766172290D0A312D303A33322E372E30283233322E382A56290D0A312D303A35322E372E30283233332E352A56290D0A312D303A37322E372E30283233382E352A56290D0A312D303A33312E372E30283030312E382A41290D0A312D303A35312E372E30283030342E302A41290D0A312D303A37312E372E30283030302E312A41290D0A21343736300D0A

48
frames/iskra_croatia.txt Normal file
View File

@ -0,0 +1,48 @@
They actually use multiple frames, so this is a "fake" frame combining the two into one, but without checksum fields.
7E
A0 BD
CF 02 23 03 00 00
E6 E7 00
0F 00 03 46 3B
0C 07 E9 0C 13 05 17 37 28 00 FF C4 00
02 21
09 08 39 32 30 32 39 36 39 31
09 04 17 37 28 00
09 05 07 E9 0C 13 05
06 00 6C 28 5A
06 00 4B 76 1A
06 00 20 B2 40
06 00 58 68 AA
06 00 57 A1 62
06 00 00 C7 48
06 00 17 EE D7
06 00 12 F5 5C
06 00 00 D9 6A
06 00 15 36 84
06 00 00 01 7E
06 00 00 00 00
12 03 79
06 00 00 00 7F
06 00 00 00 BD
06 00 00 00 41
06 00 00 00 00
06 00 00 00 00
06 00 00 00 00
12 09 54
12 09 35
12 09 49
12 00 37
12 00 59
12 00 4D
06 00 00 43 62
01 01
12 24 B8
01 01
12 24 B8
01 01
12 24 B8
03 01
00 00 7E

79
frames/lng.raw Normal file
View File

@ -0,0 +1,79 @@
7E // Flag
A08B
CEFF03
13
EEE1
E6E700
E0 // GBT (Green book 9.4.6.13)
40 // Block control 0100 0000, last block=no, streaming=yes, remainig=window
0001 // Block sequence
0000 // Block sequence ack
77 // How many bytes in this block
0F 00000DB7 // APDU tag, Invoke ID and priority
0C07E604020607220FFF800000 // Date and time
0205 // Structure with 5 items
0105 // Array with 5 items
020412002809060008190900FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (0-8:25.9.0;2)
020412002809060008190900FF0F01120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (0-8:25.9.0;1)
020412000109060000600101FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (96.1.1 - Meter model)
020412000309060100010700FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (1.7.0 Active import)
020412000309060100020700FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (2.7.0 Active export)
09060008190900 // OBIS 0-8:25.9.0 Object list push settings consumer information 1
ABA6
7E
7E
A024
CEFF03
13
D661
E0 // GBT
C0 // Block control 0100 0000, last block=yes, streaming=yes, remainig=window
0002 // Block sequence
0000 // Block sequence ack
13 // How many bytes in this block
FF // Last byte of OBIS in previous block
0906363031313039 // Device ID
0600000028 // Accumulated import
0600000000 // Accumulated export
8BA4
7E
7E A1 23 CE FF 03 13 21 55 E6 E7 00
0F 00 00 08 E2
0C 07 E5 07 13 01 0C 1A 0A FF 80 00 00
02 0B // 11
01 0B // 11
02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 02 12 00 00
02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 01 12 00 00
02 04 12 00 01 09 06 00 00 60 01 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 00 01 07 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 00 02 07 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 01 01 08 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 01 02 08 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 01 05 08 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 01 06 08 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 01 07 08 00 FF 0F 02 12 00 00
02 04 12 00 03 09 06 01 01 08 08 00 FF 0F 02 12 00 00
09 06 00 08 19 09 00 FF
09 08 34 33 30 39 34 33 35 31
06 00 00 00 0B
06 00 00 00 00
06 00 00 00 10
06 00 00 00 04
06 00 00 00 00
06 00 00 00 08
06 00 00 00 00
06 00 00 00 01
7C 8B
7E

33
frames/lng2.raw Normal file
View File

@ -0,0 +1,33 @@
7E
A0 76 CE FF 03 13 3C 02 E6 E7 00
DB
08 4C 47 5A 67 72 A9 A1 11
5E 30 00 21 80 F7 FE B8 07 C6
72 B1 90 AE AC 15 D0 AD 95 7B AC 13 7E 67 D8 A2
F0 43 51 3C 63 B6 A1 89 10 AE 9A 7E 55 4A 12 49
B9 6D EB A5 7B 57 03 69 9A BF 16 5E AD 2A 54 41
65 5E 79 C6 95 71 92 46 A2 3F 5B 63 0D 53 96 7D
42 52 1F A3 80 1C 00 E8 E3
A4 B3 9B 86 CB E5 2D 2C CA B0 E2 B7
AE 4D
7E
0f00057e41 // UI Frame header
0c07e60c0c010c232dff800000 // Date & time
020e // Structure with 14 items
1200ec // U1 = 236 V
1200ec // U2 = 236 V
1200ec // U3 = 236 V
120000 // I1 = 0.00 A
12002e // I2 = 0.46 A
12001a // I3 = 0.26 A
060000007d // Active import = 125 W
0600000000 // Active export = 0 W
0601a96ebd // Accumulated import = 27881.149 kWh
0600001dc3 // Accumulated export = 7.619 kWh
120190 // 400 ?
120003 // 3 ?
120120 // 288 ?
09083330313337313831 // Meter ID = 30137181

34
frames/slovenia-iskra.raw Normal file
View File

@ -0,0 +1,34 @@
02 12
09 10 49 53 4B 31 30 33 30 37 38 39 33 37 35 36 30 36 // str: ISK1030789375606 (device name)
09 08 31 36 38 32 30 30 30 35 // str: 16820005 (device id)
06 00 00 05 71 // active import
06 00 00 00 00 // active export
06 00 00 00 00 // reactive import
06 00 00 02 E2 // reactive export
12 09 4B // U1
12 09 4B // U2
12 08 F8 // U3
12 00 67 // I1
12 00 7D // I2
12 02 55 // I3
06 00 00 00 10 // L1 a+
06 00 00 00 33 // L2 a+
06 00 00 05 2D // L3 a+
06 00 00 00 00 // L1 a-
06 00 00 00 00 // L2 a-
06 00 00 00 00 // L3 a-
02 0C
09 10 49 53 4B 31 30 33 30 37 38 39 33 37 35 36 30 36
09 08 31 36 38 32 30 30 30 36
16 01 // Disconnect control
09 02 00 01 // Currently active energy tariff
06 00 00 CE 65 // 1.8.0 a+
06 00 00 35 19 // 1.8.1
06 00 00 99 4C // 1.8.2
06 00 02 B7 07 // 2.8.0 a-
06 00 01 33 17 // 2.8.1
06 00 01 83 F0 // 2.8.2
06 00 01 A5 6A // q+
06 00 00 A8 F5 // q-

View File

@ -1,45 +1 @@
# Hardware options
There are currently two possible hardware options for this project, both in need of external power supply. A self powered board is under development by a member of the community and is currently being tested.
## Hardware v1 by [@roarfred](https://github.com/roarfred)
Composed from a ESP12E (or F) chip, this ESP8266 based board is designed specifically for this project with an on board M-bus chip.
Building this project will require some skills in ordering and assembling electronic circuits as well as programming. No detailed instructions are available.
![The HAN Reader Hardware](v1/img/HanReaderInEnclosure.PNG)
*The completed board mounted in a [3D printed enclosure](/Enclosure)*
## HAN reader 2.0 by [@dakarym](https://github.com/dakarym)
A board that does not require external power source. This have only been successfully tested on Aidon as far as I know. It draws too much power for Kamstrup, but it may work with Kaifa. The design is almost
completely built with SMD components, so advanced soldering skills are required to make this one.
[View his design here](https://github.com/dakarym/AmsToMqttBridge/tree/master/PCB)
## Assembly of readily available modules
You can also use a ESP based development board and combine this with a M-Bus module. Here are a few boards that have been tested, each one has a dedicated firmware file in the releases section.
### ESP8266 based boards
[Wemos D1 mini](https://docs.wemos.cc/en/latest/d1/d1_mini.html)
- M-Bus connected to GPIO5 (D1)
- Jump GPIO4 (D2) to GND to force AP mode during boot
- Dallas temp sensor connected to GPIO14 (D5)
### ESP32 based boards
[Wemos Lolin D32](https://docs.wemos.cc/en/latest/d32/d32.html)
- M-Bus connected to GPIO16
- Jump GPIO4 to GND to force AP mode during boot
- Dallas temp sensor connected to GPIO14
[Adafruit HUZZAH32](https://www.adafruit.com/product/3405)
- M-Bus connected to GPIO16
Combine one of above board with an M-Bus module. Connect 3.3v and GND together between the boards and connect the TX pin from the M-Bus board to the dedicated M-Bus pin on the ESP board.
[TSS721 M-BUS module board](https://www.aliexpress.com/item/TSS721/32751482255.html)
![FeatherMbus](img/feather_3010-00_mbus_slave.jpg)
[See Hardware page in Wiki](https://github.com/UtilitechAS/amsreader-firmware/wiki)

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

View File

@ -0,0 +1,76 @@
{
"board": {
"active_layer": 0,
"active_layer_preset": "",
"auto_track_width": true,
"hidden_nets": [],
"high_contrast_mode": 0,
"net_color_mode": 1,
"opacity": {
"pads": 1.0,
"tracks": 1.0,
"vias": 1.0,
"zones": 0.6
},
"ratsnest_display_mode": 0,
"selection_filter": {
"dimensions": true,
"footprints": true,
"graphics": true,
"keepouts": true,
"lockedItems": true,
"otherItems": true,
"pads": true,
"text": true,
"tracks": true,
"vias": true,
"zones": true
},
"visible_items": [
0,
1,
2,
3,
4,
5,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27,
28,
29,
30,
32,
33,
34,
35,
36
],
"visible_layers": "fffffff_ffffffff",
"zone_display_mode": 0
},
"meta": {
"filename": "HAN_ESP_TSS721.kicad_prl",
"version": 3
},
"project": {
"files": []
}
}

View File

@ -0,0 +1,440 @@
{
"board": {
"design_settings": {
"defaults": {
"board_outline_line_width": 0.15,
"copper_line_width": 0.19999999999999998,
"copper_text_italic": false,
"copper_text_size_h": 1.5,
"copper_text_size_v": 1.5,
"copper_text_thickness": 0.3,
"copper_text_upright": false,
"courtyard_line_width": 0.049999999999999996,
"dimension_precision": 4,
"dimension_units": 3,
"dimensions": {
"arrow_length": 1270000,
"extension_offset": 500000,
"keep_text_aligned": true,
"suppress_zeroes": false,
"text_position": 0,
"units_format": 1
},
"fab_line_width": 0.09999999999999999,
"fab_text_italic": false,
"fab_text_size_h": 1.0,
"fab_text_size_v": 1.0,
"fab_text_thickness": 0.15,
"fab_text_upright": false,
"other_line_width": 0.09999999999999999,
"other_text_italic": false,
"other_text_size_h": 1.0,
"other_text_size_v": 1.0,
"other_text_thickness": 0.15,
"other_text_upright": false,
"pads": {
"drill": 0.762,
"height": 1.524,
"width": 1.524
},
"silk_line_width": 0.15,
"silk_text_italic": false,
"silk_text_size_h": 1.0,
"silk_text_size_v": 1.0,
"silk_text_thickness": 0.15,
"silk_text_upright": false,
"zones": {
"45_degree_only": true,
"min_clearance": 0.508
}
},
"diff_pair_dimensions": [],
"drc_exclusions": [],
"meta": {
"filename": "board_design_settings.json",
"version": 2
},
"rule_severities": {
"annular_width": "error",
"clearance": "error",
"copper_edge_clearance": "error",
"courtyards_overlap": "error",
"diff_pair_gap_out_of_range": "error",
"diff_pair_uncoupled_length_too_long": "error",
"drill_out_of_range": "error",
"duplicate_footprints": "warning",
"extra_footprint": "warning",
"footprint_type_mismatch": "error",
"hole_clearance": "error",
"hole_near_hole": "error",
"invalid_outline": "error",
"item_on_disabled_layer": "error",
"items_not_allowed": "error",
"length_out_of_range": "error",
"malformed_courtyard": "error",
"microvia_drill_out_of_range": "error",
"missing_courtyard": "ignore",
"missing_footprint": "warning",
"net_conflict": "warning",
"npth_inside_courtyard": "ignore",
"padstack": "error",
"pth_inside_courtyard": "ignore",
"shorting_items": "error",
"silk_over_copper": "warning",
"silk_overlap": "warning",
"skew_out_of_range": "error",
"through_hole_pad_without_hole": "error",
"too_many_vias": "error",
"track_dangling": "warning",
"track_width": "error",
"tracks_crossing": "error",
"unconnected_items": "error",
"unresolved_variable": "error",
"via_dangling": "warning",
"zone_has_empty_net": "error",
"zones_intersect": "error"
},
"rules": {
"allow_blind_buried_vias": false,
"allow_microvias": false,
"max_error": 0.005,
"min_clearance": 0.0,
"min_copper_edge_clearance": 0.075,
"min_hole_clearance": 0.25,
"min_hole_to_hole": 0.25,
"min_microvia_diameter": 0.19999999999999998,
"min_microvia_drill": 0.09999999999999999,
"min_silk_clearance": 0.0,
"min_through_hole_diameter": 0.3,
"min_track_width": 0.19999999999999998,
"min_via_annular_width": 0.049999999999999996,
"min_via_diameter": 0.39999999999999997,
"use_height_for_length_calcs": true
},
"track_widths": [
0.0,
0.2,
0.4,
0.6,
1.0
],
"via_dimensions": [],
"zones_allow_external_fillets": false,
"zones_use_no_outline": true
},
"layer_presets": []
},
"boards": [],
"cvpcb": {
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
"pin_map": [
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
1,
0,
1,
2
],
[
0,
1,
0,
0,
0,
0,
1,
1,
2,
1,
1,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
1,
1,
2
],
[
0,
0,
0,
1,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
1,
2,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
0,
2,
1,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"extra_units": "error",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
"lib_symbol_issues": "warning",
"multiple_net_names": "warning",
"net_not_bus_member": "warning",
"no_connect_connected": "warning",
"no_connect_dangling": "warning",
"pin_not_connected": "error",
"pin_not_driven": "error",
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
},
"libraries": {
"pinned_footprint_libs": [],
"pinned_symbol_libs": []
},
"meta": {
"filename": "HAN_ESP_TSS721.kicad_pro",
"version": 1
},
"net_settings": {
"classes": [
{
"bus_width": 12.0,
"clearance": 0.2,
"diff_pair_gap": 0.25,
"diff_pair_via_gap": 0.25,
"diff_pair_width": 0.2,
"line_style": 0,
"microvia_diameter": 0.3,
"microvia_drill": 0.1,
"name": "Default",
"pcb_color": "rgba(0, 0, 0, 0.000)",
"schematic_color": "rgba(0, 0, 0, 0.000)",
"track_width": 0.25,
"via_diameter": 0.6,
"via_drill": 0.4,
"wire_width": 6.0
},
{
"bus_width": 12.0,
"clearance": 0.5,
"diff_pair_gap": 0.25,
"diff_pair_via_gap": 0.25,
"diff_pair_width": 0.2,
"line_style": 0,
"microvia_diameter": 0.5,
"microvia_drill": 0.2,
"name": "PWR",
"nets": [
"+3V3"
],
"pcb_color": "rgba(0, 0, 0, 0.000)",
"schematic_color": "rgba(0, 0, 0, 0.000)",
"track_width": 0.5,
"via_diameter": 0.8,
"via_drill": 0.6,
"wire_width": 6.0
}
],
"meta": {
"version": 2
},
"net_colors": null
},
"pcbnew": {
"last_paths": {
"gencad": "",
"idf": "",
"netlist": "",
"specctra_dsn": "",
"step": "",
"vrml": ""
},
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_line_thickness": 6.0,
"default_text_size": 50.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.25,
"pin_symbol_size": 0.0,
"text_offset_ratio": 0.08
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 1
},
"net_format_name": "",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",
"spice_adjust_passive_values": false,
"spice_external_command": "spice \"%I\"",
"subpart_first_id": 65,
"subpart_id_separator": 0
},
"sheets": [],
"text_variables": {}
}

View File

@ -0,0 +1 @@
0

View File

@ -0,0 +1,34 @@
## Wemos shield
Fits D1 mini and S2 mini.
<img src="img1.jpg"/>
<img src="img2.jpg"/>
**WARNING** Not properly tested
**Resistors**
- R1: 470 (for U1)
- R2: 220 (for U1)
- R3: 82k (for U1)
- R4: 220 (for U1)
- R5: 100k (for U1)
- R6: 10k (for AP button)
- R7: 4.7k (for DS18B20)
- R8-R10: 1k (for RGB LED)
**Capacitors**
- C1: 100n (for U1)
- C2: 1u (for U1)
- C3: 100n (for U1)
**Other components**
- U1: TSS521 or TSS721
- U2: DS18B20 (Digital temperature sensor)
- D1: RGB LED
- J1: RJ45
- SW1: AP button (to D3 GPIO0)
**Jumper**
- JP1 & JP4: Jump these to receive power (5V) via RJ45 on pin 7 (GND) and 8 (+5)
- JP2 & JP3: Jump these to attach DS18B20 sensors via RJ45 on pin 4 (Data) and pin 5 (GND)

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 KiB

View File

@ -0,0 +1,3 @@
gerber
rescue-backup
*-bak

View File

@ -0,0 +1,326 @@
EESchema-LIBRARY Version 2.4
#encoding utf-8
#
# Connector_RJ45
#
DEF Connector_RJ45 J 0 40 Y Y 1 F N
F0 "J" -200 550 50 H V R CNN
F1 "Connector_RJ45" 100 550 50 H V L CNN
F2 "" 0 25 50 V I C CNN
F3 "" 0 25 50 V I C CNN
ALIAS RJ31 RJ32 RJ33 RJ34 RJ35 RJ41 RJ45 RJ49 RJ61
$FPLIST
8P8C*
RJ31*
RJ32*
RJ33*
RJ34*
RJ35*
RJ41*
RJ45*
RJ49*
RJ61*
$ENDFPLIST
DRAW
S 300 500 -300 -400 0 1 10 f
P 2 0 1 0 -200 175 -250 175 N
P 2 0 1 0 -200 225 -250 225 N
P 3 0 1 0 -250 -125 -200 -125 -200 -125 N
P 3 0 1 0 -250 -75 -200 -75 -200 -75 N
P 3 0 1 0 -250 -25 -200 -25 -200 -25 N
P 3 0 1 0 -250 25 -200 25 -200 25 N
P 3 0 1 0 -250 75 -200 75 -200 75 N
P 3 0 1 0 -200 125 -250 125 -250 125 N
P 14 0 1 0 -250 -175 -250 275 150 275 150 175 200 175 200 125 250 125 250 -25 200 -25 200 -75 150 -75 150 -175 -250 -175 -250 -175 N
X ~ 1 400 -300 100 L 50 50 1 1 P
X ~ 2 400 -200 100 L 50 50 1 1 P
X ~ 3 400 -100 100 L 50 50 1 1 P
X ~ 4 400 0 100 L 50 50 1 1 P
X ~ 5 400 100 100 L 50 50 1 1 P
X ~ 6 400 200 100 L 50 50 1 1 P
X ~ 7 400 300 100 L 50 50 1 1 P
X ~ 8 400 400 100 L 50 50 1 1 P
ENDDRAW
ENDDEF
#
# Device_C
#
DEF Device_C C 0 10 N Y 1 F N
F0 "C" 25 100 50 H V L CNN
F1 "Device_C" 25 -100 50 H V L CNN
F2 "" 38 -150 50 H I C CNN
F3 "" 0 0 50 H I C CNN
$FPLIST
C_*
$ENDFPLIST
DRAW
P 2 0 1 20 -80 -30 80 -30 N
P 2 0 1 20 -80 30 80 30 N
X ~ 1 0 150 110 D 50 50 1 1 P
X ~ 2 0 -150 110 U 50 50 1 1 P
ENDDRAW
ENDDEF
#
# Device_Jumper
#
DEF Device_Jumper JP 0 30 Y N 1 F N
F0 "JP" 0 150 50 H V C CNN
F1 "Device_Jumper" 0 -80 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
$FPLIST
SolderJumper*
$ENDFPLIST
DRAW
A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
C -100 0 35 0 1 0 N
C 100 0 35 0 1 0 N
X 1 1 -300 0 165 R 50 50 0 1 P
X 2 2 300 0 165 L 50 50 0 1 P
ENDDRAW
ENDDEF
#
# Device_LED_RGB
#
DEF Device_LED_RGB D 0 0 Y N 1 F N
F0 "D" 0 370 50 H V C CNN
F1 "Device_LED_RGB" 0 -350 50 H V C CNN
F2 "" 0 -50 50 H I C CNN
F3 "" 0 -50 50 H I C CNN
$FPLIST
LED*
LED_SMD:*
LED_THT:*
$ENDFPLIST
DRAW
T 0 -75 -250 50 0 0 0 B Normal 0 C C
T 0 -75 -50 50 0 0 0 G Normal 0 C C
T 0 -75 150 50 0 0 0 R Normal 0 C C
S 50 -50 50 50 0 1 0 N
S 50 50 50 50 0 1 0 N
S 50 150 50 250 0 1 0 N
S 50 250 50 250 0 1 0 N
S 110 330 -110 -300 0 1 10 f
P 2 0 1 0 -50 -200 -100 -200 N
P 2 0 1 0 -50 -200 50 -200 N
P 2 0 1 0 -50 -150 -50 -250 N
P 2 0 1 8 -50 -150 -50 -250 N
P 2 0 1 0 -50 0 -100 0 N
P 2 0 1 8 -50 50 -50 -50 N
P 2 0 1 0 -50 200 -100 200 N
P 2 0 1 0 -50 200 50 200 N
P 2 0 1 8 -50 250 -50 150 N
P 2 0 1 0 50 -200 100 -200 N
P 2 0 1 0 50 0 -50 0 N
P 2 0 1 0 50 0 100 0 N
P 2 0 1 0 50 200 100 200 N
P 3 0 1 0 -50 50 -50 -50 -50 -50 N
P 3 0 1 0 -50 250 -50 150 -50 150 N
P 4 0 1 8 50 -150 50 -250 -50 -200 50 -150 N
P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
P 4 0 1 8 50 250 50 150 -50 200 50 250 N
P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
X RK 1 -200 200 100 R 50 50 1 1 P
X GK 2 -200 0 100 R 50 50 1 1 P
X BK 3 -200 -200 100 R 50 50 1 1 P
X BA 4 200 -200 100 L 50 50 1 1 P
X GA 5 200 0 100 L 50 50 1 1 P
X RA 6 200 200 100 L 50 50 1 1 P
ENDDRAW
ENDDEF
#
# Device_R
#
DEF Device_R R 0 0 N Y 1 F N
F0 "R" 80 0 50 V V C CNN
F1 "Device_R" 0 0 50 V V C CNN
F2 "" -70 0 50 V I C CNN
F3 "" 0 0 50 H I C CNN
$FPLIST
R_*
$ENDFPLIST
DRAW
S -40 -100 40 100 0 1 10 N
X ~ 1 0 150 50 D 50 50 1 1 P
X ~ 2 0 -150 50 U 50 50 1 1 P
ENDDRAW
ENDDEF
#
# Sensor_Temperature_DS18B20
#
DEF Sensor_Temperature_DS18B20 U 0 40 Y Y 1 F N
F0 "U" -150 250 50 H V C CNN
F1 "Sensor_Temperature_DS18B20" 250 250 50 H V C CNN
F2 "Package_TO_SOT_THT:TO-92_Inline" -1000 -250 50 H I C CNN
F3 "" -150 250 50 H I C CNN
ALIAS DS1822 DS18B20 DS18S20 DS1821C
$FPLIST
TO*92*
$ENDFPLIST
DRAW
A -130 125 25 1 1799 0 1 10 N -105 125 -155 125
C -130 -100 50 0 1 10 F
S -200 200 200 -200 0 1 10 f
S -105 -75 -155 0 0 1 10 F
P 2 0 1 10 -155 25 -130 25 N
P 2 0 1 10 -155 50 -130 50 N
P 2 0 1 10 -155 75 -130 75 N
P 2 0 1 10 -155 100 -130 100 N
P 2 0 1 10 -155 125 -155 0 N
P 2 0 1 10 -155 125 -130 125 N
P 2 0 1 10 -105 125 -105 0 N
X GND 1 0 -300 100 U 50 50 1 1 W
X DQ 2 300 0 100 L 50 50 1 1 B
X VDD 3 0 300 100 D 50 50 1 1 W
ENDDRAW
ENDDEF
#
# Switch_SW_Push
#
DEF Switch_SW_Push SW 0 40 N N 1 F N
F0 "SW" 50 100 50 H V L CNN
F1 "Switch_SW_Push" 0 -60 50 H V C CNN
F2 "" 0 200 50 H I C CNN
F3 "" 0 200 50 H I C CNN
DRAW
C -80 0 20 0 1 0 N
C 80 0 20 0 1 0 N
P 2 0 1 0 0 50 0 120 N
P 2 0 1 0 100 50 -100 50 N
X 1 1 -200 0 100 R 50 50 0 1 P
X 2 2 200 0 100 L 50 50 0 1 P
ENDDRAW
ENDDEF
#
# d1_mini_shield-rescue_CONN_01X08
#
DEF d1_mini_shield-rescue_CONN_01X08 P 0 40 Y N 1 F N
F0 "P" 0 450 50 H V C CNN
F1 "d1_mini_shield-rescue_CONN_01X08" 100 0 50 V V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST
Pin_Header_Straight_1X08
Pin_Header_Angled_1X08
Socket_Strip_Straight_1X08
Socket_Strip_Angled_1X08
$ENDFPLIST
DRAW
S -50 -400 50 400 0 1 0 N
S -50 -345 10 -355 0 1 0 N
S -50 -245 10 -255 0 1 0 N
S -50 -145 10 -155 0 1 0 N
S -50 -45 10 -55 0 1 0 N
S -50 55 10 45 0 1 0 N
S -50 155 10 145 0 1 0 N
S -50 255 10 245 0 1 0 N
S -50 355 10 345 0 1 0 N
X P1 1 -200 350 150 R 50 50 1 1 P
X P2 2 -200 250 150 R 50 50 1 1 P
X P3 3 -200 150 150 R 50 50 1 1 P
X P4 4 -200 50 150 R 50 50 1 1 P
X P5 5 -200 -50 150 R 50 50 1 1 P
X P6 6 -200 -150 150 R 50 50 1 1 P
X P7 7 -200 -250 150 R 50 50 1 1 P
X P8 8 -200 -350 150 R 50 50 1 1 P
ENDDRAW
ENDDEF
#
# power_+3.3V
#
DEF power_+3.3V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -150 50 H I C CNN
F1 "power_+3.3V" 0 140 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
ALIAS +3.3V
DRAW
P 2 0 1 0 -30 50 0 100 N
P 2 0 1 0 0 0 0 100 N
P 2 0 1 0 0 100 30 50 N
X +3V3 1 0 0 0 U 50 50 1 1 W N
ENDDRAW
ENDDEF
#
# power_+3V3
#
DEF power_+3V3 #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -150 50 H I C CNN
F1 "power_+3V3" 0 140 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
P 2 0 1 0 -30 50 0 100 N
P 2 0 1 0 0 0 0 100 N
P 2 0 1 0 0 100 30 50 N
X +3V3 1 0 0 0 U 50 50 1 1 W N
ENDDRAW
ENDDEF
#
# power_+5V
#
DEF power_+5V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -150 50 H I C CNN
F1 "power_+5V" 0 140 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
P 2 0 1 0 -30 50 0 100 N
P 2 0 1 0 0 0 0 100 N
P 2 0 1 0 0 100 30 50 N
X +5V 1 0 0 0 U 50 50 1 1 W N
ENDDRAW
ENDDEF
#
# power_GND
#
DEF power_GND #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -250 50 H I C CNN
F1 "power_GND" 0 -150 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
X GND 1 0 0 0 D 50 50 1 1 W N
ENDDRAW
ENDDEF
#
# tss721_TSS721
#
DEF tss721_TSS721 U 0 40 Y Y 1 F N
F0 "U" 200 850 50 H V L CNN
F1 "tss721_TSS721" 200 750 50 H V L CNN
F2 "" 0 -850 50 H V C CIN
F3 "" -200 -800 50 H V C CNN
ALIAS TSS721A
$FPLIST
SOIC*3.9x9.9mm*Pitch1.27mm*
TSSOP*4.4x5mm*Pitch0.65mm*
$ENDFPLIST
DRAW
S -500 -700 500 700 0 1 10 f
X BUSL2 1 -600 400 100 R 50 50 1 1 I
X VS 10 -600 0 100 R 50 50 1 1 P
X VDD 11 0 800 100 D 50 50 1 1 W
X RX 12 600 500 100 L 50 50 1 1 I
X RXI 13 600 400 100 L 50 50 1 1 I I
X RIS 14 300 -800 100 U 50 50 1 1 I
X GND 15 0 -800 100 U 50 50 1 1 W
X BUSL1 16 -600 500 100 R 50 50 1 1 I
X VB 2 -600 -150 100 R 50 50 1 1 P
X STC 3 -600 -500 100 R 50 50 1 1 P
X RIDD 4 200 -800 100 U 50 50 1 1 O
X PF 5 -600 100 100 R 50 50 1 1 I
X SC 6 400 -800 100 U 50 50 1 1 P
X TXI 7 600 100 100 L 50 50 1 1 O I
X TX 8 600 200 100 L 50 50 1 1 O
X BAT 9 -100 800 100 D 50 50 1 1 I
ENDDRAW
ENDDEF
#
#End Library

View File

@ -0,0 +1,3 @@
EESchema-DOCLIB Version 2.0
#
#End Doc Library

View File

@ -0,0 +1,72 @@
EESchema-LIBRARY Version 2.4
#encoding utf-8
#
# +3.3V-power
#
DEF +3.3V-power #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -150 50 H I C CNN
F1 "+3.3V-power" 0 140 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
P 2 0 1 0 -30 50 0 100 N
P 2 0 1 0 0 0 0 100 N
P 2 0 1 0 0 100 30 50 N
X +3V3 1 0 0 0 U 50 50 1 1 W N
ENDDRAW
ENDDEF
#
# CONN_01X08
#
DEF CONN_01X08 P 0 40 Y N 1 F N
F0 "P" 0 450 50 H V C CNN
F1 "CONN_01X08" 100 0 50 V V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST
Pin_Header_Straight_1X08
Pin_Header_Angled_1X08
Socket_Strip_Straight_1X08
Socket_Strip_Angled_1X08
$ENDFPLIST
DRAW
S -50 -400 50 400 0 1 0 N
S -50 -345 10 -355 0 1 0 N
S -50 -245 10 -255 0 1 0 N
S -50 -145 10 -155 0 1 0 N
S -50 -45 10 -55 0 1 0 N
S -50 55 10 45 0 1 0 N
S -50 155 10 145 0 1 0 N
S -50 255 10 245 0 1 0 N
S -50 355 10 345 0 1 0 N
X P1 1 -200 350 150 R 50 50 1 1 P
X P2 2 -200 250 150 R 50 50 1 1 P
X P3 3 -200 150 150 R 50 50 1 1 P
X P4 4 -200 50 150 R 50 50 1 1 P
X P5 5 -200 -50 150 R 50 50 1 1 P
X P6 6 -200 -150 150 R 50 50 1 1 P
X P7 7 -200 -250 150 R 50 50 1 1 P
X P8 8 -200 -350 150 R 50 50 1 1 P
ENDDRAW
ENDDEF
#
# Jumper-Device
#
DEF Jumper-Device JP 0 30 Y N 1 F N
F0 "JP" 0 150 50 H V C CNN
F1 "Jumper-Device" 0 -80 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
$FPLIST
SolderJumper*
$ENDFPLIST
DRAW
C -100 0 35 0 1 0 N
A 0 -26 125 375 1422 0 1 0 N 99 50 -98 50
C 100 0 35 0 1 0 N
X 1 1 -300 0 165 R 50 50 0 1 P
X 2 2 300 0 165 L 50 50 0 1 P
ENDDRAW
ENDDEF
#
#End Library

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,75 @@
{
"board": {
"active_layer": 0,
"active_layer_preset": "",
"auto_track_width": true,
"hidden_nets": [],
"high_contrast_mode": 0,
"net_color_mode": 1,
"opacity": {
"pads": 1.0,
"tracks": 1.0,
"vias": 1.0,
"zones": 0.6
},
"ratsnest_display_mode": 0,
"selection_filter": {
"dimensions": true,
"footprints": true,
"graphics": true,
"keepouts": true,
"lockedItems": true,
"otherItems": true,
"pads": true,
"text": true,
"tracks": true,
"vias": true,
"zones": true
},
"visible_items": [
0,
1,
2,
3,
4,
5,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27,
28,
29,
30,
32,
33,
34,
35,
36
],
"visible_layers": "fffffff_ffffffff",
"zone_display_mode": 0
},
"meta": {
"filename": "d1_mini_shield.kicad_prl",
"version": 3
},
"project": {
"files": []
}
}

View File

@ -0,0 +1,356 @@
{
"board": {
"design_settings": {
"defaults": {
"board_outline_line_width": 0.15,
"copper_line_width": 0.2,
"copper_text_italic": false,
"copper_text_size_h": 1.5,
"copper_text_size_v": 1.5,
"copper_text_thickness": 0.3,
"copper_text_upright": true,
"courtyard_line_width": 0.05,
"other_line_width": 0.15,
"other_text_italic": false,
"other_text_size_h": 1.0,
"other_text_size_v": 1.0,
"other_text_thickness": 0.15,
"other_text_upright": true,
"silk_line_width": 0.15,
"silk_text_italic": false,
"silk_text_size_h": 1.0,
"silk_text_size_v": 1.0,
"silk_text_thickness": 0.15,
"silk_text_upright": true
},
"diff_pair_dimensions": [
{
"gap": 0.25,
"via_gap": 0.25,
"width": 0.2
}
],
"drc_exclusions": [],
"rule_severitieslegacy_courtyards_overlap": true,
"rule_severitieslegacy_no_courtyard_defined": false,
"rules": {
"allow_blind_buried_vias": false,
"allow_microvias": false,
"min_hole_to_hole": 0.25,
"min_microvia_diameter": 0.2,
"min_microvia_drill": 0.09999999999999999,
"min_through_hole_diameter": 0.3,
"min_track_width": 0.2,
"min_via_diameter": 0.4,
"solder_mask_clearance": 0.2,
"solder_mask_min_width": 0.0,
"solder_paste_clearance": 0.0,
"solder_paste_margin_ratio": -0.0
},
"track_widths": [
0.25,
0.5
],
"via_dimensions": [
{
"diameter": 0.6,
"drill": 0.4
}
]
},
"layer_presets": []
},
"boards": [],
"cvpcb": {
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
"pin_map": [
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
1,
0,
1,
2
],
[
0,
1,
0,
0,
0,
0,
1,
1,
2,
1,
1,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
1,
1,
2
],
[
0,
0,
0,
1,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
1,
2,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
0,
2,
1,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"extra_units": "error",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
"lib_symbol_issues": "warning",
"multiple_net_names": "warning",
"net_not_bus_member": "warning",
"no_connect_connected": "warning",
"no_connect_dangling": "warning",
"pin_not_connected": "error",
"pin_not_driven": "error",
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
},
"libraries": {
"pinned_footprint_libs": [],
"pinned_symbol_libs": []
},
"meta": {
"filename": "d1_mini_shield.kicad_pro",
"version": 1
},
"net_settings": {
"classes": [
{
"bus_width": 12.0,
"clearance": 0.2,
"diff_pair_gap": 0.25,
"diff_pair_via_gap": 0.25,
"diff_pair_width": 0.2,
"line_style": 0,
"microvia_diameter": 0.3,
"microvia_drill": 0.1,
"name": "Default",
"pcb_color": "rgba(0, 0, 0, 0.000)",
"schematic_color": "rgba(0, 0, 0, 0.000)",
"track_width": 0.25,
"via_diameter": 0.8,
"via_drill": 0.4,
"wire_width": 6.0
}
],
"meta": {
"version": 2
},
"net_colors": null
},
"pcbnew": {
"last_paths": {
"gencad": "",
"idf": "",
"netlist": "d1_mini_shield.net",
"specctra_dsn": "",
"step": "",
"vrml": ""
},
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_line_thickness": 6.0,
"default_text_size": 50.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.25,
"pin_symbol_size": 0.0,
"text_offset_ratio": 0.08
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 1
},
"net_format_name": "Pcbnew",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",
"spice_adjust_passive_values": false,
"spice_external_command": "spice \"%I\"",
"subpart_first_id": 65,
"subpart_id_separator": 0
},
"sheets": [],
"text_variables": {}
}

View File

@ -0,0 +1,482 @@
(export (version D)
(design
(source /home/gunnar/src/AmsToMqttBridge/hardware/wemos_mbus_shield/kicad/d1_mini_shield.sch)
(date "sø. 26. juni 2022 kl. 12.19 +0200")
(tool "Eeschema 5.1.5+dfsg1-2build2")
(sheet (number 1) (name /) (tstamps /)
(title_block
(title)
(company)
(rev)
(date)
(source d1_mini_shield.sch)
(comment (number 1) (value ""))
(comment (number 2) (value ""))
(comment (number 3) (value ""))
(comment (number 4) (value "")))))
(components
(comp (ref P1)
(value CONN_01X08)
(footprint D1_mini:D1_mini_Pin_Header)
(libsource (lib d1_mini_shield-rescue) (part CONN_01X08) (description ""))
(sheetpath (names /) (tstamps /))
(tstamp 5763EB78))
(comp (ref P2)
(value CONN_01X08)
(footprint D1_mini:D1_mini_Pin_Header)
(libsource (lib d1_mini_shield-rescue) (part CONN_01X08) (description ""))
(sheetpath (names /) (tstamps /))
(tstamp 5763EBF2))
(comp (ref U1)
(value TSS721)
(footprint Package_SO:SOIC-16_3.9x9.9mm_P1.27mm)
(datasheet http://www.ti.com/lit/ds/symlink/tss721a.pdf)
(libsource (lib tss721) (part TSS721) (description "TSS721A Meter Bus Transceiver, SOIC-16/TSSOP-16"))
(sheetpath (names /) (tstamps /))
(tstamp 62B826D2))
(comp (ref J1)
(value RJ45)
(footprint Connector_RJ:RJ45_Amphenol_54602-x08_Horizontal)
(datasheet ~)
(libsource (lib Connector) (part RJ45) (description "RJ connector, 8P8C (8 positions 8 connected)"))
(sheetpath (names /) (tstamps /))
(tstamp 62B8AC34))
(comp (ref R4)
(value 220)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62B8CAA8))
(comp (ref R2)
(value 220)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62B8DB92))
(comp (ref R3)
(value 82k)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62B9F861))
(comp (ref R1)
(value 470)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62B9FC37))
(comp (ref C2)
(value 1u)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part C) (description "Unpolarized capacitor"))
(sheetpath (names /) (tstamps /))
(tstamp 62BA06BE))
(comp (ref C1)
(value 100n)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part C) (description "Unpolarized capacitor"))
(sheetpath (names /) (tstamps /))
(tstamp 62BA09E7))
(comp (ref R5)
(value 100k)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62BED413))
(comp (ref C3)
(value 100n)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part C) (description "Unpolarized capacitor"))
(sheetpath (names /) (tstamps /))
(tstamp 62BED9ED))
(comp (ref JP1)
(value Jumper)
(footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
(datasheet ~)
(libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
(sheetpath (names /) (tstamps /))
(tstamp 62C331C0))
(comp (ref JP2)
(value Jumper)
(footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
(datasheet ~)
(libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
(sheetpath (names /) (tstamps /))
(tstamp 62C365CA))
(comp (ref JP3)
(value Jumper)
(footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
(datasheet ~)
(libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
(sheetpath (names /) (tstamps /))
(tstamp 62C36C70))
(comp (ref D1)
(value LED_RGB)
(footprint LED_SMD:LED_RGB_PLCC-6)
(datasheet ~)
(libsource (lib Device) (part LED_RGB) (description "RGB LED, 6 pin package"))
(sheetpath (names /) (tstamps /))
(tstamp 62C43A7B))
(comp (ref R9)
(value 1k)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62C495F7))
(comp (ref R8)
(value 1k)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62C4BDE9))
(comp (ref R10)
(value 1k)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62C4C336))
(comp (ref U2)
(value DS18B20)
(footprint Package_TO_SOT_THT:TO-92_Inline)
(datasheet http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf)
(libsource (lib Sensor_Temperature) (part DS18B20) (description "Programmable Resolution 1-Wire Digital Thermometer TO-92"))
(sheetpath (names /) (tstamps /))
(tstamp 62C6296F))
(comp (ref R7)
(value 4k7)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62C6405D))
(comp (ref SW1)
(value SW_Push)
(footprint Button_Switch_SMD:SW_SPST_B3U-3000P)
(datasheet ~)
(libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
(sheetpath (names /) (tstamps /))
(tstamp 62C73229))
(comp (ref R6)
(value 10k)
(footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
(datasheet ~)
(libsource (lib Device) (part R) (description Resistor))
(sheetpath (names /) (tstamps /))
(tstamp 62C73CE8))
(comp (ref JP4)
(value Jumper)
(footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
(datasheet ~)
(libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
(sheetpath (names /) (tstamps /))
(tstamp 62D1E97A)))
(libparts
(libpart (lib Connector) (part 8P8C)
(aliases
(alias RJ31)
(alias RJ32)
(alias RJ33)
(alias RJ34)
(alias RJ35)
(alias RJ41)
(alias RJ45)
(alias RJ49)
(alias RJ61))
(description "RJ connector, 8P8C (8 positions 8 connected), RJ31/RJ32/RJ33/RJ34/RJ35/RJ41/RJ45/RJ49/RJ61")
(docs ~)
(footprints
(fp 8P8C*)
(fp RJ31*)
(fp RJ32*)
(fp RJ33*)
(fp RJ34*)
(fp RJ35*)
(fp RJ41*)
(fp RJ45*)
(fp RJ49*)
(fp RJ61*))
(fields
(field (name Reference) J)
(field (name Value) 8P8C))
(pins
(pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive))
(pin (num 3) (name ~) (type passive))
(pin (num 4) (name ~) (type passive))
(pin (num 5) (name ~) (type passive))
(pin (num 6) (name ~) (type passive))
(pin (num 7) (name ~) (type passive))
(pin (num 8) (name ~) (type passive))))
(libpart (lib Device) (part C)
(description "Unpolarized capacitor")
(docs ~)
(footprints
(fp C_*))
(fields
(field (name Reference) C)
(field (name Value) C))
(pins
(pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive))))
(libpart (lib Device) (part Jumper)
(description "Jumper, normally closed")
(docs ~)
(footprints
(fp SolderJumper*))
(fields
(field (name Reference) JP)
(field (name Value) Jumper))
(pins
(pin (num 1) (name 1) (type passive))
(pin (num 2) (name 2) (type passive))))
(libpart (lib Device) (part LED_RGB)
(description "RGB LED, 6 pin package")
(docs ~)
(footprints
(fp LED*)
(fp LED_SMD:*)
(fp LED_THT:*))
(fields
(field (name Reference) D)
(field (name Value) LED_RGB))
(pins
(pin (num 1) (name RK) (type passive))
(pin (num 2) (name GK) (type passive))
(pin (num 3) (name BK) (type passive))
(pin (num 4) (name BA) (type passive))
(pin (num 5) (name GA) (type passive))
(pin (num 6) (name RA) (type passive))))
(libpart (lib Device) (part R)
(description Resistor)
(docs ~)
(footprints
(fp R_*))
(fields
(field (name Reference) R)
(field (name Value) R))
(pins
(pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive))))
(libpart (lib Sensor_Temperature) (part MAX31820)
(aliases
(alias DS1822)
(alias DS18B20)
(alias DS18S20)
(alias DS1821C))
(description "1-Wire Ambient Temperature Sensor TO-92")
(docs http://datasheets.maximintegrated.com/en/ds/MAX31820.pdf)
(footprints
(fp TO*92*))
(fields
(field (name Reference) U)
(field (name Value) MAX31820)
(field (name Footprint) Package_TO_SOT_THT:TO-92_Inline))
(pins
(pin (num 1) (name GND) (type power_in))
(pin (num 2) (name DQ) (type BiDi))
(pin (num 3) (name VDD) (type power_in))))
(libpart (lib Switch) (part SW_Push)
(description "Push button switch, generic, two pins")
(docs ~)
(fields
(field (name Reference) SW)
(field (name Value) SW_Push))
(pins
(pin (num 1) (name 1) (type passive))
(pin (num 2) (name 2) (type passive))))
(libpart (lib d1_mini_shield-rescue) (part CONN_01X08)
(footprints
(fp Pin_Header_Straight_1X08)
(fp Pin_Header_Angled_1X08)
(fp Socket_Strip_Straight_1X08)
(fp Socket_Strip_Angled_1X08))
(fields
(field (name Reference) P)
(field (name Value) CONN_01X08))
(pins
(pin (num 1) (name P1) (type passive))
(pin (num 2) (name P2) (type passive))
(pin (num 3) (name P3) (type passive))
(pin (num 4) (name P4) (type passive))
(pin (num 5) (name P5) (type passive))
(pin (num 6) (name P6) (type passive))
(pin (num 7) (name P7) (type passive))
(pin (num 8) (name P8) (type passive))))
(libpart (lib tss721) (part TSS721)
(aliases
(alias TSS721A))
(description "TSS721A Meter Bus Transceiver, SOIC-16/TSSOP-16")
(docs http://www.ti.com/lit/ds/symlink/tss721a.pdf)
(footprints
(fp SOIC*3.9x9.9mm*Pitch1.27mm*)
(fp TSSOP*4.4x5mm*Pitch0.65mm*))
(fields
(field (name Reference) U)
(field (name Value) TSS721))
(pins
(pin (num 1) (name BUSL2) (type input))
(pin (num 2) (name VB) (type passive))
(pin (num 3) (name STC) (type passive))
(pin (num 4) (name RIDD) (type output))
(pin (num 5) (name PF) (type input))
(pin (num 6) (name SC) (type passive))
(pin (num 7) (name TXI) (type output))
(pin (num 8) (name TX) (type output))
(pin (num 9) (name BAT) (type input))
(pin (num 10) (name VS) (type passive))
(pin (num 11) (name VDD) (type power_in))
(pin (num 12) (name RX) (type input))
(pin (num 13) (name RXI) (type input))
(pin (num 14) (name RIS) (type input))
(pin (num 15) (name GND) (type power_in))
(pin (num 16) (name BUSL1) (type input)))))
(libraries
(library (logical Connector)
(uri /usr/share/kicad/library/Connector.lib))
(library (logical Device)
(uri /usr/share/kicad/library/Device.lib))
(library (logical Sensor_Temperature)
(uri /usr/share/kicad/library/Sensor_Temperature.lib))
(library (logical Switch)
(uri /usr/share/kicad/library/Switch.lib))
(library (logical d1_mini_shield-rescue)
(uri /home/gunnar/src/AmsToMqttBridge/hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.lib))
(library (logical tss721)
(uri /home/gunnar/src/AmsToMqttBridge/hardware/wemos_mbus_shield/kicad/tss721.lib)))
(nets
(net (code 1) (name TEMP)
(node (ref R7) (pin 2))
(node (ref U2) (pin 2))
(node (ref P1) (pin 5))
(node (ref JP3) (pin 2)))
(net (code 2) (name +3V3)
(node (ref R7) (pin 1))
(node (ref U1) (pin 9))
(node (ref P2) (pin 1))
(node (ref R6) (pin 2))
(node (ref D1) (pin 4))
(node (ref D1) (pin 5))
(node (ref D1) (pin 6))
(node (ref U2) (pin 3)))
(net (code 3) (name "Net-(D1-Pad1)")
(node (ref R9) (pin 2))
(node (ref D1) (pin 1)))
(net (code 4) (name "Net-(D1-Pad2)")
(node (ref D1) (pin 2))
(node (ref R8) (pin 2)))
(net (code 5) (name "Net-(D1-Pad3)")
(node (ref D1) (pin 3))
(node (ref R10) (pin 2)))
(net (code 6) (name MBUS2)
(node (ref J1) (pin 2))
(node (ref R4) (pin 1)))
(net (code 7) (name BTN_AP)
(node (ref P1) (pin 4))
(node (ref SW1) (pin 1))
(node (ref R6) (pin 1)))
(net (code 8) (name "Net-(R4-Pad2)")
(node (ref U1) (pin 1))
(node (ref R4) (pin 2)))
(net (code 9) (name "Net-(R2-Pad2)")
(node (ref R2) (pin 2))
(node (ref U1) (pin 16)))
(net (code 10) (name MBUS1)
(node (ref J1) (pin 1))
(node (ref R2) (pin 1)))
(net (code 11) (name LED_R)
(node (ref R9) (pin 1))
(node (ref P2) (pin 4)))
(net (code 12) (name "Net-(J1-Pad8)")
(node (ref J1) (pin 8))
(node (ref JP1) (pin 1)))
(net (code 13) (name "Net-(J1-Pad5)")
(node (ref J1) (pin 5))
(node (ref JP2) (pin 1)))
(net (code 14) (name "Net-(J1-Pad4)")
(node (ref J1) (pin 4))
(node (ref JP3) (pin 1)))
(net (code 15) (name +5V)
(node (ref P1) (pin 1))
(node (ref JP1) (pin 2)))
(net (code 16) (name "Net-(J1-Pad7)")
(node (ref J1) (pin 7))
(node (ref JP4) (pin 1)))
(net (code 17) (name GND)
(node (ref P1) (pin 2))
(node (ref C3) (pin 2))
(node (ref R3) (pin 1))
(node (ref R1) (pin 1))
(node (ref C2) (pin 1))
(node (ref C1) (pin 1))
(node (ref R5) (pin 2))
(node (ref U1) (pin 15))
(node (ref U2) (pin 1))
(node (ref SW1) (pin 2))
(node (ref JP4) (pin 2))
(node (ref JP2) (pin 2)))
(net (code 18) (name LED_G)
(node (ref R8) (pin 1))
(node (ref P2) (pin 5)))
(net (code 19) (name "Net-(U1-Pad10)")
(node (ref U1) (pin 10)))
(net (code 20) (name "Net-(U1-Pad12)")
(node (ref U1) (pin 12)))
(net (code 21) (name "Net-(U1-Pad13)")
(node (ref U1) (pin 13)))
(net (code 22) (name "Net-(U1-Pad2)")
(node (ref U1) (pin 2)))
(net (code 23) (name "Net-(U1-Pad5)")
(node (ref U1) (pin 5)))
(net (code 24) (name "Net-(U1-Pad7)")
(node (ref U1) (pin 7)))
(net (code 25) (name "Net-(J1-Pad3)")
(node (ref J1) (pin 3)))
(net (code 26) (name "Net-(J1-Pad6)")
(node (ref J1) (pin 6)))
(net (code 27) (name /RST)
(node (ref P2) (pin 8)))
(net (code 28) (name /D4)
(node (ref P1) (pin 3)))
(net (code 29) (name /D1)
(node (ref P1) (pin 6)))
(net (code 30) (name /RX)
(node (ref P1) (pin 7)))
(net (code 31) (name /TX)
(node (ref P1) (pin 8)))
(net (code 32) (name /D8)
(node (ref P2) (pin 2)))
(net (code 33) (name /D0)
(node (ref P2) (pin 6)))
(net (code 34) (name /A0)
(node (ref P2) (pin 7)))
(net (code 35) (name "Net-(R3-Pad2)")
(node (ref R3) (pin 2))
(node (ref U1) (pin 4)))
(net (code 36) (name HAN_TX)
(node (ref R10) (pin 1))
(node (ref U1) (pin 8))
(node (ref P2) (pin 3)))
(net (code 37) (name "Net-(C3-Pad1)")
(node (ref U1) (pin 11))
(node (ref C3) (pin 1))
(node (ref R5) (pin 1)))
(net (code 38) (name "Net-(R1-Pad2)")
(node (ref R1) (pin 2))
(node (ref U1) (pin 14)))
(net (code 39) (name "Net-(C2-Pad2)")
(node (ref C2) (pin 2))
(node (ref U1) (pin 3)))
(net (code 40) (name "Net-(C1-Pad2)")
(node (ref U1) (pin 6))
(node (ref C1) (pin 2)))))

View File

@ -0,0 +1,246 @@
update=. 26. juni 2022 kl. 11.55 +0200
version=1
last_client=kicad
[general]
version=1
[cvpcb]
version=1
NetIExt=net
[eeschema]
version=1
LibDir=
[schematic_editor]
version=1
PageLayoutDescrFile=
PlotDirectoryName=
SubpartIdSeparator=0
SubpartFirstId=65
NetFmtName=Pcbnew
SpiceAjustPassiveValues=0
LabSize=50
ERC_TestSimilarLabels=1
[pcbnew]
version=1
PageLayoutDescrFile=
LastNetListRead=d1_mini_shield.net
CopperLayerCount=2
BoardThickness=1.6
AllowMicroVias=0
AllowBlindVias=0
RequireCourtyardDefinitions=0
ProhibitOverlappingCourtyards=1
MinTrackWidth=0.2
MinViaDiameter=0.4
MinViaDrill=0.3
MinMicroViaDiameter=0.2
MinMicroViaDrill=0.09999999999999999
MinHoleToHole=0.25
TrackWidth1=0.25
TrackWidth2=0.5
ViaDiameter1=0.6
ViaDrill1=0.4
dPairWidth1=0.2
dPairGap1=0.25
dPairViaGap1=0.25
SilkLineWidth=0.15
SilkTextSizeV=1
SilkTextSizeH=1
SilkTextSizeThickness=0.15
SilkTextItalic=0
SilkTextUpright=1
CopperLineWidth=0.2
CopperTextSizeV=1.5
CopperTextSizeH=1.5
CopperTextThickness=0.3
CopperTextItalic=0
CopperTextUpright=1
EdgeCutLineWidth=0.15
CourtyardLineWidth=0.05
OthersLineWidth=0.15
OthersTextSizeV=1
OthersTextSizeH=1
OthersTextSizeThickness=0.15
OthersTextItalic=0
OthersTextUpright=1
SolderMaskClearance=0.2
SolderMaskMinWidth=0
SolderPasteClearance=0
SolderPasteRatio=-0
[pcbnew/Layer.F.Cu]
Name=F.Cu
Type=0
Enabled=1
[pcbnew/Layer.In1.Cu]
Name=In1.Cu
Type=0
Enabled=0
[pcbnew/Layer.In2.Cu]
Name=In2.Cu
Type=0
Enabled=0
[pcbnew/Layer.In3.Cu]
Name=In3.Cu
Type=0
Enabled=0
[pcbnew/Layer.In4.Cu]
Name=In4.Cu
Type=0
Enabled=0
[pcbnew/Layer.In5.Cu]
Name=In5.Cu
Type=0
Enabled=0
[pcbnew/Layer.In6.Cu]
Name=In6.Cu
Type=0
Enabled=0
[pcbnew/Layer.In7.Cu]
Name=In7.Cu
Type=0
Enabled=0
[pcbnew/Layer.In8.Cu]
Name=In8.Cu
Type=0
Enabled=0
[pcbnew/Layer.In9.Cu]
Name=In9.Cu
Type=0
Enabled=0
[pcbnew/Layer.In10.Cu]
Name=In10.Cu
Type=0
Enabled=0
[pcbnew/Layer.In11.Cu]
Name=In11.Cu
Type=0
Enabled=0
[pcbnew/Layer.In12.Cu]
Name=In12.Cu
Type=0
Enabled=0
[pcbnew/Layer.In13.Cu]
Name=In13.Cu
Type=0
Enabled=0
[pcbnew/Layer.In14.Cu]
Name=In14.Cu
Type=0
Enabled=0
[pcbnew/Layer.In15.Cu]
Name=In15.Cu
Type=0
Enabled=0
[pcbnew/Layer.In16.Cu]
Name=In16.Cu
Type=0
Enabled=0
[pcbnew/Layer.In17.Cu]
Name=In17.Cu
Type=0
Enabled=0
[pcbnew/Layer.In18.Cu]
Name=In18.Cu
Type=0
Enabled=0
[pcbnew/Layer.In19.Cu]
Name=In19.Cu
Type=0
Enabled=0
[pcbnew/Layer.In20.Cu]
Name=In20.Cu
Type=0
Enabled=0
[pcbnew/Layer.In21.Cu]
Name=In21.Cu
Type=0
Enabled=0
[pcbnew/Layer.In22.Cu]
Name=In22.Cu
Type=0
Enabled=0
[pcbnew/Layer.In23.Cu]
Name=In23.Cu
Type=0
Enabled=0
[pcbnew/Layer.In24.Cu]
Name=In24.Cu
Type=0
Enabled=0
[pcbnew/Layer.In25.Cu]
Name=In25.Cu
Type=0
Enabled=0
[pcbnew/Layer.In26.Cu]
Name=In26.Cu
Type=0
Enabled=0
[pcbnew/Layer.In27.Cu]
Name=In27.Cu
Type=0
Enabled=0
[pcbnew/Layer.In28.Cu]
Name=In28.Cu
Type=0
Enabled=0
[pcbnew/Layer.In29.Cu]
Name=In29.Cu
Type=0
Enabled=0
[pcbnew/Layer.In30.Cu]
Name=In30.Cu
Type=0
Enabled=0
[pcbnew/Layer.B.Cu]
Name=B.Cu
Type=0
Enabled=1
[pcbnew/Layer.B.Adhes]
Enabled=1
[pcbnew/Layer.F.Adhes]
Enabled=1
[pcbnew/Layer.B.Paste]
Enabled=1
[pcbnew/Layer.F.Paste]
Enabled=1
[pcbnew/Layer.B.SilkS]
Enabled=1
[pcbnew/Layer.F.SilkS]
Enabled=1
[pcbnew/Layer.B.Mask]
Enabled=1
[pcbnew/Layer.F.Mask]
Enabled=1
[pcbnew/Layer.Dwgs.User]
Enabled=1
[pcbnew/Layer.Cmts.User]
Enabled=1
[pcbnew/Layer.Eco1.User]
Enabled=1
[pcbnew/Layer.Eco2.User]
Enabled=1
[pcbnew/Layer.Edge.Cuts]
Enabled=1
[pcbnew/Layer.Margin]
Enabled=1
[pcbnew/Layer.B.CrtYd]
Enabled=1
[pcbnew/Layer.F.CrtYd]
Enabled=1
[pcbnew/Layer.B.Fab]
Enabled=1
[pcbnew/Layer.F.Fab]
Enabled=1
[pcbnew/Layer.Rescue]
Enabled=0
[pcbnew/Netclasses]
[pcbnew/Netclasses/Default]
Name=Default
Clearance=0.2
TrackWidth=0.25
ViaDiameter=0.6
ViaDrill=0.4
uViaDiameter=0.3
uViaDrill=0.1
dPairWidth=0.2
dPairGap=0.25
dPairViaGap=0.25

View File

@ -0,0 +1,725 @@
EESchema Schematic File Version 4
EELAYER 30 0
EELAYER END
$Descr A4 11693 8268
encoding utf-8
Sheet 1 1
Title ""
Date ""
Rev ""
Comp ""
Comment1 ""
Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
$Comp
L d1_mini_shield-rescue:CONN_01X08 P1
U 1 1 5763EB78
P 8300 1850
F 0 "P1" H 8300 2300 50 0000 C CNN
F 1 "CONN_01X08" V 8400 1850 50 0000 C CNN
F 2 "D1_mini:D1_mini_Pin_Header" H 8300 1850 50 0001 C CNN
F 3 "" H 8300 1850 50 0000 C CNN
1 8300 1850
1 0 0 -1
$EndComp
$Comp
L d1_mini_shield-rescue:CONN_01X08 P2
U 1 1 5763EBF2
P 9400 1850
F 0 "P2" H 9400 2300 50 0000 C CNN
F 1 "CONN_01X08" V 9500 1850 50 0000 C CNN
F 2 "D1_mini:D1_mini_Pin_Header" H 9400 1850 50 0001 C CNN
F 3 "" H 9400 1850 50 0000 C CNN
1 9400 1850
-1 0 0 -1
$EndComp
Text Label 8100 1500 2 60 ~ 0
+5V
Text Label 8100 1600 2 60 ~ 0
GND
Text Label 8100 1700 2 60 ~ 0
D4
Text Label 8100 1800 2 60 ~ 0
D3
Text Label 8100 1900 2 60 ~ 0
D2
Text Label 8100 2000 2 60 ~ 0
D1
Text Label 8100 2100 2 60 ~ 0
RX
Text Label 8100 2200 2 60 ~ 0
TX
Text Label 9600 1500 0 60 ~ 0
+3.3V
Text Label 9600 1600 0 60 ~ 0
D8
Text Label 9600 1700 0 60 ~ 0
D7
Text Label 9600 1800 0 60 ~ 0
D6
Text Label 9600 1900 0 60 ~ 0
D5
Text Label 9600 2000 0 60 ~ 0
D0
Text Label 9600 2100 0 60 ~ 0
A0
Text Label 9600 2200 0 60 ~ 0
RST
Text Notes 8750 1750 2 60 ~ 0
GPIO2
Text Notes 8750 1850 2 60 ~ 0
GPIO0
Text Notes 8750 1950 2 60 ~ 0
GPIO4
Text Notes 8750 2050 2 60 ~ 0
GPIO5
Text Notes 8900 1650 0 60 ~ 0
GPIO15
Text Notes 8900 1750 0 60 ~ 0
GPIO13
Text Notes 8900 1850 0 60 ~ 0
GPIO12
Text Notes 8900 1950 0 60 ~ 0
GPIO14
Text Notes 8900 2050 0 60 ~ 0
GPIO16
Text Notes 7550 1050 0 60 ~ 0
D1 Mini Shield
$Comp
L tss721:TSS721 U1
U 1 1 62B826D2
P 3650 5550
F 0 "U1" H 3650 6621 50 0000 C CNN
F 1 "TSS721" H 3650 6530 50 0000 C CNN
F 2 "Package_SO:SOIC-16_3.9x9.9mm_P1.27mm" H 3650 4700 50 0001 C CIN
F 3 "http://www.ti.com/lit/ds/symlink/tss721a.pdf" H 3650 6439 50 0000 C CNN
1 3650 5550
1 0 0 -1
$EndComp
$Comp
L power:+3.3V #PWR0101
U 1 1 62B89C7B
P 2850 4750
F 0 "#PWR0101" H 2850 4600 50 0001 C CNN
F 1 "+3.3V" V 2865 4878 50 0000 L CNN
F 2 "" H 2850 4750 50 0001 C CNN
F 3 "" H 2850 4750 50 0001 C CNN
1 2850 4750
0 -1 -1 0
$EndComp
$Comp
L Connector:RJ45 J1
U 1 1 62B8AC34
P 1950 1850
F 0 "J1" H 2007 2517 50 0000 C CNN
F 1 "RJ45" H 2007 2426 50 0000 C CNN
F 2 "Connector_RJ:RJ45_Amphenol_54602-x08_Horizontal" V 1950 1875 50 0001 C CNN
F 3 "~" V 1950 1875 50 0001 C CNN
1 1950 1850
1 0 0 -1
$EndComp
$Comp
L Device:R R4
U 1 1 62B8CAA8
P 2750 5150
F 0 "R4" V 2957 5150 50 0000 C CNN
F 1 "220" V 2866 5150 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2680 5150 50 0001 C CNN
F 3 "~" H 2750 5150 50 0001 C CNN
1 2750 5150
0 -1 -1 0
$EndComp
$Comp
L Device:R R2
U 1 1 62B8DB92
P 2500 5050
F 0 "R2" V 2707 5050 50 0000 C CNN
F 1 "220" V 2616 5050 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2430 5050 50 0001 C CNN
F 3 "~" H 2500 5050 50 0001 C CNN
1 2500 5050
0 -1 -1 0
$EndComp
$Comp
L power:GND #PWR0102
U 1 1 62B9F029
P 1850 6050
F 0 "#PWR0102" H 1850 5800 50 0001 C CNN
F 1 "GND" H 1855 5877 50 0000 C CNN
F 2 "" H 1850 6050 50 0001 C CNN
F 3 "" H 1850 6050 50 0001 C CNN
1 1850 6050
-1 0 0 1
$EndComp
$Comp
L Device:R R3
U 1 1 62B9F861
P 2500 6300
F 0 "R3" H 2570 6346 50 0000 L CNN
F 1 "82k" H 2570 6255 50 0000 L CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2430 6300 50 0001 C CNN
F 3 "~" H 2500 6300 50 0001 C CNN
1 2500 6300
1 0 0 -1
$EndComp
$Comp
L Device:R R1
U 1 1 62B9FC37
P 2250 6300
F 0 "R1" H 2320 6346 50 0000 L CNN
F 1 "470" H 2320 6255 50 0000 L CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2180 6300 50 0001 C CNN
F 3 "~" H 2250 6300 50 0001 C CNN
1 2250 6300
1 0 0 -1
$EndComp
$Comp
L Device:C C2
U 1 1 62BA06BE
P 2850 6050
F 0 "C2" V 3102 6050 50 0000 C CNN
F 1 "1u" V 3011 6050 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2888 5900 50 0001 C CNN
F 3 "~" H 2850 6050 50 0001 C CNN
1 2850 6050
0 -1 -1 0
$EndComp
$Comp
L Device:C C1
U 1 1 62BA09E7
P 1850 6300
F 0 "C1" H 1965 6346 50 0000 L CNN
F 1 "100n" H 1965 6255 50 0000 L CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 1888 6150 50 0001 C CNN
F 3 "~" H 1850 6300 50 0001 C CNN
1 1850 6300
1 0 0 -1
$EndComp
Wire Wire Line
1850 6050 1850 6150
Wire Wire Line
2250 6050 2250 6150
Wire Wire Line
2500 6050 2500 6150
Connection ~ 1850 6050
Connection ~ 2250 6050
Wire Wire Line
2250 6050 2500 6050
Wire Wire Line
1850 6050 2250 6050
Connection ~ 2500 6050
Wire Wire Line
3850 6450 3850 6350
Wire Wire Line
2250 6450 2250 6550
Wire Wire Line
3950 6550 3950 6350
Wire Wire Line
1850 6450 1850 6650
Wire Wire Line
4050 6650 4050 6350
Wire Wire Line
3050 6050 3000 6050
Wire Wire Line
2500 6050 2700 6050
Wire Wire Line
2700 6050 2700 6350
Wire Wire Line
2700 6350 3650 6350
Connection ~ 2700 6050
Wire Wire Line
3850 6450 2500 6450
Wire Wire Line
2250 6550 3950 6550
Wire Wire Line
4050 6650 1850 6650
Text GLabel 4350 5350 2 50 Output ~ 0
HAN_TX
Wire Wire Line
4350 5350 4300 5350
Wire Wire Line
2850 4750 3550 4750
$Comp
L Device:R R5
U 1 1 62BED413
P 4650 4550
F 0 "R5" V 4857 4550 50 0000 C CNN
F 1 "100k" V 4766 4550 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4580 4550 50 0001 C CNN
F 3 "~" H 4650 4550 50 0001 C CNN
1 4650 4550
0 -1 -1 0
$EndComp
$Comp
L Device:C C3
U 1 1 62BED9ED
P 4650 4900
F 0 "C3" V 4902 4900 50 0000 C CNN
F 1 "100n" V 4811 4900 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4688 4750 50 0001 C CNN
F 3 "~" H 4650 4900 50 0001 C CNN
1 4650 4900
0 -1 -1 0
$EndComp
$Comp
L power:GND #PWR0103
U 1 1 62BF4151
P 4800 5050
F 0 "#PWR0103" H 4800 4800 50 0001 C CNN
F 1 "GND" H 4805 4877 50 0000 C CNN
F 2 "" H 4800 5050 50 0001 C CNN
F 3 "" H 4800 5050 50 0001 C CNN
1 4800 5050
1 0 0 -1
$EndComp
Wire Wire Line
4800 4550 4800 4900
Wire Wire Line
4800 4900 4800 5050
Connection ~ 4800 4900
Wire Wire Line
4500 4900 4500 4550
Wire Wire Line
4500 4550 3650 4550
Wire Wire Line
3650 4550 3650 4750
Connection ~ 4500 4550
Wire Notes Line
1500 4050 5050 4050
Wire Notes Line
5050 4050 5050 6850
Wire Notes Line
5050 6850 1500 6850
Wire Notes Line
1500 6850 1500 4050
Wire Notes Line
7550 950 10200 950
Wire Notes Line
10200 950 10200 2750
Wire Notes Line
10200 2750 7550 2750
Wire Notes Line
7550 2750 7550 950
Text GLabel 9800 1700 2 50 Input ~ 0
HAN_TX
Wire Wire Line
9800 1700 9600 1700
$Comp
L power:+3V3 #PWR0104
U 1 1 62C0EBC2
P 9850 1500
F 0 "#PWR0104" H 9850 1350 50 0001 C CNN
F 1 "+3V3" V 9865 1628 50 0000 L CNN
F 2 "" H 9850 1500 50 0001 C CNN
F 3 "" H 9850 1500 50 0001 C CNN
1 9850 1500
0 1 1 0
$EndComp
Wire Wire Line
9850 1500 9600 1500
Text GLabel 9800 1800 2 50 Output ~ 0
LED_R
Text GLabel 9800 1900 2 50 Output ~ 0
LED_G
Wire Wire Line
9800 1800 9600 1800
Wire Wire Line
9800 1900 9600 1900
$Comp
L power:GND #PWR0105
U 1 1 62C13452
P 7850 1600
F 0 "#PWR0105" H 7850 1350 50 0001 C CNN
F 1 "GND" V 7855 1472 50 0000 R CNN
F 2 "" H 7850 1600 50 0001 C CNN
F 3 "" H 7850 1600 50 0001 C CNN
1 7850 1600
0 1 1 0
$EndComp
Wire Wire Line
8100 1600 7850 1600
Text GLabel 7950 1800 0 50 Input ~ 0
BTN_AP
Wire Wire Line
8100 1800 7950 1800
Text GLabel 7950 1900 0 50 Input ~ 0
TEMP
Wire Wire Line
8100 1900 7950 1900
Wire Wire Line
3050 5150 2900 5150
Wire Wire Line
3050 5050 2650 5050
Text GLabel 2200 5050 0 50 Input ~ 0
MBUS1
Text GLabel 2200 5150 0 50 Input ~ 0
MBUS2
Wire Wire Line
2350 5050 2200 5050
Wire Wire Line
2600 5150 2200 5150
Text GLabel 2500 2150 2 50 Output ~ 0
MBUS1
Text GLabel 2500 2050 2 50 Output ~ 0
MBUS2
Wire Wire Line
2500 2050 2350 2050
Wire Wire Line
2350 2150 2500 2150
$Comp
L Device:Jumper JP1
U 1 1 62C331C0
P 3300 1250
F 0 "JP1" H 3300 1514 50 0000 C CNN
F 1 "Jumper" H 3300 1423 50 0000 C CNN
F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 1250 50 0001 C CNN
F 3 "~" H 3300 1250 50 0001 C CNN
1 3300 1250
1 0 0 -1
$EndComp
$Comp
L Device:Jumper JP2
U 1 1 62C365CA
P 3300 1850
F 0 "JP2" H 3300 2114 50 0000 C CNN
F 1 "Jumper" H 3300 2023 50 0000 C CNN
F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 1850 50 0001 C CNN
F 3 "~" H 3300 1850 50 0001 C CNN
1 3300 1850
1 0 0 -1
$EndComp
$Comp
L Device:Jumper JP3
U 1 1 62C36C70
P 3300 2200
F 0 "JP3" H 3300 2464 50 0000 C CNN
F 1 "Jumper" H 3300 2373 50 0000 C CNN
F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 2200 50 0001 C CNN
F 3 "~" H 3300 2200 50 0001 C CNN
1 3300 2200
1 0 0 -1
$EndComp
Wire Wire Line
3000 1850 2900 1850
Wire Wire Line
2900 1850 2900 1750
Wire Wire Line
2350 1750 2900 1750
Wire Wire Line
2350 1850 2850 1850
Wire Wire Line
2850 1850 2850 2200
Wire Wire Line
2850 2200 3000 2200
$Comp
L power:GND #PWR0107
U 1 1 62C3D94F
P 3750 1850
F 0 "#PWR0107" H 3750 1600 50 0001 C CNN
F 1 "GND" V 3755 1722 50 0000 R CNN
F 2 "" H 3750 1850 50 0001 C CNN
F 3 "" H 3750 1850 50 0001 C CNN
1 3750 1850
0 -1 -1 0
$EndComp
Text GLabel 3750 2200 2 50 Output ~ 0
TEMP
Wire Wire Line
3750 1850 3600 1850
Wire Wire Line
3750 2200 3600 2200
Wire Notes Line
1450 950 4350 950
Wire Notes Line
4350 950 4350 2450
Wire Notes Line
4350 2450 1450 2450
Wire Notes Line
1450 2450 1450 950
$Comp
L Device:LED_RGB D1
U 1 1 62C43A7B
P 9550 4800
F 0 "D1" H 9550 5297 50 0000 C CNN
F 1 "LED_RGB" H 9550 5206 50 0000 C CNN
F 2 "LED_SMD:LED_RGB_PLCC-6" H 9550 4750 50 0001 C CNN
F 3 "~" H 9550 4750 50 0001 C CNN
1 9550 4800
1 0 0 -1
$EndComp
$Comp
L power:+3.3V #PWR0108
U 1 1 62C44A94
P 10000 4800
F 0 "#PWR0108" H 10000 4650 50 0001 C CNN
F 1 "+3.3V" V 10015 4928 50 0000 L CNN
F 2 "" H 10000 4800 50 0001 C CNN
F 3 "" H 10000 4800 50 0001 C CNN
1 10000 4800
0 1 1 0
$EndComp
Wire Wire Line
9750 4800 9900 4800
Wire Wire Line
9750 4600 9900 4600
Wire Wire Line
9900 4600 9900 4800
Connection ~ 9900 4800
Wire Wire Line
9900 4800 10000 4800
Wire Wire Line
9900 4800 9900 5000
Wire Wire Line
9900 5000 9750 5000
$Comp
L Device:R R9
U 1 1 62C495F7
P 9100 4600
F 0 "R9" V 9307 4600 50 0000 C CNN
F 1 "1k" V 9216 4600 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9030 4600 50 0001 C CNN
F 3 "~" H 9100 4600 50 0001 C CNN
1 9100 4600
0 -1 -1 0
$EndComp
$Comp
L Device:R R8
U 1 1 62C4BDE9
P 8850 4800
F 0 "R8" V 9057 4800 50 0000 C CNN
F 1 "1k" V 8966 4800 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 8780 4800 50 0001 C CNN
F 3 "~" H 8850 4800 50 0001 C CNN
1 8850 4800
0 -1 -1 0
$EndComp
$Comp
L Device:R R10
U 1 1 62C4C336
P 9100 5000
F 0 "R10" V 9307 5000 50 0000 C CNN
F 1 "1k" V 9216 5000 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9030 5000 50 0001 C CNN
F 3 "~" H 9100 5000 50 0001 C CNN
1 9100 5000
0 -1 -1 0
$EndComp
Wire Wire Line
9350 4600 9250 4600
Wire Wire Line
9350 4800 9000 4800
Wire Wire Line
9350 5000 9250 5000
Text GLabel 8650 4600 0 50 Input ~ 0
LED_R
Text GLabel 8650 4800 0 50 Input ~ 0
LED_G
Text GLabel 8650 5000 0 50 Input ~ 0
LED_B
Wire Wire Line
8700 4800 8650 4800
Wire Wire Line
8950 4600 8650 4600
Wire Wire Line
8950 5000 8650 5000
Wire Notes Line
8200 4050 10550 4050
Wire Notes Line
10550 4050 10550 5400
Wire Notes Line
10550 5400 8200 5400
Wire Notes Line
8200 5400 8200 4050
$Comp
L Sensor_Temperature:DS18B20 U2
U 1 1 62C6296F
P 6600 4900
F 0 "U2" H 6370 4946 50 0000 R CNN
F 1 "DS18B20" H 6370 4855 50 0000 R CNN
F 2 "Package_TO_SOT_THT:TO-92_Inline" H 5600 4650 50 0001 C CNN
F 3 "http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf" H 6450 5150 50 0001 C CNN
1 6600 4900
1 0 0 -1
$EndComp
$Comp
L power:GND #PWR0109
U 1 1 62C6373E
P 6600 5350
F 0 "#PWR0109" H 6600 5100 50 0001 C CNN
F 1 "GND" H 6605 5177 50 0000 C CNN
F 2 "" H 6600 5350 50 0001 C CNN
F 3 "" H 6600 5350 50 0001 C CNN
1 6600 5350
1 0 0 -1
$EndComp
$Comp
L power:+3.3V #PWR0110
U 1 1 62C63C02
P 6600 4450
F 0 "#PWR0110" H 6600 4300 50 0001 C CNN
F 1 "+3.3V" H 6615 4623 50 0000 C CNN
F 2 "" H 6600 4450 50 0001 C CNN
F 3 "" H 6600 4450 50 0001 C CNN
1 6600 4450
1 0 0 -1
$EndComp
$Comp
L Device:R R7
U 1 1 62C6405D
P 6900 4600
F 0 "R7" H 6970 4646 50 0000 L CNN
F 1 "4k7" H 6970 4555 50 0000 L CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 6830 4600 50 0001 C CNN
F 3 "~" H 6900 4600 50 0001 C CNN
1 6900 4600
1 0 0 -1
$EndComp
Wire Wire Line
6600 5200 6600 5350
Wire Wire Line
6600 4600 6600 4450
Wire Wire Line
6900 4900 6900 4750
Wire Wire Line
6900 4450 6600 4450
Connection ~ 6600 4450
Text GLabel 7050 4900 2 50 Output ~ 0
TEMP
Wire Wire Line
7050 4900 6900 4900
Connection ~ 6900 4900
Wire Notes Line
5750 4050 7500 4050
Wire Notes Line
7500 4050 7500 5750
Wire Notes Line
7500 5750 5750 5750
Wire Notes Line
5750 5750 5750 4050
$Comp
L Switch:SW_Push SW1
U 1 1 62C73229
P 5950 1400
F 0 "SW1" H 5950 1685 50 0000 C CNN
F 1 "SW_Push" H 5950 1594 50 0000 C CNN
F 2 "Button_Switch_SMD:SW_SPST_B3U-3000P" H 5950 1600 50 0001 C CNN
F 3 "~" H 5950 1600 50 0001 C CNN
1 5950 1400
1 0 0 -1
$EndComp
$Comp
L Device:R R6
U 1 1 62C73CE8
P 5950 1700
F 0 "R6" V 6157 1700 50 0000 C CNN
F 1 "10k" V 6066 1700 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 5880 1700 50 0001 C CNN
F 3 "~" H 5950 1700 50 0001 C CNN
1 5950 1700
0 -1 -1 0
$EndComp
$Comp
L power:GND #PWR0111
U 1 1 62C76961
P 6350 1400
F 0 "#PWR0111" H 6350 1150 50 0001 C CNN
F 1 "GND" V 6355 1272 50 0000 R CNN
F 2 "" H 6350 1400 50 0001 C CNN
F 3 "" H 6350 1400 50 0001 C CNN
1 6350 1400
0 -1 -1 0
$EndComp
$Comp
L power:+3.3V #PWR0112
U 1 1 62C776AD
P 6350 1700
F 0 "#PWR0112" H 6350 1550 50 0001 C CNN
F 1 "+3.3V" V 6365 1828 50 0000 L CNN
F 2 "" H 6350 1700 50 0001 C CNN
F 3 "" H 6350 1700 50 0001 C CNN
1 6350 1700
0 1 1 0
$EndComp
Wire Wire Line
6350 1400 6150 1400
Wire Wire Line
6350 1700 6100 1700
Wire Wire Line
5750 1400 5550 1400
Wire Wire Line
5550 1400 5550 1550
Wire Wire Line
5550 1700 5800 1700
Text GLabel 5450 1550 0 50 Output ~ 0
BTN_AP
Wire Wire Line
5450 1550 5550 1550
Connection ~ 5550 1550
Wire Wire Line
5550 1550 5550 1700
Wire Notes Line
5000 950 6850 950
Wire Notes Line
6850 950 6850 1950
Wire Notes Line
6850 1950 5000 1950
Wire Notes Line
5000 1950 5000 950
Text GLabel 4350 5450 2 50 Output ~ 0
LED_B
Wire Wire Line
4350 5450 4300 5450
Wire Wire Line
4300 5450 4300 5350
Connection ~ 4300 5350
Wire Wire Line
4300 5350 4250 5350
$Comp
L power:+5V #PWR0106
U 1 1 62D05402
P 7850 1500
F 0 "#PWR0106" H 7850 1350 50 0001 C CNN
F 1 "+5V" V 7865 1628 50 0000 L CNN
F 2 "" H 7850 1500 50 0001 C CNN
F 3 "" H 7850 1500 50 0001 C CNN
1 7850 1500
0 -1 -1 0
$EndComp
Wire Wire Line
8100 1500 7850 1500
$Comp
L power:+5V #PWR0113
U 1 1 62D0B1E1
P 3750 1250
F 0 "#PWR0113" H 3750 1100 50 0001 C CNN
F 1 "+5V" V 3765 1378 50 0000 L CNN
F 2 "" H 3750 1250 50 0001 C CNN
F 3 "" H 3750 1250 50 0001 C CNN
1 3750 1250
0 1 1 0
$EndComp
$Comp
L Device:Jumper JP4
U 1 1 62D1E97A
P 3300 1550
F 0 "JP4" H 3300 1814 50 0000 C CNN
F 1 "Jumper" H 3300 1723 50 0000 C CNN
F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 1550 50 0001 C CNN
F 3 "~" H 3300 1550 50 0001 C CNN
1 3300 1550
1 0 0 -1
$EndComp
Wire Wire Line
3000 1250 2350 1250
Wire Wire Line
2350 1250 2350 1450
Wire Wire Line
3600 1250 3750 1250
Wire Wire Line
3600 1550 3600 1850
Connection ~ 3600 1850
Wire Wire Line
2350 1550 3000 1550
$EndSCHEMATC

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,3 @@
(fp_lib_table
(lib (name D1_mini)(type KiCad)(uri "$(KIPRJMOD)/lib/D1_mini.pretty")(options "")(descr ""))
)

View File

@ -0,0 +1,27 @@
(module Pin_Headers:Pin_Header_Straight_1x08 (layer F.Cu) (tedit 5766A5B6)
(descr "Through hole pin header")
(tags "pin header")
(fp_text reference P1 (at 0.11176 -2.43586) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_text value CONN_01X08 (at 0 -3.1) (layer F.Fab) hide
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -1.75 -1.75) (end -1.75 19.55) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.75 -1.75) (end 1.75 19.55) (layer F.CrtYd) (width 0.05))
(fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
(fp_line (start -1.75 19.55) (end 1.75 19.55) (layer F.CrtYd) (width 0.05))
(pad 1 thru_hole rect (at 0 0) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 2 thru_hole oval (at 0 2.54) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 3 thru_hole oval (at 0 5.08) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 4 thru_hole oval (at 0 7.62) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 5 thru_hole oval (at 0 10.16) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 6 thru_hole oval (at 0 12.7) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 7 thru_hole oval (at 0 15.24) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 8 thru_hole oval (at 0 17.78) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(model Pin_Headers.3dshapes/Pin_Header_Straight_1x08.wrl
(at (xyz 0 -0.35 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 90))
)
)

View File

@ -0,0 +1,54 @@
(module OSHW (layer F.Cu) (tedit 5766B04E)
(descr OSHW)
(tags "Symbol, OSHW-Logo, Silk Screen,")
(fp_text reference "" (at 0.09906 -4.38912) (layer F.SilkS) hide
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_text value OSHW (at 0 5) (layer F.Fab) hide
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -1.78054 0.92964) (end -2.03962 1.49098) (layer F.SilkS) (width 0.15))
(fp_line (start -2.03962 1.49098) (end -1.50114 2.00914) (layer F.SilkS) (width 0.15))
(fp_line (start -1.50114 2.00914) (end -0.98044 1.7399) (layer F.SilkS) (width 0.15))
(fp_line (start -0.98044 1.7399) (end -0.70104 1.89992) (layer F.SilkS) (width 0.15))
(fp_line (start 0.73914 1.8796) (end 1.06934 1.6891) (layer F.SilkS) (width 0.15))
(fp_line (start 1.06934 1.6891) (end 1.50876 2.0193) (layer F.SilkS) (width 0.15))
(fp_line (start 1.50876 2.0193) (end 1.9812 1.52908) (layer F.SilkS) (width 0.15))
(fp_line (start 1.9812 1.52908) (end 1.69926 1.04902) (layer F.SilkS) (width 0.15))
(fp_line (start 1.69926 1.04902) (end 1.88976 0.57912) (layer F.SilkS) (width 0.15))
(fp_line (start 1.88976 0.57912) (end 2.49936 0.39116) (layer F.SilkS) (width 0.15))
(fp_line (start 2.49936 0.39116) (end 2.49936 -0.28956) (layer F.SilkS) (width 0.15))
(fp_line (start 2.49936 -0.28956) (end 1.94056 -0.42926) (layer F.SilkS) (width 0.15))
(fp_line (start 1.94056 -0.42926) (end 1.7399 -1.00076) (layer F.SilkS) (width 0.15))
(fp_line (start 1.7399 -1.00076) (end 2.00914 -1.47066) (layer F.SilkS) (width 0.15))
(fp_line (start 2.00914 -1.47066) (end 1.53924 -1.9812) (layer F.SilkS) (width 0.15))
(fp_line (start 1.53924 -1.9812) (end 1.02108 -1.71958) (layer F.SilkS) (width 0.15))
(fp_line (start 1.02108 -1.71958) (end 0.55118 -1.92024) (layer F.SilkS) (width 0.15))
(fp_line (start 0.55118 -1.92024) (end 0.381 -2.46126) (layer F.SilkS) (width 0.15))
(fp_line (start 0.381 -2.46126) (end -0.30988 -2.47904) (layer F.SilkS) (width 0.15))
(fp_line (start -0.30988 -2.47904) (end -0.5207 -1.9304) (layer F.SilkS) (width 0.15))
(fp_line (start -0.5207 -1.9304) (end -0.9398 -1.76022) (layer F.SilkS) (width 0.15))
(fp_line (start -0.9398 -1.76022) (end -1.49098 -2.02946) (layer F.SilkS) (width 0.15))
(fp_line (start -1.49098 -2.02946) (end -2.00914 -1.50114) (layer F.SilkS) (width 0.15))
(fp_line (start -2.00914 -1.50114) (end -1.76022 -0.96012) (layer F.SilkS) (width 0.15))
(fp_line (start -1.76022 -0.96012) (end -1.9304 -0.48006) (layer F.SilkS) (width 0.15))
(fp_line (start -1.9304 -0.48006) (end -2.47904 -0.381) (layer F.SilkS) (width 0.15))
(fp_line (start -2.47904 -0.381) (end -2.4892 0.32004) (layer F.SilkS) (width 0.15))
(fp_line (start -2.4892 0.32004) (end -1.9304 0.5207) (layer F.SilkS) (width 0.15))
(fp_line (start -1.9304 0.5207) (end -1.7907 0.91948) (layer F.SilkS) (width 0.15))
(fp_line (start 0.35052 0.89916) (end 0.65024 0.7493) (layer F.SilkS) (width 0.15))
(fp_line (start 0.65024 0.7493) (end 0.8509 0.55118) (layer F.SilkS) (width 0.15))
(fp_line (start 0.8509 0.55118) (end 1.00076 0.14986) (layer F.SilkS) (width 0.15))
(fp_line (start 1.00076 0.14986) (end 1.00076 -0.24892) (layer F.SilkS) (width 0.15))
(fp_line (start 1.00076 -0.24892) (end 0.8509 -0.59944) (layer F.SilkS) (width 0.15))
(fp_line (start 0.8509 -0.59944) (end 0.39878 -0.94996) (layer F.SilkS) (width 0.15))
(fp_line (start 0.39878 -0.94996) (end -0.0508 -1.00076) (layer F.SilkS) (width 0.15))
(fp_line (start -0.0508 -1.00076) (end -0.44958 -0.89916) (layer F.SilkS) (width 0.15))
(fp_line (start -0.44958 -0.89916) (end -0.8509 -0.55118) (layer F.SilkS) (width 0.15))
(fp_line (start -0.8509 -0.55118) (end -1.00076 -0.09906) (layer F.SilkS) (width 0.15))
(fp_line (start -1.00076 -0.09906) (end -0.94996 0.39878) (layer F.SilkS) (width 0.15))
(fp_line (start -0.94996 0.39878) (end -0.70104 0.70104) (layer F.SilkS) (width 0.15))
(fp_line (start -0.70104 0.70104) (end -0.35052 0.89916) (layer F.SilkS) (width 0.15))
(fp_line (start -0.35052 0.89916) (end -0.70104 1.89992) (layer F.SilkS) (width 0.15))
(fp_line (start 0.35052 0.89916) (end 0.7493 1.89992) (layer F.SilkS) (width 0.15))
)

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,21 @@
<HTML>
<HEAD>
<title>D1Shield</title>
</HEAD>
<BODY>
<P>This project template is the basis of an expansion board for the
<A HREF="https://www.wemos.cc/en/latest/d1/d1_mini.html" TARGET="blank">D1 mini board</A>.
<BR><BR>This base project includes a PCB edge defined
as the same size as the D1 mini PCB with the connectors placed
correctly to align the two boards. All IO present on the D1 mini
board is connected to the project through the expansion
headers. <BR><BR>The board looks like the following:
</P>
<P><IMG SRC="brd.png">
</P>
<p><i>Dwgs.User</i> layer show mechanical components of the D1mini board.</p>
<P>&copy;2016 J&eacute;r&ocirc;me Labidurie<br/>
Licence: <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC:BY-SA 3.0</a><br/>
<a href="http://dinask.eu">dinask.eu</a></P>
</BODY>
</HTML>

View File

@ -0,0 +1,4 @@
(sym_lib_table
(lib (name d1_mini_shield-rescue)(type Legacy)(uri ${KIPRJMOD}/d1_mini_shield-rescue.lib)(options "")(descr ""))
(lib (name tss721)(type Legacy)(uri ${KIPRJMOD}/tss721.lib)(options "")(descr ""))
)

View File

@ -0,0 +1,9 @@
EESchema-DOCLIB Version 2.0
#
$CMP TSS721
D TSS721A Meter Bus Transceiver, SOIC-16/TSSOP-16
K MBUS Tranciever
F http://www.ti.com/lit/ds/symlink/tss721a.pdf
$ENDCMP
#
#End Doc Library

Some files were not shown because too many files have changed in this diff Show More