fix: a hand-assigned award reference no longer loses to the matcher

Reported on the DARC DOK award, with DL2FDM: a German address matches two or
three DOKs, the operator deletes the wrong ones and assigns the right one, and
the next recompute puts the wrong ones straight back.

The manual reference was APPENDED to what the matcher found. Storage already
kept exactly one manual entry per award — setOverrideRef drops the previous one
— so it was an override everywhere except at the one place it mattered. The
operator was arguing with the matcher and could not win.

It now replaces. The trace records what was superseded, so a corrected QSO can
still be explained rather than being merely different. A QSO with no correction
keeps every automatic reference, which the test also pins: an override must not
quietly disable matching for everyone else.

This does not address the over-matching itself — an address containing "Berlin
Mitte, 10115 Berlin" genuinely matches two DOK descriptions. That is the next
question, and a separate one.

app.go

@@ -114,6 +114,7 @@ const (
 	keyCATXieguPort       = "cat.xiegu.port"      // Xiegu CI-V serial port (G90/X6100…)
 	keyCATXieguBaud       = "cat.xiegu.baud"      // Xiegu CI-V baud (G90 default 19200)
 	keyCATXieguAddr       = "cat.xiegu.addr"      // Xiegu CI-V address (factory 0x70)
+	keyCATXieguPTTLine    = "cat.xiegu.ptt_line"  // "" | rts | dtr — G90 does not key over CI-V
 	keyCATYaesuPort       = "cat.yaesu.port"      // Yaesu CAT serial port (e.g. COM4)
 	keyCATYaesuBaud       = "cat.yaesu.baud"      // Yaesu CAT baud (FTDX10/101 default 38400)
 	keyCATKenwoodHost     = "cat.kenwood.host"    // Kenwood CAT over a network serial bridge (ser2net), "host:port"
@@ -370,6 +371,7 @@ type CATSettings struct {
 	XieguPort       string `json:"xiegu_port"`        // Xiegu CI-V serial port (G90/X6100…)
 	XieguBaud       int    `json:"xiegu_baud"`        // Xiegu CI-V baud (G90 default 19200)
 	XieguAddr       int    `json:"xiegu_addr"`        // Xiegu CI-V address (factory 0x70)
+	XieguPTTLine    string `json:"xiegu_ptt_line"`    // "", "rts" or "dtr" — how the rig is keyed
 	YaesuPort       string `json:"yaesu_port"`        // Yaesu CAT serial port (e.g. COM4)
 	YaesuBaud       int    `json:"yaesu_baud"`        // Yaesu CAT baud (FTDX10/101 default 38400)
 	KenwoodHost     string `json:"kenwood_host"`      // "host:port" of a serial-over-network bridge (ser2net, Ethernet-serial
@@ -6748,7 +6750,7 @@ func (a *App) GetCATSettings() (CATSettings, error) {
 	if a.settings == nil {
 		return CATSettings{Backend: "omnirig", OmniRigNum: 1, PollMs: 250}, fmt.Errorf("db not initialized")
 	}
-	m, err := a.settings.GetMany(a.ctx, keyCATEnabled, keyCATBackend, keyCATOmniRigNum, keyCATOmniRigVFO, keyCATFlexHost, keyCATFlexPort, keyCATFlexSpots, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPollMs, keyCATDelayMs, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort)
+	m, err := a.settings.GetMany(a.ctx, keyCATEnabled, keyCATBackend, keyCATOmniRigNum, keyCATOmniRigVFO, keyCATFlexHost, keyCATFlexPort, keyCATFlexSpots, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATXieguPTTLine, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPollMs, keyCATDelayMs, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort)
 	if err != nil {
 		return CATSettings{}, err
 	}
@@ -6800,6 +6802,7 @@ func (a *App) GetCATSettings() (CATSettings, error) {
 	if n, _ := strconv.Atoi(m[keyCATXieguBaud]); n > 0 {
 		out.XieguBaud = n
 	}
+	out.XieguPTTLine = m[keyCATXieguPTTLine]
 	if n, _ := strconv.Atoi(m[keyCATXieguAddr]); n > 0 && n <= 0xFF {
 		out.XieguAddr = n
 	}
@@ -6920,6 +6923,7 @@ func (a *App) SaveCATSettings(s CATSettings) error {
 		keyCATXieguPort:       strings.TrimSpace(s.XieguPort),
 		keyCATXieguBaud:       strconv.Itoa(s.XieguBaud),
 		keyCATXieguAddr:       strconv.Itoa(s.XieguAddr),
+		keyCATXieguPTTLine:    strings.ToLower(strings.TrimSpace(s.XieguPTTLine)),
 		keyCATYaesuPort:       strings.TrimSpace(s.YaesuPort),
 		keyCATYaesuBaud:       strconv.Itoa(s.YaesuBaud),
 		keyCATKenwoodPort:     strings.TrimSpace(s.KenwoodPort),
@@ -12743,7 +12747,12 @@ func (a *App) reloadCAT() {
 		// Xiegu G90/X6100/X6200/X5105 — CI-V, but a REDUCED command set: no scope,
 		// no DSP block, no data mode. Its own backend rather than the Icom one at
 		// another address, so we never poll a G90 for answers it cannot give.
-		a.cat.Start(cat.NewXiegu(s.XieguPort, s.XieguBaud, s.XieguAddr, s.DigitalDefault))
+		xg := cat.NewXiegu(s.XieguPort, s.XieguBaud, s.XieguAddr, s.DigitalDefault)
+		// A G90 ignores the CI-V PTT command; its interfaces key on a hardware
+		// line instead. Selected here so rigctld — and therefore WSJT-X — can
+		// actually put the rig on the air.
+		xg.SetPTTLine(s.XieguPTTLine)
+		a.cat.Start(xg)
 	case "yaesu":
 		// Native Yaesu CAT over the rig's USB/serial port — no OmniRig. Every
 		// Yaesu fault reported so far came from OmniRig's interpretation layer

changelog.json

@@ -1,9 +1,22 @@
 [
   {
-    "version": "0.22.5",
+    "version": "0.22.7",
+    "date": "",
+    "en": [
+      "Serial CAT no longer keys the radio just by connecting: DTR and RTS are dropped on Xiegu, Yaesu and Kenwood as they already were on Icom — a Xiegu G90 behind a DE-19 went straight into transmit and stayed there.",
+      "Xiegu: choose how the rig is keyed — CI-V command, RTS or DTR. A G90 does not transmit on the CI-V command, so this is also what lets WSJT-X transmit through the shared CAT link.",
+      "A reference you assign by hand now replaces what the matcher found instead of being added to it, so a correction survives the next recompute."
+    ],
+    "fr": [
+      "Le CAT série ne met plus la radio en émission par le seul fait de se connecter : DTR et RTS sont abaissés sur Xiegu, Yaesu et Kenwood comme ils l'étaient déjà sur Icom — un Xiegu G90 derrière un DE-19 partait en émission et y restait.",
+      "Xiegu : choix du passage en émission — commande CI-V, RTS ou DTR. Un G90 n'émet pas sur la commande CI-V, c'est donc aussi ce qui permet à WSJT-X d'émettre via le partage CAT.",
+      "Une référence que vous affectez à la main remplace désormais ce que la détection avait trouvé au lieu de s'y ajouter : une correction survit au recalcul suivant."
+    ]
+  },
+  {
+    "version": "0.22.6",
     "date": "",
     "en": [
-      "Cluster filters gain NEW POTA and NEW COUNTY, alongside the existing status chips.",
       "A playback that fails to start now says so in the log instead of ending silently after a tenth of a second.",
       "Replaying a recording before the previous one has finished now works: the new playback waits for the audio device to be free instead of keying the radio and releasing at once.",
       "The play button becomes a stop button while the recording is going out: it cuts the transmission and releases the PTT, and you can send it again straight away.",
@@ -15,7 +28,6 @@
       "A quiet DX cluster no longer looks like a broken one: silence stopped counting as a disconnection, so a node with few spots keeps its session, its login and its filters."
     ],
     "fr": [
-      "Les filtres du cluster gagnent NEW POTA et NEW COUNTY, à côté des pastilles de statut existantes.",
       "Une lecture qui ne démarre pas le signale désormais dans le journal, au lieu de s'arrêter en silence au bout d'un dixième de seconde.",
       "Relancer un enregistrement avant la fin du précédent fonctionne désormais : la nouvelle lecture attend que le périphérique audio soit libre, au lieu de passer en émission et de relâcher aussitôt.",
       "Le bouton de lecture devient un bouton d'arrêt pendant l'émission de l'enregistrement : il coupe l'émission et relâche le PTT, et vous pouvez le renvoyer aussitôt.",
@@ -27,6 +39,16 @@
       "Un cluster calme ne passe plus pour un cluster mort : le silence ne compte plus comme une déconnexion, donc un nœud avec peu de spots garde sa session, son login et ses filtres."
     ]
   },
+  {
+    "version": "0.22.5",
+    "date": "",
+    "en": [
+      "Cluster filters gain NEW POTA and NEW COUNTY, alongside the existing status chips."
+    ],
+    "fr": [
+      "Les filtres du cluster gagnent NEW POTA et NEW COUNTY, à côté des pastilles de statut existantes."
+    ]
+  },
   {
     "version": "0.22.4",
     "date": "",

frontend/src/App.tsx

@@ -3719,8 +3719,10 @@ export default function App() {
   // The callsign field is WIDER than the fields around it, deliberately: it is
   // the one field always typed into, it carries the REC badges on its right, and
   // a long portable call (VK9/OH1ABC/MM) must stay readable as it is entered.
-  // The room comes from the RST pair, which never needs more than five
-  // characters.
+  // It was widened by taking room from the RST pair — until a signal report of
+  // "59+30" turned up, which is five characters plus its padding and no longer
+  // fitted. The RST fields are back to their original width; the callsign keeps
+  // the rest of the row.
   const callsignBlock = (
     <div className="flex flex-col w-56" data-esm="call">
       <Label className="flex items-center gap-2 h-3.5" style={{ marginBottom: 6 }}>
@@ -3869,12 +3871,12 @@ export default function App() {
     </div>
   );
   const rstTxBlock = (
-    <div className="flex flex-col w-16" data-esm="rsttx"><Label className="mb-1 h-3.5">{t('field.rstTx')}</Label>
+    <div className="flex flex-col w-20" data-esm="rsttx"><Label className="mb-1 h-3.5">{t('field.rstTx')}</Label>
       <Combobox value={rstSent} options={rstOptions(mode, rstLists)} commitOnType onChange={(v) => { setRstSent(v); rstUserEditedRef.current = true; }} />
     </div>
   );
   const rstRxBlock = (
-    <div className="flex flex-col w-16" data-esm="rstrx"><Label className="mb-1 h-3.5">{t('field.rstRx')}</Label>
+    <div className="flex flex-col w-20" data-esm="rstrx"><Label className="mb-1 h-3.5">{t('field.rstRx')}</Label>
       <Combobox value={rstRcvd} options={rstOptions(mode, rstLists)} commitOnType onChange={(v) => { setRstRcvd(v); rstUserEditedRef.current = true; }} />
     </div>
   );

frontend/src/components/SettingsModal.tsx

@@ -1136,7 +1136,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
   const [modeDraft, setModeDraft] = useState('');
   const [catCfg, setCatCfg] = useState<CATSettings>({
     enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120,
-    yaesu_port: '', yaesu_baud: 38400, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70,
+    yaesu_port: '', yaesu_baud: 38400, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
     icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
     tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0,
     digital_default: 'FT8', share_enabled: false, share_port: 4532,
@@ -2538,6 +2538,19 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
                   }} />
                 <span className="text-xs text-muted-foreground">{t('cat.xieguAddrHint')}</span>
               </div>
+              <div className="space-y-1">
+                <Label>{t('cat.xieguPTTLine')}</Label>
+                <Select value={catCfg.xiegu_ptt_line || 'civ'}
+                  onValueChange={(v) => setCatCfg((s) => ({ ...s, xiegu_ptt_line: v === 'civ' ? '' : v }))}>
+                  <SelectTrigger><SelectValue /></SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="civ">{t('cat.xieguPTTCiv')}</SelectItem>
+                    <SelectItem value="rts">RTS</SelectItem>
+                    <SelectItem value="dtr">DTR</SelectItem>
+                  </SelectContent>
+                </Select>
+                <span className="text-xs text-muted-foreground">{t('cat.xieguPTTHint')}</span>
+              </div>
             </>
             )}
             {catCfg.backend === 'yaesu' && (

frontend/src/lib/i18n.tsx

@@ -277,7 +277,7 @@ const en: Dict = {
   'extsvc.hint': 'Upload logged QSOs to online logbooks. Each service uploads automatically on a new QSO when enabled; timing is per-service (immediate, or a 1–2 min delay so a mis-logged QSO can still be fixed first).',
   'hw.motorTxInhibit': 'Inhibit transmission while the antenna is moving', 'hw.motorTxInhibitHint': 'Blocks the FlexRadio from transmitting while the elements move (needs FlexRadio in API mode + this antenna enabled). No effect with other radios.', 'hw.motorAntenna': 'Ultrabeam / Steppir', 'hw.motorEnable': 'Enable antenna control', 'hw.motorType': 'Antenna type', 'hw.motorTransport': 'Connection', 'hw.motorTcp': 'Network (TCP)', 'hw.motorSerial': 'Serial (COM)', 'hw.motorCom': 'Serial port', 'hw.motorBaud': 'Baud', 'hw.steppirHint': 'SteppIR controllers are RS-232 serial (the DATA OUT DB9 port). Serial = a USB↔RS-232 (FTDI) adapter, shown as a COM port. Network = a serial-to-Ethernet bridge (as for the Ultrabeam).', 'hw.steppirRange': 'Tunable range', 'hw.steppirRangeHint': "The SteppIR's frequency coverage. On a band outside this range (e.g. 30 m on a 20 m–6 m SteppIR) OpsLog won't try to tune the antenna and won't inhibit transmission. Default 13–54 MHz (20 m–6 m); widen the low edge (e.g. 6) for a 40 m-equipped SteppIR.", 'hw.ultrabeam': 'Antenna (Ultrabeam)', 'hw.audioVoice': 'Audio devices & voice keyer',
   // CAT panel body
-  'cat.enable': 'Enable CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Share CAT with other programs', 'cat.shareHint': 'A native CAT backend owns the radio serial port, so no other program can reach it. This lets WSJT-X, JTDX, MSHV or Log4OM talk to the rig THROUGH OpsLog: in the other program pick the rig model "Hamlib NET rigctl" and enter 127.0.0.1:4532. Works with every backend, not only the native ones.', 'cat.sharePort': 'Sharing port', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Xiegu CAT port', 'cat.xieguBaudHint': 'Must match the radio menu (G90 default: 19200).', 'cat.xieguAddrHint': 'Factory CI-V address of the G90/X6100 family: 0x70.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, network)', 'cat.civTrace': 'Log the CAT protocol', 'cat.civTraceHint': 'Writes every CAT frame to and from the radio into the log \u2014 CI-V as hex, Kenwood as the text it exchanges. For reporting a rig that answers oddly \u2014 a button that does the wrong thing, a frequency that jumps. Session only: it is a diagnostic, and it makes the log large.', 'cat.kenwoodPort': 'Kenwood COM port', 'cat.kenwoodPortHint': 'The rig\u2019s CAT/USB serial port (TS-590, TS-890, TS-990, TS-2000, and Elecraft K3/K4 which speak the same dialect).', 'cat.kenwoodBaudHint': 'Must match MENU on the radio: a TS-590 leaves the factory at 9600, a TS-890 at 115200.', 'cat.kenwoodHost': 'Or over the network (host:port)', 'cat.kenwoodHostHint': 'A serial-over-network bridge \u2014 ser2net, an Ethernet-serial adapter, a Raspberry Pi at the radio. Filled in, it is used INSTEAD of the COM port above. This is not the radio\u2019s own RJ45 socket, which speaks Kenwood\u2019s KNS protocol and is not supported.', 'cat.yaesuPort': 'Yaesu CAT port', 'cat.yaesuPortHint': 'The rig CAT port — on an FTDX10/FTDX101 over USB this is the ENHANCED COM port, not the standard one.', 'cat.yaesuBaudHint': 'Must match the radio menu (FTDX10/FTDX101 default: 38400).', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V network)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 power per band and mode', 'flxpw.hint': 'TX power applied when the band or mode changes. Leave a box empty to leave the power alone.', 'flxpw.band': 'Band', 'flxb.title': 'FlexRadio \u2014 per-band antennas and power', 'flxb.hint': 'Antennas are applied when the band changes; power when the band or the mode changes. Leave a power box empty to leave it alone.', 'flxb.rxAnt': 'RX antenna', 'flxb.txAnt': 'TX antenna', 'flxb.noRadio': 'No antennas reported yet \u2014 connect the FlexRadio, then reopen this panel.', 'flxpw.phone': 'Phone', 'flxpw.digi': 'Digital', 'flxpw.noBands': 'No bands configured \u2014 add them in Lists \u2192 Bands.', 'flxpw.saved': 'Saved',
+  'cat.enable': 'Enable CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Share CAT with other programs', 'cat.shareHint': 'A native CAT backend owns the radio serial port, so no other program can reach it. This lets WSJT-X, JTDX, MSHV or Log4OM talk to the rig THROUGH OpsLog: in the other program pick the rig model "Hamlib NET rigctl" and enter 127.0.0.1:4532. Works with every backend, not only the native ones.', 'cat.sharePort': 'Sharing port', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Xiegu CAT port', 'cat.xieguBaudHint': 'Must match the radio menu (G90 default: 19200).', 'cat.xieguAddrHint': 'Factory CI-V address of the G90/X6100 family: 0x70.', 'cat.xieguPTTLine': 'How the rig is keyed', 'cat.xieguPTTCiv': 'CI-V command', 'cat.xieguPTTHint': 'A G90 does not transmit on the CI-V command: interfaces like the DE-19 key it on RTS or DTR. Pick the line yours uses \u2014 it is also what lets WSJT-X transmit through the shared CAT link.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, network)', 'cat.civTrace': 'Log the CAT protocol', 'cat.civTraceHint': 'Writes every CAT frame to and from the radio into the log \u2014 CI-V as hex, Kenwood as the text it exchanges. For reporting a rig that answers oddly \u2014 a button that does the wrong thing, a frequency that jumps. Session only: it is a diagnostic, and it makes the log large.', 'cat.kenwoodPort': 'Kenwood COM port', 'cat.kenwoodPortHint': 'The rig\u2019s CAT/USB serial port (TS-590, TS-890, TS-990, TS-2000, and Elecraft K3/K4 which speak the same dialect).', 'cat.kenwoodBaudHint': 'Must match MENU on the radio: a TS-590 leaves the factory at 9600, a TS-890 at 115200.', 'cat.kenwoodHost': 'Or over the network (host:port)', 'cat.kenwoodHostHint': 'A serial-over-network bridge \u2014 ser2net, an Ethernet-serial adapter, a Raspberry Pi at the radio. Filled in, it is used INSTEAD of the COM port above. This is not the radio\u2019s own RJ45 socket, which speaks Kenwood\u2019s KNS protocol and is not supported.', 'cat.yaesuPort': 'Yaesu CAT port', 'cat.yaesuPortHint': 'The rig CAT port — on an FTDX10/FTDX101 over USB this is the ENHANCED COM port, not the standard one.', 'cat.yaesuBaudHint': 'Must match the radio menu (FTDX10/FTDX101 default: 38400).', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V network)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 power per band and mode', 'flxpw.hint': 'TX power applied when the band or mode changes. Leave a box empty to leave the power alone.', 'flxpw.band': 'Band', 'flxb.title': 'FlexRadio \u2014 per-band antennas and power', 'flxb.hint': 'Antennas are applied when the band changes; power when the band or the mode changes. Leave a power box empty to leave it alone.', 'flxb.rxAnt': 'RX antenna', 'flxb.txAnt': 'TX antenna', 'flxb.noRadio': 'No antennas reported yet \u2014 connect the FlexRadio, then reopen this panel.', 'flxpw.phone': 'Phone', 'flxpw.digi': 'Digital', 'flxpw.noBands': 'No bands configured \u2014 add them in Lists \u2192 Bands.', 'flxpw.saved': 'Saved',
   'cat.icomNetHost': 'Rig IP / hostname', 'cat.icomNetUser': 'Network user (ID)', 'cat.icomNetPass': 'Network password',
   'cat.icomNetHint': "Connects to the rig's built-in LAN server directly — no RS-BA1 or Remote Utility needed (close them first). Use the Network User1 ID/Password set in the rig's Network menu. A rig in standby is powered on automatically.",
   'cat.icomNetAudio': 'Stream RX audio over the network (experimental)',
@@ -678,7 +678,7 @@ const fr: Dict = {
   'rot.enable': 'Activer le contrôle du rotator', 'rot.testOkRG': 'Connecté — le Rotator Genius a accepté la commande (rotation vers 0°).',  'rot.type': 'Type de rotator', 'rot.rotatorNum': 'Rotator n°', 'rot.rgHint': 'Parle directement à un Rotator Genius 4O3A en TCP (port 9006 par défaut) — sans PstRotator. Le n° choisit lequel des deux rotators du boîtier piloter.', 'rot.arcoHint': "Parle directement à tout contrôleur réglé sur Yaesu GS-232A — sans PstRotator. microHAM ARCO : régler Config → LAN → CONTROL PROTOCOL (ou USB CONTROL PROTOCOL) sur « Yaesu GS-232A » ; en USB la vitesse est sans importance. ERC (Easy Rotor Control, ERC Mini compris) : son émulation DOIT être réglée sur GS-232 — un ERC laissé en Hy-Gain DCU-1 parle un autre jeu de commandes et ne répondra pas — puis choisir son port COM et la même vitesse que dans la configuration de l'ERC.", 'rot.hint': "OpsLog envoie des commandes UDP à PstRotator. Active l'écouteur UDP de PstRotator (Setup → Communication → UDP) avant de tester.",
   'extsvc.hint': "Envoie les QSO enregistrés vers des carnets en ligne. Chaque service upload automatiquement à chaque nouveau QSO si activé ; le délai est propre à chaque service (immédiat, ou 1–2 min pour corriger un QSO mal saisi avant).",
   'hw.motorTxInhibit': "Inhiber la transmission pendant que l'antenne bouge", 'hw.motorTxInhibitHint': "Empêche le FlexRadio d'émettre pendant que les éléments bougent (nécessite le FlexRadio en API + cette antenne activée). Sans effet avec les autres radios.", 'hw.motorAntenna': 'Antenne motorisée', 'hw.motorEnable': "Activer le contrôle de l'antenne", 'hw.motorType': "Type d'antenne", 'hw.motorTransport': 'Connexion', 'hw.motorTcp': 'Réseau (TCP)', 'hw.motorSerial': 'Série (COM)', 'hw.motorCom': 'Port série', 'hw.motorBaud': 'Débit', 'hw.steppirHint': "Les contrôleurs SteppIR sont en RS-232 série (port DB9 « DATA OUT »). Série = un adaptateur USB↔RS-232 (FTDI), vu comme un port COM. Réseau = un pont série-Ethernet (comme pour l'Ultrabeam).", 'hw.steppirRange': 'Plage accordable', 'hw.steppirRangeHint': "La couverture en fréquence de la SteppIR. Sur une bande hors de cette plage (p. ex. 30 m avec une SteppIR 20 m-6 m), OpsLog n'essaie pas d'accorder l'antenne et n'inhibe pas l'émission. Défaut 13-54 MHz (20 m-6 m) ; abaisse la borne basse (p. ex. 6) pour une SteppIR équipée 40 m.", 'hw.ultrabeam': 'Antenne (Ultrabeam)', 'hw.audioVoice': 'Périphériques audio & manipulateur vocal',
-  'cat.enable': 'Activer le CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Partager le CAT avec les autres logiciels', 'cat.shareHint': "Un backend CAT natif occupe le port série de la radio, aucun autre logiciel ne peut donc y accéder. Ceci permet à WSJT-X, JTDX, MSHV ou Log4OM de dialoguer avec la radio À TRAVERS OpsLog : dans l'autre logiciel, choisissez le modèle « Hamlib NET rigctl » et saisissez 127.0.0.1:4532. Fonctionne avec tous les backends, pas seulement les natifs.", 'cat.sharePort': 'Port de partage', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Port CAT Xiegu', 'cat.xieguBaudHint': 'Doit correspondre au menu de la radio (G90 par défaut : 19200).', 'cat.xieguAddrHint': "Adresse CI-V d'usine de la famille G90/X6100 : 0x70.", 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, réseau)', 'cat.civTrace': 'Journaliser le protocole CAT', 'cat.civTraceHint': '\u00c9crit dans le journal chaque trame CAT \u00e9chang\u00e9e avec la radio \u2014 CI-V en hexad\u00e9cimal, Kenwood en texte. Pour signaler une radio qui r\u00e9pond de travers \u2014 un bouton qui fait autre chose, une fr\u00e9quence qui saute. Valable pour la session seulement : c\u2019est un diagnostic, et le journal grossit vite.', 'cat.kenwoodPort': 'Port COM Kenwood', 'cat.kenwoodPortHint': 'Le port s\u00e9rie CAT/USB de la radio (TS-590, TS-890, TS-990, TS-2000, ainsi que les Elecraft K3/K4 qui parlent le m\u00eame dialecte).', 'cat.kenwoodBaudHint': 'Doit correspondre au MENU de la radio : un TS-590 sort d\u2019usine \u00e0 9600, un TS-890 \u00e0 115200.', 'cat.kenwoodHost': 'Ou par le r\u00e9seau (h\u00f4te:port)', 'cat.kenwoodHostHint': 'Un pont s\u00e9rie-r\u00e9seau \u2014 ser2net, un bo\u00eetier Ethernet-s\u00e9rie, un Raspberry Pi pr\u00e8s de la radio. S\u2019il est rempli, il est utilis\u00e9 \u00c0 LA PLACE du port COM ci-dessus. Il ne s\u2019agit pas de la prise RJ45 de la radio, qui parle le protocole KNS de Kenwood et n\u2019est pas prise en charge.', 'cat.yaesuPort': 'Port CAT Yaesu', 'cat.yaesuPortHint': "Le port CAT de la radio — sur un FTDX10/FTDX101 en USB c'est le port COM ENHANCED, pas le standard.", 'cat.yaesuBaudHint': 'Doit correspondre au menu de la radio (FTDX10/FTDX101 par défaut : 38400).', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V réseau)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 puissance par bande et par mode', 'flxpw.hint': 'Puissance d\u2019\u00e9mission appliqu\u00e9e au changement de bande ou de mode. Laissez une case vide pour ne pas toucher \u00e0 la puissance.', 'flxpw.band': 'Bande', 'flxb.title': 'FlexRadio \u2014 antennes et puissance par bande', 'flxb.hint': 'Les antennes sont appliqu\u00e9es au changement de bande ; la puissance au changement de bande ou de mode. Laissez une case de puissance vide pour ne pas y toucher.', 'flxb.rxAnt': 'Antenne RX', 'flxb.txAnt': 'Antenne TX', 'flxb.noRadio': 'Aucune antenne remont\u00e9e \u2014 connectez le FlexRadio, puis rouvrez ce panneau.', 'flxpw.phone': 'Phonie', 'flxpw.digi': 'Num\u00e9rique', 'flxpw.noBands': 'Aucune bande configur\u00e9e \u2014 ajoutez-les dans Listes \u2192 Bandes.', 'flxpw.saved': 'Enregistr\u00e9',
+  'cat.enable': 'Activer le CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Partager le CAT avec les autres logiciels', 'cat.shareHint': "Un backend CAT natif occupe le port série de la radio, aucun autre logiciel ne peut donc y accéder. Ceci permet à WSJT-X, JTDX, MSHV ou Log4OM de dialoguer avec la radio À TRAVERS OpsLog : dans l'autre logiciel, choisissez le modèle « Hamlib NET rigctl » et saisissez 127.0.0.1:4532. Fonctionne avec tous les backends, pas seulement les natifs.", 'cat.sharePort': 'Port de partage', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Port CAT Xiegu', 'cat.xieguBaudHint': 'Doit correspondre au menu de la radio (G90 par défaut : 19200).', 'cat.xieguAddrHint': "Adresse CI-V d'usine de la famille G90/X6100 : 0x70.", 'cat.xieguPTTLine': 'Passage en \u00e9mission', 'cat.xieguPTTCiv': 'Commande CI-V', 'cat.xieguPTTHint': 'Un G90 ne passe pas en \u00e9mission sur la commande CI-V : les interfaces comme le DE-19 le pilotent par RTS ou DTR. Choisissez la ligne de la v\u00f4tre \u2014 c\u2019est aussi ce qui permet \u00e0 WSJT-X d\u2019\u00e9mettre via le partage CAT.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, réseau)', 'cat.civTrace': 'Journaliser le protocole CAT', 'cat.civTraceHint': '\u00c9crit dans le journal chaque trame CAT \u00e9chang\u00e9e avec la radio \u2014 CI-V en hexad\u00e9cimal, Kenwood en texte. Pour signaler une radio qui r\u00e9pond de travers \u2014 un bouton qui fait autre chose, une fr\u00e9quence qui saute. Valable pour la session seulement : c\u2019est un diagnostic, et le journal grossit vite.', 'cat.kenwoodPort': 'Port COM Kenwood', 'cat.kenwoodPortHint': 'Le port s\u00e9rie CAT/USB de la radio (TS-590, TS-890, TS-990, TS-2000, ainsi que les Elecraft K3/K4 qui parlent le m\u00eame dialecte).', 'cat.kenwoodBaudHint': 'Doit correspondre au MENU de la radio : un TS-590 sort d\u2019usine \u00e0 9600, un TS-890 \u00e0 115200.', 'cat.kenwoodHost': 'Ou par le r\u00e9seau (h\u00f4te:port)', 'cat.kenwoodHostHint': 'Un pont s\u00e9rie-r\u00e9seau \u2014 ser2net, un bo\u00eetier Ethernet-s\u00e9rie, un Raspberry Pi pr\u00e8s de la radio. S\u2019il est rempli, il est utilis\u00e9 \u00c0 LA PLACE du port COM ci-dessus. Il ne s\u2019agit pas de la prise RJ45 de la radio, qui parle le protocole KNS de Kenwood et n\u2019est pas prise en charge.', 'cat.yaesuPort': 'Port CAT Yaesu', 'cat.yaesuPortHint': "Le port CAT de la radio — sur un FTDX10/FTDX101 en USB c'est le port COM ENHANCED, pas le standard.", 'cat.yaesuBaudHint': 'Doit correspondre au menu de la radio (FTDX10/FTDX101 par défaut : 38400).', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V réseau)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 puissance par bande et par mode', 'flxpw.hint': 'Puissance d\u2019\u00e9mission appliqu\u00e9e au changement de bande ou de mode. Laissez une case vide pour ne pas toucher \u00e0 la puissance.', 'flxpw.band': 'Bande', 'flxb.title': 'FlexRadio \u2014 antennes et puissance par bande', 'flxb.hint': 'Les antennes sont appliqu\u00e9es au changement de bande ; la puissance au changement de bande ou de mode. Laissez une case de puissance vide pour ne pas y toucher.', 'flxb.rxAnt': 'Antenne RX', 'flxb.txAnt': 'Antenne TX', 'flxb.noRadio': 'Aucune antenne remont\u00e9e \u2014 connectez le FlexRadio, puis rouvrez ce panneau.', 'flxpw.phone': 'Phonie', 'flxpw.digi': 'Num\u00e9rique', 'flxpw.noBands': 'Aucune bande configur\u00e9e \u2014 ajoutez-les dans Listes \u2192 Bandes.', 'flxpw.saved': 'Enregistr\u00e9',
   'cat.icomNetHost': 'IP / nom d\'hôte du poste', 'cat.icomNetUser': 'Utilisateur réseau (ID)', 'cat.icomNetPass': 'Mot de passe réseau',
   'cat.icomNetHint': "Se connecte directement au serveur LAN intégré du poste — sans RS-BA1 ni Remote Utility (ferme-les d'abord). Utilise l'ID/mot de passe Network User1 configurés dans le menu Network du poste. Un poste en veille est allumé automatiquement.",
   'cat.icomNetAudio': 'Diffuser l’audio RX par le réseau (expérimental)',

frontend/wailsjs/go/models.ts

@@ -461,6 +461,7 @@ export namespace award {
 	    ref_count: number;
 	    steps: Step[];
 	    manual?: string[];
+	    superseded?: string[];
 	    result: string[];
 	
 	    static createFrom(source: any = {}) {
@@ -476,6 +477,7 @@ export namespace award {
 	        this.ref_count = source["ref_count"];
 	        this.steps = this.convertValues(source["steps"], Step);
 	        this.manual = source["manual"];
+	        this.superseded = source["superseded"];
 	        this.result = source["result"];
 	    }
 	
@@ -1912,6 +1914,7 @@ export namespace main {
 	    xiegu_port: string;
 	    xiegu_baud: number;
 	    xiegu_addr: number;
+	    xiegu_ptt_line: string;
 	    yaesu_port: string;
 	    yaesu_baud: number;
 	    kenwood_host: string;
@@ -1951,6 +1954,7 @@ export namespace main {
 	        this.xiegu_port = source["xiegu_port"];
 	        this.xiegu_baud = source["xiegu_baud"];
 	        this.xiegu_addr = source["xiegu_addr"];
+	        this.xiegu_ptt_line = source["xiegu_ptt_line"];
 	        this.yaesu_port = source["yaesu_port"];
 	        this.yaesu_baud = source["yaesu_baud"];
 	        this.kenwood_host = source["kenwood_host"];

internal/award/award.go

@@ -859,6 +859,10 @@ type Explanation struct {
 	RefCount   int      `json:"ref_count"`             // size of that list
 	Steps      []Step   `json:"steps"`
 	Manual     []string `json:"manual,omitempty"` // references the operator assigned by hand
+	// Superseded is what the matcher had found before the operator's choice
+	// replaced it — shown in the trace so a correction is explainable rather
+	// than mysterious.
+	Superseded []string `json:"superseded,omitempty"`
 	Result     []string `json:"result"` // what the QSO finally counts for
 }
 
@@ -977,7 +981,22 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
 	if ex != nil {
 		ex.Manual = manual
 	}
-	found = append(found, manual...)
+	// An operator's choice REPLACES what the matcher found. It does not join it.
+	//
+	// Adding to it was the behaviour, and it made a correction impossible: a
+	// German address matching two or three DOKs kept them all, so deleting the
+	// wrong ones and assigning the right one lasted exactly until the next
+	// recompute, which put them straight back. The operator was arguing with
+	// the matcher and could not win.
+	//
+	// One manual entry is stored per award (setOverrideRef drops the previous
+	// one), so this is an override in the storage as well as in the name.
+	if len(manual) > 0 {
+		if ex != nil {
+			ex.Superseded = dedupe(found)
+		}
+		found = manual
+	}
 	out := dedupe(found)
 	if ex != nil {
 		ex.Result = out

internal/award/override_test.go

@@ -0,0 +1,56 @@
+package award
+
+import (
+	"strings"
+	"testing"
+
+	"hamlog/internal/qso"
+)
+
+// An operator's correction must survive a recompute.
+//
+// Reported on the DARC DOK award: a German address matches two or three DOKs,
+// the operator deletes the wrong ones and assigns the right one, and the next
+// recompute puts the wrong ones straight back. The manual reference was being
+// ADDED to what the matcher found instead of replacing it, so the correction
+// could never win.
+func TestManualReferenceReplacesTheMatch(t *testing.T) {
+	// An award that reads the address and matches a reference's description —
+	// the shape the DOK award uses, and the shape that over-matches.
+	def := Def{
+		Code: "DLD", Name: "DARC DOK", Field: "address",
+		MatchBy: "description", Type: "QSOFIELDS", Valid: true,
+	}
+	metas := []RefMeta{
+		{Code: "A01", Name: "Berlin", Valid: true},
+		{Code: "B05", Name: "Berlin Mitte", Valid: true},
+	}
+	// An address that legitimately matches both.
+	q := &qso.QSO{
+		Callsign: "DL2FDM",
+		Address:  "Berlin Mitte, 10115 Berlin",
+	}
+
+	auto := Explain(def, metas, q)
+	if len(auto.Result) < 2 {
+		t.Fatalf("the test needs an over-matching case; got %v", auto.Result)
+	}
+
+	// The operator picks the right one.
+	q.Extras = map[string]string{ManualRefsKey: "DLD@B05"}
+	fixed := Explain(def, metas, q)
+
+	if got := strings.Join(fixed.Result, ","); got != "B05" {
+		t.Errorf("after the correction the QSO counts for %q — want B05 alone", got)
+	}
+	if len(fixed.Superseded) == 0 {
+		t.Error("the trace does not say what the correction replaced")
+	}
+
+	// A QSO with no correction still gets everything the matcher found: the
+	// override must not disable matching for everyone else.
+	q2 := &qso.QSO{Callsign: "DL3XYZ", Address: "Berlin Mitte, 10115 Berlin"}
+	if len(Explain(def, metas, q2).Result) < 2 {
+		t.Error("an untouched QSO lost its automatic references")
+	}
+}

internal/cat/kenwood.go

@@ -492,7 +492,25 @@ func (k *Kenwood) openPort() (serial.Port, error) {
 		}
 		return &tcpSerial{conn: c}, nil
 	}
-	return serial.Open(k.portName, &serial.Mode{BaudRate: k.baud})
+	p, err := serial.Open(k.portName, &serial.Mode{BaudRate: k.baud})
+	if err != nil {
+		return nil, err
+	}
+	// Deassert DTR and RTS.
+	//
+	// Windows raises both when a serial port is opened, and a great many
+	// interfaces read them as PTT: a Xiegu G90 behind a DE-19 goes into
+	// transmit the moment OpsLog connects and STAYS there — Xiegu's own
+	// documentation asks for RTS and DTR low. The same applies to an Icom with
+	// USB SEND mapped to a line (which is why the CI-V backend has done this
+	// from the start) and to any rig keyed by a home-made cable.
+	//
+	// PTT on this backend is a CAT command, so neither line should ever be
+	// asserted here. A station keying by RTS/DTR configures that separately,
+	// on its own port.
+	_ = p.SetDTR(false)
+	_ = p.SetRTS(false)
+	return p, nil
 }
 
 // tcpSerial presents a TCP connection as a serial.Port, so the backend has one

internal/cat/xiegu.go

@@ -56,6 +56,9 @@ type Xiegu struct {
 	// asking every cycle — a Xiegu that has no split must not cost a timeout per
 	// poll, which would slow the whole loop to a crawl.
 	splitSupported bool
+	// pttLine is "", "rts" or "dtr": which hardware line keys the rig, when the
+	// CI-V command does not.
+	pttLine string
 }
 
 func NewXiegu(portName string, baud int, addr int, digital string) *Xiegu {
@@ -74,6 +77,14 @@ func NewXiegu(portName string, baud int, addr int, digital string) *Xiegu {
 	}
 }
 
+// SetPTTLine selects the hardware line that keys this rig: "rts", "dtr", or ""
+// for the CI-V command. Set before Connect.
+func (x *Xiegu) SetPTTLine(line string) {
+	x.mu.Lock()
+	x.pttLine = strings.ToLower(strings.TrimSpace(line))
+	x.mu.Unlock()
+}
+
 func (x *Xiegu) Name() string { return "xiegu" }
 
 func (x *Xiegu) Connect() error {
@@ -87,6 +98,20 @@ func (x *Xiegu) Connect() error {
 		return fmt.Errorf("xiegu: open %s @ %d baud: %w", x.portName, x.baud, err)
 	}
 	p.SetReadTimeout(200 * time.Millisecond)
+	// Deassert DTR and RTS.
+	//
+	// Windows raises both when a serial port is opened, and a great many
+	// interfaces read them as PTT: a Xiegu G90 behind a DE-19 goes into
+	// transmit the moment OpsLog connects and STAYS there — Xiegu's own
+	// documentation asks for RTS and DTR low. The same applies to an Icom with
+	// USB SEND mapped to a line (which is why the CI-V backend has done this
+	// from the start) and to any rig keyed by a home-made cable.
+	//
+	// PTT on this backend is a CAT command, so neither line should ever be
+	// asserted here. A station keying by RTS/DTR configures that separately,
+	// on its own port.
+	_ = p.SetDTR(false)
+	_ = p.SetRTS(false)
 	x.port = p
 	x.splitSupported = true
 
@@ -177,12 +202,25 @@ func (x *Xiegu) SetMode(mode string) error {
 	return x.send(civ.CmdSetMode, m)
 }
 
+// SetPTT keys the transmitter, by CI-V or by a hardware line.
+//
+// A G90 does not transmit on the CI-V PTT command. Xiegu's own interfaces key
+// on RTS or DTR instead — the DE-19 does exactly that — which is why the line
+// can be selected here. Without it, WSJT-X talking to OpsLog's rigctld server
+// decoded perfectly and never transmitted: the command left, the radio ignored
+// it, and nothing in the chain was wrong enough to complain.
 func (x *Xiegu) SetPTT(on bool) error {
 	x.mu.Lock()
 	defer x.mu.Unlock()
 	if x.port == nil {
 		return fmt.Errorf("xiegu: not connected")
 	}
+	switch x.pttLine {
+	case "rts":
+		return x.port.SetRTS(on)
+	case "dtr":
+		return x.port.SetDTR(on)
+	}
 	v := byte(0x00)
 	if on {
 		v = 0x01

internal/cat/yaesu.go

@@ -150,6 +150,20 @@ func (y *Yaesu) Connect() error {
 	if err != nil {
 		return fmt.Errorf("yaesu: open %s @ %d baud: %w", y.portName, y.baud, err)
 	}
+	// Deassert DTR and RTS.
+	//
+	// Windows raises both when a serial port is opened, and a great many
+	// interfaces read them as PTT: a Xiegu G90 behind a DE-19 goes into
+	// transmit the moment OpsLog connects and STAYS there — Xiegu's own
+	// documentation asks for RTS and DTR low. The same applies to an Icom with
+	// USB SEND mapped to a line (which is why the CI-V backend has done this
+	// from the start) and to any rig keyed by a home-made cable.
+	//
+	// PTT on this backend is a CAT command, so neither line should ever be
+	// asserted here. A station keying by RTS/DTR configures that separately,
+	// on its own port.
+	_ = p.SetDTR(false)
+	_ = p.SetRTS(false)
 	p.SetReadTimeout(300 * time.Millisecond)
 	y.port = p