@ya-modbus/driver-xymd1 0.6.14 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/README.md +11 -11
- package/dist/cjs/src/index.d.ts +4 -3
- package/dist/cjs/src/index.d.ts.map +1 -1
- package/dist/cjs/src/index.js +6 -4
- package/dist/cjs/src/index.js.map +1 -1
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/esm/src/index.d.ts +4 -3
- package/dist/esm/src/index.d.ts.map +1 -1
- package/dist/esm/src/index.js +6 -4
- package/dist/esm/src/index.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,20 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [0.7.0](https://github.com/groupsky/ya-modbus/compare/@ya-modbus/driver-xymd1@0.6.15...@ya-modbus/driver-xymd1@0.7.0) (2026-10-14)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- **driver-xymd1:** read temperature as signed and default to 8N1 ([#635](https://github.com/groupsky/ya-modbus/issues/635)) ([](https://github.com/groupsky/ya-modbus/commit/)), closes [#609](https://github.com/groupsky/ya-modbus/issues/609) [#628](https://github.com/groupsky/ya-modbus/issues/628)
|
|
11
|
+
|
|
12
|
+
### BREAKING CHANGES
|
|
13
|
+
|
|
14
|
+
- **driver-xymd1:** DEFAULT_CONFIG.parity of @ya-modbus/driver-xymd1 is now 'none' (9600 8N1) instead of 'even'. If you relied on the old even default, set parity even yourself.
|
|
15
|
+
|
|
16
|
+
## [0.6.15](https://github.com/groupsky/ya-modbus/compare/@ya-modbus/driver-xymd1@0.6.14...@ya-modbus/driver-xymd1@0.6.15) (2026-10-12)
|
|
17
|
+
|
|
18
|
+
**Note:** Version bump only for package @ya-modbus/driver-xymd1
|
|
19
|
+
|
|
6
20
|
## [0.6.14](https://github.com/groupsky/ya-modbus/compare/@ya-modbus/driver-xymd1@0.6.13...@ya-modbus/driver-xymd1@0.6.14) (2026-10-12)
|
|
7
21
|
|
|
8
22
|
**Note:** Version bump only for package @ya-modbus/driver-xymd1
|
package/README.md
CHANGED
|
@@ -7,10 +7,10 @@ XYMD1 Temperature and Humidity Sensor driver for ya-modbus.
|
|
|
7
7
|
- **Model**: XY-MD1
|
|
8
8
|
- **Type**: Temperature and Humidity Sensor
|
|
9
9
|
- **Communication**: Modbus RTU
|
|
10
|
-
- **Default Settings
|
|
10
|
+
- **Default Settings** (9600 8N1):
|
|
11
11
|
- Address: 1
|
|
12
12
|
- Baud rate: 9600
|
|
13
|
-
- Parity:
|
|
13
|
+
- Parity: None
|
|
14
14
|
- Stop bits: 1
|
|
15
15
|
- Data bits: 8
|
|
16
16
|
|
|
@@ -30,7 +30,7 @@ import { createRTUTransport } from '@ya-modbus/transport'
|
|
|
30
30
|
const transport = await createRTUTransport({
|
|
31
31
|
port: '/dev/ttyUSB0',
|
|
32
32
|
baudRate: 9600,
|
|
33
|
-
parity: '
|
|
33
|
+
parity: 'none',
|
|
34
34
|
dataBits: 8,
|
|
35
35
|
stopBits: 1,
|
|
36
36
|
slaveId: 1,
|
|
@@ -75,7 +75,7 @@ import { createRTUTransport } from '@ya-modbus/transport'
|
|
|
75
75
|
const transport = await createRTUTransport({
|
|
76
76
|
port: '/dev/ttyUSB0',
|
|
77
77
|
baudRate: DEFAULT_CONFIG.baudRate, // 9600
|
|
78
|
-
parity: DEFAULT_CONFIG.parity, // '
|
|
78
|
+
parity: DEFAULT_CONFIG.parity, // 'none'
|
|
79
79
|
dataBits: DEFAULT_CONFIG.dataBits, // 8
|
|
80
80
|
stopBits: DEFAULT_CONFIG.stopBits, // 1
|
|
81
81
|
slaveId: DEFAULT_CONFIG.defaultAddress, // 1
|
|
@@ -102,13 +102,13 @@ This ensures your code always uses the correct factory defaults and makes it eas
|
|
|
102
102
|
|
|
103
103
|
## Register Mapping
|
|
104
104
|
|
|
105
|
-
| Function | Register | Type | Format | Description
|
|
106
|
-
| ------------- | -------- | ------- | --------------- |
|
|
107
|
-
| Read | 1-2 | Input | 16-bit × 2 | Temperature and humidity (×10)
|
|
108
|
-
| Configuration | 0x101 | Holding | 16-bit unsigned | Device address (1-247)
|
|
109
|
-
| Configuration | 0x102 | Holding | 16-bit unsigned | Baud rate setting
|
|
110
|
-
| Calibration | 0x103 | Holding | 16-bit signed | Temperature correction (×10, -100 to +100)
|
|
111
|
-
| Calibration | 0x104 | Holding | 16-bit signed | Humidity correction (×10, -100 to +100)
|
|
105
|
+
| Function | Register | Type | Format | Description |
|
|
106
|
+
| ------------- | -------- | ------- | --------------- | ------------------------------------------------------ |
|
|
107
|
+
| Read | 1-2 | Input | 16-bit × 2 | Temperature (signed, ×10) and humidity (unsigned, ×10) |
|
|
108
|
+
| Configuration | 0x101 | Holding | 16-bit unsigned | Device address (1-247) |
|
|
109
|
+
| Configuration | 0x102 | Holding | 16-bit unsigned | Baud rate setting |
|
|
110
|
+
| Calibration | 0x103 | Holding | 16-bit signed | Temperature correction (×10, -100 to +100) |
|
|
111
|
+
| Calibration | 0x104 | Holding | 16-bit signed | Humidity correction (×10, -100 to +100) |
|
|
112
112
|
|
|
113
113
|
## Calibration
|
|
114
114
|
|
package/dist/cjs/src/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* See DEFAULT_CONFIG for baud rate, parity, data bits, stop bits, and default address.
|
|
6
6
|
*
|
|
7
7
|
* Register mapping:
|
|
8
|
-
* - Input registers 1-2: Temperature (×10) and Humidity (×10)
|
|
8
|
+
* - Input registers 1-2: Temperature (signed, ×10) and Humidity (unsigned, ×10)
|
|
9
9
|
* - Holding register 0x101: Device address configuration
|
|
10
10
|
* - Holding register 0x102: Baud rate configuration
|
|
11
11
|
* - Holding register 0x103: Temperature correction (signed, ×10, -100 to +100)
|
|
@@ -35,7 +35,8 @@ export declare const SUPPORTED_CONFIG: {
|
|
|
35
35
|
* Default XYMD1 device configuration
|
|
36
36
|
*
|
|
37
37
|
* Use these values when connecting to a factory-default XYMD1 device.
|
|
38
|
-
* These are the settings the device ships with from the manufacturer
|
|
38
|
+
* These are the settings the device ships with from the manufacturer:
|
|
39
|
+
* 9600 baud, 8N1 (8 data bits, no parity, 1 stop bit), address 1.
|
|
39
40
|
*
|
|
40
41
|
* @example
|
|
41
42
|
* ```typescript
|
|
@@ -53,7 +54,7 @@ export declare const SUPPORTED_CONFIG: {
|
|
|
53
54
|
*/
|
|
54
55
|
export declare const DEFAULT_CONFIG: {
|
|
55
56
|
readonly baudRate: 9600;
|
|
56
|
-
readonly parity: "
|
|
57
|
+
readonly parity: "none";
|
|
57
58
|
readonly dataBits: 8;
|
|
58
59
|
readonly stopBits: 1;
|
|
59
60
|
readonly defaultAddress: 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAYH,OAAO,KAAK,EAGV,oBAAoB,EAIrB,MAAM,yBAAyB,CAAA;AAEhC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB;;;;;;CAMa,CAAA;AAE1C
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAYH,OAAO,KAAK,EAGV,oBAAoB,EAIrB,MAAM,yBAAyB,CAAA;AAEhC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB;;;;;;CAMa,CAAA;AAE1C;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,cAAc;;;;;;CAMa,CAAA;AA8IxC;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,oBAgI1B,CAAA"}
|
package/dist/cjs/src/index.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* See DEFAULT_CONFIG for baud rate, parity, data bits, stop bits, and default address.
|
|
7
7
|
*
|
|
8
8
|
* Register mapping:
|
|
9
|
-
* - Input registers 1-2: Temperature (×10) and Humidity (×10)
|
|
9
|
+
* - Input registers 1-2: Temperature (signed, ×10) and Humidity (unsigned, ×10)
|
|
10
10
|
* - Holding register 0x101: Device address configuration
|
|
11
11
|
* - Holding register 0x102: Baud rate configuration
|
|
12
12
|
* - Holding register 0x103: Temperature correction (signed, ×10, -100 to +100)
|
|
@@ -38,7 +38,8 @@ exports.SUPPORTED_CONFIG = {
|
|
|
38
38
|
* Default XYMD1 device configuration
|
|
39
39
|
*
|
|
40
40
|
* Use these values when connecting to a factory-default XYMD1 device.
|
|
41
|
-
* These are the settings the device ships with from the manufacturer
|
|
41
|
+
* These are the settings the device ships with from the manufacturer:
|
|
42
|
+
* 9600 baud, 8N1 (8 data bits, no parity, 1 stop bit), address 1.
|
|
42
43
|
*
|
|
43
44
|
* @example
|
|
44
45
|
* ```typescript
|
|
@@ -56,7 +57,7 @@ exports.SUPPORTED_CONFIG = {
|
|
|
56
57
|
*/
|
|
57
58
|
exports.DEFAULT_CONFIG = {
|
|
58
59
|
baudRate: 9600,
|
|
59
|
-
parity: '
|
|
60
|
+
parity: 'none',
|
|
60
61
|
dataBits: 8,
|
|
61
62
|
stopBits: 1,
|
|
62
63
|
defaultAddress: 1,
|
|
@@ -137,8 +138,9 @@ const DATA_POINTS = [
|
|
|
137
138
|
* Decode raw Modbus value to data point value
|
|
138
139
|
*/
|
|
139
140
|
function decodeDataPoint(id, rawValue) {
|
|
141
|
+
// Temperature can be negative (signed); humidity cannot (unsigned)
|
|
140
142
|
if (id === 'temperature') {
|
|
141
|
-
return (0, driver_sdk_1.
|
|
143
|
+
return (0, driver_sdk_1.readScaledInt16BE)(rawValue, 0, 10);
|
|
142
144
|
}
|
|
143
145
|
if (id === 'humidity') {
|
|
144
146
|
return (0, driver_sdk_1.readScaledUInt16BE)(rawValue, 2, 10);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;AAEH,sDAS8B;AAU9B;;;;;;;;;;;GAWG;AACU,QAAA,gBAAgB,GAAG;IAC9B,cAAc,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC;IACpC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,CAAC,CAAC,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC,CAAC;IAClB,iBAAiB,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;CACa,CAAA;AAE1C
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|