evan/ewconfig
1
Fork 0
Code

Tweaks

Browse Source
This commit is contained in:
Evan Pratten 2024-11-21 15:20:54 -05:00
parent b61aa049b5
commit 57b4f2e52c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/stacks/mqtt-ingest-radio-spots.docker-compose.yaml
View File

@ -6,7 +6,7 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
environment: environment:
- Mode=cw - MODE=cw
- MQTT_HOST=${MQTT_HOST} - MQTT_HOST=${MQTT_HOST}
rbn_ft8_to_mqtt: rbn_ft8_to_mqtt:
@ -16,5 +16,5 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
environment: environment:
- Mode=ft8 - MODE=ft8
- MQTT_HOST=${MQTT_HOST} - MQTT_HOST=${MQTT_HOST}

4
scripts/rbn-to-mqtt
View File

@ -6,7 +6,7 @@ import socket
import re import re
import json import json
import paho.mqtt.client as mqtt # pip install paho-mqtt import paho.mqtt.client as mqtt # pip install paho-mqtt
from datetime import datetime from datetime import datetime, UTC
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
RBN_SPOT_RE = re.compile(r"DX de (?P<spotter>[A-Z\d]+(?:-\d+)?)[^\d]+(?P<frequency>[\d\.]+)\s+(?P<spotted>[A-Z\d\/]+)\s+(?P<mode>[A-Z\d]+)\s+(?P<db>[a-zA-Z\d\-]+) dB\s+(?P<notes>(?:[A-Z]+\d+)|(?:\d+ WPM))?[^\d]+(?P<time>\d+Z)") RBN_SPOT_RE = re.compile(r"DX de (?P<spotter>[A-Z\d]+(?:-\d+)?)[^\d]+(?P<frequency>[\d\.]+)\s+(?P<spotted>[A-Z\d\/]+)\s+(?P<mode>[A-Z\d]+)\s+(?P<db>[a-zA-Z\d\-]+) dB\s+(?P<notes>(?:[A-Z]+\d+)|(?:\d+ WPM))?[^\d]+(?P<time>\d+Z)")
@ -58,7 +58,7 @@ def main() -> int:
values = match.groupdict() values = match.groupdict()
# Parse the timestamp into something more useful # Parse the timestamp into something more useful
utc_now = datetime.utcnow() utc_now = datetime.now(UTC)
timestamp = datetime(utc_now.year, utc_now.month, utc_now.day, int(values["time"][:2]), int(values["time"][2:4]), 0) timestamp = datetime(utc_now.year, utc_now.month, utc_now.day, int(values["time"][:2]), int(values["time"][2:4]), 0)
# Sanitize into a new dict # Sanitize into a new dict