From 22e16db1f27f8a74fe849d800bb13c1cc5656d09 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 27 Aug 2024 18:10:29 -0700 Subject: [PATCH] typos --- config.template | 6 +++--- mesh_bot.py | 6 +++--- modules/settings.py | 4 ++-- modules/system.py | 14 +++++++------- pong_bot.py | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config.template b/config.template index e3d6e9b..7aa0030 100644 --- a/config.template +++ b/config.template @@ -75,7 +75,7 @@ lon = -123.0 NOAAforecastDuration = 4 # number of weather alerts to display NOAAalertCount = 2 -# use Open-Meteo API for weather data not NOAA usefull for non US locations +# use Open-Meteo API for weather data not NOAA useful for non US locations UseMeteoWxAPI = False # Default to metric units rather than imperial useMetric = False @@ -93,8 +93,8 @@ repeater_channels = # using Hamlib rig control will monitor and alert on channel use enabled = False rigControlServerAddress = localhost:4532 -# brodcast to all nodes on the channel can alsp be = 2,3 -sigWatchBrodcastCh = 2 +# broadcast to all nodes on the channel can alsp be = 2,3 +sigWatchBroadcastCh = 2 # minimum SNR as reported by radio via hamlib signalDetectionThreshold = -10 # hold time for high SNR diff --git a/mesh_bot.py b/mesh_bot.py index 0baa335..f3d083a 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -419,8 +419,8 @@ async def start_rx(): logger.debug(f"System: Respond by DM only") if repeater_enabled and interface2_enabled: logger.debug(f"System: Repeater Enabled for Channels: {repeater_channels}") - if radio_dectection_enabled: - logger.debug(f"System: Radio Detection Enabled using rigctld at {rigControlServerAddress} brodcasting to channels: {sigWatchBrodcastCh} for {get_freq_common_name(get_hamlib('f'))}") + if radio_detection_enabled: + logger.debug(f"System: Radio Detection Enabled using rigctld at {rigControlServerAddress} brodcasting to channels: {sigWatchBroadcastCh} for {get_freq_common_name(get_hamlib('f'))}") if scheduler_enabled: # Examples of using the scheduler, Times here are in 24hr format # https://schedule.readthedocs.io/en/stable/ @@ -447,7 +447,7 @@ async def start_rx(): async def main(): meshRxTask = asyncio.create_task(start_rx()) watchdogTask = asyncio.create_task(watchdog()) - if radio_dectection_enabled: + if radio_detection_enabled: hamlibTask = asyncio.create_task(handleSignalWatcher()) await asyncio.wait([meshRxTask, watchdogTask, hamlibTask]) else: diff --git a/modules/settings.py b/modules/settings.py index 3a84880..823957c 100644 --- a/modules/settings.py +++ b/modules/settings.py @@ -118,9 +118,9 @@ try: repeater_enabled = config['repeater'].getboolean('enabled', False) repeater_channels = config['repeater'].get('repeater_channels', '').split(',') - radio_dectection_enabled = config['radioMon'].getboolean('enabled', False) + radio_detection_enabled = config['radioMon'].getboolean('enabled', False) rigControlServerAddress = config['radioMon'].get('rigControlServerAddress', 'localhost:4532') # default localhost:4532 - sigWatchBrodcastCh = config['radioMon'].get('sigWatchBrodcastCh', '2').split(',') # default Channel 2 + sigWatchBroadcastCh = config['radioMon'].get('sigWatchBroadcastCh', '2').split(',') # default Channel 2 signalDetectionThreshold = config['radioMon'].getint('signalDetectionThreshold', -10) # default -10 dBm signalHoldTime = config['radioMon'].getint('signalHoldTime', 10) # default 10 seconds signalCooldown = config['radioMon'].getint('signalCooldown', 5) # default 1 second diff --git a/modules/system.py b/modules/system.py index 8f74175..89d294d 100644 --- a/modules/system.py +++ b/modules/system.py @@ -81,7 +81,7 @@ if store_forward_enabled: help_message = help_message + ", messages" # Radio Monitor Configuration -if radio_dectection_enabled: +if radio_detection_enabled: from modules.radio import * # from the spudgunman/meshing-around repo # Interface1 Configuration @@ -523,7 +523,7 @@ async def BroadcastScheduler(): await asyncio.sleep(1) async def handleSignalWatcher(): - global lastHamLibAlert, antiSpam, sigWatchBrodcastCh + global lastHamLibAlert, antiSpam, sigWatchBroadcastCh # monitor rigctld for signal strength and frequency while True: msg = await signalWatcher() @@ -534,8 +534,8 @@ async def handleSignalWatcher(): if time.time() - lastHamLibAlert > 60: lastHamLibAlert = time.time() # if sigWatchBrodcastCh list contains multiple channels, broadcast to all - if type(sigWatchBrodcastCh) is list: - for ch in sigWatchBrodcastCh: + if type(sigWatchBroadcastCh) is list: + for ch in sigWatchBroadcastCh: if antiSpam and ch != publicChannel: send_message(msg, int(ch), 0, 1) if interface2_enabled: @@ -543,10 +543,10 @@ async def handleSignalWatcher(): else: logger.error(f"System: antiSpam prevented Alert from Hamlib {msg}") else: - if antiSpam and sigWatchBrodcastCh != publicChannel: - send_message(msg, int(sigWatchBrodcastCh), 0, 1) + if antiSpam and sigWatchBroadcastCh != publicChannel: + send_message(msg, int(sigWatchBroadcastCh), 0, 1) if interface2_enabled: - send_message(msg, int(sigWatchBrodcastCh), 0, 2) + send_message(msg, int(sigWatchBroadcastCh), 0, 2) else: logger.error(f"System: antiSpam prevented Alert from Hamlib {msg}") diff --git a/pong_bot.py b/pong_bot.py index 7ed0298..9f56d10 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -273,8 +273,8 @@ async def start_rx(): logger.debug(f"System: Respond by DM only") if repeater_enabled and interface2_enabled: logger.debug(f"System: Repeater Enabled for Channels: {repeater_channels}") - if radio_dectection_enabled: - logger.debug(f"System: Radio Detection Enabled using rigctld at {rigControlServerAddress} brodcasting to channels: {sigWatchBrodcastCh} for {get_freq_common_name(get_hamlib('f'))}") + if radio_detection_enabled: + logger.debug(f"System: Radio Detection Enabled using rigctld at {rigControlServerAddress} brodcasting to channels: {sigWatchBroadcastCh} for {get_freq_common_name(get_hamlib('f'))}") # here we go loopty loo while True: