Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[dsmr] Update line endings #8433

Merged
merged 1 commit into from
Sep 9, 2020
Merged

[dsmr] Update line endings #8433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions ...ab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Iskra_AM550.telegram
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
/ISK5\2M550T-1012
1-3:0.2.8(50)
0-0:1.0.0(180104231941W)
0-0:96.1.1(4530303434303036393033333132393137)
1-0:1.8.1(000156.167*kWh)
1-0:1.8.2(000071.546*kWh)
1-0:2.8.1(000000.000*kWh)
1-0:2.8.2(000000.000*kWh)
0-0:96.14.0(0001)
1-0:1.7.0(00.519*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00009)
0-0:96.7.9(00005)
1-0:99.97.0(2)(0-0:96.7.19)(170609063239S)(0000000267*s)(170611001706S)(0000149657*s)
1-0:32.32.0(00000)
1-0:52.32.0(00000)
1-0:72.32.0(00000)
1-0:32.36.0(00002)
1-0:52.36.0(00002)
1-0:72.36.0(00002)
0-0:96.13.0()
1-0:32.7.0(234.8*V)
1-0:52.7.0(232.1*V)
1-0:72.7.0(235.3*V)
1-0:31.7.0(000*A)
1-0:51.7.0(001*A)
1-0:71.7.0(001*A)
1-0:21.7.0(00.122*kW)
1-0:41.7.0(00.237*kW)
1-0:61.7.0(00.158*kW)
1-0:22.7.0(00.000*kW)
1-0:42.7.0(00.000*kW)
1-0:62.7.0(00.000*kW)
0-1:24.1.0(003)
0-1:96.1.0(4730303339303031373633333738373137)
0-1:24.2.1(180104231507W)(00212.529*m3)
!D82C
/ISK5\2M550T-1012

1-3:0.2.8(50)
0-0:1.0.0(180104231941W)
0-0:96.1.1(4530303434303036393033333132393137)
1-0:1.8.1(000156.167*kWh)
1-0:1.8.2(000071.546*kWh)
1-0:2.8.1(000000.000*kWh)
1-0:2.8.2(000000.000*kWh)
0-0:96.14.0(0001)
1-0:1.7.0(00.519*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00009)
0-0:96.7.9(00005)
1-0:99.97.0(2)(0-0:96.7.19)(170609063239S)(0000000267*s)(170611001706S)(0000149657*s)
1-0:32.32.0(00000)
1-0:52.32.0(00000)
1-0:72.32.0(00000)
1-0:32.36.0(00002)
1-0:52.36.0(00002)
1-0:72.36.0(00002)
0-0:96.13.0()
1-0:32.7.0(234.8*V)
1-0:52.7.0(232.1*V)
1-0:72.7.0(235.3*V)
1-0:31.7.0(000*A)
1-0:51.7.0(001*A)
1-0:71.7.0(001*A)
1-0:21.7.0(00.122*kW)
1-0:41.7.0(00.237*kW)
1-0:61.7.0(00.158*kW)
1-0:22.7.0(00.000*kW)
1-0:42.7.0(00.000*kW)
1-0:62.7.0(00.000*kW)
0-1:24.1.0(003)
0-1:96.1.0(4730303339303031373633333738373137)
0-1:24.2.1(180104231507W)(00212.529*m3)
!D82C
24 changes: 12 additions & 12 deletions ...inding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_E350.telegram
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/XMX5XMXABCE000015779
0-0:96.1.1(31323639333037322020202020202020)
1-0:1.8.1(07654.321*kWh)
1-0:1.8.2(01234.567*kWh)
1-0:2.8.1(00000.000*kWh)
1-0:2.8.2(00000.000*kWh)
0-0:96.14.0(0002)
1-0:1.7.0(0000.32*kW)
1-0:2.7.0(0000.00*kW)
0-0:96.13.1()
0-0:96.13.0()
!
/XMX5XMXABCE000015779
0-0:96.1.1(31323639333037322020202020202020)
1-0:1.8.1(07654.321*kWh)
1-0:1.8.2(01234.567*kWh)
1-0:2.8.1(00000.000*kWh)
1-0:2.8.2(00000.000*kWh)
0-0:96.14.0(0002)
1-0:1.7.0(0000.32*kW)
1-0:2.7.0(0000.00*kW)
0-0:96.13.1()
0-0:96.13.0()
!
52 changes: 26 additions & 26 deletions ...ding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_ZCF110.telegram
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
/XMX5LGBBFG1012530239
1-3:0.2.8(42)
0-0:1.0.0(161116201035W)
0-0:96.1.1(4530303331303033323737383938383136)
1-0:1.8.1(000075.067*kWh)
1-0:1.8.2(000084.813*kWh)
1-0:2.8.1(000000.000*kWh)
1-0:2.8.2(000000.000*kWh)
0-0:96.14.0(0002)
1-0:1.7.0(02.778*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00002)
0-0:96.7.9(00000)
1-0:99.97.0(0)(0-0:96.7.19)
1-0:32.32.0(00000)
1-0:32.36.0(00000)
0-0:96.13.1()
0-0:96.13.0()
1-0:31.7.0(012*A)
1-0:21.7.0(02.778*kW)
1-0:22.7.0(00.000*kW)
0-1:24.1.0(003)
0-1:96.1.0(4730303435303031363038313037323136)
0-1:24.2.1(161116200000W)(00066.405*m3)
!CC1E
/XMX5LGBBFG1012530239

1-3:0.2.8(42)
0-0:1.0.0(161116201035W)
0-0:96.1.1(4530303331303033323737383938383136)
1-0:1.8.1(000075.067*kWh)
1-0:1.8.2(000084.813*kWh)
1-0:2.8.1(000000.000*kWh)
1-0:2.8.2(000000.000*kWh)
0-0:96.14.0(0002)
1-0:1.7.0(02.778*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00002)
0-0:96.7.9(00000)
1-0:99.97.0(0)(0-0:96.7.19)
1-0:32.32.0(00000)
1-0:32.36.0(00000)
0-0:96.13.1()
0-0:96.13.0()
1-0:31.7.0(012*A)
1-0:21.7.0(02.778*kW)
1-0:22.7.0(00.000*kW)
0-1:24.1.0(003)
0-1:96.1.0(4730303435303031363038313037323136)
0-1:24.2.1(161116200000W)(00066.405*m3)
!CC1E
66 changes: 33 additions & 33 deletions ...binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Sagemcom_XS210.telegram
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
/KFM5KAIFA-METER
1-3:0.2.8(42)
0-0:1.0.0(171119202357W)
0-0:96.1.1(4530303236303030303130363837393134)
1-0:1.8.1(003095.599*kWh)
1-0:1.8.2(003283.520*kWh)
1-0:2.8.1(000000.000*kWh)
1-0:2.8.2(000000.000*kWh)
0-0:96.14.0(0001)
1-0:1.7.0(00.526*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00012)
0-0:96.7.9(00005)
1-0:99.97.0(5)(0-0:96.7.19)(170615124004S)(0000015270*s)(160504100552S)(0000000186*s)(160422115631S)(0000001201*s)(160420145748S)(0000000611*s)(000101000001W)(2147483647*s)
1-0:32.32.0(00000)
1-0:52.32.0(00000)
1-0:72.32.0(00000)
1-0:32.36.0(00000)
1-0:52.36.0(00000)
1-0:72.36.0(00000)
0-0:96.13.1()
0-0:96.13.0()
1-0:31.7.0(001*A)
1-0:51.7.0(000*A)
1-0:71.7.0(000*A)
1-0:21.7.0(00.401*kW)
1-0:22.7.0(00.000*kW)
1-0:41.7.0(00.123*kW)
1-0:42.7.0(00.000*kW)
1-0:61.7.0(00.001*kW)
1-0:62.7.0(00.000*kW)
!AD4B
/KFM5KAIFA-METER

