@zimo-elektronik/zcan 1.0.9 → 1.0.11

package/__tests__/accessoriesGroup.test.ts

@@ -0,0 +1,39 @@
+import {createMX10, initConnection} from './util';
+import {afterAll, beforeAll, describe, expect, it} from '@jest/globals';
+import {AccessoryMode, AccessoryPortState} from '../src';
+
+describe('Accessories group tests - 0x01', () => {
+  const mx10 = createMX10(true);
+  const nid = 0x300a; // nid:10
+
+  beforeAll(async () => {
+    await initConnection(mx10);
+  });
+
+  afterAll(() => {
+    mx10.closeSocket();
+  });
+
+  it('0x01 - Accessory Mode test', () => {
+    mx10.accessoryCommand.accessoryModeByNid(nid);
+
+    const test = mx10.accessoryCommand.onAccessoryMode.subscribe((data) => {
+      expect(data.nid).toBe(nid);
+      expect(data.mode).toBeDefined();
+      expect(data.mode).toBe(AccessoryMode.PAIRED);
+
+      test.unsubscribe();
+    });
+  });
+
+  it('0x02 - Accessory Port test', async () => {
+    mx10.accessoryCommand.accessoryPortByNid(nid);
+
+    const test = mx10.accessoryCommand.onAccessoryPort.subscribe((data) => {
+      expect(data.nid).toBe(nid);
+      expect(data.port).toBeDefined();
+
+      test.unsubscribe();
+    });
+  });
+});

package/dist/@types/models.d.ts

@@ -1,4 +1,4 @@
-import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxInfoType, SpecialFunctionMode, Manual, DirectionDefault, ShuntingFunction, BidiType, ForwardOrReverse } from 'src/util/enums';
+import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxInfoType, SpecialFunctionMode, Manual, DirectionDefault, ShuntingFunction, BidiType, ForwardOrReverse, AccessoryMode } from 'src/util/enums';
 import { ZcanDataArray } from './communication';
 export interface Train {
     nid: number;
@@ -188,3 +188,12 @@ export interface LocoStateData {
     sentDCCData: number;
     receivedRailcomData: number;
 }
+export interface AccessoryModeData {
+    nid: number;
+    mode: AccessoryMode;
+}
+export interface AccessoryPortData {
+    nid: number;
+    mode: number;
+    port: number;
+}

package/dist/internal/accessoryUtils.d.ts

@@ -0,0 +1,3 @@
+import { AccessoryPortState } from '../util/enums';
+export declare const parseAccessory4Byte: (accessoryState: number) => Map<number, AccessoryPortState>;
+export declare const parseAccessory8byte: (accessoryState: number) => Map<number, AccessoryPortState>;

package/dist/internal/accessoryUtils.js

@@ -0,0 +1,36 @@
+import { AccessoryPortState } from '../util/enums';
+export const parseAccessory4Byte = (accessoryState) => {
+    const portStates = new Map();
+    for (let i = 0; i < 8; i++) {
+        const onBit = 1 << (i * 2);
+        const offBit = 1 << (i * 2 + 1);
+        if (accessoryState & onBit) {
+            portStates.set(i + 1, AccessoryPortState.ON);
+        }
+        else if (accessoryState & offBit) {
+            portStates.set(i + 1, AccessoryPortState.OFF);
+        }
+        else {
+            portStates.set(i + 1, AccessoryPortState.UNKNOWN);
+        }
+    }
+    return portStates;
+};
+export const parseAccessory8byte = (accessoryState) => {
+    const portStates = new Map();
+    for (let i = 0; i < 8; i++) {
+        const onBit = 1 << i;
+        const offBit = 1 << (i + 1);
+        if (accessoryState & onBit) {
+            portStates.set(i + 1, AccessoryPortState.ON);
+        }
+        else if (accessoryState & offBit) {
+            portStates.set(i + 1, AccessoryPortState.OFF);
+        }
+        else {
+            portStates.set(i + 1, AccessoryPortState.UNKNOWN);
+        }
+    }
+    return portStates;
+};
+//# sourceMappingURL=accessoryUtils.js.map

package/dist/internal/accessoryUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accessoryUtils.js","sourceRoot":"","sources":["../../src/internal/accessoryUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,cAAsB,EAAE,EAAE;IAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAC;IAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAEhC,IAAI,cAAc,GAAG,KAAK,EAAE,CAAC;YAC3B,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC;YACnC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,cAAsB,EAAE,EAAE;IAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAC;IAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE5B,IAAI,cAAc,GAAG,KAAK,EAAE,CAAC;YAC3B,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC;YACnC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}

