From 1b904e9af7da0ed4f96364f4eda6624489562b64 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Fri, 26 Feb 2021 13:40:44 -0800 Subject: [PATCH] improve regexp for APRS messages --- bridge_gps_data.py | 2 +- gps_data.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge_gps_data.py b/bridge_gps_data.py index 049e968..b6fba2e 100755 --- a/bridge_gps_data.py +++ b/bridge_gps_data.py @@ -328,7 +328,7 @@ def process_sms(_rf_src, sms): elif 'A-' in sms and '@' in sms: #Example SMS text: @ARMDS A-This is a test. aprs_dest = re.sub('@| A-.*','',sms) - aprs_msg = re.sub('@.* A-|','',sms) + aprs_msg = re.sub('^@|.* A-|','',sms) logger.info('APRS message to ' + aprs_dest.upper() + '. Message: ' + aprs_msg) user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read()) if int_id(_rf_src) in user_settings and user_settings[int_id(_rf_src)][1]['ssid'] != '': diff --git a/gps_data.py b/gps_data.py index d7f5c98..a9d8978 100644 --- a/gps_data.py +++ b/gps_data.py @@ -321,7 +321,7 @@ def process_sms(_rf_src, sms): elif 'A-' in sms and '@' in sms: #Example SMS text: @ARMDS A-This is a test. aprs_dest = re.sub('@| A-.*','',sms) - aprs_msg = re.sub('@.* A-|','',sms) + aprs_msg = re.sub('^@|.* A-|','',sms) logger.info('APRS message to ' + aprs_dest.upper() + '. Message: ' + aprs_msg) user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read()) if int_id(_rf_src) in user_settings and user_settings[int_id(_rf_src)][1]['ssid'] != '':