1-3:0.2.8(42)
0-0:1.0.0(171119202357W)
0-0:96.1.1(4530303236303030303130363837393134)
1-0:1.8.1(003095.599*kWh)
1-0:1.8.2(003283.520*kWh)
1-0:2.8.1(000000.000*kWh)
1-0:2.8.2(000000.000*kWh)
0-0:96.14.0(0001)
1-0:1.7.0(00.526*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00012)
0-0:96.7.9(00005)
1-0:99.97.0(5)(0-0:96.7.19)(170615124004S)(0000015270*s)(160504100552S)(0000000186*s)(160422115631S)(0000001201*s)(160420145748S)(0000000611*s)(000101000001W)(2147483647*s)
1-0:32.32.0(00000)
1-0:52.32.0(00000)
1-0:72.32.0(00000)
1-0:32.36.0(00000)
1-0:52.36.0(00000)
1-0:72.36.0(00000)
0-0:96.13.1()
0-0:96.13.0()
1-0:31.7.0(001*A)
1-0:51.7.0(000*A)
1-0:71.7.0(000*A)
1-0:21.7.0(00.401*kW)
1-0:22.7.0(00.000*kW)
1-0:41.7.0(00.123*kW)
1-0:42.7.0(00.000*kW)
1-0:61.7.0(00.001*kW)
1-0:62.7.0(00.000*kW)
!AD4B
76 changes: 38 additions & 38 deletions ...penhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/ace4000.telegram
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
/ACE5ACE4KGPRS
0-0:96.1.0*255(1234567890123456)
1-0:1.8.0*255(012345.074*kWh)
1-0:1.8.1*255(012345.074*kWh)
1-0:2.8.0*255(000000.000*kWh)
1-0:2.8.1*255(000000.000*kWh)
0-0:96.14.0*255(01)
1-0:15.7.0*255(000123*W)
0-0:17.0.0*255(0085*A)
0-0:96.3.10*255(1)
0-3:96.1.0*255(12345678 )
7-0:23.1.0*255(01238.740*m3)(19-01-01 00:00:00)
7-0:23.1.0*255(01238.770*m3)(19-01-01 01:00:00)
7-0:23.1.0*255(01238.810*m3)(19-01-01 02:00:00)
7-0:23.1.0*255(01238.830*m3)(19-01-01 03:00:00)
7-0:23.1.0*255(01238.830*m3)(19-01-01 04:00:00)
7-0:23.1.0*255(01238.930*m3)(19-01-01 05:00:00)
7-0:23.1.0*255(01239.340*m3)(19-01-01 06:00:00)
7-0:23.1.0*255(01239.540*m3)(19-01-01 07:00:00)
7-0:23.1.0*255(01239.660*m3)(19-01-01 08:00:00)
7-0:23.1.0*255(01239.860*m3)(19-01-01 09:00:00)
7-0:23.1.0*255(01240.090*m3)(19-01-01 10:00:00)
7-0:23.1.0*255(01240.540*m3)(19-01-01 11:00:00)
7-0:23.1.0*255(01240.560*m3)(19-01-01 12:00:00)
7-0:23.1.0*255(01240.690*m3)(19-01-01 13:00:00)
7-0:23.1.0*255(01237.560*m3)(18-12-31 14:00:00)
7-0:23.1.0*255(01237.560*m3)(18-12-31 15:00:00)
7-0:23.1.0*255(01237.760*m3)(18-12-31 16:00:00)
7-0:23.1.0*255(01237.840*m3)(18-12-31 17:00:00)
7-0:23.1.0*255(01238.110*m3)(18-12-31 18:00:00)
7-0:23.1.0*255(01238.390*m3)(18-12-31 19:00:00)
7-0:23.1.0*255(01238.440*m3)(18-12-31 20:00:00)
7-0:23.1.0*255(01238.590*m3)(18-12-31 21:00:00)
7-0:23.1.0*255(01238.680*m3)(18-12-31 22:00:00)
7-0:23.1.0*255(01238.700*m3)(18-12-31 23:00:00)
7-0:24.4.0*255(0)
!
/ACE5ACE4KGPRS

