Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WB-MAI6: Add supply voltage channel #846

Merged
merged 10 commits into from
Dec 20, 2024
Merged

WB-MAI6: Add supply voltage channel #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fcd0735
WB-MAI6: Add supply voltage channel
Ilia1S Dec 19, 2024
37f4197
Refactoring
Ilia1S Dec 19, 2024
55020a9
Merge branch 'master' into feature/fw771-mai6-add-supply-voltage
Ilia1S Dec 19, 2024
82446ea
Fix type
Ilia1S Dec 19, 2024
cd65d0a
Fix errors
Ilia1S Dec 20, 2024
72dee9d
Fix errors
Ilia1S Dec 20, 2024
614457d
Change names
Ilia1S Dec 20, 2024
d4c7357
changelog
Ilia1S Dec 20, 2024
cdc7bec
changelog
Ilia1S Dec 20, 2024
cc1e021
Fix order
Ilia1S Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
wb-mqtt-serial (2.152.1) stable; urgency=medium

* WB-MAI6: add Internal 5V Bus Voltage channel

-- Ilia Skochilov <ilia.skochilov@wirenboard.com> Fri, 20 Dec 2024 17:13:00 +0300

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

* Add "protocol:" prefix to type field in config/Load RPC response for schemas of custom devices.
Expand Down
18 changes: 15 additions & 3 deletions templates/config-wb-mai6.json.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,16 @@
"enabled": false,
"group": "hw_info"
},
{
"name": "Internal 5V Bus Voltage",
"reg_type": "input",
"address": 121,
"type": "value",
"units": "V",
"scale": 0.001,
"enabled": false,
"group": "hw_info"
},
{
"name": "Uptime",
"reg_type": "input",
Expand All @@ -1013,7 +1023,8 @@
"reg_type": "input",
"address": 123,
"scale": 0.001,
"type": "voltage",
"type": "value",
"units": "V",
"enabled": false,
"group": "hw_info"
},
Expand All @@ -1038,7 +1049,7 @@
"format": "u16",
"enabled": false,
"group": "debug"
},
},
{
"name": "ADC Loop Duration",
"reg_type": "input",
Expand All @@ -1048,7 +1059,7 @@
"scale": 0.001,
"enabled": false,
"group": "debug"
}
}
],

"translations": {
Expand Down Expand Up @@ -1191,6 +1202,7 @@
"Internal Temperature": "Температура внутри модуля",
"Serial": "Серийный номер",
"FW Version": "Версия прошивки",
"Internal 5V Bus Voltage": "Напряжение внутренней шины 5В",
"Uptime": "Время работы с момента включения",
"ADC Loop Duration": "Время цикла опроса АЦП",
"ADC Loop Counter": "Счетчик циклов опроса АЦП",
Expand Down
2 changes: 2 additions & 0 deletions test/TDeviceTemplatesTest.Validate.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13750,6 +13750,7 @@ WB-MAI6
IN 6 Temperature => IN 6 Temperature
IN 6 Value => IN 6 Value
IN 6 Voltage => IN 6 Voltage
Internal 5V Bus Voltage => Internal 5V Bus Voltage
Internal Temperature => Internal Temperature
MCU Temperature => MCU Temperature
MCU Voltage => MCU Voltage
Expand Down Expand Up @@ -23584,6 +23585,7 @@ tpl1_oni_plc_w_ema_06U00
IN 6 Temperature => IN 6 Temperature
IN 6 Value => IN 6 Value
IN 6 Voltage => IN 6 Voltage
Internal 5V Bus Voltage => Internal 5V Bus Voltage
Internal Temperature => Internal Temperature
MCU Temperature => MCU Temperature
MCU Voltage => MCU Voltage
Expand Down