Skip to content

Commit

Permalink
chore: release v6.0.0
Browse files Browse the repository at this point in the history
* (bluefox) GUI packages updated
* (bluefox) Added help for settings
* (bluefox) Minimal supported node.js version is 16
  • Loading branch information
GermanBluefox committed Oct 27, 2023
1 parent bfe2c26 commit c2f4655
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 31 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Such a convenience does not come without any complications, however, and Modbus
The protocol itself was designed based on devices with a 16-bit register length.
Consequently, special considerations were required when implementing 32-bit data elements.
This implementation settled on using two consecutive 16-bit registers to represent 32 bits of data or essentially 4 bytes of data.
It is within these 4 bytes of data that single-precision floating point data can be encoded into a Modbus RTU message.
It is within these four bytes of data that single-precision floating point data can be encoded into a Modbus RTU message.

### The Importance of Byte Order
Modbus itself does not define a floating point data type, but it is widely accepted that it implements 32-bit floating point data using the IEEE-754 standard.
Expand Down Expand Up @@ -267,12 +267,12 @@ The following table shows the FieldServer function moves that copy a single 32-b

Given the various FieldServer function moves, the correct handling of 32-bit data is dependent on choosing the proper one. Observe the following behavior of these FieldServer function moves on the known single-precision decimal float value of 123456.00:

|16-bit Values | Function Move | Result | Function Move | Result |
|---------------|-------------------|-----------|-------------------|---------------|
|0x2000 0x47F1 | 2.i16-1.float | 123456.00 | 1.float-2.i16 | 0x2000 0x47F1 |
|0xF147 0x0020 | 2.i16-1.float-s | 123456.00 | 1.float-2.i16-s | 0xF147 0X0020 |
|0x0020 0xF147 | 2.i16-1.float-sb | 123456.00 | 1.float-2.i16-sb | 0x0020 0xF147 |
|0x47F1 0x2000 | 2.i16-1.float-sw | 123456.00 | 1.float-2.i16-sw | 0x47F1 0x2000 |
|16-bit Values | Function Move | Result | Function Move | Result |
|--------------|--------------------|------------|-------------------|---------------|
|0x2000 0x47F1 | 2.i16-1.float | 123456.00 | 1.float-2.i16 | 0x2000 0x47F1 |
|0xF147 0x0020 | 2.i16-1.float-s | 123456.00 | 1.float-2.i16-s | 0xF147 0X0020 |
|0x0020 0xF147 | 2.i16-1.float-sb | 123456.00 | 1.float-2.i16-sb | 0x0020 0xF147 |
|0x47F1 0x2000 | 2.i16-1.float-sw | 123456.00 | 1.float-2.i16-sw | 0x47F1 0x2000 |

Notice that different byte and word orderings require the use of the appropriate FieldServer function move. Once the proper function move is selected, the data can be converted in both directions.

Expand All @@ -292,7 +292,7 @@ There are some programs in folder `test` to test the TCP communication:
### **WORK IN PROGRESS**
-->
## Changelog
### **WORK IN PROGRESS**
### 6.0.0 (2023-10-27)
* (bluefox) GUI packages updated
* (bluefox) Added help for settings
* (bluefox) Minimal supported node.js version is 16
Expand Down
6 changes: 3 additions & 3 deletions admin/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "./static/css/main.96b3c861.css",
"main.js": "./static/js/main.136d20db.js",
"main.js": "./static/js/main.fec1abba.js",
"static/media/Ground Floor.svg": "./static/media/Ground Floor.2b7c5c91db7f070935a2.svg",
"static/media/Second Floor.svg": "./static/media/Second Floor.a2d5ed32df336591c06b.svg",
"static/media/Cellar.svg": "./static/media/Cellar.7ec1b1803a2437c8b78c.svg",
Expand Down Expand Up @@ -123,10 +123,10 @@
"static/media/Outdoor Blinds.svg": "./static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
"static/media/Upstairs.svg": "./static/media/Upstairs.441813e54e0daca0882d.svg",
"main.96b3c861.css.map": "./static/css/main.96b3c861.css.map",
"main.136d20db.js.map": "./static/js/main.136d20db.js.map"
"main.fec1abba.js.map": "./static/js/main.fec1abba.js.map"
},
"entrypoints": [
"static/css/main.96b3c861.css",
"static/js/main.136d20db.js"
"static/js/main.fec1abba.js"
]
}
2 changes: 1 addition & 1 deletion admin/index_m.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>Modbus</title><script defer="defer" src="./static/js/main.136d20db.js"></script><link href="./static/css/main.96b3c861.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>Modbus</title><script defer="defer" src="./static/js/main.fec1abba.js"></script><link href="./static/css/main.96b3c861.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