package/dist/internal/bites.d.ts

@@ -7,3 +7,19 @@ export declare const speedStepBites = 15;
 export declare const modeBites_____ = 240;
 export declare const shuntingFunctionB = 15;
 export declare const manualModeB = 48;
+export declare const accessoryPort1on_ = 1;
+export declare const accessoryPort1off = 2;
+export declare const accessoryPort2on_ = 4;
+export declare const accessoryPort2off = 8;
+export declare const accessoryPort3on_ = 16;
+export declare const accessoryPort3off = 32;
+export declare const accessoryPort4on_ = 64;
+export declare const accessoryPort4off = 128;
+export declare const accessoryPort5on_ = 256;
+export declare const accessoryPort5off = 512;
+export declare const accessoryPort6on_ = 1024;
+export declare const accessoryPort6off = 2048;
+export declare const accessoryPort7on_ = 4096;
+export declare const accessoryPort7off = 8192;
+export declare const accessoryPort8on_ = 16384;
+export declare const accessoryPort8off = 32768;

package/dist/internal/bites.js

@@ -7,4 +7,20 @@ export const speedStepBites = 0b00001111;
 export const modeBites_____ = 0b11110000;
 export const shuntingFunctionB = 0b1111;
 export const manualModeB = 0b110000;
+export const accessoryPort1on_ = 0b00000000000000000000000000000001;
+export const accessoryPort1off = 0b00000000000000000000000000000010;
+export const accessoryPort2on_ = 0b00000000000000000000000000000100;
+export const accessoryPort2off = 0b00000000000000000000000000001000;
+export const accessoryPort3on_ = 0b00000000000000000000000000010000;
+export const accessoryPort3off = 0b00000000000000000000000000100000;
+export const accessoryPort4on_ = 0b00000000000000000000000001000000;
+export const accessoryPort4off = 0b00000000000000000000000010000000;
+export const accessoryPort5on_ = 0b00000000000000000000000100000000;
+export const accessoryPort5off = 0b00000000000000000000001000000000;
+export const accessoryPort6on_ = 0b00000000000000000000010000000000;
+export const accessoryPort6off = 0b00000000000000000000100000000000;
+export const accessoryPort7on_ = 0b00000000000000000001000000000000;
+export const accessoryPort7off = 0b00000000000000000010000000000000;
+export const accessoryPort8on_ = 0b00000000000000000100000000000000;
+export const accessoryPort8off = 0b00000000000000001000000000000000;
 //# sourceMappingURL=bites.js.map

package/dist/internal/bites.js.map

@@ -1 +1 @@
-{"version":3,"file":"bites.js","sourceRoot":"","sources":["../../src/internal/bites.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACxC,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"bites.js","sourceRoot":"","sources":["../../src/internal/bites.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACxC,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC;AAGpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC"}

package/dist/util/enums.d.ts

@@ -111,3 +111,13 @@ export declare enum ForwardOrReverse {
     FORWARD = 1,
     REVERSE = 2
 }
+export declare enum AccessoryMode {
+    UNKNOWN = 0,
+    PAIRED = 1,
+    SINGLE = 2
+}
+export declare enum AccessoryPortState {
+    ON = "on",
+    OFF = "off",
+    UNKNOWN = "unknown"
+}

package/dist/util/enums.js

@@ -134,4 +134,16 @@ export var ForwardOrReverse;
     ForwardOrReverse[ForwardOrReverse["FORWARD"] = 1] = "FORWARD";
     ForwardOrReverse[ForwardOrReverse["REVERSE"] = 2] = "REVERSE";
 })(ForwardOrReverse || (ForwardOrReverse = {}));
