cli #15

Merged
madrigal merged 28 commits from cli into main 2025-12-22 10:42:57 -05:00
2 changed files with 8 additions and 6 deletions
Showing only changes of commit a898a0a076 - Show all commits

View File

@ -337,6 +337,8 @@ def capture(
if duration is not None and num_samples is None: if duration is not None and num_samples is None:
num_samples = int(duration * sample_rate) num_samples = int(duration * sample_rate)
echo_verbose(f"Duration {duration}s = {num_samples} samples at {format_sample_rate(sample_rate)}", verbose) echo_verbose(f"Duration {duration}s = {num_samples} samples at {format_sample_rate(sample_rate)}", verbose)
elif duration is None and num_samples is None:
raise click.ClickException(f"Must provide either --num-samples or --duration")
# Show capture parameters # Show capture parameters
echo_progress(f"Capturing from {device.upper()}...", quiet) echo_progress(f"Capturing from {device.upper()}...", quiet)

View File

@ -357,7 +357,7 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False):
try: try:
if device_type == "pluto": if device_type == "pluto":
from src.ria_toolkit_oss.sdr.pluto import Pluto from ria_toolkit_oss.sdr.pluto import Pluto
if ip_addr: if ip_addr:
return Pluto(identifier=ip_addr) return Pluto(identifier=ip_addr)
@ -365,17 +365,17 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False):
return Pluto() return Pluto()
elif device_type == "hackrf": elif device_type == "hackrf":
from src.ria_toolkit_oss.sdr.hackrf import HackRF from ria_toolkit_oss.sdr.hackrf import HackRF
return HackRF() return HackRF()
elif device_type == "bladerf": elif device_type == "bladerf":
from src.ria_toolkit_oss.sdr.blade import Blade from ria_toolkit_oss.sdr.blade import Blade
return Blade() return Blade()
elif device_type == "usrp": elif device_type == "usrp":
from src.ria_toolkit_oss.sdr.usrp import USRP from ria_toolkit_oss.sdr.usrp import USRP
if ip_addr: if ip_addr:
return USRP(identifier=f"addr={ip_addr}") return USRP(identifier=f"addr={ip_addr}")
@ -385,12 +385,12 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False):
return USRP() return USRP()
elif device_type == "rtlsdr": elif device_type == "rtlsdr":
from src.ria_toolkit_oss.sdr.rtlsdr import RTLSDR from ria_toolkit_oss.sdr.rtlsdr import RTLSDR
return RTLSDR() return RTLSDR()
elif device_type == "thinkrf": elif device_type == "thinkrf":
from src.ria_toolkit_oss.sdr.thinkrf import ThinkRF from ria_toolkit_oss.sdr.thinkrf import ThinkRF
if ip_addr: if ip_addr:
return ThinkRF(identifier=ip_addr) return ThinkRF(identifier=ip_addr)