icom-wlan-node 0.5.1 → 0.6.0

package/dist/scope/IcomScopeCommands.js

@@ -1,83 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IcomScopeCommands = void 0;
+const IcomCivFrame_1 = require("../rig/IcomCivFrame");
+const IcomCivSpec_1 = require("../rig/IcomCivSpec");
 exports.IcomScopeCommands = {
     setScopeDataOutput(ctrAddr, rigAddr, enabled) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x11, enabled ? 0x01 : 0x00, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_DOP, payload: [enabled ? 0x01 : 0x00] });
     },
     setScopeDisplay(ctrAddr, rigAddr, enabled) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x10, enabled ? 0x01 : 0x00, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_STS, payload: [enabled ? 0x01 : 0x00] });
     },
     readScopeSpan(ctrAddr, rigAddr, receiver = 0) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x15, receiver & 0xff, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_SPN, payload: [receiver & 0xff] });
     },
     setScopeSpan(ctrAddr, rigAddr, spanHz, receiver = 0) {
-        const bytes = exports.IcomScopeCommands.encodeScopeSpanHz(spanHz);
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x15, receiver & 0xff, ...bytes, 0xfd
-        ]);
+        // Hamlib maps public span to ICOM's +/- span value.
+        const bytes = exports.IcomScopeCommands.encodeScopeSpanHz(Math.round(spanHz / 2));
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_SPN, payload: [receiver & 0xff, ...bytes] });
     },
     readScopeMode(ctrAddr, rigAddr, receiver = 0) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x14, receiver & 0xff, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_MOD, payload: [receiver & 0xff] });
     },
     setScopeMode(ctrAddr, rigAddr, mode, receiver = 0) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x14, receiver & 0xff, mode & 0xff, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_MOD, payload: [receiver & 0xff, mode & 0xff] });
     },
     readScopeEdge(ctrAddr, rigAddr, receiver = 0) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x16, receiver & 0xff, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_EDG, payload: [receiver & 0xff] });
     },
     setScopeEdge(ctrAddr, rigAddr, edgeSlot, receiver = 0) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x16, receiver & 0xff, edgeSlot & 0xff, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_EDG, payload: [receiver & 0xff, edgeSlot & 0xff] });
     },
     readScopeFixedEdge(ctrAddr, rigAddr, rangeId, edgeSlot) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x1e, rangeId & 0xff, edgeSlot & 0xff, 0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({ rigAddr, ctrlAddr: ctrAddr, cmd: IcomCivSpec_1.CIV.C_CTL_SCP, subcmd: IcomCivSpec_1.CIV.S_SCP_FEF, payload: [rangeId & 0xff, edgeSlot & 0xff] });
     },
     setScopeFixedEdge(ctrAddr, rigAddr, rangeId, edgeSlot, lowHz, highHz) {
-        return Buffer.from([
-            0xfe, 0xfe, rigAddr & 0xff, ctrAddr & 0xff, 0x27, 0x1e,
-            rangeId & 0xff,
-            edgeSlot & 0xff,
-            ...exports.IcomScopeCommands.encodeScopeFreqHz(lowHz),
-            ...exports.IcomScopeCommands.encodeScopeFreqHz(highHz),
-            0xfd
-        ]);
+        return (0, IcomCivFrame_1.buildCivFrame)({
+            rigAddr,
+            ctrlAddr: ctrAddr,
+            cmd: IcomCivSpec_1.CIV.C_CTL_SCP,
+            subcmd: IcomCivSpec_1.CIV.S_SCP_FEF,
+            payload: [
+                rangeId & 0xff,
+                edgeSlot & 0xff,
+                ...exports.IcomScopeCommands.encodeScopeFreqHz(lowHz),
+                ...exports.IcomScopeCommands.encodeScopeFreqHz(highHz),
+            ],
+        });
     },
     encodeScopeSpanHz(spanHz) {
-        const safeSpanHz = Math.max(0, Math.round(spanHz));
-        const out = Buffer.alloc(5);
-        let remaining = safeSpanHz;
-        for (let i = 0; i < out.length; i++) {
-            const twoDigits = remaining % 100;
-            out[i] = ((((twoDigits / 10) | 0) & 0x0f) << 4) | (twoDigits % 10);
-            remaining = Math.floor(remaining / 100);
-        }
-        return out;
+        return (0, IcomCivFrame_1.encodeFrequencyBcdLE)(Math.max(0, Math.round(spanHz)), 5);
     },
     encodeScopeFreqHz(freqHz) {
-        const safeFreqHz = Math.max(0, Math.round(freqHz));
-        const out = Buffer.alloc(5);
-        let remaining = safeFreqHz;
-        for (let i = 0; i < out.length; i++) {
-            const twoDigits = remaining % 100;
-            out[i] = ((((twoDigits / 10) | 0) & 0x0f) << 4) | (twoDigits % 10);
-            remaining = Math.floor(remaining / 100);
-        }
-        return out;
+        return (0, IcomCivFrame_1.encodeFrequencyBcdLE)(Math.max(0, Math.round(freqHz)), 5);
     }
 };

package/dist/types.d.ts

@@ -8,8 +8,11 @@ export interface IcomCredentials {
     userName: string;
     password: string;
 }
