Skip to content

Add hybrid squelch UI and manual threshold control feature #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xnetinho wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add hybrid squelch UI and manual threshold control feature #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ export default function App() {
volume: 20,
mute: false,
squelch: false,
squelchAuto: true,
squelchLevel: -80,
nr: false,
nb: false,
an: false,
Expand Down
2 changes: 2 additions & 0 deletions src/components/audio/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ export type AudioUiSettings = {
volume: number; // 0..100
mute: boolean;
squelch: boolean;
squelchAuto: boolean; // true = auto (statistical), false = manual threshold
squelchLevel: number; // manual threshold in dB (default: -80)
nr: boolean;
nb: boolean;
an: boolean;
Expand Down
14 changes: 9 additions & 5 deletions src/components/audio/useAudioClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export function useAudioClient({ receiverId, receiverSessionNonce, mode, centerH
const lastWindowRef = useRef<string>('');
const lastDemodRef = useRef<string>('');
const lastSentMuteRef = useRef<boolean | null>(null);
const lastSentSquelchRef = useRef<boolean | null>(null);
const lastSentSquelchRef = useRef<string | null>(null);
const lastSentAgcRef = useRef<string | null>(null);
const receiverIdRef = useRef<string | null>(receiverId);
const smeterOffsetDbRef = useRef<number>(0);
Expand Down Expand Up @@ -1003,10 +1003,14 @@ export function useAudioClient({ receiverId, receiverSessionNonce, mode, centerH
useEffect(() => {
if (!basicInfo) return;
const enabled = settings.squelch;
if (lastSentSquelchRef.current === enabled) return;
if (!send({ cmd: 'squelch', enabled })) return;
lastSentSquelchRef.current = enabled;
}, [basicInfo, connectionNonce, send, settings.squelch]);
const level = (enabled && !settings.squelchAuto)
? settings.squelchLevel - smeterOffsetDbRef.current
: null;
const key = `${enabled}:${settings.squelchAuto}:${settings.squelchLevel}`;
if (lastSentSquelchRef.current === key) return;
if (!send({ cmd: 'squelch', enabled, level })) return;
lastSentSquelchRef.current = key;
}, [basicInfo, connectionNonce, send, settings.squelch, settings.squelchAuto, settings.squelchLevel]);

useEffect(() => {
if (!basicInfo) return;
Expand Down
27 changes: 27 additions & 0 deletions src/components/receiver/panels/AudioPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,33 @@ export function AudioPanel({
/>
</div>

{settings.squelch && (
<div className="ml-2 space-y-2 border-l-2 border-primary/20 pl-3">
<ToggleSmall
label="Auto"
help="Uses automatic noise detection algorithm to open/close squelch."
checked={settings.squelchAuto}
onCheckedChange={(checked) =>
onChange((prev) => ({ ...prev, squelchAuto: checked }))
}
/>
{!settings.squelchAuto && (
<div className="space-y-1">
<Label className="text-xs">Level ({settings.squelchLevel} dB)</Label>
<Slider
value={[settings.squelchLevel]}
min={-140}
max={0}
step={1}
onValueChange={([v]) =>
onChange((prev) => ({ ...prev, squelchLevel: v }))
}
/>
</div>
)}
</div>
)}

<div className="grid grid-cols-3 gap-3">
<ToggleSmall
label="NR"
Expand Down