- Minor bugfixes to Sennheiser wireless receivers

space928 · Jul 4, 2024 · b368421 · b368421
1 parent 6eabfa8
commit b368421
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/WirelessMicSuiteServer/SennheiserSSC/SennheiserSSCWirelessMic.cs b/WirelessMicSuiteServer/SennheiserSSC/SennheiserSSCWirelessMic.cs
@@ -348,8 +348,11 @@ private void ParseSyncSettingsMessage(Memory<char> msg, JsonElement json)
                     //bool
                     break;
                 case "trim":
-                    sensitivity = prop.Value.GetInt32();
-                    OnPropertyChanged(nameof(Sensitivity));
+                    if (!isTXConnected)
+                    {
+                        sensitivity = prop.Value.GetInt32();
+                        OnPropertyChanged(nameof(Sensitivity));
+                    }
                     break;
                 case "name_ignore":
                     //bool
@@ -374,7 +377,11 @@ private void ParseSyncSettingsMessage(Memory<char> msg, JsonElement json)
                     break;
                 case "lock":
                     //bool
-                    lockMode = prop.Value.GetBoolean() ? WirelessMicSuiteServer.LockMode.Power : WirelessMicSuiteServer.LockMode.None;
+                    if (!isTXConnected)
+                    {
+                        lockMode = prop.Value.GetBoolean() ? WirelessMicSuiteServer.LockMode.Power : WirelessMicSuiteServer.LockMode.None;
+                        OnPropertyChanged(nameof(LockMode));
+                    }
                     break;
                 case "led_ignore":
                     //bool
@@ -418,16 +425,19 @@ internal void ParseAudioMessage(Memory<char> msg, JsonElement json)
     internal void ParseMeterMessage(Memory<char> msg, JsonElement json)
     {
         var meter = lastMeterData == null ? new MeteringData() : new MeteringData(lastMeterData.Value);
+        float rssi = 0;
         foreach (var prop in json.EnumerateObject())
         {
             switch (prop.Name)
             {
                 case "rssi":
                     //rssi: float (dBm)
-                    meter.rssiA = meter.rssiB = (prop.Value.GetSingle()+120)/80f;
+                    rssi = prop.Value.GetSingle();
+                    meter.rssiA = meter.rssiB = (rssi+100)/60f;
                     break;
                 case "rsqi":
                     //rsqi: int(%)(RF signal quality indicator)
+                    //meter.rssiA = meter.rssiB = prop.Value.GetInt32() / 100f;
                     break;
                 case "divi":
                     //divi: 0,1,2 (None, antenna A, antenna B)