Task #146 — Modbus addressing: align type codes with Wonderware DASMBTCP + Ignition
Web verification (2026-04-25) against current vendor docs surfaced concrete grammar conflicts in the v1 suffix grammar shipped in #137. Hard cutover before the Admin UI rolls out widely so users don't paste `:I` from a Wonderware spreadsheet and silently get wrong-typed reads. Sources: - Wonderware DASMBTCP user guide https://cdn.logic-control.com/media/DASMBTCP.pdf - Ignition Modbus addressing (8.1) https://www.docs.inductiveautomation.com/docs/8.1/ignition-modules/opc-ua/opc-ua-drivers/modbus/modbus-addressing Type-code changes: | Code | Pre-#146 | Post-#146 | Vendor reference | |--------|----------|------------|------------------------------| | `:S` | (n/a) | Int16 | Wonderware DASMBTCP `S` | | `:US` | (n/a) | UInt16 | Ignition `HRUS` | | `:I` | Int16 | **Int32** | Wonderware `I` + Ignition `HRI` | | `:UI` | UInt16 | **UInt32** | Ignition `HRUI` | | `:I_64` | (n/a) | Int64 | Ignition `HRI_64` | | `:UI_64` | (n/a) | UInt64 | Ignition `HRUI_64` | | `:BCD_32`| (n/a) | BCD32 | Ignition `HRBCD_32` | Codes REMOVED (no clear vendor precedent + conflict with the new mapping): `:DI`, `:L`, `:UDI`, `:UL`, `:LI`, `:ULI`, `:LBCD`. Pre-#146 configs that use them get an "Unknown type code" diagnostic at parse time so users get a fast surface-level error rather than silent wrong-typed reads. Codes UNCHANGED (already vendor-aligned): `:BOOL`, `:F`, `:D`, `:BCD`, `:STR<n>`. Modicon 5/6-digit + mnemonic regions (HR/IR/C/DI) + bit suffix `.N` are also unchanged. Defaults: - Coils / DiscreteInputs → `BOOL` (unchanged) - HoldingRegisters / InputRegisters with no explicit type → Int16 (matches Ignition's bare `HR` default) Byte-order mnemonics (`:ABCD` / `:CDAB` / `:BADC` / `:DCBA`) are kept but documented as OtOpcUa-specific — they aren't in any major vendor's per-tag address string. Ignition uses a `-R` suffix per prefix; Wonderware configures word-order at the topic level. Tests: - 12 Type_Codes_Parse rows updated to assert the new mappings. - New Removed_Aliases_Are_Rejected (×7) confirms each pre-#146 alias now fails fast with "Unknown type code". - Worked_Example_Int16_Array uses the new `:S` code. - New Worked_Example_Int32_Array_Via_I_Code documents the `:I = Int32` vendor-alignment intent so a future "fix" doesn't accidentally regress. - Unknown_Type_Code_Rejected_With_Catalog updated to match the new error message ("Valid: BOOL, S, US, I, ..."). Docs: - docs/v2/modbus-addressing.md — table replaced with the post-#146 codes, each row cites its Wonderware / Ignition reference. New "Codes removed in #146" subsection documents the cutover. - docs/Driver.Modbus.Cli.md — example grammar list updated; explicit type-code reminder appended. 114 addressing tests + 231 driver tests still green. Solution build clean.
This commit is contained in:
@@ -135,15 +135,21 @@ Quick examples:
|
||||
40001:F Float32
|
||||
40001:F:CDAB Float32 word-swapped
|
||||
40001:STR20 20-char ASCII string
|
||||
40001:I:5 Int16[5] array (3-field shorthand)
|
||||
40001:S:5 Int16[5] array (3-field shorthand)
|
||||
40001:F:CDAB:10 Float32[10] with explicit word-swap (4-field strict)
|
||||
40001.5 bit 5 of HR[0]
|
||||
HR1:DI Int32 via mnemonic region prefix
|
||||
HR1:I Int32 via mnemonic region prefix (matches Wonderware)
|
||||
C100 Coil 100 (mnemonic, 1-based)
|
||||
V2000:F:CDAB DL205 V-memory at PDU 1024 + Float32 + word-swap (Family=DL205)
|
||||
D100:I MELSEC D-register 100 (Family=MELSEC)
|
||||
D100:I MELSEC D-register 100, Int32 (Family=MELSEC)
|
||||
```
|
||||
|
||||
**Type-code reminder** (post-#146): `:I` is **Int32** (matches Wonderware
|
||||
DASMBTCP + Ignition `HRI`). The explicit Int16 code is `:S`. Bare HR/IR
|
||||
with no type still defaults to Int16. Pre-#146 codes `:DI` / `:L` /
|
||||
`:UDI` / `:UL` / `:LI` / `:ULI` / `:LBCD` are removed; configs that use
|
||||
them get a clear "Unknown type code" diagnostic at parse time.
|
||||
|
||||
In `DriverConfig` JSON, set the per-tag `addressString` field instead of
|
||||
the structured `region` + `address` + `dataType` fields. Both styles can
|
||||
coexist within one driver instance.
|
||||
|
||||
@@ -41,24 +41,37 @@ mixing with an explicit type or array-count is rejected.
|
||||
|
||||
### Type code `:T`
|
||||
|
||||
| Code | Type | Registers |
|
||||
|---|---|---|
|
||||
| `BOOL` | Boolean | 1 (region must be Coils / DiscreteInputs) |
|
||||
| `I` | Int16 | 1 |
|
||||
| `UI` | UInt16 | 1 |
|
||||
| `DI`, `L` | Int32 | 2 |
|
||||
| `UDI`, `UL` | UInt32 | 2 |
|
||||
| `LI` | Int64 | 4 |
|
||||
| `ULI` | UInt64 | 4 |
|
||||
| `F` | Float32 | 2 |
|
||||
| `D` | Float64 | 4 |
|
||||
| `BCD` | 16-bit BCD | 1 |
|
||||
| `LBCD` | 32-bit BCD | 2 |
|
||||
| `STR<len>` | ASCII string, `len` chars (2 chars / register) | `ceil(len/2)` |
|
||||
Codes verified 2026-04-25 against [Wonderware DASMBTCP user
|
||||
guide](https://cdn.logic-control.com/media/DASMBTCP.pdf) and the
|
||||
[Ignition Modbus addressing
|
||||
manual](https://www.docs.inductiveautomation.com/docs/8.1/ignition-modules/opc-ua/opc-ua-drivers/modbus/modbus-addressing).
|
||||
The `I` / `UI` / `I_64` / `UI_64` / `BCD_32` shapes match Wonderware's
|
||||
suffix convention and Ignition's underscore-N prefix variants where
|
||||
those vendors agree.
|
||||
|
||||
| Code | Type | Registers | Vendor reference |
|
||||
|---|---|---|---|
|
||||
| `BOOL` | Boolean | 1 (region must be Coils / DiscreteInputs) | universal |
|
||||
| `S` | Int16 | 1 | Wonderware DASMBTCP `S` = 16-bit signed |
|
||||
| `US` | UInt16 | 1 | Ignition `HRUS` = Unsigned Short |
|
||||
| `I` | Int32 | 2 | Wonderware DASMBTCP `I` = 32-bit signed; Ignition `HRI` |
|
||||
| `UI` | UInt32 | 2 | Ignition `HRUI` |
|
||||
| `I_64` | Int64 | 4 | Ignition `HRI_64` |
|
||||
| `UI_64` | UInt64 | 4 | Ignition `HRUI_64` |
|
||||
| `F` | Float32 | 2 | Wonderware `F`; Ignition `HRF` |
|
||||
| `D` | Float64 | 4 | Ignition `HRD` |
|
||||
| `BCD` | 16-bit BCD | 1 | Ignition `HRBCD` |
|
||||
| `BCD_32` | 32-bit BCD | 2 | Ignition `HRBCD_32` |
|
||||
| `STR<len>` | ASCII string, `len` chars (2 chars / register) | `ceil(len/2)` | analogous to Ignition `HRS<addr>:<len>` |
|
||||
|
||||
Default when omitted:
|
||||
- Coils / DiscreteInputs → `BOOL`
|
||||
- HoldingRegisters / InputRegisters → `I` (Int16)
|
||||
- HoldingRegisters / InputRegisters → `S` (Int16) — matches Ignition's bare-`HR` default
|
||||
|
||||
**Codes removed in #146** (silent wrong-data risk, never compatible with the
|
||||
two reference vendors): `:DI`, `:L`, `:UDI`, `:UL`, `:LI`, `:ULI`, `:LBCD`.
|
||||
Pre-#146 configs that use these get a clear "Unknown type code" diagnostic at
|
||||
parse time; rewrite to the post-#146 codes per the table above.
|
||||
|
||||
### Byte order `:O`
|
||||
|
||||
|
||||
Reference in New Issue
Block a user