Skip to content

Commit cc54ed1

Browse files
LKuemmelLKuemmel
authored
Merge pull request #418 from ndrsnhs/variable-modbus-id-for-modules
Variable modbus id for modules
2 parents 3b47551 + 17ffae6 commit cc54ed1

File tree

36 files changed

+206
-28
lines changed

36 files changed

+206
-28
lines changed

‎src/components/devices/alpha_ess/device.vue

+11
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@
3838
updateConfiguration($event, 'configuration.port')
3939
"
4040
/>
41+
<openwb-base-number-input
42+
title="Modbus ID"
43+
v-if="configuration.source == 1"
44+
required
45+
:model-value="configuration.modbus_id"
46+
min="1"
47+
max="255"
48+
@update:model-value="
49+
updateConfiguration($event, 'configuration.modbus_id')
50+
"
51+
/>
4152
<openwb-base-select-input
4253
title="Firmware Version"
4354
notSelected="Bitte auswählen"

‎src/components/devices/carlo_gavazzi/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
updateConfiguration($event, 'configuration.port')
2424
"
2525
/>
26+
<openwb-base-number-input
27+
title="Modbus ID"
28+
required
29+
:model-value="configuration.modbus_id"
30+
min="1"
31+
max="255"
32+
@update:model-value="
33+
updateConfiguration($event, 'configuration.modbus_id')
34+
"
35+
/>
2636
</div>
2737
</template>
2838

‎src/components/devices/deye/bat.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/deye/counter.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/deye/inverter.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/e3dc/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
updateConfiguration($event, 'configuration.port')
2424
"
2525
/>
26+
<openwb-base-number-input
27+
title="Modbus ID"
28+
required
29+
:model-value="configuration.modbus_id"
30+
min="1"
31+
max="255"
32+
@update:model-value="
33+
updateConfiguration($event, 'configuration.modbus_id')
34+
"
35+
/>
2636
</div>
2737
</template>
2838

‎src/components/devices/good_we/device.vue

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
/>
2626
<openwb-base-number-input
2727
title="Modbus ID"
28+
required
2829
:model-value="configuration.modbus_id"
2930
min="1"
3031
max="255"

‎src/components/devices/huawei/device.vue

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
/>
2626
<openwb-base-number-input
2727
title="Modbus ID"
28+
required
2829
:model-value="configuration.modbus_id"
2930
min="1"
3031
max="255"

‎src/components/devices/huawei_smartlogger/bat.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/huawei_smartlogger/counter.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/huawei_smartlogger/inverter.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/janitza/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
updateConfiguration($event, 'configuration.port')
2424
"
2525
/>
26+
<openwb-base-number-input
27+
title="Modbus ID"
28+
required
29+
:model-value="configuration.modbus_id"
30+
min="1"
31+
max="255"
32+
@update:model-value="
33+
updateConfiguration($event, 'configuration.modbus_id')
34+
"
35+
/>
2636
</div>
2737
</template>
2838

‎src/components/devices/kostal_plenticore/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
updateConfiguration($event, 'configuration.port')
2929
"
3030
/>
31+
<openwb-base-number-input
32+
title="Modbus ID"
33+
required
34+
:model-value="configuration.modbus_id"
35+
min="1"
36+
max="255"
37+
@update:model-value="
38+
updateConfiguration($event, 'configuration.modbus_id')
39+
"
40+
/>
3141
</div>
3242
</template>
3343

‎src/components/devices/kostal_sem/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
updateConfiguration($event, 'configuration.port')
2424
"
2525
/>
26+
<openwb-base-number-input
27+
title="Modbus ID"
28+
required
29+
:model-value="configuration.modbus_id"
30+
min="1"
31+
max="255"
32+
@update:model-value="
33+
updateConfiguration($event, 'configuration.modbus_id')
34+
"
35+
/>
2636
</div>
2737
</template>
2838

‎src/components/devices/powerdog/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@
2626
updateConfiguration($event, 'configuration.port')
2727
"
2828
/>
29+
<openwb-base-number-input
30+
title="Modbus ID"
31+
required
32+
:model-value="configuration.modbus_id"
33+
min="1"
34+
max="255"
35+
@update:model-value="
36+
updateConfiguration($event, 'configuration.modbus_id')
37+
"
38+
/>
2939
</div>
3040
</template>
3141

‎src/components/devices/qcells/device.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
/>
2626
<openwb-base-number-input
2727
title="Modbus ID"
28+
required
2829
:model-value="configuration.modbus_id"
2930
min="1"
3031
max="255"
@@ -37,7 +38,7 @@
3738

