hamlib 0.4.3 → 0.4.4

package/README.md

@@ -40,7 +40,7 @@ For faster installation or offline environments, you can manually install precom
 ## Quick Start
 
 ```javascript
-const { HamLib, Rotator } = require('hamlib');
+const { HamLib, Rotator, PASSBAND } = require('hamlib');
 
 async function main() {
   // Create rig instance (model 1035 = FT-991A)
@@ -50,7 +50,7 @@ async function main() {
   
   // Basic operations
   await rig.setFrequency(144390000);  // 144.39 MHz
-  await rig.setMode('FM');
+  await rig.setMode('FM', 'nochange');
   
   const freq = await rig.getFrequency();
   const mode = await rig.getMode();
@@ -116,6 +116,9 @@ const freq = await rig.getFrequency();
 
 // Mode
 await rig.setMode('USB');
+await rig.setMode('USB', 'nochange');
+await rig.setMode('USB', PASSBAND.NOCHANGE);
+await rig.setMode('USB', rig.getPassbandNormal('USB'));
 const mode = await rig.getMode();
 
 // VFO
@@ -360,7 +363,7 @@ async function repeaterOperation() {
     
     // Set up for 2m repeater
     await rig.setFrequency(145500000);      // 145.500 MHz
-    await rig.setMode('FM');
+    await rig.setMode('FM', 'nochange');
     await rig.setRepeaterShift('MINUS');    // Negative offset
     await rig.setRepeaterOffset(600000);    // 600 kHz offset
     await rig.setTuningStep(12500);         // 12.5 kHz steps

package/index.d.ts

@@ -147,6 +147,13 @@ type VFO =
  */
 type RadioMode = 'USB' | 'LSB' | 'FM' | 'PKTFM' | 'AM' | 'CW' | 'RTTY' | 'DIG' | string;
 
+type PassbandSelector = 'narrow' | 'wide' | 'normal' | 'nochange' | number;
+
+interface PassbandConstants {
+  NORMAL: 0;
+  NOCHANGE: -1;
+}
+
 /**
  * Frequency range information
  */
@@ -604,14 +611,16 @@ declare class HamLib extends EventEmitter {
   /**
    * Set radio mode
    * @param mode Radio mode (such as 'USB', 'LSB', 'FM', 'PKTFM')
-   * @param bandwidth Optional bandwidth setting ('narrow', 'wide', or default)
+   * @param bandwidth Optional bandwidth selector ('narrow', 'wide', 'normal', 'nochange') or width in Hz
    * @param vfo Optional VFO to set mode on ('VFOA' or 'VFOB'). If not specified, uses current VFO
    * @example
    * await rig.setMode('USB');
    * await rig.setMode('FM', 'narrow');
+   * await rig.setMode('USB', 'nochange');
+   * await rig.setMode('USB', PASSBAND.NOCHANGE);
    * await rig.setMode('USB', 'wide', 'VFOA');
    */
-  setMode(mode: RadioMode, bandwidth?: 'narrow' | 'wide', vfo?: VFO): Promise<number>;
+  setMode(mode: RadioMode, bandwidth?: PassbandSelector, vfo?: VFO): Promise<number>;
 
   /**
    * Set PTT (Push-to-Talk) status
@@ -1711,8 +1720,11 @@ interface VfoInfo {
 declare const nodeHamlib: {
   HamLib: typeof HamLib;
   Rotator: typeof Rotator;
+  PASSBAND: PassbandConstants;
 };
 
+declare const PASSBAND: PassbandConstants;
+
 // Export types for use elsewhere
 export { ConnectionInfo, ModeInfo, SupportedRigInfo, SupportedRotatorInfo, AntennaInfo, RotatorConnectionInfo,
          RotatorPosition, RotatorStatus, RotatorDirection, RotatorResetType, RotatorCaps, VFO, RadioMode, MemoryChannelData,
@@ -1722,7 +1734,7 @@ export { ConnectionInfo, ModeInfo, SupportedRigInfo, SupportedRotatorInfo, Anten
          HamlibConfigFieldType, HamlibConfigFieldDescriptor, HamlibPortType, HamlibPortCaps,
          SpectrumScopeInfo, SpectrumModeInfo, SpectrumAverageModeInfo, SpectrumLine,
          SpectrumCapabilities, SpectrumSupportSummary, SpectrumConfig, SpectrumDisplayState,
-         ClockInfo, VfoInfo, HamLib, Rotator };
+         ClockInfo, VfoInfo, PassbandSelector, PassbandConstants, HamLib, Rotator, PASSBAND };
 
 // Support both CommonJS and ES module exports
 // @ts-ignore

package/lib/index.js

@@ -4,6 +4,11 @@ const nodeGypBuild = require('node-gyp-build');
 // Ensure loader resolves from package root (contains prebuilds/ and build/)
 const nativeModule = nodeGypBuild(path.join(__dirname, '..'));
 
+const PASSBAND = Object.freeze({
+  NORMAL: 0,
+  NOCHANGE: -1,
+});
+
 /**
  * HamLib class for controlling amateur radio devices
  * 
@@ -110,7 +115,7 @@ class HamLib extends EventEmitter {
   /**
    * Set radio mode
    * @param {string} mode - Radio mode ('USB', 'LSB', 'FM', 'PKTFM', etc.)
-   * @param {string} [bandwidth] - Optional bandwidth ('narrow', 'wide')
+   * @param {string|number} [bandwidth] - Optional bandwidth selector ('narrow', 'wide', 'normal', 'nochange') or width in Hz
    * @param {string} [vfo] - Optional VFO ('VFOA' or 'VFOB')
    */
   async setMode(mode, bandwidth, vfo) {
@@ -1549,7 +1554,8 @@ class Rotator extends EventEmitter {
 }
 
 // Export for CommonJS
-module.exports = { HamLib, Rotator };
+module.exports = { HamLib, Rotator, PASSBAND };
 module.exports.HamLib = HamLib;
 module.exports.Rotator = Rotator;
-module.exports.default = { HamLib, Rotator };
+module.exports.PASSBAND = PASSBAND;
+module.exports.default = { HamLib, Rotator, PASSBAND };

package/lib/index.mjs

@@ -7,8 +7,8 @@ const __dirname = path.dirname(__filename);
 const require = createRequire(import.meta.url);
 
 // Import the CommonJS module
-const { HamLib, Rotator } = require('./index.js');
+const { HamLib, Rotator, PASSBAND } = require('./index.js');
 
 // Export for ES modules
-export { HamLib, Rotator };
-export default { HamLib, Rotator }; 
+export { HamLib, Rotator, PASSBAND };
+export default { HamLib, Rotator, PASSBAND }; 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hamlib",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Node.js bindings for Hamlib rig control with official spectrum streaming support",
   "main": "index.js",
   "module": "lib/index.mjs",

package/src/hamlib.cpp

@@ -2567,16 +2567,28 @@ Napi::Value NodeHamLib::SetMode(const Napi::CallbackInfo & info) {
   int vfo = SHIM_RIG_VFO_CURR;
 
   // Parse parameters: setMode(mode) or setMode(mode, bandwidth) or setMode(mode, bandwidth, vfo)
-  if (info.Length() >= 2 && info[1].IsString()) {
-    std::string bandstr = info[1].As<Napi::String>().Utf8Value();
-    if (bandstr == "narrow") {
-      bandwidth = shim_rig_passband_narrow(my_rig, mode);
-    } else if (bandstr == "wide") {
-      bandwidth = shim_rig_passband_wide(my_rig, mode);
+  if (info.Length() >= 2) {
+    if (info[1].IsNumber()) {
+      bandwidth = info[1].As<Napi::Number>().Int32Value();
+    } else if (info[1].IsString()) {
+      std::string bandstr = info[1].As<Napi::String>().Utf8Value();
+      if (bandstr == "narrow") {
+        bandwidth = shim_rig_passband_narrow(my_rig, mode);
+      } else if (bandstr == "wide") {
+        bandwidth = shim_rig_passband_wide(my_rig, mode);
+      } else if (bandstr == "normal") {
+        bandwidth = SHIM_RIG_PASSBAND_NORMAL;
+      } else if (bandstr == "nochange") {
+        bandwidth = SHIM_RIG_PASSBAND_NOCHANGE;
+      } else {
+        // If second parameter is not a known passband selector, treat it as VFO
+        vfo = parseVfoParameter(info, 1, SHIM_RIG_VFO_CURR);
+        RETURN_NULL_IF_INVALID_VFO(vfo);
+      }
     } else {
-      // If second parameter is not "narrow" or "wide", might be VFO
-      vfo = parseVfoParameter(info, 1, SHIM_RIG_VFO_CURR);
-      RETURN_NULL_IF_INVALID_VFO(vfo);
+      Napi::TypeError::New(env, "Bandwidth must be a string selector or numeric passband width")
+        .ThrowAsJavaScriptException();
+      return env.Null();
     }
   }
   

package/src/shim/hamlib_shim.h

@@ -70,6 +70,7 @@ typedef void* hamlib_shim_handle_t;
 
 /* Passband constants */
 #define SHIM_RIG_PASSBAND_NORMAL  0
+#define SHIM_RIG_PASSBAND_NOCHANGE (-1)
 
 /* Port types (must match hamlib rig_port_e enum) */
 #define SHIM_RIG_PORT_NONE     0