+export type IcomModelId = 'IC-705' | 'IC-905' | 'IC-7300' | 'IC-9700' | 'IC-7610' | 'IC-7760' | 'generic-modern-icom';
 export interface IcomRigOptions extends IcomCredentials {
     control: UdpAddress;
+    /** Radio model profile. Defaults to auto-detection from rig name or CI-V address. */
+    model?: IcomModelId | 'auto';
 }
 export interface CivCommand {
     bytes: Buffer;
@@ -32,6 +35,8 @@ export interface CapabilitiesInfo {
     civAddress?: number;
     audioName?: string;
     supportTX?: boolean;
+    modelId?: IcomModelId;
+    profileName?: string;
 }
 export interface IcomRigEvents {
     login: (res: LoginResult) => void;
@@ -71,9 +76,11 @@ export type ConnectorDataMode = keyof typeof CONNECTOR_MODE_MAP;
 export interface SetModeOptions {
     /**
      * Enable data mode (e.g., USB-D for digital modes)
-     * Uses CI-V command 0x26 instead of 0x06
+     * Uses CI-V command 0x26 on modern targetable ICOM profiles.
      */
     dataMode?: boolean;
+    /** Optional IF filter preset. Modern DSP rigs commonly support 1, 2, or 3. */
+    filter?: 1 | 2 | 3;
 }
 /**
  * Options for query operations (frequency, meters, etc.)
@@ -183,8 +190,8 @@ export interface LevelReading {
 export interface SwrReading {
     /**
      * Raw BCD value (0-300+)
-     * Actual SWR = raw / 100
-     * Example: 120 = SWR 1.2, 250 = SWR 2.5
+     * Conversion is profile-calibrated from Hamlib curves.
+     * Example: raw 48 ≈ SWR 1.5, raw 120 ≈ SWR 3.0 on modern ICOM profiles.
      */
     raw: number;
     /**
@@ -193,7 +200,7 @@ export interface SwrReading {
      */
     swr: number;
     /**
-     * Alert flag when SWR is too high (≥1.2)
+     * Alert flag when SWR is too high (≥3.0)
      * High SWR can damage transmitter
      */
     alert: boolean;
@@ -292,11 +299,13 @@ export interface OvfStatusReading {
 export interface PowerLevelReading {
     /**
      * Raw BCD value (0-255)
-     * Calibration: 0143≈50%, 0213≈100%
+     * Calibration is model-specific.
      */
     raw: number;
-    /** Percentage of maximum power (0-100%) */
+    /** Percentage of profile maximum power (0-100%) */
     percent: number;
+    /** Estimated RF output in watts when profile calibration is available */
+    watts?: number;
 }
 /**
  * COMP (voice compression) level reading (CI-V 0x15/0x14)
@@ -305,8 +314,10 @@ export interface PowerLevelReading {
 export interface CompLevelReading {
     /** Raw BCD value (0-255) */
     raw: number;
-    /** Percentage of maximum compression (0-100%) */
+    /** Percentage of 30 dB compression scale (0-100%) */
     percent: number;
+    /** Estimated compression level in dB */
+    db?: number;
 }
 /**
  * Voltage reading (CI-V 0x15/0x15)
@@ -335,7 +346,7 @@ export interface CurrentReading {
     amps: number;
 }
 /**
- * Antenna tuner state (IC-705 CI-V 0x1A/0x00)
+ * Antenna tuner state (standard CI-V 0x1C/0x01)
  * 00=OFF, 01=ON, 02=TUNING
  */
 export type TunerState = 'OFF' | 'ON' | 'TUNING';

package/dist/utils/errors.d.ts

@@ -31,3 +31,16 @@ export declare class ConnectionAbortedError extends Error {
         context: Record<string, any> | undefined;
     };
 }
+export interface UnsupportedCommandContext {
+    modelId?: string;
+    commandName: string;
+    civCommand?: number | string;
+    reason?: string;
+}
+export declare class UnsupportedCommandError extends Error {
+    readonly modelId?: string;
+    readonly commandName: string;
+    readonly civCommand?: number | string;
+    readonly reason?: string;
+    constructor(context: UnsupportedCommandContext);
+}

package/dist/utils/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionAbortedError = void 0;
+exports.UnsupportedCommandError = exports.ConnectionAbortedError = void 0;
 exports.getDisconnectMessage = getDisconnectMessage;
 const types_1 = require("../types");
 /**
@@ -62,3 +62,19 @@ class ConnectionAbortedError extends Error {
     }
 }
 exports.ConnectionAbortedError = ConnectionAbortedError;
+class UnsupportedCommandError extends Error {
+    constructor(context) {
+        const details = [
+            context.modelId ? `model=${context.modelId}` : undefined,
+            context.civCommand !== undefined ? `civ=${context.civCommand}` : undefined,
+            context.reason,
+        ].filter(Boolean).join(', ');
+        super(`Unsupported ICOM CI-V command '${context.commandName}'${details ? ` (${details})` : ''}`);
+        this.name = 'UnsupportedCommandError';
+        this.modelId = context.modelId;
+        this.commandName = context.commandName;
+        this.civCommand = context.civCommand;
+        this.reason = context.reason;
+    }
+}
+exports.UnsupportedCommandError = UnsupportedCommandError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icom-wlan-node",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Icom WLAN (CI‑V, audio) protocol implementation for Node.js/TypeScript.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/boybook/icom-wlan-node.git"
+    "url": "git+https://github.com/boybook/icom-wlan-node.git"
   },
   "files": [
     "dist"