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

Add WB-MDALI RS485-DALI gate template #811

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

Add WB-MDALI RS485-DALI gate template #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
398a366
initial version, regex errors
ad7718 Sep 12, 2024
372a206
fix grammar
ad7718 Sep 12, 2024
11d19ab
upd changelog
ad7718 Sep 12, 2024
6f379ba
fix regex errors
ad7718 Sep 12, 2024
084d8b9
fix few errs
ad7718 Sep 12, 2024
6079d7b
use switches instead values for 0/1
ad7718 Sep 12, 2024
e21c183
fix tests
ad7718 Sep 12, 2024
53f290d
fix few strings
ad7718 Sep 12, 2024
a472b17
fix few strings
ad7718 Sep 12, 2024
7c6abde
del prev packet not sent error, add frame counters
ad7718 Sep 23, 2024
9d7a7ae
disable frame counters by default
ad7718 Sep 23, 2024
b4c3813
add tx busy error counter
ad7718 Sep 25, 2024
e1f7535
make few regs sporadic
ad7718 Sep 25, 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.140.1) stable; urgency=medium

* Add WB-MDALI support

-- Radmir Khakimov <radmir.khakimov@wirenboard.ru> Thu, 12 Sep 2024 16:41:08 +0500

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

* Add WB-MAO4-20mA support
Expand Down
367 changes: 367 additions & 0 deletions templates/config-wb-mdali.json.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,367 @@
{% set CHANNELS_NUMBER = 3 -%}
{
"title": "WB-MDALI_template_title",
"device_type": "WB-MDALI",
"group": "g-wb",
"hw": [
{
"signature": "WB-MDALI"
}
],
"device": {
"name": "WB-MDALI",
"id": "wb-mdali",
"max_read_registers": 0,
"response_timeout_ms": 1,
"frame_timeout_ms": 8,
"enable_wb_continuous_read": true,

"groups": [
{
"title": "Bus states",
"id": "g_bus_states"
},
{
"title": "Transparent mode",
"id": "g_transparent_mode"
},
{
"title": "Error counters",
"id": "g_error_counters"
},
{
"title": "General",
"id": "general"
},
{
"title": "HW Info",
"id": "g_hw_info"
}
],

"parameters": {
"baud_rate": {
"title": "Baud rate",
"description": "baud_rate_description",
"address": 110,
"reg_type": "holding",
"enum": [96, 192, 384, 576, 1152],
"default": 96,
"enum_titles": [
"9600",
"19200",
"38400",
"57600",
"115200"
],
"group": "general",
"order": 1
}
},

"channels": [
{% for ch in range(CHANNELS_NUMBER) -%}
{
"name": "Transmit 16bit forward frame over channel {{ ch + 1 }}",
"id": "channel{{ ch + 1 }}_transmit_16bit_forward",
"reg_type": "holding",
"address": {{ 1800 + ch }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_transparent_mode"
},
{
"name": "Transmit 24bit forward frame over channel {{ ch + 1 }}, left aligned",
"id": "channel{{ ch + 1 }}_transmit_24bit_forward",
"reg_type": "holding",
"address": {{ 1805 + ch * 2 }},
"type": "value",
"format": "u32",
"enabled": false,
"group": "g_transparent_mode"
},
{
"name": "Channel {{ ch + 1 }} reply timeout",
"id": "channel{{ ch + 1 }}_reply_timeout",
"reg_type": "input",
"address": {{ 1815 + ch }},
"type": "switch",
"format": "u16",
"sporadic": true,
"enabled": false,
"group": "g_transparent_mode"
},
{
"name": "Received 8bit backward frame from channel {{ ch + 1 }}, left aligned",
"id": "channel{{ ch + 1 }}_receive_8bit_backward",
"reg_type": "input",
"address": {{ 1820 + ch }},
"type": "value",
"format": "u16",
"sporadic": true,
"enabled": false,
"group": "g_transparent_mode"
},
{
"name": "Received 24bit forward frame from channel {{ ch + 1 }}, left aligned",
"id": "channel{{ ch + 1 }}_receive_24bit_forward",
"reg_type": "input",
"address": {{ 1825 + ch * 2 }},
"type": "value",
"format": "u32",
"sporadic": true,
"enabled": false,
"group": "g_transparent_mode"
},
{
"name": "24bit forward frame is received from channel {{ ch + 1 }}",
"id": "channel{{ ch + 1 }}_received_24bit_flag",
"reg_type": "input",
"address": {{ 1835 + ch }},
"type": "switch",
"format": "u16",
"enabled": false,
"group": "g_transparent_mode"
},
{
"name": "Channel {{ ch + 1 }} bus is powered",
"id": "channel{{ ch + 1 }}_bus_is_powered",
"reg_type": "input",
"address": {{ 1850 + ch }},
"type": "switch",
"format": "u16",
"group": "g_bus_states"
},
{
"name": "Channel {{ ch + 1 }} bus state changed after request",
"id": "channel{{ ch + 1 }}_bus_state_changed",
"reg_type": "input",
"address": {{ 1880 + ch }},
"type": "switch",
"format": "u16",
"sporadic": true,
"enabled": false,
"group": "g_transparent_mode"
},
{
"name": "Channel {{ ch + 1 }} start bit is not received error counter",
"id": "channel{{ ch + 1 }}_nostart_error_counter",
"reg_type": "input",
"address": {{ 1855 + ch * 10 }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} bit time error counter",
"id": "channel{{ ch + 1 }}_bittime_error_counter",
"reg_type": "input",
"address": {{ 1856 + ch * 10 }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} frame length error counter",
"id": "channel{{ ch + 1 }}_framelen_error_counter",
"reg_type": "input",
"address": {{ 1857 + ch * 10 }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} stop bits are not received error counter",
"id": "channel{{ ch + 1 }}_nostops_error_counter",
"reg_type": "input",
"address": {{ 1858 + ch * 10 }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} frame receive timeout error counter",
"id": "channel{{ ch + 1 }}_timeout_error_counter",
"reg_type": "input",
"address": {{ 1859 + ch * 10 }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} bus is not powered error counter",
"id": "channel{{ ch + 1 }}_buspower_error_counter",
"reg_type": "input",
"address": {{ 1860 + ch * 10 }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} tx busy error counter",
"id": "channel{{ ch + 1 }}_txbusy_error_counter",
"reg_type": "input",
"address": {{ 1861 + ch * 10 }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} sent frames counter",
"id": "channel{{ ch + 1 }}_sent_frames_counter",
"reg_type": "input",
"address": {{ 1885 + ch }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{
"name": "Channel {{ ch + 1 }} received frames counter",
"id": "channel{{ ch + 1 }}_received_frames_counter",
"reg_type": "input",
"address": {{ 1890 + ch }},
"type": "value",
"format": "u16",
"enabled": false,
"group": "g_error_counters"
},
{% endfor -%}
{
"name": "Serial",
"reg_type": "input",
"address": 270,
"type": "text",
"format": "u32",
"group": "g_hw_info"
},
{
"name": "FW Version",
"reg_type": "input",
"address": 250,
"type": "text",
"format": "string",
"string_data_size": 16,
"enabled": false,
"group": "g_hw_info"
},
{
"name": "Supply Voltage",
"reg_type": "input",
"address": 121,
"type": "value",
"units": "V",
"scale": 0.001,
"enabled": false,
"group": "g_hw_info"
},
{
"name": "Uptime",
"reg_type": "input",
"address": 104,
"type": "value",
"units": "s",
"format": "u32",
"enabled": false,
"group": "g_hw_info"
},
{
"name": "Minimum Voltage Since Startup",
"reg_type": "input",
"address": 122,
"scale": 0.001,
"type": "value",
"units": "V",
"enabled": false,
"group": "g_hw_info"
},
{
"name": "MCU Temperature",
"reg_type": "input",
"address": 124,
"type": "value",
"units": "deg C",
"format": "s16",
"scale": 0.1,
"enabled": false,
"group": "g_hw_info"
},
{
"name": "MCU Voltage",
"reg_type": "input",
"address": 123,
"scale": 0.001,
"type": "value",
"units": "V",
"enabled": false,
"group": "g_hw_info"
},
{
"name": "Minimum MCU Voltage Since Startup",
"reg_type": "input",
"address": 119,
"scale": 0.001,
"type": "value",
"units": "V",
"enabled": false,
"group": "g_hw_info"
}
],
"translations": {
"en": {
"WB-MDALI_template_title": "WB-MDALI (3-channel RS485-DALI gate)",
"baud_rate_description": "Make sure that communication with the device is estabilished before changing this parameter. Select required baud rate, save configuration and then change port baud rate to the same value. Default value is 9600"
},
"ru": {
"WB-MDALI_template_title": "WB-MDALI (3-канальный шлюз RS485-DALI)",
"Bus states": "Состояние шин",
"Error counters": "Счетчики ошибок",
"Transparent mode": "Прозрачный режим",
"General": "Общее",
"HW Info": "Данные модуля",

{% for ch in range(CHANNELS_NUMBER) -%}
"Transmit 16bit forward frame over channel {{ ch + 1 }}": "Передать 16-битный forward фрейм по каналу {{ ch + 1 }}",
"Transmit 24bit forward frame over channel {{ ch + 1 }}, left aligned": "Передать 24-битный forward фрейм по каналу {{ ch + 1 }}, выровнен по левому краю",
"Channel {{ ch + 1 }} reply timeout": "Таймаут ответа канала {{ ch + 1 }}",
"Received 8bit backward frame from channel {{ ch + 1 }}, left aligned": "Полученный 8-битный backward фрейм от канала {{ ch + 1 }}, выровнен по левому краю",
"Received 24bit forward frame from channel {{ ch + 1 }}, left aligned": "Полученный 24-битный forward фрейм от канала {{ ch + 1 }}, выровнен по левому краю",
"24bit forward frame is received from channel {{ ch + 1 }}": "Получен 24-битный фрейм от канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} bus is powered": "Шина канала {{ ch + 1 }} запитана",
"Channel {{ ch + 1 }} bus state changed after request": "Состояние шины канала {{ ch + 1 }} изменилось после запроса",

"Channel {{ ch + 1 }} start bit is not received error counter": "Счетчик ошибок остуствия стартового бита канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} bit time error counter": "Счетчик ошибок времени бита канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} frame length error counter": "Счетчик ошибок длины фрейма канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} stop bits are not received error counter": "Счетчик ошибок отсутствия стоп-битов канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} frame receive timeout error counter": "Счетчик ошибок таймаута приема фрейма канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} bus is not powered error counter": "Счетчик ошибок незапитанности шины канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} tx busy error counter": "Счетчик ошибок занятости шины {{ ch + 1 }}",

"Channel {{ ch + 1 }} sent frames counter": "Счетчик отправленных фреймов канала {{ ch + 1 }}",
"Channel {{ ch + 1 }} received frames counter": "Счетчик принятых фреймов канала {{ ch + 1 }}",
{% endfor -%}

"Serial": "Серийный номер",
"FW Version": "Версия прошивки",
"Supply Voltage": "Напряжение питания",
"Uptime": "Время работы с момента включения",
"Minimum Voltage Since Startup": "Минимальное напряжение с момента включения",
"MCU Temperature": "Температура МК",
"MCU Voltage": "Напряжение питания МК",
"Minimum MCU Voltage Since Startup": "Минимальное напряжение питания МК с момента включения",

"Baud rate": "Скорость обмена",
"baud_rate_description": "Перед изменением параметра убедитесь, что связь с устройством установлена. Выберите нужную скорость обмена, сохраните конфигурацию, а затем укажите в настройках порта эту же скорость. Значение по умолчанию - 9600"
}
}
}
}
Loading