diff --git a/app.go b/app.go index 5857640..fe23fb0 100644 --- a/app.go +++ b/app.go @@ -14985,3 +14985,9 @@ func (a *App) yaesuDo(fn func(cat.YaesuController) error) error { func (a *App) SetYaesuModeRaw(mode string) error { return a.yaesuDo(func(y cat.YaesuController) error { return y.SetYaesuModeRaw(mode) }) } + +// SetYaesuSplitOffset turns split on with the TX VFO a fixed distance up — the +// classic "listen down, transmit up 5" of a phone pile-up, or up 1 on CW. +func (a *App) SetYaesuSplitOffset(offsetHz int64) error { + return a.yaesuDo(func(y cat.YaesuController) error { return y.SetYaesuSplitOffset(offsetHz) }) +} diff --git a/changelog.json b/changelog.json index efe3544..c1b19aa 100644 --- a/changelog.json +++ b/changelog.json @@ -3,7 +3,7 @@ "version": "0.21.9", "date": "2026-07-28", "en": [ - "Yaesu control panel: with the native Yaesu backend, a console tab and Main-view pane give S/PO/SWR meters, band and mode buttons, AF/RF/squelch, AGC, IPO-AMP1-AMP2, a 6/12/18 dB attenuator, NB, DNR, narrow filter, power, mic gain, VOX, split and ATU tune. CW, RTTY, DIGI and PSK show their sideband — double-click a button to switch it.", + "Yaesu control panel: with the native Yaesu backend, a console tab and Main-view pane give S/PO/SWR meters, band and mode buttons, AF/RF/squelch, AGC, IPO-AMP1-AMP2, a 6/12/18 dB attenuator, NB, DNR, narrow filter, power, mic gain, VOX, split and ATU tune. CW, RTTY, DIGI and PSK show their sideband — click an active button again to switch it. Split shows where you transmit, with one-touch up 1 kHz (CW) and up 5 kHz (phone).", "Native Xiegu CAT (G90, X6100, X6200, X5105): a new backend talks CI-V straight to the radio — frequency, mode, split and PTT. Pick \"Xiegu (native CI-V)\" in Settings → CAT. Untested on a radio so far, feedback welcome.", "CAT sharing: OpsLog can now serve its rig connection to other programs (Settings → CAT → Share CAT). WSJT-X, JTDX, MSHV or Log4OM connect with rig model \"Hamlib NET rigctl\" at 127.0.0.1:4532 — needed because a native CAT backend holds the radio serial port on its own. Works with every backend, and with both Hamlib command dialects (JTDX names the VFO, MSHV does not).", "Native Yaesu CAT: a new backend talks to an FTDX10/FTDX101 directly over its serial port, without OmniRig — frequency, mode, VFO A/B, split and PTT. Pick \"Yaesu (native CAT)\" in Settings → CAT. First release, feedback welcome.", @@ -16,7 +16,7 @@ "CQ and ITU zones you correct by hand in your profile stay corrected. They are derived from cty.dat, which gives the zones of the whole entity — in a country spanning several, the automatic value is wrong and it came back at every restart. They now only fill in when empty, and recompute when the callsign or grid changes." ], "fr": [ - "Panneau de contrôle Yaesu : avec le backend Yaesu natif, un onglet console et un volet de la vue principale offrent les mesures S/PO/ROS, les boutons de bande et de mode, AF/RF/squelch, AGC, IPO-AMP1-AMP2, un atténuateur 6/12/18 dB, NB, DNR, filtre étroit, puissance, gain micro, VOX, split et accord d'antenne. CW, RTTY, DIGI et PSK affichent leur bande latérale — double-cliquez pour en changer.", + "Panneau de contrôle Yaesu : avec le backend Yaesu natif, un onglet console et un volet de la vue principale offrent les mesures S/PO/ROS, les boutons de bande et de mode, AF/RF/squelch, AGC, IPO-AMP1-AMP2, un atténuateur 6/12/18 dB, NB, DNR, filtre étroit, puissance, gain micro, VOX, split et accord d'antenne. CW, RTTY, DIGI et PSK affichent leur bande latérale — recliquez sur le bouton actif pour en changer. Le split indique où vous émettez, avec +1 kHz (CW) et +5 kHz (phonie) en un geste.", "CAT Xiegu natif (G90, X6100, X6200, X5105) : un nouveau backend dialogue en CI-V directement avec la radio — fréquence, mode, split et PTT. À choisir dans Réglages → CAT sous « Xiegu (CI-V natif) ». Pas encore testé sur une radio, retours bienvenus.", "Partage du CAT : OpsLog peut désormais servir sa liaison radio aux autres logiciels (Réglages → CAT → Partager le CAT). WSJT-X, JTDX, MSHV ou Log4OM s'y connectent avec le modèle « Hamlib NET rigctl » sur 127.0.0.1:4532 — nécessaire car un backend CAT natif occupe seul le port série. Fonctionne avec tous les backends, et avec les deux dialectes Hamlib (JTDX nomme le VFO, MSHV non).", "CAT Yaesu natif : un nouveau backend dialogue directement avec un FTDX10/FTDX101 par son port série, sans OmniRig — fréquence, mode, VFO A/B, split et PTT. À choisir dans Réglages → CAT sous « Yaesu (CAT natif) ». Première version, retours bienvenus.", diff --git a/frontend/src/components/YaesuPanel.tsx b/frontend/src/components/YaesuPanel.tsx index 6497479..ebf13da 100644 --- a/frontend/src/components/YaesuPanel.tsx +++ b/frontend/src/components/YaesuPanel.tsx @@ -5,7 +5,7 @@ import { SetYaesuPower, SetYaesuMicGain, SetYaesuAFGain, SetYaesuRFGain, SetYaesuSquelch, SetYaesuAGC, SetYaesuPreamp, SetYaesuAtt, SetYaesuNB, SetYaesuNR, SetYaesuNRLevel, SetYaesuNarrow, SetYaesuVOX, SetYaesuSplit, SetYaesuBand, TuneYaesuATU, - SetYaesuModeRaw, GetCATState, + SetYaesuModeRaw, SetYaesuSplitOffset, GetCATState, } from '../../wailsjs/go/main/App'; import { cn } from '@/lib/utils'; import { useI18n } from '@/lib/i18n'; @@ -18,6 +18,7 @@ type YaesuState = { rf_power: number; mic_gain: number; af_gain: number; rf_gain: number; squelch: number; agc?: string; preamp: number; att: number; nb: boolean; nr: boolean; nr_level: number; narrow: boolean; vox: boolean; + split_tx_hz?: number; }; const ZERO: YaesuState = { @@ -33,9 +34,10 @@ const ZERO: YaesuState = { const BANDS = ['160m', '80m', '40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m']; // Mode buttons. CW, RTTY, DIGI and PSK exist on BOTH sidebands on a Yaesu and -// the operator is the one who knows which they want, so each carries its -// current sideband and DOUBLE-CLICK flips it. SSB picks its sideband from the -// frequency, as the band plan dictates, and AM/FM have none. +// the operator is the one who knows which they want, so each shows its sideband +// and CLICKING AN ACTIVE BUTTON AGAIN flips it: CW-U → CW-L → CW-U. One button, +// one finger, no hidden gesture. SSB takes its sideband from the frequency, as +// the band plan dictates, and AM/FM have none. // // PSK rides on the rig's DATA mode, like the other digital modes — the button // exists because the operator thinks in modes, not in what the radio calls them. @@ -294,12 +296,27 @@ export function YaesuPanel({ onReportRST }: { onReportRST?: (rst: string) => voi
{st.model || 'Yaesu'}
{fmtVFO(freqHz)}
+ {view.split && ( +
+ {t('yaesu.txOn')} {fmtVFO(view.split_tx_hz)} + {view.split_tx_hz && freqHz ? ' (' + (view.split_tx_hz > freqHz ? '+' : '') + Math.round((view.split_tx_hz - freqHz) / 100) / 10 + ' kHz)' : ''} +
+ )}
{st.transmitting && ( TX )} push('split', !view.split, () => SetYaesuSplit(!view.split))} label="SPLIT" /> + {/* The usual pile-up offsets. Which one is idiomatic depends on the + mode — up 5 on phone, up 1 on CW — so both are offered rather than + guessed, and each turns split on in the same action. */} + +