hamlib 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hamlib",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Node.js wrapper for hamlib radio control library",
   "main": "index.js",
   "module": "lib/index.mjs",

package/src/hamlib.cpp

@@ -280,7 +280,7 @@ public:
     void Execute() override {
         CHECK_RIG_VALID();
 
-        result_code_ = shim_rig_set_level_f(hamlib_instance_->my_rig, SHIM_RIG_VFO_CURR, level_type_, value_);
+        result_code_ = shim_rig_set_level_f(hamlib_instance_->my_rig, SHIM_RIG_VFO_NONE, level_type_, value_);
         if (result_code_ != SHIM_RIG_OK) {
             error_message_ = shim_rigerror(result_code_);
         }
@@ -313,7 +313,9 @@ public:
     void Execute() override {
         CHECK_RIG_VALID();
 
-        result_code_ = shim_rig_get_level_f(hamlib_instance_->my_rig, SHIM_RIG_VFO_CURR, level_type_, &value_);
+        // Use RIG_VFO_NONE to avoid unnecessary VFO switching that fails on
+        // ICOM rigs (e.g. IC-705) where icom_set_vfo returns "unsupported VFO"
+        result_code_ = shim_rig_get_level_f(hamlib_instance_->my_rig, SHIM_RIG_VFO_NONE, level_type_, &value_);
         if (result_code_ != SHIM_RIG_OK) {
             error_message_ = shim_rigerror(result_code_);
         }
@@ -2191,19 +2193,17 @@ NodeHamLib::NodeHamLib(const Napi::CallbackInfo & info): ObjectWrap(info) {
     return;
   }
 
-  // Set default port path if not provided
-  strncpy(port_path, "/dev/ttyUSB0", SHIM_HAMLIB_FILPATHLEN - 1);
-  port_path[SHIM_HAMLIB_FILPATHLEN - 1] = '\0';
-
   // Check if port path is provided as second argument
-  if (info.Length() >= 2) {
-    if (info[1].IsString()) {
-      std::string portStr = info[1].As<Napi::String>().Utf8Value();
+  bool has_port = false;
+  port_path[0] = '\0';
+
+  if (info.Length() >= 2 && info[1].IsString()) {
+    std::string portStr = info[1].As<Napi::String>().Utf8Value();
+    if (!portStr.empty()) {
       strncpy(port_path, portStr.c_str(), SHIM_HAMLIB_FILPATHLEN - 1);
       port_path[SHIM_HAMLIB_FILPATHLEN - 1] = '\0';
+      has_port = true;
     }
-    // Note: Debug level is now controlled globally via HamLib.setDebugLevel()
-    // and set to RIG_DEBUG_NONE by default in addon initialization
   }
   //unsigned int myrig_model;
   //   hamlib_port_t myport;
@@ -2242,13 +2242,16 @@ NodeHamLib::NodeHamLib(const Napi::CallbackInfo & info): ObjectWrap(info) {
     Napi::TypeError::New(env, errorMsg).ThrowAsJavaScriptException();
   }
   
-  // Set port path and type based on connection type
-  shim_rig_set_port_path(my_rig, port_path);
+  // Only set port path and type when user explicitly provided a port.
+  // Otherwise, let rig_init() defaults take effect (e.g., dummy rig uses RIG_PORT_NONE).
+  if (has_port) {
+    shim_rig_set_port_path(my_rig, port_path);
 
-  if (is_network_rig) {
-    shim_rig_set_port_type(my_rig, SHIM_RIG_PORT_NETWORK);
-  } else {
-    shim_rig_set_port_type(my_rig, SHIM_RIG_PORT_SERIAL);
+    if (is_network_rig) {
+      shim_rig_set_port_type(my_rig, SHIM_RIG_PORT_NETWORK);
+    } else {
+      shim_rig_set_port_type(my_rig, SHIM_RIG_PORT_SERIAL);
+    }
   }
 
   // this->freq_emit_cb = [info](double freq) {

package/src/shim/hamlib_shim.h

@@ -71,9 +71,10 @@ typedef void* hamlib_shim_handle_t;
 /* Passband constants */
 #define SHIM_RIG_PASSBAND_NORMAL  0
 
-/* Port types */
-#define SHIM_RIG_PORT_SERIAL   0
-#define SHIM_RIG_PORT_NETWORK  4
+/* Port types (must match hamlib rig_port_e enum) */
+#define SHIM_RIG_PORT_NONE     0
+#define SHIM_RIG_PORT_SERIAL   1
+#define SHIM_RIG_PORT_NETWORK  2
 
 /* Scan types */
 #define SHIM_RIG_SCAN_STOP   0