+export var AccessoryMode;
+(function (AccessoryMode) {
+    AccessoryMode[AccessoryMode["UNKNOWN"] = 0] = "UNKNOWN";
+    AccessoryMode[AccessoryMode["PAIRED"] = 1] = "PAIRED";
+    AccessoryMode[AccessoryMode["SINGLE"] = 2] = "SINGLE";
+})(AccessoryMode || (AccessoryMode = {}));
+export var AccessoryPortState;
+(function (AccessoryPortState) {
+    AccessoryPortState["ON"] = "on";
+    AccessoryPortState["OFF"] = "off";
+    AccessoryPortState["UNKNOWN"] = "unknown";
+})(AccessoryPortState || (AccessoryPortState = {}));
 //# sourceMappingURL=enums.js.map

package/dist/util/enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/util/enums.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/util/enums.ts"],"names":[],"mappings":"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"}

package/dist/zcan/accessoryCommandGroup.d.ts

@@ -1,6 +1,14 @@
+import { Subject } from 'rxjs';
 import MX10 from '../MX10';
+import { AccessoryModeData, AccessoryPortData } from '../@types/models';
 export default class AccessoryCommandGroup {
+    readonly onAccessoryMode: Subject<AccessoryModeData>;
+    readonly onAccessoryPort: Subject<AccessoryPortData>;
     private mx10;
     constructor(mx10: MX10);
+    accessoryModeByNid(nid: number): void;
+    accessoryPortByNid(nid: number): void;
     parse(size: number, command: number, mode: number, nid: number, buffer: Buffer): void;
+    parseAccessoryMode(size: number, mode: number, nid: number, buffer: Buffer): void;
+    parseAccessoryPort(size: number, mode: number, nid: number, buffer: Buffer): void;
 }

package/dist/zcan/accessoryCommandGroup.js

@@ -1,9 +1,69 @@
+import { Subject } from 'rxjs';
+import { AccessoryMode } from '../util/enums';
 export default class AccessoryCommandGroup {
+    onAccessoryMode = new Subject();
+    onAccessoryPort = new Subject();
     mx10;
     constructor(mx10) {
         this.mx10 = mx10;
     }
+    accessoryModeByNid(nid) {
+        this.mx10.sendData(0x01, 0x01, [{ value: nid, length: 2 }], 0b00);
+    }
+    accessoryPortByNid(nid) {
+        this.mx10.sendData(0x01, 0x02, [
+            { value: nid, length: 2 },
+            { value: 0, length: 2 },
+        ], 0b00);
+    }
     parse(size, command, mode, nid, buffer) {
+        switch (command) {
+            case 0x01:
+                this.parseAccessoryMode(size, mode, nid, buffer);
+                break;
+            case 0x02:
+                this.parseAccessoryPort(size, mode, nid, buffer);
+                break;
+            default:
+                console.warn('command not parsed: ' + command.toString());
+        }
+    }
+    parseAccessoryMode(size, mode, nid, buffer) {
+        if (this.onAccessoryMode.observed) {
+            const deviceNID = buffer.readUInt16LE(0);
+            const mode = buffer.readUInt16LE(2);
+            let parsedMode;
+            switch (mode) {
+                case 1:
+                    parsedMode = AccessoryMode.PAIRED;
+                    break;
+                case 2:
+                    parsedMode = AccessoryMode.SINGLE;
+                    break;
+                default:
+                    parsedMode = AccessoryMode.UNKNOWN;
+            }
+            if (deviceNID) {
+                this.onAccessoryMode.next({
+                    nid: deviceNID,
+                    mode: parsedMode,
+                });
+            }
+        }
+    }
+    parseAccessoryPort(size, mode, nid, buffer) {
+        if (this.onAccessoryPort.observed) {
+            const deviceNID = buffer.readUInt16LE(0);
+            const type = buffer.readUInt16LE(2);
+            const port = buffer.readUInt8(4);
+            if (deviceNID) {
+                this.onAccessoryPort.next({
+                    nid: deviceNID,
+                    mode,
+                    port,
+                });
+            }
+        }
     }
 }
 //# sourceMappingURL=accessoryCommandGroup.js.map