0-0:96.1.0*255(1234567890123456)
1-0:1.8.0*255(012345.074*kWh)
1-0:1.8.1*255(012345.074*kWh)
1-0:2.8.0*255(000000.000*kWh)
1-0:2.8.1*255(000000.000*kWh)
0-0:96.14.0*255(01)
1-0:15.7.0*255(000123*W)
0-0:17.0.0*255(0085*A)
0-0:96.3.10*255(1)
0-3:96.1.0*255(12345678 )
7-0:23.1.0*255(01238.740*m3)(19-01-01 00:00:00)
7-0:23.1.0*255(01238.770*m3)(19-01-01 01:00:00)
7-0:23.1.0*255(01238.810*m3)(19-01-01 02:00:00)
7-0:23.1.0*255(01238.830*m3)(19-01-01 03:00:00)
7-0:23.1.0*255(01238.830*m3)(19-01-01 04:00:00)
7-0:23.1.0*255(01238.930*m3)(19-01-01 05:00:00)
7-0:23.1.0*255(01239.340*m3)(19-01-01 06:00:00)
7-0:23.1.0*255(01239.540*m3)(19-01-01 07:00:00)
7-0:23.1.0*255(01239.660*m3)(19-01-01 08:00:00)
7-0:23.1.0*255(01239.860*m3)(19-01-01 09:00:00)
7-0:23.1.0*255(01240.090*m3)(19-01-01 10:00:00)
7-0:23.1.0*255(01240.540*m3)(19-01-01 11:00:00)
7-0:23.1.0*255(01240.560*m3)(19-01-01 12:00:00)
7-0:23.1.0*255(01240.690*m3)(19-01-01 13:00:00)
7-0:23.1.0*255(01237.560*m3)(18-12-31 14:00:00)
7-0:23.1.0*255(01237.560*m3)(18-12-31 15:00:00)
7-0:23.1.0*255(01237.760*m3)(18-12-31 16:00:00)
7-0:23.1.0*255(01237.840*m3)(18-12-31 17:00:00)
7-0:23.1.0*255(01238.110*m3)(18-12-31 18:00:00)
7-0:23.1.0*255(01238.390*m3)(18-12-31 19:00:00)
7-0:23.1.0*255(01238.440*m3)(18-12-31 20:00:00)
7-0:23.1.0*255(01238.590*m3)(18-12-31 21:00:00)
7-0:23.1.0*255(01238.680*m3)(18-12-31 22:00:00)
7-0:23.1.0*255(01238.700*m3)(18-12-31 23:00:00)
7-0:24.4.0*255(0)
!
72 changes: 36 additions & 36 deletions ...penhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_40.telegram
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
/ISk5\2MT382-1000
1-3:0.2.8(40)
0-0:1.0.0(101209113020W)
0-0:96.1.1(4B384547303034303436333935353037)
1-0:1.8.1(123456.789*kWh)
1-0:1.8.2(123456.789*kWh)
1-0:2.8.1(123456.789*kWh)
1-0:2.8.2(123456.789*kWh)
0-0:96.14.0(0002)
1-0:1.7.0(01.193*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00004)
0-0:96.7.9(00002)
1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
1-0:32.32.0(00002)
1-0:52.32.0(00001)
1-0:72.32.0(00000)
1-0:32.36.0(00000)
1-0:52.36.0(00003)
1-0:72.36.0(00000)
0-0:96.13.1(3031203631203831)
0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
1-0:31.7.0.255(001*A)
1-0:51.7.0.255(002*A)
1-0:71.7.0.255(003*A)
1-0:21.7.0.255(01.111*kW)
1-0:41.7.0.255(02.222*kW)
1-0:61.7.0.255(03.333*kW)
1-0:22.7.0.255(04.444*kW)
1-0:42.7.0.255(05.555*kW)
1-0:62.7.0.255(06.666*kW)
0-1:24.1.0(003)
0-1:96.1.0(3232323241424344313233343536373839)
0-1:24.2.1(101209110000W)(12785.123*m3)
!1CBD
/ISk5\2MT382-1000
1-3:0.2.8(40)
0-0:1.0.0(101209113020W)
0-0:96.1.1(4B384547303034303436333935353037)
1-0:1.8.1(123456.789*kWh)
1-0:1.8.2(123456.789*kWh)
1-0:2.8.1(123456.789*kWh)
1-0:2.8.2(123456.789*kWh)
0-0:96.14.0(0002)
1-0:1.7.0(01.193*kW)
1-0:2.7.0(00.000*kW)
0-0:96.7.21(00004)
0-0:96.7.9(00002)
1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
1-0:32.32.0(00002)
1-0:52.32.0(00001)
1-0:72.32.0(00000)
1-0:32.36.0(00000)
1-0:52.36.0(00003)
1-0:72.36.0(00000)
0-0:96.13.1(3031203631203831)
0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
1-0:31.7.0.255(001*A)
1-0:51.7.0.255(002*A)
1-0:71.7.0.255(003*A)
1-0:21.7.0.255(01.111*kW)
1-0:41.7.0.255(02.222*kW)
1-0:61.7.0.255(03.333*kW)
1-0:22.7.0.255(04.444*kW)
1-0:42.7.0.255(05.555*kW)
1-0:62.7.0.255(06.666*kW)
0-1:24.1.0(003)
0-1:96.1.0(3232323241424344313233343536373839)
0-1:24.2.1(101209110000W)(12785.123*m3)
!1CBD
Loading