Skip to content

Commit

Permalink
WB-MAP6S: Add peaks registers (#856)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ilia1S
Ilia1S authored Jan 30, 2025
1 parent 52b2631 commit 4b9342b
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 3 deletions.
8 changes: 7 additions & 1 deletion debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
wb-mqtt-serial (2.154.1) stable; urgency=medium

* WB-MAP6S fw2: add peaks registers

-- Ilia Skochilov <[email protected]> Wed, 29 Jan 2025 14:53:00 +0300

wb-mqtt-serial (2.154.0) stable; urgency=medium

* Add new template for meanwell-drs-series
* Add new template for meanwell-drs-series

-- Mikhail Burchu <[email protected]> Wed, 29 Jan 2025 09:45:00 +0300

Expand Down
103 changes: 101 additions & 2 deletions templates/config-map6s-fw2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,17 @@
],
"group": "general",
"order": 1
},
"peaks_measurement_period_s": {
"title": "Peaks Measurement Period (s)",
"address": "0x10F0",
"reg_type": "holding",
"format": "u16",
"min": 1,
"default": 60,
"group": "general",
"description": "Firmware v2.3.0 or newer is required",
"order": 2
}
},

Expand All @@ -270,6 +281,18 @@
"round_to": 0.0001,
"group": "channel_1"
},
{
"name": "Ipeak 1",
"reg_type": "input",
"address": "0x181c",
"type": "value",
"units": "A",
"format": "s32",
"scale": 0.016,
"round_to": 0.01,
"word_order": "little_endian",
"group": "channel_1"
},
{
"name": "P 1",
"reg_type": "input",
Expand Down Expand Up @@ -331,7 +354,7 @@
"round_to": 1e-6,
"word_order": "little_endian",
"group": "channel_1"
},
},
{
"name": "RP energy 1",
"reg_type": "input",
Expand Down Expand Up @@ -374,6 +397,18 @@
"round_to": 0.0001,
"group": "channel_2"
},
{
"name": "Ipeak 2",
"reg_type": "input",
"address": "0x181a",
"type": "value",
"units": "A",
"format": "s32",
"scale": 0.016,
"round_to": 0.01,
"word_order": "little_endian",
"group": "channel_2"
},
{
"name": "P 2",
"reg_type": "input",
Expand Down Expand Up @@ -478,6 +513,18 @@
"round_to": 0.0001,
"group": "channel_3"
},
{
"name": "Ipeak 3",
"reg_type": "input",
"address": "0x1818",
"type": "value",
"units": "A",
"format": "s32",
"scale": 0.016,
"round_to": 0.01,
"word_order": "little_endian",
"group": "channel_3"
},
{
"name": "P 3",
"reg_type": "input",
Expand Down Expand Up @@ -582,6 +629,18 @@
"round_to": 0.0001,
"group": "channel_4"
},
{
"name": "Ipeak 4",
"reg_type": "input",
"address": "0x281c",
"type": "value",
"units": "A",
"format": "s32",
"scale": 0.016,
"round_to": 0.01,
"word_order": "little_endian",
"group": "channel_4"
},
{
"name": "P 4",
"reg_type": "input",
Expand Down Expand Up @@ -686,6 +745,18 @@
"round_to": 0.0001,
"group": "channel_5"
},
{
"name": "Ipeak 5",
"reg_type": "input",
"address": "0x281a",
"type": "value",
"units": "A",
"format": "s32",
"scale": 0.016,
"round_to": 0.01,
"word_order": "little_endian",
"group": "channel_5"
},
{
"name": "P 5",
"reg_type": "input",
Expand Down Expand Up @@ -790,6 +861,18 @@
"round_to": 0.0001,
"group": "channel_6"
},
{
"name": "Ipeak 6",
"reg_type": "input",
"address": "0x2818",
"type": "value",
"units": "A",
"format": "s32",
"scale": 0.016,
"round_to": 0.01,
"word_order": "little_endian",
"group": "channel_6"
},
{
"name": "P 6",
"reg_type": "input",
Expand Down Expand Up @@ -888,13 +971,27 @@
"name": "Urms",
"reg_type": "input",
"address": "0x10d9",
"type": "voltage",
"type": "value",
"units": "V",
"semi-sporadic": true,
"format": "u16",
"scale": 0.01,
"round_to": 0.01,
"group": "general"
},
{
"name": "Upeak",
"reg_type": "input",
"address": "0x1810",
"type": "value",
"units": "V",
"format": "s32",
"scale": 0.01,
"round_to": 0.01,
"word_order": "little_endian",
"error_value": "0x7FFFFFFF",
"group": "general"
},
{
"name": "Frequency",
"reg_type": "input",
Expand Down Expand Up @@ -999,6 +1096,7 @@
"Current Transformer Reverse 6": "Инвертировать токовый трансформатор 6",
"Baud rate": "Скорость обмена",
"baud_rate_description": "Перед изменением параметра убедитесь, что связь с устройством установлена. Выберите нужную скорость обмена, сохраните конфигурацию, а затем укажите в настройках порта эту же скорость.",
"Peaks Measurement Period (s)": "Период сброса пиковых значений (с)",
"AP energy 1": "Энергия AP 1",
"RP energy 1": "Энергия RP 1",
"AN energy 1": "Энергия AN 1",
Expand Down Expand Up @@ -1038,6 +1136,7 @@
"Uptime": "Время работы с момента включения (с)",
"MCU Temperature": "Температура МК",
"MCU Voltage": "Напряжение питания МК",
"Firmware v2.3.0 or newer is required": "Для прошивок v2.3.0 и новее",
"Firmware v2.10.0 or newer is required": "Для прошивок v2.10.0 и новее"
}
}
Expand Down
7 changes: 7 additions & 0 deletions test/TDeviceTemplatesTest.Validate.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18625,6 +18625,12 @@ WB-MAP6S fw2
AP energy 6 => AP energy 6
FW Version => FW Version
Frequency => Frequency
Ipeak 1 => Ipeak 1
Ipeak 2 => Ipeak 2
Ipeak 3 => Ipeak 3
Ipeak 4 => Ipeak 4
Ipeak 5 => Ipeak 5
Ipeak 6 => Ipeak 6
Irms 1 => Irms 1
Irms 2 => Irms 2
Irms 3 => Irms 3
Expand Down Expand Up @@ -18677,6 +18683,7 @@ WB-MAP6S fw2
S 6 => S 6
Serial => Serial
Supply voltage => Supply voltage
Upeak => Upeak
Uptime => Uptime
Urms => Urms
WB-MCM16
Expand Down

0 comments on commit 4b9342b

Please sign in to comment.