Skip to content

Commit c206146

Browse files
foxthefoxfoxthefox
authored
Merge pull request #358 from foxthefox/1.4.8
1.4.8 test, wave2
2 parents 7307791 + 42a5c81 commit c206146

File tree

4 files changed

+78
-17
lines changed

4 files changed

+78
-17
lines changed

‎io-package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
"version": "1.4.8",
55
"news": {
66
"1.4.8": {
7-
"en": "dev dependencies",
8-
"de": "Dev -Abhängigkeiten",
9-
"ru": "DEV -зависимости",
10-
"pt": "Dependências dev",
11-
"nl": "Dev -afhankelijkheden",
12-
"fr": "dépendances de développement",
13-
"it": "Dipendenze Dev",
14-
"es": "dependencias",
15-
"pl": "zależności dew",
16-
"uk": "залежності DEV",
17-
"zh-cn": "开发依赖性"
7+
"en": "dev dependencies; new glacier55L, delta3maxplus, stream ac; error corrections",
8+
"de": "Entwicklungsabhängigkeiten; neuer Glacier55L, Delta3maxplus, Stream AC; Fehlerkorrekturen",
9+
"ru": "зависимости разработчиков; новый ледник55L, delta3maxplus, поток переменного тока; исправление ошибок",
10+
"pt": "dependências de desenvolvimento; novo glacier55L, delta3maxplus, fluxo ac; correções de erros",
11+
"nl": "afhankelijkheden van ontwikkelaars; nieuwe gletsjer55L, delta3maxplus, stroom ac; Foutcorrecties",
12+
"fr": "dépendances de développement ; nouveau glacier55L, delta3maxplus, ruisseau ac; corrections d'erreurs",
13+
"it": "dipendenze dello sviluppatore; nuovo ghiacciaio55L, delta3maxplus, torrente ac; correzioni di errori",
14+
"es": "dependencias de desarrollo; nuevo glaciar55L, delta3maxplus, arroyo ac; correcciones de errores",
15+
"pl": "zależności deweloperskie; nowy lodowiec55L, delta3maxplus, strumień ac; poprawki błędów",
16+
"uk": "залежності від розробника; новий льодовик55L, delta3maxplus, потік ac; виправлення помилок",
17+
"zh-cn": "开发依赖；新glacier55L、delta3maxplus、stream ac；错误更正"
1818
},
1919
"1.4.7": {
2020
"en": "powerocean enhancements",

‎lib/dict_data/ef_wave2_data.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2436,7 +2436,7 @@ const deviceStates = {
24362436
},
24372437
};
24382438
const deviceStatesDict = {
2439-
wave: {
2439+
wave2: {
24402440
pd: {
24412441
idleMode: {
24422442
entity: 'switch',
@@ -3260,7 +3260,7 @@ const deviceStatesDict = {
32603260
},
32613261
};
32623262
const deviceRanges = {
3263-
wave: {
3263+
wave2: {
32643264
bmsMaster: {
32653265
number: {
32663266
remainCap: {
@@ -3271,7 +3271,7 @@ const deviceRanges = {
32713271
},
32723272
};
32733273
const deviceCmd = {
3274-
wave: {
3274+
wave2: {
32753275
pd: {
32763276
mainMode: {
32773277
valName: 'mainMode',

‎main.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@ class EcoflowMqtt extends utils.Adapter {
733733
devtype === 'wave3' ||
734734
devtype === 'devtype === ' ||
735735
devtype === 'stream_ac' ||
736+
devtype === 'delta3maxplus' ||
736737
devtype === 'unknown'
737738
) {
738739
if (this.pdevicesStatesDict && this.pdevicesStates) {

‎test/integration.mjs‎

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ tests.integration(path.join(__dirname, '..'), {
317317
resolve();
318318
});
319319
});
320-
}).timeout(20000);
320+
}).timeout(25000);
321321

322322
it('Plug states should be created', async () => {
323323
//await harness.objects.delObject('ecoflow-mqtt.0.HW52ZDH4SF12345.plug_heartbeat.brightness');
@@ -373,17 +373,35 @@ tests.integration(path.join(__dirname, '..'), {
373373
}
374374
}
375375
});
376+
it('Stream AC states should be created', async () => {
377+
//await harness.objects.delObject('ecoflow-mqtt.0.BK32Z123456789012.inverter_heartbeat.permanentWatts');
378+
for (let channel in streamacstates['deviceStatesDict']['stream_ac']) {
379+
for (let state in streamacstates['deviceStatesDict']['stream_ac'][channel]) {
380+
await harness.objects.getObject(
381+
'ecoflow-mqtt.0.BK32Z123456789012.' + channel + '.' + state,
382+
function (err, obj) {
383+
if (err) console.error('stream ac TEST' + channel + '.' + state + ' -> ' + err);
384+
385+
if (!obj) {
386+
console.error('stream ac state ' + channel + '.' + state + ' not set');
387+
}
388+
expect(obj).to.exist;
389+
},
390+
);
391+
}
392+
}
393+
});
376394
it('Stream AC pro states should be created', async () => {
377395
//await harness.objects.delObject('ecoflow-mqtt.0.HW51ZOH5SF412345.inverter_heartbeat.permanentWatts');
378396
for (let channel in streamacstates['deviceStatesDict']['stream_ac_pro']) {
379397
for (let state in streamacstates['deviceStatesDict']['stream_ac_pro'][channel]) {
380398
await harness.objects.getObject(
381399
'ecoflow-mqtt.0.BK31Z123456789012.' + channel + '.' + state,
382400
function (err, obj) {
383-
if (err) console.error('stream ac TEST' + channel + '.' + state + ' -> ' + err);
401+
if (err) console.error('stream ac pro TEST' + channel + '.' + state + ' -> ' + err);
384402

385403
if (!obj) {
386-
console.error('stream ac state ' + channel + '.' + state + ' not set');
404+
console.error('stream ac pro state ' + channel + '.' + state + ' not set');
387405
}
388406
expect(obj).to.exist;
389407
},
@@ -589,6 +607,29 @@ tests.integration(path.join(__dirname, '..'), {
589607
}
590608
}
591609
});
610+
it('Delta3 Max plus should be created', async () => {
611+
//await harness.objects.delObject('ecoflow-mqtt.0.D3M1ZE1234567890.mppt.');
612+
for (let channel in delta3plusstates['deviceStatesDict']['delta3maxplus']) {
613+
for (let state in delta3plusstates['deviceStatesDict']['delta3maxplus'][channel]) {
614+
if (
615+
delta3plusstates['deviceStatesDict']['delta3maxplus'][channel][state]['entity'] !== 'icon'
616+
) {
617+
await harness.objects.getObject(
618+
'ecoflow-mqtt.0.D3M1ZE1234567890.' + channel + '.' + state,
619+
function (err, obj) {
620+
if (err)
621+
console.error('delta3max plus TEST' + channel + '.' + state + ' -> ' + err);
622+
623+
if (!obj) {
624+
console.error('delta3max plus state ' + channel + '.' + state + ' not set');
625+
}
626+
expect(obj).to.exist;
627+
},
628+
);
629+
}
630+
}
631+
}
632+
});
592633
it('River2Pro should be created', async () => {
593634
//await harness.objects.delObject('ecoflow-mqtt.0.R621ZEB4XEC12345.mppt.');
594635
for (let channel in river2prostates['deviceStatesDict']['river2pro']) {
@@ -768,7 +809,26 @@ tests.integration(path.join(__dirname, '..'), {
768809
}
769810
}
770811
});
812+
it('Glacier55L should be created', async () => {
813+
//await harness.objects.delObject('ecoflow-mqtt.0.RF45Z11234567.mppt.');
814+
for (let channel in glacierstates['deviceStatesDict']['glacier55']) {
815+
for (let state in glacierstates['deviceStatesDict']['glacier55'][channel]) {
816+
if (glacierstates['deviceStatesDict']['glacier55'][channel][state]['entity'] !== 'icon') {
817+
await harness.objects.getObject(
818+
'ecoflow-mqtt.0.RF45Z11234567.' + channel + '.' + state,
819+
function (err, obj) {
820+
if (err) console.error('glacier55 TEST' + channel + '.' + state + ' -> ' + err);
771821

822+
if (!obj) {
823+
console.error('glacier55 state ' + channel + '.' + state + ' not set');
824+
}
825+
expect(obj).to.exist;
826+
},
827+
);
828+
}
829+
}
830+
}
831+
});
772832
it('Generator should be created', async () => {
773833
//await harness.objects.delObject('ecoflow-mqtt.0.BX11ZFB5EF412345.mppt.');
774834
for (let channel in generatorstates['deviceStatesDict']['generator']) {

0 commit comments

Comments
 (0)