package/dist/zcan/accessoryCommandGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessoryCommandGroup.js","sourceRoot":"","sources":["../../src/zcan/accessoryCommandGroup.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAChC,IAAI,CAAO;IAEnB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CACH,IAAY,EACZ,OAAe,EACf,IAAY,EACZ,GAAW,EACX,MAAc;IAGhB,CAAC;CACF"}
+{"version":3,"file":"accessoryCommandGroup.js","sourceRoot":"","sources":["../../src/zcan/accessoryCommandGroup.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -5,7 +5,7 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "repository": "https://github.com/ZIMO-Elektronik/zcan",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "scripts": {
     "start": "node dist/main.js",
     "start:dev": "nodemon --ext js,ts,json,env --exec \"node --experimental-specifier-resolution=node --loader ts-node/esm\" src/main.ts",
@@ -14,7 +14,7 @@
     "test": "jest --forceExit",
     "test:coverage": "npm run test -- --coverage",
     "test:ci": "npm run test -- --colors --coverage --ci",
-    "test:selected": "jest --forceExit --runTestsByPath D:\\Projects\\zcan\\__tests__\\vehicleGroup.test.ts",
+    "test:selected": "jest --forceExit --runTestsByPath D:\\Projects\\zcan\\__tests__\\accessoriesGroup.test.ts",
     "lint": "eslint --ext=.ts,.js .",
     "format": "prettier \"./**\" --write --ignore-unknown",
     "format:check": "prettier \"./**\" --ignore-unknown --check",

package/src/@types/models.ts

@@ -14,6 +14,7 @@ import {
   ShuntingFunction,
   BidiType,
   ForwardOrReverse,
+  AccessoryMode,
 } from 'src/util/enums';
 import {ZcanDataArray} from './communication';
 
@@ -233,3 +234,13 @@ export interface LocoStateData {
   sentDCCData: number;
   receivedRailcomData: number;
 }
+
+export interface AccessoryModeData {
+  nid: number;
+  mode: AccessoryMode;
+}
+export interface AccessoryPortData {
+  nid: number;
+  mode: number;
+  port: number;
+}

package/src/internal/accessoryUtils.ts

@@ -0,0 +1,39 @@
+import {AccessoryPortState} from '../util/enums';
+
+export const parseAccessory4Byte = (accessoryState: number) => {
+  const portStates = new Map<number, AccessoryPortState>();
+
+  for (let i = 0; i < 8; i++) {
+    const onBit = 1 << (i * 2);
+    const offBit = 1 << (i * 2 + 1);
+
+    if (accessoryState & onBit) {
+      portStates.set(i + 1, AccessoryPortState.ON);
+    } else if (accessoryState & offBit) {
+      portStates.set(i + 1, AccessoryPortState.OFF);
+    } else {
+      portStates.set(i + 1, AccessoryPortState.UNKNOWN);
+    }
+  }
+
+  return portStates;
+};
+
+export const parseAccessory8byte = (accessoryState: number) => {
+  const portStates = new Map<number, AccessoryPortState>();
+
+  for (let i = 0; i < 8; i++) {
+    const onBit = 1 << i;
+    const offBit = 1 << (i + 1);
+
+    if (accessoryState & onBit) {
+      portStates.set(i + 1, AccessoryPortState.ON);
+    } else if (accessoryState & offBit) {
+      portStates.set(i + 1, AccessoryPortState.OFF);
+    } else {
+      portStates.set(i + 1, AccessoryPortState.UNKNOWN);
+    }
+  }
+
+  return portStates;
+};

package/src/internal/bites.ts

@@ -9,3 +9,21 @@ export const modeBites_____ = 0b11110000;
 
 export const shuntingFunctionB = 0b1111;
 export const manualModeB = 0b110000;
+
+// accessories
+export const accessoryPort1on_ = 0b00000000000000000000000000000001;
+export const accessoryPort1off = 0b00000000000000000000000000000010;
+export const accessoryPort2on_ = 0b00000000000000000000000000000100;
+export const accessoryPort2off = 0b00000000000000000000000000001000;
+export const accessoryPort3on_ = 0b00000000000000000000000000010000;
+export const accessoryPort3off = 0b00000000000000000000000000100000;
+export const accessoryPort4on_ = 0b00000000000000000000000001000000;
+export const accessoryPort4off = 0b00000000000000000000000010000000;
+export const accessoryPort5on_ = 0b00000000000000000000000100000000;
+export const accessoryPort5off = 0b00000000000000000000001000000000;
+export const accessoryPort6on_ = 0b00000000000000000000010000000000;
+export const accessoryPort6off = 0b00000000000000000000100000000000;
+export const accessoryPort7on_ = 0b00000000000000000001000000000000;
+export const accessoryPort7off = 0b00000000000000000010000000000000;
+export const accessoryPort8on_ = 0b00000000000000000100000000000000;
+export const accessoryPort8off = 0b00000000000000001000000000000000;

package/src/util/enums.ts

@@ -145,3 +145,15 @@ export enum ForwardOrReverse {
   FORWARD = 1,
   REVERSE = 2,
 }
+
+export enum AccessoryMode {
+  UNKNOWN = 0,
+  PAIRED = 1,
+  SINGLE = 2,
+}
+
+export enum AccessoryPortState {
+  ON = 'on',
+  OFF = 'off',
+  UNKNOWN = 'unknown',
+}

package/src/zcan/accessoryCommandGroup.ts

@@ -1,17 +1,39 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
+import {Subject} from 'rxjs';
 import MX10 from '../MX10';
+import {AccessoryModeData, AccessoryPortData} from '../@types/models';
+import {AccessoryMode} from '../util/enums';
 
 /**
  *
  * @category Groups
  */
 export default class AccessoryCommandGroup {
+  public readonly onAccessoryMode = new Subject<AccessoryModeData>();
+  public readonly onAccessoryPort = new Subject<AccessoryPortData>();
+
   private mx10: MX10;
 
   constructor(mx10: MX10) {
     this.mx10 = mx10;
   }
 
+  accessoryModeByNid(nid: number) {
+    this.mx10.sendData(0x01, 0x01, [{value: nid, length: 2}], 0b00);
+  }
+
+  accessoryPortByNid(nid: number) {
+    this.mx10.sendData(
+      0x01,
+      0x02,
+      [
+        {value: nid, length: 2},
+        {value: 0, length: 2},
+      ],
+      0b00,
+    );
+  }
+
   parse(
     size: number,
     command: number,
@@ -19,6 +41,58 @@ export default class AccessoryCommandGroup {
     nid: number,
     buffer: Buffer,
   ) {
-    // console.log('parse accessory command group');
+    switch (command) {
+      case 0x01:
+        this.parseAccessoryMode(size, mode, nid, buffer);
+        break;
+      case 0x02:
+        this.parseAccessoryPort(size, mode, nid, buffer);
+        break;
+      default:
+        // eslint-disable-next-line no-console
+        console.warn('command not parsed: ' + command.toString());
+    }
+  }
+
+  parseAccessoryMode(size: number, mode: number, nid: number, buffer: Buffer) {
+    if (this.onAccessoryMode.observed) {
+      const deviceNID = buffer.readUInt16LE(0);
+      const mode = buffer.readUInt16LE(2);
+
+      let parsedMode: AccessoryMode;
+      switch (mode) {
+        case 1:
+          parsedMode = AccessoryMode.PAIRED;
+          break;
+        case 2:
+          parsedMode = AccessoryMode.SINGLE;
+          break;
+        default:
+          parsedMode = AccessoryMode.UNKNOWN;
+      }
+
+      if (deviceNID) {
+        this.onAccessoryMode.next({
+          nid: deviceNID,
+          mode: parsedMode,
+        });
+      }
+    }
+  }
+
+  parseAccessoryPort(size: number, mode: number, nid: number, buffer: Buffer) {
+    if (this.onAccessoryPort.observed) {
+      const deviceNID = buffer.readUInt16LE(0);
+      const type = buffer.readUInt16LE(2);
+      const port = buffer.readUInt8(4); // only 1.st byte represents state of pins
+
+      if (deviceNID) {
+        this.onAccessoryPort.next({
+          nid: deviceNID,
+          mode,
+          port,
+        });
+      }
+    }
   }
 }