27 changes: 14 additions & 13 deletions io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
{
"common": {
"name": "modbus",
"version": "5.0.11",
"version": "6.0.0",
"news": {
"6.0.0": {
"en": "GUI packages updated\nAdded help for settings\nMinimal supported node.js version is 16",
"de": "GUI-Pakete aktualisiert\nHilfe für Einstellungen hinzugefügt\nMinimal unterstützt node.js version is 16",
"ru": "GUI пакеты обновлены\nДобавлена помощь для настроек\nМинимальная поддерживаемая версия node.js 16",
"pt": "Pacotes GUI atualizados\nAdicionado ajuda para configurações\nNode.js com suporte mínimo é 16",
"nl": "GUI verpakkingen\nVoegde hulp toe voor de instelling\nMinimale ondersteunde node",
"fr": "GUI packages updated\nAjout d'aide pour les paramètres\nVersion node.js supportée Minimal est 16",
"it": "Pacchetti GUI aggiornati\nAggiunto aiuto per le impostazioni\nMinimal supportato node.js versione è 16",
"es": "Paquetes GUI actualizados\nAyuda adicional para la configuración\nMinimal soportado node.js versión es 16",
"pl": "Pakiet GUI\nZamknięte pomoc dla ustawienia\nMinimal supportowana wersja węzła wynosi 16",
"uk": "Оновлення пакетів GUI\nДодана допомога для налаштування\nMinimal підтримуваний node.js версія 16",
"zh-cn": "古伊一揽子计划更新\n增加环境援助\n米切尔支持不dejs版本为16。"
},
"5.0.11": {
"en": "fixed reconnect of serial communication",
"de": "feste wiederverbindung der seriellen kommunikation",
Expand Down Expand Up @@ -75,18 +88,6 @@
"es": "Evitar registro de estado no válido",
"pl": "Zapobiegaj nieprawidłowemu dziennikowi stanu",
"zh-cn": "防止无效状态日志"
},
"4.0.3": {
"en": "Updated serial port package\nMinimal node.js version is 12",
"de": "Aktualisiertes Paket für die serielle Schnittstelle\nDie minimale Version von node.js ist 12",
"ru": "Обновленный пакет последовательного порта\nМинимальная версия node.js — 12.",
"pt": "Pacote de porta serial atualizado\nA versão mínima do node.js é 12",
"nl": "Bijgewerkt seriële poortpakket\nMinimale node.js-versie is 12",
"fr": "Package de port série mis à jour\nLa version minimale de node.js est 12",
"it": "Pacchetto porta seriale aggiornato\nLa versione minima di node.js è 12",
"es": "Paquete de puerto serie actualizado\nLa versión mínima de node.js es 12",
"pl": "Zaktualizowany pakiet portu szeregowego\nMinimalna wersja node.js to 12",
"zh-cn": "更新串口包\n最小的 node.js 版本是 12"
}
},
"title": "ModBus",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.modbus",
"version": "5.0.11",
"version": "6.0.0",
"description": "Connect devices oder Modbus protocol to ioBroker",
"author": {
"name": "bluefox",
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "modebus-admin",
"version": "5.0.11",
"version": "6.0.0",
"private": true,
"dependencies": {
"@iobroker/adapter-react-v5": "^4.6.7",
Expand Down

0 comments on commit c2f4655

Please sign in to comment.