3839
<script>
3940
export default {
40-
name: "DeviceQCellls",
41+
name: "DeviceQCells",
4142
emits: ["update:configuration"],
4243
props: {
4344
configuration: { type: Object, required: true },

‎src/components/devices/saxpower/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
updateConfiguration($event, 'configuration.port')
2424
"
2525
/>
26+
<openwb-base-number-input
27+
title="Modbus ID"
28+
required
29+
:model-value="configuration.modbus_id"
30+
min="1"
31+
max="255"
32+
@update:model-value="
33+
updateConfiguration($event, 'configuration.modbus_id')
34+
"
35+
/>
2636
</div>
2737
</template>
2838

‎src/components/devices/siemens/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@
2626
updateConfiguration($event, 'configuration.port')
2727
"
2828
/>
29+
<openwb-base-number-input
30+
title="Modbus ID"
31+
required
32+
:model-value="configuration.modbus_id"
33+
min="1"
34+
max="255"
35+
@update:model-value="
36+
updateConfiguration($event, 'configuration.modbus_id')
37+
"
38+
/>
2939
</div>
3040
</template>
3141

‎src/components/devices/siemens_sentron/device.vue

+10
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@
2727
updateConfiguration($event, 'configuration.port')
2828
"
2929
/>
30+
<openwb-base-number-input
31+
title="Modbus ID"
32+
required
33+
:model-value="configuration.modbus_id"
34+
min="1"
35+
max="255"
36+
@update:model-value="
37+
updateConfiguration($event, 'configuration.modbus_id')
38+
"
39+
/>
3040
</div>
3141
</template>
3242

‎src/components/devices/sma_sunny_boy/bat.vue

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
Einstellungen für SMA Sunny Boy/Tripower Batteriespeicher
55
<span class="small">(Modul: {{ $options.name }})</span>
66
</openwb-base-heading>
7-
<openwb-base-alert subtype="info">
8-
Diese Komponente benötigt keine Einstellungen.
9-
</openwb-base-alert>
7+
<openwb-base-number-input
8+
title="Modbus ID"
9+
required
10+
:model-value="configuration.modbus_id"
11+
min="1"
12+
max="255"
13+
@update:model-value="
14+
updateConfiguration($event, 'configuration.modbus_id')
15+
"
16+
/>
1017
</div>
1118
</template>
1219

‎src/components/devices/sma_sunny_boy/bat_smart_energy.vue

+11-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@
44
Einstellungen für SMA Sunny Boy Smart Energy Batteriespeicher
55
<span class="small">(Modul: {{ $options.name }})</span>
66
</openwb-base-heading>
7-
<openwb-base-alert subtype="info">
8-
Diese Komponente benötigt keine Einstellungen.
9-
</openwb-base-alert>
7+
8+
<openwb-base-number-input
9+
title="Modbus ID"
10+
required
11+
:model-value="configuration.modbus_id"
12+
min="1"
13+
max="255"
14+
@update:model-value="
15+
updateConfiguration($event, 'configuration.modbus_id')
16+
"
17+
/>
1018
</div>
1119
</template>
1220

‎src/components/devices/sma_sunny_boy/counter.vue

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
Einstellungen für SMA Sunny Boy/Tripower Zähler
55
<span class="small">(Modul: {{ $options.name }})</span>
66
</openwb-base-heading>
7-
<openwb-base-alert subtype="info">
8-
Diese Komponente benötigt keine Einstellungen.
9-
</openwb-base-alert>
7+
<openwb-base-number-input
8+
title="Modbus ID"
9+
required
10+
:model-value="configuration.modbus_id"
11+
min="1"
12+
max="255"
13+
@update:model-value="
14+
updateConfiguration($event, 'configuration.modbus_id')
15+
"
16+
/>
1017
</div>
1118
</template>
1219

‎src/components/devices/sma_sunny_boy/inverter.vue

+16
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,22 @@
3333
updateConfiguration($event, 'configuration.version')
3434
"
3535
/>
36+
<openwb-base-number-input
37+
title="Modbus ID"
38+
required
39+
:model-value="configuration.modbus_id"
40+
min="1"
41+
max="255"
42+
@update:model-value="
43+
updateConfiguration($event, 'configuration.modbus_id')
44+
"
45+
>
46+
<template #help>
47+
Für die Standardversion ist die Standardmodbus-ID 3, für Core-2
48+
ist sie 1 und für Data Manager/Cluster Controller 2. Wurde eine
49+
abweichende Modbus ID konfiguriert, entsprechend anpassen.
50+
</template>
51+
</openwb-base-number-input>
3652
</div>
3753
</template>
3854

‎src/components/devices/sma_sunny_island/bat.vue

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
Einstellungen für Sunny Island Batteriespeicher
55
<span class="small">(Modul: {{ $options.name }})</span>
66
</openwb-base-heading>
7-
<openwb-base-alert subtype="info">
8-
Diese Komponente erfordert keine Einstellungen.
9-
</openwb-base-alert>
7+
<openwb-base-number-input
8+
title="Modbus ID"
9+
required
10+
:model-value="configuration.modbus_id"
11+
min="1"
12+
max="255"
13+
@update:model-value="
14+
updateConfiguration($event, 'configuration.modbus_id')
15+
"
16+
/>
1017
</div>
1118
</template>
1219

‎src/components/devices/solaredge/bat.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/solaredge/counter.vue

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</openwb-base-alert>
1212
<openwb-base-number-input
1313
title="Modbus ID"
14+
required
1415
:model-value="configuration.modbus_id"
1516
min="1"
1617
max="255"

‎src/components/devices/solaredge/external_inverter.vue

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
</openwb-base-alert>
1414
<openwb-base-number-input
1515
title="Modbus ID"
16+
required
1617
:model-value="configuration.modbus_id"
1718
min="1"
1819
max="255"

‎src/components/devices/solaredge/inverter.vue

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</openwb-base-heading>
77
<openwb-base-number-input
88
title="Modbus ID"
9+
required
910
:model-value="configuration.modbus_id"
1011
min="1"
1112
max="255"

‎src/components/devices/solarmax/bat.vue

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</openwb-base-alert>
1313
<openwb-base-number-input
1414
title="Modbus ID"
15+
required
1516
:model-value="configuration.modbus_id"
1617
min="1"
1718
max="255"

0 commit comments

Comments
 (0)