hamlib 0.2.5 → 0.2.7

package/index.d.ts

@@ -178,7 +178,7 @@ interface SplitStatusInfo {
 type LevelType = 'AF' | 'RF' | 'SQL' | 'RFPOWER' | 'MICGAIN' | 'IF' | 'APF' | 'NR' | 
                  'PBT_IN' | 'PBT_OUT' | 'CWPITCH' | 'KEYSPD' | 'NOTCHF' | 'COMP' | 
                  'AGC' | 'BKINDL' | 'BALANCE' | 'VOXGAIN' | 'VOXDELAY' | 'ANTIVOX' |
-                 'STRENGTH' | 'RAWSTR' | 'SWR' | 'ALC' | 'RFPOWER_METER' | 
+                 'STRENGTH' | 'RAWSTR' | 'SWR' | 'ALC' | 'RFPOWER_METER' | 'RFPOWER_METER_WATTS' |
                  'COMP_METER' | 'VD_METER' | 'ID_METER' | 'TEMP_METER' | string;
 
 /**

package/package.json

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

package/src/hamlib.cpp

@@ -2962,6 +2962,8 @@ Napi::Value NodeHamLib::GetLevel(const Napi::CallbackInfo & info) {
     levelType = SHIM_RIG_LEVEL_RAWSTR;
   } else if (levelTypeStr == "RFPOWER_METER") {
     levelType = SHIM_RIG_LEVEL_RFPOWER_METER;
+  } else if (levelTypeStr == "RFPOWER_METER_WATTS") {
+    levelType = SHIM_RIG_LEVEL_RFPOWER_METER_WATTS;
   } else if (levelTypeStr == "COMP_METER") {
     levelType = SHIM_RIG_LEVEL_COMP_METER;
   } else if (levelTypeStr == "VD_METER") {
@@ -3026,6 +3028,7 @@ Napi::Value NodeHamLib::GetSupportedLevels(const Napi::CallbackInfo & info) {
   if (levels & SHIM_RIG_LEVEL_SWR) levelArray[index++] = Napi::String::New(env, "SWR");
   if (levels & SHIM_RIG_LEVEL_ALC) levelArray[index++] = Napi::String::New(env, "ALC");
   if (levels & SHIM_RIG_LEVEL_RFPOWER_METER) levelArray[index++] = Napi::String::New(env, "RFPOWER_METER");
+  if (levels & SHIM_RIG_LEVEL_RFPOWER_METER_WATTS) levelArray[index++] = Napi::String::New(env, "RFPOWER_METER_WATTS");
   if (levels & SHIM_RIG_LEVEL_COMP_METER) levelArray[index++] = Napi::String::New(env, "COMP_METER");
   if (levels & SHIM_RIG_LEVEL_VD_METER) levelArray[index++] = Napi::String::New(env, "VD_METER");
   if (levels & SHIM_RIG_LEVEL_ID_METER) levelArray[index++] = Napi::String::New(env, "ID_METER");

package/src/shim/hamlib_shim.c

@@ -405,11 +405,32 @@ SHIM_API int shim_rig_get_level_auto(hamlib_shim_handle_t h, int vfo, uint64_t l
 
 /* ===== Function control ===== */
 
+/*
+ * Ensure RIG_TARGETABLE_FUNC is set so rig_get_func()/rig_set_func()
+ * skip VFO switching. Same fix as RIG_TARGETABLE_LEVEL for ICOM serial
+ * rigs where icom_set_vfo fails with "unsupported VFO".
+ *
+ * RIG_TARGETABLE_FUNC = (1<<4) tells Hamlib: "this rig can get/set
+ * functions without needing to switch VFO first".
+ */
+#ifndef RIG_TARGETABLE_FUNC
+#define RIG_TARGETABLE_FUNC (1<<4)
+#endif
+
+static void shim_ensure_targetable_func(hamlib_shim_handle_t h) {
+    RIG* rig = (RIG*)h;
+    if (rig && rig->caps && !(rig->caps->targetable_vfo & RIG_TARGETABLE_FUNC)) {
+        rig->caps->targetable_vfo |= RIG_TARGETABLE_FUNC;
+    }
+}
+
 SHIM_API int shim_rig_set_func(hamlib_shim_handle_t h, int vfo, uint64_t func, int enable) {
+    shim_ensure_targetable_func(h);
     return rig_set_func((RIG*)h, (vfo_t)vfo, (setting_t)func, enable);
 }
 
 SHIM_API int shim_rig_get_func(hamlib_shim_handle_t h, int vfo, uint64_t func, int* state) {
+    shim_ensure_targetable_func(h);
     int s = 0;
     int ret = rig_get_func((RIG*)h, (vfo_t)vfo, (setting_t)func, &s);
     if (state) *state = s;
@@ -612,8 +633,20 @@ SHIM_API int shim_rig_scan(hamlib_shim_handle_t h, int vfo, int scan_type, int c
 
 /* ===== VFO operations ===== */
 
+/*
+ * vfo_op with fallback for rigs with VFO switching issues.
+ * There is no RIG_TARGETABLE for vfo_op, so we use the same
+ * fallback pattern as the old getLevel fix: try standard call
+ * first, then direct backend call if RIG_EINVAL (-1).
+ */
 SHIM_API int shim_rig_vfo_op(hamlib_shim_handle_t h, int vfo, int op) {
-    return rig_vfo_op((RIG*)h, (vfo_t)vfo, (vfo_op_t)op);
+    RIG* rig = (RIG*)h;
+    int ret = rig_vfo_op(rig, (vfo_t)vfo, (vfo_op_t)op);
+    if (ret == -1 && rig->caps->vfo_op) {
+        /* RIG_EINVAL: VFO switching failed, try direct backend call */
+        ret = rig->caps->vfo_op(rig, (vfo_t)vfo, (vfo_op_t)op);
+    }
+    return ret;
 }
 
 /* ===== Antenna control ===== */