homebridge-frontier-silicon-plugin 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project are documented in this file.
 
 The format is based on Keep a Changelog, and this project follows Semantic Versioning.
 
+## [1.2.1] – 2025-12-28
+
+### Fixed
+- Corrected preset numbering by mapping Homebridge presets (1-based) to Frontier Silicon FSAPI keys (0-based).
+- Ensured station preset switches behave exclusively (activating one station automatically deactivates the others).
+- Fixed incorrect preset selection where presets were offset by one position on the radio.
+
+### Improved
+- More reliable DAB+ / preset switching on Frontier Silicon radios using navigation-based FSAPI calls.
+- Better HomeKit UI consistency when switching between stations.
+
 ## [1.2.0] – 2025-12-28
 
 ### Added

package/index.js

@@ -29,11 +29,15 @@ function FrontierSiliconAccessory(log, config) {
 
   this.autoPowerOnOnPreset = config.autoPowerOnOnPreset !== false;
 
+  // stations: [{ name: "Radio 2", preset: 2 }, ...]
+  // preset is 1 based like the radio UI, internally we convert to 0 based presetKey for FSAPI
   this.stations = Array.isArray(config.stations) ? config.stations : [];
 
   this.lastKnownPower = null;
   this.lastKnownRadioVolume = null;
-  this.lastKnownPresetIndex = null;
+
+  // 0 based FSAPI preset key that we last selected via HomeKit
+  this.lastKnownPresetKey = null;
 
   this.isUpdatingStationSwitches = false;
 
@@ -91,8 +95,6 @@ function FrontierSiliconAccessory(log, config) {
   }
 
   this.stationServices = [];
-  this.stationServiceByPreset = new Map();
-
   this.buildStationServices();
 
   this.startPolling();
@@ -107,12 +109,16 @@ FrontierSiliconAccessory.prototype.buildStationServices = function () {
     if (!s || typeof s !== "object") continue;
 
     const stationName = String(s.name ?? "").trim();
-    const preset = Number(s.preset);
+    const presetUi = Number(s.preset);
 
     if (!stationName) continue;
-    if (!Number.isFinite(preset)) continue;
+    if (!Number.isFinite(presetUi)) continue;
 
-    const subtype = "preset_" + String(Math.trunc(preset));
+    // Convert 1 based UI preset number to 0 based FSAPI key
+    const presetKey = Math.trunc(presetUi) - 1;
+    if (presetKey < 0) continue;
+
+    const subtype = "preset_" + String(presetKey);
     if (seenSubtypes.has(subtype)) continue;
     seenSubtypes.add(subtype);
 
@@ -120,15 +126,18 @@ FrontierSiliconAccessory.prototype.buildStationServices = function () {
 
     sw.getCharacteristic(Characteristic.On)
       .on("get", (cb) => {
-        const isOn = this.lastKnownPresetIndex === Math.trunc(preset);
-        cb(null, isOn);
+        cb(null, this.lastKnownPresetKey === presetKey);
       })
       .on("set", (value, cb) => {
-        this.handleSetStationPreset(Math.trunc(preset), !!value, cb);
+        this.handleSetStationPreset(presetKey, !!value, cb);
       });
 
-    this.stationServices.push({ preset: Math.trunc(preset), name: stationName, service: sw });
-    this.stationServiceByPreset.set(Math.trunc(preset), sw);
+    this.stationServices.push({
+      presetKey,
+      presetUi: Math.trunc(presetUi),
+      name: stationName,
+      service: sw
+    });
   }
 };
 
@@ -171,9 +180,7 @@ FrontierSiliconAccessory.prototype.handleGetVolume = async function (callback) {
   try {
     const radioVol = await this.client.getVolume();
     this.lastKnownRadioVolume = radioVol;
-
-    const homekitVol = radioToHomekitVolume(radioVol);
-    callback(null, homekitVol);
+    callback(null, radioToHomekitVolume(radioVol));
   } catch (err) {
     this.log.warn("Volume get failed, returning last known level.", toMsg(err));
     const fallbackRadio = this.lastKnownRadioVolume ?? 0;
@@ -194,18 +201,24 @@ FrontierSiliconAccessory.prototype.handleSetVolume = async function (value, call
   }
 };
 
-FrontierSiliconAccessory.prototype.handleSetStationPreset = async function (preset, turnOn, callback) {
+FrontierSiliconAccessory.prototype.handleSetStationPreset = async function (presetKey, turnOn, callback) {
   if (this.isUpdatingStationSwitches) {
     callback(null);
     return;
   }
 
+  // Exclusive selector behaviour
+  // Turning OFF does not change the radio, we snap back to the current selection
   if (!turnOn) {
     callback(null);
-    this.syncStationSwitchesFromPreset(this.lastKnownPresetIndex);
+    this.syncStationSwitchesFromPresetKey(this.lastKnownPresetKey);
     return;
   }
 
+  // Optimistic UI update so previous station immediately turns off
+  this.lastKnownPresetKey = presetKey;
+  this.syncStationSwitchesFromPresetKey(presetKey);
+
   try {
     if (this.autoPowerOnOnPreset) {
       try {
@@ -213,29 +226,30 @@ FrontierSiliconAccessory.prototype.handleSetStationPreset = async function (pres
         this.lastKnownPower = true;
         this.switchService.getCharacteristic(Characteristic.On).updateValue(true);
       } catch (_e) {
+        // ignore
       }
     }
 
-    await this.client.setPresetIndex(preset);
-    this.lastKnownPresetIndex = preset;
+    await this.client.setPresetKey(presetKey);
 
-    this.syncStationSwitchesFromPreset(preset);
     callback(null);
   } catch (err) {
     this.log.warn("Preset set failed.", toMsg(err));
     callback(null);
-    this.syncStationSwitchesFromPreset(this.lastKnownPresetIndex);
+
+    // Keep UI consistent with the last selection we know about
+    this.syncStationSwitchesFromPresetKey(this.lastKnownPresetKey);
   }
 };
 
-FrontierSiliconAccessory.prototype.syncStationSwitchesFromPreset = function (presetIndex) {
+FrontierSiliconAccessory.prototype.syncStationSwitchesFromPresetKey = function (presetKey) {
   if (!this.stationServices || this.stationServices.length === 0) return;
 
   this.isUpdatingStationSwitches = true;
 
   try {
     for (const s of this.stationServices) {
-      const shouldBeOn = presetIndex === s.preset;
+      const shouldBeOn = presetKey === s.presetKey;
       s.service.getCharacteristic(Characteristic.On).updateValue(shouldBeOn);
     }
   } finally {
@@ -264,7 +278,6 @@ FrontierSiliconAccessory.prototype.startPolling = function () {
         const radioVol = await this.client.getVolume();
         if (this.lastKnownRadioVolume !== radioVol) {
           this.lastKnownRadioVolume = radioVol;
-
           const homekitVol = radioToHomekitVolume(radioVol);
 
           if (this.speakerService) {
@@ -280,17 +293,8 @@ FrontierSiliconAccessory.prototype.startPolling = function () {
       }
     }
 
-    if (this.stationServices && this.stationServices.length > 0) {
-      try {
-        const preset = await this.client.getPresetIndex();
-        if (Number.isFinite(preset) && this.lastKnownPresetIndex !== preset) {
-          this.lastKnownPresetIndex = preset;
-          this.syncStationSwitchesFromPreset(preset);
-        }
-      } catch (err) {
-        if (this.log.debug) this.log.debug("Polling preset failed.", toMsg(err));
-      }
-    }
+    // Preset readback is not implemented for this firmware
+    // We keep station switch states based on the last selected presetKey via HomeKit
   };
 
   tick();
@@ -328,15 +332,14 @@ FsApiClient.prototype.setVolume = async function (volume) {
   await this.fetchText("/fsapi/SET/netRemote.sys.audio.volume?value=" + v);
 };
 
-FsApiClient.prototype.getPresetIndex = async function () {
-  const text = await this.fetchText("/fsapi/GET/netRemote.sys.preset.index");
-  const value = parseFsapiValue(text);
-  const n = Number(value);
-  return Number.isFinite(n) ? Math.trunc(n) : null;
-};
+// DIR3010 style preset selection using nav.state and selectPreset
+FsApiClient.prototype.setPresetKey = async function (presetKey) {
+  const p = Math.trunc(Number(presetKey));
+  if (!Number.isFinite(p)) throw new Error("Invalid preset key");
 
-FsApiClient.prototype.setPresetIndex = async function (preset) {
-  await this.fetchText("/fsapi/SET/netRemote.sys.preset.index?value=" + encodeURIComponent(String(preset)));
+  await this.fetchText("/fsapi/SET/netRemote.nav.state?value=1");
+  await this.fetchText("/fsapi/SET/netRemote.nav.action.selectPreset?value=" + encodeURIComponent(String(p)));
+  await this.fetchText("/fsapi/SET/netRemote.nav.state?value=0");
 };
 
 FsApiClient.prototype.fetchText = async function (pathAndQuery) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-frontier-silicon-plugin",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Homebridge plugin for Frontier Silicon FSAPI devices, power and volume with safe polling",
   "license": "ISC",
   "main": "index.js",