iobroker.tibberlink 4.4.0 → 4.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -4
- package/admin/CalculatorTab.jsonConfig.json +21 -17
- package/admin/i18n/de.json +4 -3
- package/admin/i18n/en.json +1 -0
- package/admin/i18n/es.json +2 -1
- package/admin/i18n/fr.json +2 -1
- package/admin/i18n/it.json +2 -1
- package/admin/i18n/nl.json +2 -1
- package/admin/i18n/pl.json +2 -1
- package/admin/i18n/pt.json +2 -1
- package/admin/i18n/ru.json +2 -1
- package/admin/i18n/uk.json +2 -1
- package/admin/i18n/zh-cn.json +2 -1
- package/admin/jsonConfig.json +1 -0
- package/build/lib/projectUtils.js +2 -0
- package/build/lib/projectUtils.js.map +1 -1
- package/build/lib/tibberCalculator.js +152 -65
- package/build/lib/tibberCalculator.js.map +1 -1
- package/build/lib/tibberCharts.js +5 -1
- package/build/lib/tibberCharts.js.map +1 -1
- package/build/lib/tibberPulse.js.map +1 -1
- package/build/main.js +10 -8
- package/build/main.js.map +1 -1
- package/io-package.json +27 -27
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -160,6 +160,20 @@ If you enjoyed this project — or just feeling generous, consider buying me a b
|
|
|
160
160
|
|
|
161
161
|
## Changelog
|
|
162
162
|
|
|
163
|
+
### 4.5.1 (2025-03-23)
|
|
164
|
+
|
|
165
|
+
- (HombachC) fix Smart Battery Buffer JSON2 (#676)
|
|
166
|
+
- (HombachC) fix not visible SBB LTF output 2 (#681)
|
|
167
|
+
- (HombachC) enable JSON5 parsing starting with admin 7.5.3
|
|
168
|
+
- (HombachC) fix vulnerability in axios <1.8.2 (#673)
|
|
169
|
+
|
|
170
|
+
### 4.5.0 (2025-03-05)
|
|
171
|
+
|
|
172
|
+
- (HombachC) add calculator channel 'smart battery buffer LTF' (#668)
|
|
173
|
+
- (HombachC) rearrange calculator channels in configuration
|
|
174
|
+
- (HombachC) improve debugging messages, code optimisations
|
|
175
|
+
- (HombachC) fix 2 errors in enable/disable FlexCharts
|
|
176
|
+
|
|
163
177
|
### 4.4.0 (2025-03-01)
|
|
164
178
|
|
|
165
179
|
- (HombachC) add generation time cutoffs for graph outputs (#643)
|
|
@@ -189,10 +203,6 @@ If you enjoyed this project — or just feeling generous, consider buying me a b
|
|
|
189
203
|
|
|
190
204
|
- (HombachC) bump cron to 3.5
|
|
191
205
|
|
|
192
|
-
### 4.2.2 (2025-01-14)
|
|
193
|
-
|
|
194
|
-
- (HombachC) max API-Token lenght now 80 to meet newest Tibber accounts (#627)
|
|
195
|
-
|
|
196
206
|
### Old Changes see [CHANGELOG OLD](CHANGELOG_OLD.md)
|
|
197
207
|
|
|
198
208
|
## License
|
|
@@ -44,29 +44,25 @@
|
|
|
44
44
|
"label": "LBL_item_chType_option_1",
|
|
45
45
|
"value": 1
|
|
46
46
|
},
|
|
47
|
-
{
|
|
48
|
-
"label": "LBL_item_chType_option_2",
|
|
49
|
-
"value": 2
|
|
50
|
-
},
|
|
51
|
-
{
|
|
52
|
-
"label": "LBL_item_chType_option_3",
|
|
53
|
-
"value": 3
|
|
54
|
-
},
|
|
55
47
|
{
|
|
56
48
|
"label": "LBL_item_chType_option_4",
|
|
57
49
|
"value": 4
|
|
58
50
|
},
|
|
51
|
+
{
|
|
52
|
+
"label": "LBL_item_chType_option_2",
|
|
53
|
+
"value": 2
|
|
54
|
+
},
|
|
59
55
|
{
|
|
60
56
|
"label": "LBL_item_chType_option_5",
|
|
61
57
|
"value": 5
|
|
62
58
|
},
|
|
63
59
|
{
|
|
64
|
-
"label": "
|
|
65
|
-
"value":
|
|
60
|
+
"label": "LBL_item_chType_option_3",
|
|
61
|
+
"value": 3
|
|
66
62
|
},
|
|
67
63
|
{
|
|
68
|
-
"label": "
|
|
69
|
-
"value":
|
|
64
|
+
"label": "LBL_item_chType_option_6",
|
|
65
|
+
"value": 6
|
|
70
66
|
},
|
|
71
67
|
{
|
|
72
68
|
"label": "LBL_item_chType_option_8",
|
|
@@ -75,6 +71,14 @@
|
|
|
75
71
|
{
|
|
76
72
|
"label": "LBL_item_chType_option_9",
|
|
77
73
|
"value": 9
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
"label": "LBL_item_chType_option_7",
|
|
77
|
+
"value": 7
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
"label": "LBL_item_chType_option_10",
|
|
81
|
+
"value": 10
|
|
78
82
|
}
|
|
79
83
|
],
|
|
80
84
|
"xs": 12,
|
|
@@ -145,7 +149,7 @@
|
|
|
145
149
|
"label": "LBL_item_chTargetState2",
|
|
146
150
|
"tooltip": "TTIP_item_chTargetState2",
|
|
147
151
|
"attr": "chTargetState2",
|
|
148
|
-
"hidden": "data.chType !== 7",
|
|
152
|
+
"hidden": "data.chType !== 7 && data.chType !== 10",
|
|
149
153
|
"xs": 12,
|
|
150
154
|
"sm": 12,
|
|
151
155
|
"md": 12,
|
|
@@ -160,12 +164,12 @@
|
|
|
160
164
|
"maxLength": 20,
|
|
161
165
|
"attr": "chValueOn2",
|
|
162
166
|
"default": "true",
|
|
167
|
+
"hidden": "data.chType !== 7 && data.chType !== 10",
|
|
163
168
|
"xs": 12,
|
|
164
169
|
"sm": 12,
|
|
165
170
|
"md": 6,
|
|
166
171
|
"lg": 6,
|
|
167
|
-
"xl": 6
|
|
168
|
-
"hidden": "data.chType !== 7"
|
|
172
|
+
"xl": 6
|
|
169
173
|
},
|
|
170
174
|
{
|
|
171
175
|
"type": "text",
|
|
@@ -174,12 +178,12 @@
|
|
|
174
178
|
"maxLength": 20,
|
|
175
179
|
"attr": "chValueOff2",
|
|
176
180
|
"default": "false",
|
|
181
|
+
"hidden": "data.chType !== 7 && data.chType !== 10",
|
|
177
182
|
"xs": 12,
|
|
178
183
|
"sm": 12,
|
|
179
184
|
"md": 6,
|
|
180
185
|
"lg": 6,
|
|
181
|
-
"xl": 6
|
|
182
|
-
"hidden": "data.chType !== 7"
|
|
186
|
+
"xl": 6
|
|
183
187
|
},
|
|
184
188
|
{
|
|
185
189
|
"type": "checkbox",
|
package/admin/i18n/de.json
CHANGED
|
@@ -67,9 +67,9 @@
|
|
|
67
67
|
"LBL_item_tibberBridgeRawDataInterval": "Abfrageintervall",
|
|
68
68
|
"LBL_item_tibberBridgeUrl": "Bridge-Netzwerkadresse",
|
|
69
69
|
"LBL_item_tibberPulseLocalNodeId": "Pulse NodeID",
|
|
70
|
-
"LBL_phases": "Spannungs- und Stromwerte – Bei
|
|
70
|
+
"LBL_phases": "Spannungs- und Stromwerte – Bei einigen Messgeräten sind diese Werte möglicherweise nicht im Datenpaket enthalten, was dann zu Nullwerten führt. Abhängig von der spezifischen Firmware des Messgeräts können weitere Abweichungen auftreten. Nullwerte generieren keinen Status in Ihren ioBroker-Objekten.",
|
|
71
71
|
"LBL_referralLink": "Wenn Sie noch kein Tibber-Benutzer sind, würde ich mich sehr freuen, wenn Sie meinen Empfehlungslink verwenden könnten.",
|
|
72
|
-
"LBL_templateFlexGraph01": "Sie können diese Demo
|
|
72
|
+
"LBL_templateFlexGraph01": "Sie können diese Demo-Vorlagen für Flexcharts verwenden. Kopieren Sie einfach den Code hier in den Editor.",
|
|
73
73
|
"TTIP_chGraphEnabled": "Wether JSON gibt Grafiken wie Flexcharts aus",
|
|
74
74
|
"TTIP_item_chHomeID": "Wählen Sie das Home aus, dem dieser Kanal zugeordnet werden soll.",
|
|
75
75
|
"TTIP_item_chName": "Kanalname, um Ihre Bundesstaaten leichter identifizieren zu können.",
|
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "FlexGraph in der Vergangenheit abgeschnitten",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "Anzahl der Stunden, die in der Vergangenheit gezeigt werden sollen",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "FlexGraph in der Zukunft abgeschnitten",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "Anzahl der Stunden, die in Zukunft gezeigt werden sollen"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "Anzahl der Stunden, die in Zukunft gezeigt werden sollen",
|
|
100
|
+
"LBL_item_chType_option_10": "Smart Battery Buffer LTF"
|
|
100
101
|
}
|
package/admin/i18n/en.json
CHANGED
|
@@ -46,6 +46,7 @@
|
|
|
46
46
|
"LBL_item_chType_option_7": "smart battery buffer",
|
|
47
47
|
"LBL_item_chType_option_8": "best percentage",
|
|
48
48
|
"LBL_item_chType_option_9": "best percentage LTF",
|
|
49
|
+
"LBL_item_chType_option_10": "smart battery buffer LTF",
|
|
49
50
|
"LBL_item_chValueOff": "Value NO",
|
|
50
51
|
"LBL_item_chValueOff2": "Value NO 2",
|
|
51
52
|
"LBL_item_chValueOn": "Value YES",
|
package/admin/i18n/es.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "Flexgraph Horas pasadas cortadas",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "número de horas que se muestran en el pasado",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph Horas futuras cortadas",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "número de horas que se muestran en el futuro"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "número de horas que se muestran en el futuro",
|
|
100
|
+
"LBL_item_chType_option_10": "Smart Battery Buffer LTF"
|
|
100
101
|
}
|
package/admin/i18n/fr.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "Flexgraph passés passés coupés",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "nombre d'heures à montrer dans le passé",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph Future Hours Coupé",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "nombre d'heures à montrer à l'avenir"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "nombre d'heures à montrer à l'avenir",
|
|
100
|
+
"LBL_item_chType_option_10": "Tampon de batterie intelligent LTF"
|
|
100
101
|
}
|
package/admin/i18n/it.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "Flexgraph Ore passate tagliate fuori",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "Numero di ore da mostrare in passato",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph Hours Future Tagliate",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "Numero di ore da mostrare in futuro"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "Numero di ore da mostrare in futuro",
|
|
100
|
+
"LBL_item_chType_option_10": "smart batteria tampone ltf"
|
|
100
101
|
}
|
package/admin/i18n/nl.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "Flexgraph afgelopen uren afgesneden",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "aantal uren dat in het verleden moet worden getoond",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "FlexGraph toekomstige uren afgesneden",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "aantal uren dat in de toekomst moet worden getoond"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "aantal uren dat in de toekomst moet worden getoond",
|
|
100
|
+
"LBL_item_chType_option_10": "Smart Battery Buffer LTF"
|
|
100
101
|
}
|
package/admin/i18n/pl.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "FlexGraph w przeszłości odcięty",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "liczba godzin do pokazania w przeszłości",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph Przyszłe godziny odcięte",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "liczba godzin do pokazania w przyszłości"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "liczba godzin do pokazania w przyszłości",
|
|
100
|
+
"LBL_item_chType_option_10": "inteligentny bufor baterii LTF"
|
|
100
101
|
}
|
package/admin/i18n/pt.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "FLEXGRAPH HORAS PASSAS cortadas",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "Número de horas a serem mostradas no passado",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph Horas futuras cortadas",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "Número de horas a serem mostradas no futuro"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "Número de horas a serem mostradas no futuro",
|
|
100
|
+
"LBL_item_chType_option_10": "Buffer de bateria inteligente LTF"
|
|
100
101
|
}
|
package/admin/i18n/ru.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "Flexgraph в прошлые часы отключено",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "количество часов будет показано в прошлом",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph в будущие часы отключены",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "количество часов будет показано в будущем"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "количество часов будет показано в будущем",
|
|
100
|
+
"LBL_item_chType_option_10": "Smart Actule Buffer LTF"
|
|
100
101
|
}
|
package/admin/i18n/uk.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "Flexgraph минулі години відрізані",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "кількість годин, які будуть показані в минулому",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph майбутні години відрізані",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "кількість годин, які будуть показані в майбутньому"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "кількість годин, які будуть показані в майбутньому",
|
|
100
|
+
"LBL_item_chType_option_10": "розумний буфер акумулятора LTF"
|
|
100
101
|
}
|
package/admin/i18n/zh-cn.json
CHANGED
|
@@ -96,5 +96,6 @@
|
|
|
96
96
|
"LBL_FlexGraphPastCutOff": "弹性过去的时间切断了",
|
|
97
97
|
"TTIP_FlexGraphPastCutOff": "过去要显示的小时数",
|
|
98
98
|
"LBL_FlexGraphFutureCutOff": "Flexgraph Future Birs切断",
|
|
99
|
-
"TTIP_FlexGraphFutureCutOff": "将来要显示的小时数"
|
|
99
|
+
"TTIP_FlexGraphFutureCutOff": "将来要显示的小时数",
|
|
100
|
+
"LBL_item_chType_option_10": "智能电池缓冲ltf"
|
|
100
101
|
}
|
package/admin/jsonConfig.json
CHANGED
|
@@ -489,6 +489,7 @@
|
|
|
489
489
|
"type": "jsonEditor",
|
|
490
490
|
"label": "Configure template to create a data string to be used in graphs - e.g. ioBroker FlexCharts",
|
|
491
491
|
"validateJson": false,
|
|
492
|
+
"json5": true,
|
|
492
493
|
"delimiter": ";",
|
|
493
494
|
"newLine": true,
|
|
494
495
|
"default": "%%xAxisData%%\n\n%%yAxisData%%\n\n%%CalcChannelsData%%",
|
|
@@ -13,6 +13,7 @@ var enCalcType;
|
|
|
13
13
|
enCalcType[enCalcType["SmartBatteryBuffer"] = 7] = "SmartBatteryBuffer";
|
|
14
14
|
enCalcType[enCalcType["BestPercentage"] = 8] = "BestPercentage";
|
|
15
15
|
enCalcType[enCalcType["BestPercentageLTF"] = 9] = "BestPercentageLTF";
|
|
16
|
+
enCalcType[enCalcType["SmartBatteryBufferLTF"] = 10] = "SmartBatteryBufferLTF";
|
|
16
17
|
})(enCalcType || (exports.enCalcType = enCalcType = {}));
|
|
17
18
|
function getCalcTypeDescription(calcType) {
|
|
18
19
|
const descriptions = {
|
|
@@ -25,6 +26,7 @@ function getCalcTypeDescription(calcType) {
|
|
|
25
26
|
[enCalcType.SmartBatteryBuffer]: `smart battery buffer`,
|
|
26
27
|
[enCalcType.BestPercentage]: `best percentage`,
|
|
27
28
|
[enCalcType.BestPercentageLTF]: `best percentage LTF`,
|
|
29
|
+
[enCalcType.SmartBatteryBufferLTF]: `smart battery buffer LTF`,
|
|
28
30
|
};
|
|
29
31
|
return descriptions[calcType] || `Unknown`;
|
|
30
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../src/lib/projectUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../src/lib/projectUtils.ts"],"names":[],"mappings":"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"}
|