Skip to content

Commit f726f3d

Browse files
committed
Fix HISTORY mode for three-phase counters
1 parent 7ca8cee commit f726f3d

File tree

2 files changed

+35
-4
lines changed

2 files changed

+35
-4
lines changed

app/teleinfo/history/HistoryTicMode.js

+32-4
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,27 @@ class HistoryTicMode extends TicMode {
5757
return value.length === 1;
5858
case 'ISOUSC':
5959
case 'PEJP':
60+
case 'PPOT':
6061
return value.length === 2;
61-
case 'IINST':
62+
case 'ADIR1':
63+
case 'ADIR2':
64+
case 'ADIR3':
6265
case 'ADPS':
66+
case 'IINST':
67+
case 'IINST1':
68+
case 'IINST2':
69+
case 'IINST3':
6370
case 'IMAX':
71+
case 'IMAX1':
72+
case 'IMAX2':
73+
case 'IMAX3':
6474
return value.length === 3;
75+
case 'DEMAIN':
76+
case 'OPTARIF':
6577
case 'PTEC':
6678
return value.length === 4;
67-
case 'OPTARIF':
68-
case 'DEMAIN':
69-
return value.length <= 4;
7079
case 'PAPP':
80+
case 'PMAX':
7181
return value.length === 5;
7282
case 'MOTDETAT':
7383
return value.length === 6;
@@ -102,9 +112,18 @@ class HistoryTicMode extends TicMode {
102112
*/
103113
getHADeviceClass(label) {
104114
switch (label) {
115+
case 'ADIR1':
116+
case 'ADIR2':
117+
case 'ADIR3':
105118
case 'ADPS':
106119
case 'IINST':
120+
case 'IINST1':
121+
case 'IINST2':
122+
case 'IINST3':
107123
case 'IMAX':
124+
case 'IMAX1':
125+
case 'IMAX2':
126+
case 'IMAX3':
108127
case 'ISOUSC':
109128
return 'current';
110129
case 'BASE':
@@ -120,6 +139,7 @@ class HistoryTicMode extends TicMode {
120139
case 'HCHP':
121140
return 'energy';
122141
case 'PAPP':
142+
case 'PMAX':
123143
return 'power';
124144
default:
125145
return undefined;
@@ -157,7 +177,13 @@ class HistoryTicMode extends TicMode {
157177
switch (label) {
158178
case 'ADPS':
159179
case 'IINST':
180+
case 'IINST1':
181+
case 'IINST2':
182+
case 'IINST3':
160183
case 'IMAX':
184+
case 'IMAX1':
185+
case 'IMAX2':
186+
case 'IMAX3':
161187
case 'ISOUSC':
162188
return 'A';
163189
case 'BASE':
@@ -174,6 +200,8 @@ class HistoryTicMode extends TicMode {
174200
return 'Wh';
175201
case 'PAPP':
176202
return 'VA';
203+
case 'PMAX':
204+
return 'W';
177205
case 'PEJP':
178206
return 'min';
179207
default:

docs/changelog/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## dev
4+
- :fire: Fix `HISTORY` mode for three-phase counters
5+
36
## 8.0.1
47
- :fire: Fix `DATE` and `PJOURF+1` labels parsing
58

0 commit comments

Comments
 (0)