mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in setting the Tx frequency

Browse Source 
Uses 0x25 01 command to set the Tx frequency,
which is the correct command when in split mode.
This commit is contained in:
Rui Oliveira committed 2026-07-24 20:09:01 +01:00
1 parent dc596b4348
commit 58fb688593
4 files changed
+39 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/Ic705Controller.kt
+12 -1
View File
@@ -204,12 +204,23 @@ class Ic705Controller(
* always writing to the active VFO is the correct strategy.
*/
override suspend fun setWorkingFrequency(frequencyHz: Long): Boolean = withContext(Dispatchers.IO) {
Log.d(tag, "setWorkingFrequency: ${frequencyHz}Hz")
Log.d(tag, "setWorkingFrequency (0x25/00): ${frequencyHz}Hz")
val cmd = IcomCivProtocol.buildSetWorkingFreqCommand(frequencyHz)
Log.d(tag, "CMD setWorkingFreq → ${IcomCivProtocol.toHex(cmd)}")
ioMutex.withLock { sendAndWaitAck(cmd) }
}
/**
* Set TX VFO frequency via CMD 0x25 sub 0x01 (unselected VFO).
* Used in split mode while PTT is pressed.
*/
override suspend fun setTxVfoFrequency(frequencyHz: Long): Boolean = withContext(Dispatchers.IO) {
Log.d(tag, "setTxVfoFrequency (0x25/01): ${frequencyHz}Hz")
val cmd = IcomCivProtocol.buildSetUnselectedVfoFreqCommand(frequencyHz)
Log.d(tag, "CMD setTxVfoFreq → ${IcomCivProtocol.toHex(cmd)}")
ioMutex.withLock { sendAndWaitAck(cmd) }
}
// ── Internal I/O helpers ────────────────────────────────────────────────
/**
core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/IcomCivProtocol.kt
+13 -1
View File
@@ -73,8 +73,10 @@ object IcomCivProtocol {
const val SUB_SPLIT_ON: Byte = 0x01
/** Sub for CMD_TX_STATUS: query TX/RX state. */
const val SUB_TX_STATE: Byte = 0x00
/** Sub for CMD_SELECTED_VFO_FREQ: selected VFO frequency. */
/** Sub for CMD_SELECTED_VFO_FREQ: selected (active) VFO frequency. */
const val SUB_SELECTED_VFO: Byte = 0x00
/** Sub for CMD_SELECTED_VFO_FREQ: unselected (inactive / TX in split) VFO frequency. */
const val SUB_UNSELECTED_VFO: Byte = 0x01
/** Sub for CMD_MISC_SETTING: CTCSS/DTCS tone squelch. */
const val SUB_CTCSS_SETTING: Byte = 0x42.toByte()
@@ -167,6 +169,16 @@ object IcomCivProtocol {
return frame(CMD_SELECTED_VFO_FREQ, SUB_SELECTED_VFO, *encodeFrequencyBcd(frequencyHz))
}
/**
* Set unselected-VFO frequency via CMD 0x25 sub 0x01.
* In split mode while PTT is pressed the IC-705 makes VFO-B active, so
* this command targets VFO-A (the RX VFO) — and vice-versa when in RX.
* Use this to update the TX VFO when PTT is on.
*/
fun buildSetUnselectedVfoFreqCommand(frequencyHz: Long): ByteArray {
return frame(CMD_SELECTED_VFO_FREQ, SUB_UNSELECTED_VFO, *encodeFrequencyBcd(frequencyHz))
}
/** Read operating frequency (CMD 0x03). */
fun buildReadFreqCommand(): ByteArray = frame(CMD_READ_FREQ)
core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/RadioTrackingService.kt
+5 -5
View File
@@ -387,17 +387,17 @@ class RadioTrackingService(
when (isPtt) {
true -> {
// PTT ON → radio's active VFO is VFO-B (TX)
// Update TX frequency on active VFO only
// Use 0x25/01 (unselected VFO) to target VFO-B directly
if (txRadioFreq != null) {
Log.d(tag, "Split loop TX update: ${txRadioFreq}Hz")
radio.setWorkingFrequency(txRadioFreq)
Log.d(tag, "Split loop TX update (0x25/01): ${txRadioFreq}Hz")
radio.setTxVfoFrequency(txRadioFreq)
}
}
false -> {
// PTT OFF → radio's active VFO is VFO-A (RX)
// Update RX frequency on active VFO only
// Use 0x25/00 (selected/active VFO) to update RX
if (rxRadioFreq != null) {
Log.d(tag, "Split loop RX update: ${rxRadioFreq}Hz")
Log.d(tag, "Split loop RX update (0x25/00): ${rxRadioFreq}Hz")
radio.setWorkingFrequency(rxRadioFreq)
}
}