Simplified data output code, aligned with HamLib defaults

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/BluetoothReporter.kt

@@ -55,8 +55,8 @@ class BluetoothReporter(
             if (!rotatorConnected) return@launch
             val el = if (elevation > 0.0) elevation else 0.0
             val command = format
-                .replace($$"$AZ", "%03d".format(azimuth.toInt()))
-                .replace($$"$EL", "%03d".format(el.toInt()))
+                .replace($$"$AZ", azimuth.toString())
+                .replace($$"$EL", el.toString())
                 .unescapeControlChars()
             write(rotatorStream, command) { rotatorConnected = false }
         }

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/NetworkReporter.kt

@@ -52,6 +52,7 @@ class NetworkReporter(
             val command = format
                 .replace($$"$AZ", azimuth.toString())
                 .replace($$"$EL", el.toString())
+                .unescapeControlChars()
             write(rotatorSocket, command) { rotatorConnected = false }
         }
     }
@@ -60,7 +61,9 @@ class NetworkReporter(
         reporterScope.launch {
             ensureFrequencyConnected()
             if (!frequencyConnected) return@launch
-            val command = format.replace($$"$FREQ", frequency.toString())
+            val command = format
+                .replace($$"$FREQ", frequency.toString())
+                .unescapeControlChars()
             write(frequencySocket, command) { frequencyConnected = false }
         }
     }
@@ -110,4 +113,7 @@ class NetworkReporter(
             onError()
         }
     }
+
+    private fun String.unescapeControlChars(): String =
+        replace("\\r", "\r").replace("\\n", "\n").replace("\\t", "\t")
 }

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt

@@ -246,6 +246,29 @@ class SettingsRepo(
     //endregion
 
     //region # RC settings
+    init {
+        migrateRCFormats()
+    }
+
+    // TODO: Remove after a few releases (added in v4.2.0)
+    private val keyRCFormatsMigrated = "rcFormatsMigrated"
+
+    private fun migrateRCFormats() {
+        if (preferences.getBoolean(keyRCFormatsMigrated, false)) return
+        val formatKeys = listOf(
+            keyRotatorFormat, keyFrequencyFormat, keyBluetoothRotatorFormat, keyBluetoothFrequencyFormat
+        )
+        preferences.edit {
+            for (key in formatKeys) {
+                val value = preferences.getString(key, null) ?: continue
+                if (value.contains("_") && !value.startsWith("\\")) {
+                    putString(key, "\\$value")
+                }
+            }
+            putBoolean(keyRCFormatsMigrated, true)
+        }
+    }
+
     private val _rcSettings = MutableStateFlow(getRCSettings())
     override val rcSettings: StateFlow<RCSettings> = _rcSettings
 
@@ -280,12 +303,12 @@ class SettingsRepo(
         frequencyPort = preferences.getString(keyFrequencyPort, null) ?: "4532",
         frequencyFormat = preferences.getString(keyFrequencyFormat, null) ?: $$"F $FREQ",
         bluetoothRotatorState = preferences.getBoolean(keyBluetoothRotatorState, false),
-        bluetoothRotatorFormat = preferences.getString(keyBluetoothRotatorFormat, null) ?: $$"W$AZ $EL",
+        bluetoothRotatorFormat = preferences.getString(keyBluetoothRotatorFormat, null) ?: $$"P $AZ $EL",
         bluetoothRotatorName = preferences.getString(keyBluetoothRotatorName, null) ?: "Default",
         bluetoothRotatorAddress = preferences.getString(keyBluetoothRotatorAddress, null) ?: "00:0C:BF:13:80:5D",
         bluetoothFrequencyState = preferences.getBoolean(keyBluetoothFrequencyState, false),
         bluetoothFrequencyAddress = preferences.getString(keyBluetoothFrequencyAddress, null) ?: "00:0C:BF:13:80:5D",
-        bluetoothFrequencyFormat = preferences.getString(keyBluetoothFrequencyFormat, null) ?: $$"FA$FREQ"
+        bluetoothFrequencyFormat = preferences.getString(keyBluetoothFrequencyFormat, null) ?: $$"F $FREQ"
     )
     //endregion