fix: closing OpsLog no longer switches off the Icom's own scope display
SetScope(false) sent both 0x27 0x10 00 (scope DISPLAY off) and 0x27 0x11 00 (CI-V data output off), so quitting OpsLog blanked a local IC-7300's own scope screen. Only the display-on (0x27 0x10 01) is now sent, and only on enable; disable stops the CI-V stream alone and never touches the radio's display.
This commit is contained in:
@@ -725,12 +725,19 @@ func (b *IcomSerial) SetScope(on bool) error {
|
||||
// but nothing shows, compare its `icom scope raw` frames against this.
|
||||
applog.Printf("icom scope: enable on rig=%q addr=0x%02X dualScope=%v (expect %s frame layout)",
|
||||
b.model, b.rigAddr, b.dualScope, map[bool]string{true: "27 00 [MS] [seq] [total] …", false: "27 00 [seq] [total] …"}[b.dualScope])
|
||||
// Turn the scope DISPLAY on — needed so the rig actually streams (esp. when
|
||||
// remote and we can't touch the front panel). ONLY on enable: we must never
|
||||
// switch the display OFF, because that is the operator's own scope on the
|
||||
// radio, and closing OpsLog (SetScope(false)) blanking a local IC-7300's
|
||||
// screen is exactly the regression this avoids. Some firmwares don't ack a
|
||||
// 0x27 set; a timeout isn't fatal, so log and continue.
|
||||
if err := b.exec(civ.CmdScope, civ.SubScopeOnOff, 0x01); err != nil {
|
||||
applog.Printf("icom scope: display on ack: %v", err)
|
||||
}
|
||||
}
|
||||
// Some firmwares don't ack 0x27 sets; a timeout here isn't fatal, so log and
|
||||
// continue rather than abort the second command.
|
||||
if err := b.exec(civ.CmdScope, civ.SubScopeOnOff, boolByte(on)); err != nil {
|
||||
applog.Printf("icom scope: display on=%v ack: %v", on, err)
|
||||
}
|
||||
// Waveform data OUTPUT over CI-V: enabled with the scope, and — crucially —
|
||||
// the ONLY thing we switch off on disable, so the radio's own scope display is
|
||||
// left exactly as the operator had it.
|
||||
if err := b.exec(civ.CmdScope, civ.SubScopeOn, boolByte(on)); err != nil {
|
||||
applog.Printf("icom scope: output on=%v ack: %v", on, err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user