op25-container
- generate-config takes p25_mode "conventional" + conv_channels [{frequency,
name, nac}]. It builds fixed fsk4 channels (up to 2 on one non-tunable SDR,
DC spike kept off the channels) with no control channel to hunt. Two
channels send audio to UDP 23456/23457, and audio.py -2 + amplify(2) keeps
levels.
- tk_drb_conv.py (a tk_p25.rx_ctl subclass, copied into OP25 apps) reports
voice / NAC / encryption (LC service options + LDU2 ESS algid/keyid) for
conventional channels and applies the per-channel NAC filter, which stock
tk_p25 does not. Analog uses it too.
- Trunked P25 config is unchanged when p25_mode is absent.
drb-edge-node
- radio_config: system kind from type + config.mode (missing = trunked).
- conventional.py normalizes the console: a distinctive LC TGID, else the
channel's last TGID (30 s), else a synthetic per-channel id (freq/100 Hz).
Encrypted rows are never talkers. With exactly one conventional channel,
orphan audio is attributed to it at close, which fixes analog recording
(#20). The synthetic id and the real TGID on one channel never split.
- Health/dashboard: P25 conventional listen tab (/api/listen p25conv), and
conventional decode + encryption checks. The checkin carries radio_channels.
- Tests: edge 296 pass; op25-container 18 (new CI job). Reviewed by
drb-audio-review (findings fixed; simultaneous two-channel mixdown filed
as #26) and drb-qa-review.
Not verified on SDR hardware.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
178 lines
6.0 KiB
Python
178 lines
6.0 KiB
Python
from pydantic import BaseModel
|
|
from typing import List, Optional, Union
|
|
from enum import Enum
|
|
from config import bind_host
|
|
|
|
# Preset device settings for common RTL-SDR hardware.
|
|
# gains: OP25 gain string passed to the device block.
|
|
# ppm: frequency offset correction (user should calibrate and override).
|
|
# cqpsk_tracking: disable for TCXO dongles (RTL-SDR v3, NESDR) once PPM is dialled in;
|
|
# leave enabled for unknown hardware as a safety net.
|
|
HARDWARE_PRESETS: dict = {
|
|
"rtl-sdr-v3": {
|
|
"gains": "lna:34",
|
|
"ppm": 0.0,
|
|
"cqpsk_tracking": False,
|
|
},
|
|
"nesdr-smart-v4": {
|
|
"gains": "lna:32",
|
|
"ppm": 0.0,
|
|
"cqpsk_tracking": False,
|
|
},
|
|
"other": {
|
|
"gains": "lna:32",
|
|
"ppm": 0.0,
|
|
"cqpsk_tracking": True,
|
|
},
|
|
}
|
|
|
|
class DecodeMode(str, Enum):
|
|
P25 = "P25"
|
|
DMR = "DMR"
|
|
ANALOG = "NBFM"
|
|
|
|
class TalkgroupTag(BaseModel):
|
|
talkgroup: str
|
|
tagDec: int
|
|
|
|
# Defined before ConfigGenerator, which annotates a field with it. Under
|
|
# Python 3.14 (PEP 649) annotations are evaluated lazily, so the original
|
|
# order happened to work in the container; on 3.13 or earlier it is a hard
|
|
# NameError at import. Keep the definition above its first use so this file
|
|
# does not depend on the base image's Python version.
|
|
class IcecastConfig(BaseModel):
|
|
icecast_host: str
|
|
icecast_port: int
|
|
icecast_mountpoint: str
|
|
icecast_password: str
|
|
icecast_description: Optional[str] = "OP25"
|
|
icecast_genre: Optional[str] = "Public Safety"
|
|
|
|
|
|
class P25Mode(str, Enum):
|
|
TRUNKED = "trunked"
|
|
CONVENTIONAL = "conventional"
|
|
|
|
|
|
class ConventionalChannel(BaseModel):
|
|
"""One fixed P25 conventional voice channel (node-26#24)."""
|
|
frequency: int # Hz
|
|
name: str = ""
|
|
nac: Optional[int] = None # 0x001-0xFFF; None = accept any NAC
|
|
|
|
|
|
class ConfigGenerator(BaseModel):
|
|
type: DecodeMode
|
|
systemName: str
|
|
# P25 trunked: control channel list (Hz). NBFM: channels[0] is the one
|
|
# analog frequency to listen to (Hz). P25 conventional: unused — see
|
|
# conv_channels.
|
|
channels: List[Union[int, str]] = []
|
|
# P25 only. Missing = trunked, so every existing caller is unchanged.
|
|
p25_mode: P25Mode = P25Mode.TRUNKED
|
|
conv_channels: List[ConventionalChannel] = []
|
|
tags: Optional[List[TalkgroupTag]] = None
|
|
whitelist: Optional[List[int]] = None
|
|
icecastConfig: Optional[IcecastConfig] = None
|
|
hardware_preset: str = "rtl-sdr-v3"
|
|
ppm_override: Optional[float] = None # when set, overrides the preset's default PPM
|
|
# NBFM only: power squelch threshold in dB (op25_nbfm default is -60).
|
|
nbfm_squelch: Optional[float] = None
|
|
|
|
class DemodType(str, Enum):
|
|
CQPSK = "cqpsk"
|
|
FSK4 = "fsk4"
|
|
|
|
class FilterType(str, Enum):
|
|
RC = "rc"
|
|
WIDEPULSE = "widepulse"
|
|
|
|
class ChannelConfig(BaseModel):
|
|
name: str
|
|
trunking_sysname: Optional[str] = None
|
|
enable_analog: str
|
|
meta_stream_name: str
|
|
demod_type: DemodType
|
|
filter_type: FilterType
|
|
device: Optional[str] = "sdr"
|
|
cqpsk_tracking: Optional[bool] = None
|
|
frequency: Optional[int] = None
|
|
# Key name op25_nbfm.py actually reads (from_dict(config, 'nbfm_squelch_threshold', -60)).
|
|
nbfm_squelch_threshold: Optional[float] = None
|
|
destination: Optional[str] = "udp://127.0.0.1:23456"
|
|
# P25 conventional only, read by tk_drb_conv.py (not by multi_rx): the NAC
|
|
# to lock the frame assembler to. multi_rx passes the whole channel dict
|
|
# through, so an extra key is harmless.
|
|
nac: Optional[int] = None
|
|
# Set on the channel itself for conventional (multi_rx forwards it to the
|
|
# frame assembler). 2 = drop encrypted voice instead of decoding noise.
|
|
crypt_behavior: Optional[int] = None
|
|
tracking_threshold: Optional[int] = 120
|
|
tracking_feedback: Optional[float] = 0.75
|
|
excess_bw: Optional[float] = 0.2
|
|
if_rate: Optional[int] = 24000
|
|
plot: Optional[str] = ""
|
|
symbol_rate: Optional[int] = 4800
|
|
blacklist: Optional[str] = ""
|
|
whitelist: Optional[str] = ""
|
|
|
|
class DeviceConfig(BaseModel):
|
|
args: Optional[str] = "rtl"
|
|
gains: Optional[str] = "lna:39"
|
|
gain_mode: Optional[bool] = False
|
|
name: Optional[str] = "sdr"
|
|
# Centre frequency (Hz). Unset for trunked P25, where tk_p25 tunes the
|
|
# device; required for a fixed analog channel (tunable=False).
|
|
frequency: Optional[int] = None
|
|
offset: Optional[int] = 0
|
|
ppm: Optional[float] = 0.0
|
|
rate: Optional[int] = 1920000
|
|
usable_bw_pct: Optional[float] = 0.85
|
|
tunable: Optional[bool] = True
|
|
|
|
class TrunkingChannelConfig(BaseModel):
|
|
sysname: str
|
|
control_channel_list: str
|
|
tagsFile: Optional[str] = None
|
|
whitelist: Optional[str] = None
|
|
nac: Optional[str] = ""
|
|
wacn: Optional[str] = ""
|
|
tdma_cc: Optional[bool] = False
|
|
crypt_behavior: Optional[int] = 2
|
|
|
|
class TrunkingConfig(BaseModel):
|
|
module: str
|
|
chans: List[TrunkingChannelConfig]
|
|
|
|
class MetadataStreamConfig(BaseModel):
|
|
stream_name: str = "stream_0"
|
|
meta_format_idle: str = "[idle]"
|
|
meta_format_tgid: str = "[%TGID%]"
|
|
meta_format_tag: str = "[%TGID%] %TAG%"
|
|
icecastServerAddress: str = "localhost"
|
|
icecastMountpoint: str = "NODE_ID"
|
|
icecastMountExt: str = ".xspf"
|
|
icecastPass: str = "PASSWORD"
|
|
delay: float = 0.0
|
|
|
|
class MetadataConfig(BaseModel):
|
|
module: str = "icemeta.py"
|
|
streams: List[MetadataStreamConfig]
|
|
|
|
class TerminalConfig(BaseModel):
|
|
module: Optional[str] = "terminal.py"
|
|
# Bind address comes from OP25_DEBUG_EXPOSE (config.py) — 127.0.0.1 unless
|
|
# that flag is set. See config.py for why.
|
|
terminal_type: Optional[str] = f"http:{bind_host()}:8081"
|
|
terminal_timeout: Optional[float] = 5.0
|
|
curses_plot_interval: Optional[float] = 0.2
|
|
http_plot_interval: Optional[float] = 1.0
|
|
http_plot_directory: Optional[str] = "../www/images"
|
|
tuning_step_large: Optional[int] = 1200
|
|
tuning_step_small: Optional[int] = 100
|
|
|
|
|
|
|
|
### ======================================================
|
|
# Icecast models
|
|
# (IcecastConfig itself is defined above ConfigGenerator, which references it.) |