fix(driver-or-we-516): correct energy register range and validation consistency

groupsky · groupsky · commit 31d51f3c734d · 2026-01-06T18:08:03.000+02:00
- Fix energy register range from 0x012E to 0x012F (48 registers = offsets 0-47)
- Refactor combined_code validation to reuse isValidCycleTime validator
diff --git a/packages/driver-or-we-516/AGENTS.md b/packages/driver-or-we-516/AGENTS.md
@@ -7,7 +7,7 @@ ORNO OR-WE-516 3-Phase Energy Meter driver implementation.
 - Implements DeviceDriver interface from `@ya-modbus/driver-types`
 - Uses SDK utilities from `@ya-modbus/driver-sdk` for validation and encoding
 - All floats are IEEE 754 big-endian (use `readFloatBE`/`writeFloatBE`)
-- Two register ranges: realtime (0x0000-0x003B) and energy (0x0100-0x012E)
+- Two register ranges: realtime (0x0000-0x003B) and energy (0x0100-0x012F)
 
 ## Testing
 
diff --git a/packages/driver-or-we-516/README.md b/packages/driver-or-we-516/README.md
@@ -161,7 +161,7 @@ const driver = await createDriver({
 | ------------- | ---------- | ------- | ------------------------------ |
 | 0x0000-0x003B | 60 (120 B) | Holding | Device info + real-time values |
 | 0x0042        | 1 (2 B)    | Holding | Combined code (config)         |
-| 0x0100-0x012E | 48 (96 B)  | Holding | Energy counters                |
+| 0x0100-0x012F | 48 (96 B)  | Holding | Energy counters                |
 
 All float values are IEEE 754 single-precision (32-bit) big-endian.
 
diff --git a/packages/driver-or-we-516/src/index.ts b/packages/driver-or-we-516/src/index.ts
@@ -9,7 +9,7 @@
  *
  * Register mapping:
  * - Holding registers 0x0000-0x003B: Device info and real-time measurements
- * - Holding registers 0x0100-0x012E: Energy counters
+ * - Holding registers 0x0100-0x012F: Energy counters
  * - All float values are IEEE 754 single-precision (32-bit)
  */
 
@@ -797,7 +797,7 @@ export const createDriver: CreateDriverFunction = (config: DriverConfig) => {
       }
 
       if (id === 'combined_code') {
-        if (!isValidInteger(value) || value < 0 || value > 65535) {
+        if (!isValidInteger(value) || !isValidCycleTime(value)) {
           throw new Error(formatRangeError('combined code', 0, 65535))
         }
         await transport.writeSingleRegister(0x0042, value)

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* Register mapping:`
`11`	`11`	`* - Holding registers 0x0000-0x003B: Device info and real-time measurements`
`12`		`- * - Holding registers 0x0100-0x012E: Energy counters`
	`12`	`+ * - Holding registers 0x0100-0x012F: Energy counters`
`13`	`13`	`* - All float values are IEEE 754 single-precision (32-bit)`
`14`	`14`	`*/`
`15`	`15`
`@@ -797,7 +797,7 @@ export const createDriver: CreateDriverFunction = (config: DriverConfig) => {`
`797`	`797`	`}`
`798`	`798`
`799`	`799`	`if (id === 'combined_code') {`
`800`		`- if (!isValidInteger(value) \|\| value < 0 \|\| value > 65535) {`
	`800`	`+ if (!isValidInteger(value) \|\| !isValidCycleTime(value)) {`
`801`	`801`	`throw new Error(formatRangeError('combined code', 0, 65535))`
`802`	`802`	`}`
`803`	`803`	`await transport.writeSingleRegister(0x0042, value)`