Update README.md

disable dashboard stuff
add example config for combined application
2021-02-08 14:55:08 -08:00 · 2021-02-08 14:46:11 -08:00 · 2021-02-08 12:38:45 -08:00 · 2021-02-07 15:02:52 -08:00 · 2021-02-07 13:52:03 -08:00 · 2021-02-04 12:58:16 -08:00
24 changed files with 3936 additions and 28 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,7 @@
+## See the main README (under branch: gps) for more on the operation of the application.
+
+This branch is really no different than the other branches. It just has the dashboard disabled, and the example configs modified to make it easier to run on an Android device.
+
 ---
 ### FOR SUPPORT, DISCUSSION, GETTING INVOLVED ###

--- a/bridge.py
+++ b/bridge.py
@ -56,6 +56,9 @@ import pickle
 import logging
 logger = logging.getLogger(__name__)

+# Import UNIT time from rules.py
+from rules import UNIT_TIME, STATIC_UNIT
+

 # Does anybody read this stuff? There's a PEP somewhere that says I should do this.
 __author__     = 'Cortney T. Buffington, N0MJS'
@ -73,6 +76,14 @@ __email__      = 'n0mjs@me.com'
 # format 'unit_id': ('SYSTEM', time)
 UNIT_MAP = {} 

+# UNIX time for end of year 2060. This is used to keep subscribers in UNIT_MAP indefinitely to accomplish static routes for unit calls
+#time_2060 = 2871763199.0000000
+# 20 years in seconds. added to current at time of start to keep static units from being trimmed.
+time_20 = 630720000
+
+# Build a UNIT_MAP based on values in STATIC_MAP.
+for i in STATIC_UNIT:
+	UNIT_MAP[bytes_3(i[0])] = i[1], time() + time_20

 # Timed loop used for reporting HBP status
 #
@ -152,11 +163,12 @@ def rule_timer_loop():
            else:
                logger.debug('(ROUTER) Conference Bridge NO ACTION: System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))

-    _then = _now - 60
+    _then = _now - 60 * UNIT_TIME
    remove_list = []
+    #logger.info(UNIT_MAP)
    for unit in UNIT_MAP:
-        if UNIT_MAP[unit][1] < (_then):
-            remove_list.append(unit)
+       if UNIT_MAP[unit][1] < (_then):
+           remove_list.append(unit)

    for unit in remove_list:
        del UNIT_MAP[unit]
@ -427,9 +439,18 @@ class routerOBP(OPENBRIDGE):
        pkt_time = time()
        dmrpkt = _data[20:53]
        _bits = _data[15]
- 
+
+        # Check if subscriber is in STATIC_UNIT
+        for i in STATIC_UNIT:
+            # Subscriber is static. Add 20 years of time.
+            if i[0] == int_id(_rf_src):
+                map_time = pkt_time + time_20
+                logger.debug('Static Unit, update time.')
+            # Proceed as normal
+            else:
+                map_time = pkt_time        
        # Make/update this unit in the UNIT_MAP cache
-        UNIT_MAP[_rf_src] = (self.name, pkt_time)
+        UNIT_MAP[_rf_src] = (self.name, map_time)
        
        
        # Is this a new call stream?
@ -575,8 +596,11 @@ class routerOBP(OPENBRIDGE):
            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
        elif _call_type == 'unit':
            self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
-        elif _call_type == 'vscsbk':
-            logger.debug('CSBK recieved, but HBlink does not process them currently')
+        elif _call_type == 'vcsbk':
+            # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder.
+            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
+            logger.debug('CSBK recieved, but HBlink does not process them currently. Packets routed to talkgroup.')
+
        else:
            logger.error('Unknown call type recieved -- not processed')

@ -906,9 +930,20 @@ class routerHBP(HBSYSTEM):
        pkt_time = time()
        dmrpkt = _data[20:53]
        _bits = _data[15]
+
+        # Check if subscriber is in STATIC_UNIT
+        for i in STATIC_UNIT:
+            # Subscriber is static. Add 20 years of time.
+            if i[0] == int_id(_rf_src):
+                map_time = pkt_time + time_20
+                logger.debug('Static Unit, update time.')
+            # Proceed as normal
+            else:
+                map_time = pkt_time
 
+
        # Make/update this unit in the UNIT_MAP cache
-        UNIT_MAP[_rf_src] = (self.name, pkt_time)
+        UNIT_MAP[_rf_src] = (self.name, map_time)
        
        
        # Is this a new call stream?
@ -1051,7 +1086,9 @@ class routerHBP(HBSYSTEM):
            else:
                self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
        elif _call_type == 'vcsbk':
-            logger.debug('CSBK recieved, but HBlink does not process them currently')
+            # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder.
+            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
+            logger.debug('CSBK recieved, but HBlink does not process them currently. Packets routed to talkgroup.')
        else:
            logger.error('Unknown call type recieved -- not processed')

--- a/bridge_gps_data-SAMPLE.cfg
+++ b/bridge_gps_data-SAMPLE.cfg
@ -0,0 +1,329 @@
+# PROGRAM-WIDE PARAMETERS GO HERE
+# PATH - working path for files, leave it alone unless you NEED to change it
+# PING_TIME - the interval that peers will ping the master, and re-try registraion
+#           - how often the Master maintenance loop runs
+# MAX_MISSED - how many pings are missed before we give up and re-register
+#           - number of times the master maintenance loop runs before de-registering a peer
+#
+# ACLs:
+#
+# Access Control Lists are a very powerful tool for administering your system.
+# But they consume packet processing time. Disable them if you are not using them.
+# But be aware that, as of now, the configuration stanzas still need the ACL
+# sections configured even if you're not using them.
+#
+# REGISTRATION ACLS ARE ALWAYS USED, ONLY SUBSCRIBER AND TGID MAY BE DISABLED!!!
+#
+# The 'action' May be PERMIT|DENY
+# Each entry may be a single radio id, or a hypenated range (e.g. 1-2999)
+# Format:
+# 	ACL = 'action:id|start-end|,id|start-end,....'
+#		--for example--
+#	SUB_ACL: DENY:1,1000-2000,4500-60000,17
+#
+# ACL Types:
+# 	REG_ACL: peer radio IDs for registration (only used on HBP master systems)
+# 	SUB_ACL: subscriber IDs for end-users
+# 	TGID_TS1_ACL: destination talkgroup IDs on Timeslot 1
+# 	TGID_TS2_ACL: destination talkgroup IDs on Timeslot 2
+#
+# ACLs may be repeated for individual systems if needed for granularity
+# Global ACLs will be processed BEFORE the system level ACLs
+# Packets will be matched against all ACLs, GLOBAL first. If a packet 'passes'
+# All elements, processing continues. Packets are discarded at the first
+# negative match, or 'reject' from an ACL element.
+#
+# If you do not wish to use ACLs, set them to 'PERMIT:ALL'
+# TGID_TS1_ACL in the global stanza is used for OPENBRIDGE systems, since all
+# traffic is passed as TS 1 between OpenBridges
+[GLOBAL]
+PATH: ./
+PING_TIME: 5
+MAX_MISSED: 3
+USE_ACL: True
+REG_ACL: PERMIT:ALL
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+
+# NOT YET WORKING: NETWORK REPORTING CONFIGURATION
+#   Enabling "REPORT" will configure a socket-based reporting
+#   system that will send the configuration and other items
+#   to a another process (local or remote) that may process
+#   the information for some useful purpose, like a web dashboard.
+#
+#   REPORT - True to enable, False to disable
+#   REPORT_INTERVAL - Seconds between reports
+#   REPORT_PORT - TCP port to listen on if "REPORT_NETWORKS" = NETWORK
+#   REPORT_CLIENTS - comma separated list of IPs you will allow clients
+#       to connect on. Entering a * will allow all.
+#
+# ****FOR NOW MUST BE TRUE - USE THE LOOPBACK IF YOU DON'T USE THIS!!!****
+[REPORTS]
+REPORT: True
+REPORT_INTERVAL: 60
+REPORT_PORT: 4321
+REPORT_CLIENTS: 127.0.0.1
+
+
+# SYSTEM LOGGER CONFIGURAITON
+#   This allows the logger to be configured without chaning the individual
+#   python logger stuff. LOG_FILE should be a complete path/filename for *your*
+#   system -- use /dev/null for non-file handlers.
+#   LOG_HANDLERS may be any of the following, please, no spaces in the
+#   list if you use several:
+#       null
+#       console
+#       console-timed
+#       file
+#       file-timed
+#       syslog
+#   LOG_LEVEL may be any of the standard syslog logging levels, though
+#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
+#   used.
+#
+[LOGGER]
+LOG_FILE: ./hblink.log
+LOG_HANDLERS: console-timed
+LOG_LEVEL: DEBUG
+LOG_NAME: HBlink
+
+# DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
+# Ok, not the TGID, there's no master list I know of to download
+# This is intended as a facility for other applcations built on top of
+# HBlink to use, and will NOT be used in HBlink directly.
+# STALE_DAYS is the number of days since the last download before we
+# download again. Don't be an ass and change this to less than a few days.
+[ALIASES]
+TRY_DOWNLOAD: True
+PATH: ./
+PEER_FILE: peer_ids.json
+SUBSCRIBER_FILE: subscriber_ids.json
+TGID_FILE: talkgroup_ids.json
+PEER_URL: https://www.radioid.net/static/rptrs.json
+SUBSCRIBER_URL: https://www.radioid.net/static/users.json
+STALE_DAYS: 1
+
+# GPS/Data Application - by KF7EEL
+# Configure the settings for the DMR GPS to APRS position application here.
+#
+# DATA_DMR_ID - This is the DMR ID that users send DMR GPS data.
+# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
+# unit if you want users to send data as a private call, or both if you want both options.
+# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
+# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
+# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Login settings for APRS-IS.
+[GPS_DATA]
+DATA_DMR_ID: 9099
+CALL_TYPE: both
+USER_APRS_SSID: 15
+USER_APRS_COMMENT: HBLink3 D-APRS -
+
+# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
+APRS_LOGIN_CALL: N0CALL
+APRS_LOGIN_PASSCODE: 12345
+APRS_SERVER: rotate.aprs2.net
+APRS_PORT: 14580
+
+# The following settings are only applicable if you are using the gps_data_beacon_igate script.
+# They do not affect the operation gps_data itself.
+# Time in minutes.
+IGATE_BEACON_TIME = 45
+IGATE_BEACON_COMMENT = HBLink3 D-APRS Gateway
+IGATE_BEACON_ICON = /I
+IGATE_LATITUDE = 0000.00N
+IGATE_LONGITUDE = 00000.00W
+
+# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
+# to enable the email gateway. Leave as is to disable.
+EMAIL_SENDER: 
+EMAIL_PASSWORD: 
+SMTP_SERVER: smtp.gmail.com
+SMTP_PORT: 465
+
+# OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
+# OpenBridge is a protocol originall created by DMR+ for connection between an
+# IPSC2 server and Brandmeister. It has been implemented here at the suggestion
+# of the Brandmeister team as a way to legitimately connect HBlink to the
+# Brandemiester network.
+# It is recommended to name the system the ID of the Brandmeister server that
+# it connects to, but is not necessary. TARGET_IP and TARGET_PORT are of the
+# Brandmeister or IPSC2 server you are connecting to. PASSPHRASE is the password
+# that must be agreed upon between you and the operator of the server you are
+# connecting to. NETWORK_ID is a number in the format of a DMR Radio ID that
+# will be sent to the other server to identify this connection.
+# other parameters follow the other system types.
+#
+# ACLs:
+# OpenBridge does not 'register', so registration ACL is meaningless.
+# Proper OpenBridge passes all traffic on TS1.
+# HBlink can extend OPB to use both slots for unit calls only.
+# Setting "BOTH_SLOTS" True ONLY affects unit traffic!
+# Otherwise ACLs work as described in the global stanza
+[OBP-1]
+MODE: OPENBRIDGE
+ENABLED: False
+IP:
+PORT: 62035
+NETWORK_ID: 3129100
+PASSPHRASE: password
+TARGET_IP: 1.2.3.4
+TARGET_PORT: 62035
+BOTH_SLOTS: True
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_ACL: PERMIT:ALL
+
+# MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
+# HomeBrew Protocol Master instances go here.
+# IP may be left blank if there's one interface on your system.
+# Port should be the port you want this master to listen on. It must be unique
+# and unused by anything else.
+# Repeat - if True, the master repeats traffic to peers, False, it does nothing.
+#
+# MAX_PEERS -- maximun number of peers that may be connect to this master
+# at any given time. This is very handy if you're allowing hotspots to
+# connect, or using a limited computer like a Raspberry Pi.
+#
+# ACLs:
+# See comments in the GLOBAL stanza
+[MASTER-1]
+MODE: MASTER
+ENABLED: True
+REPEAT: True
+MAX_PEERS: 10
+EXPORT_AMBE: False
+IP:
+PORT: 54000
+PASSPHRASE: s3cr37w0rd
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+[D-APRS]
+MODE: MASTER
+ENABLED: True
+REPEAT: True
+MAX_PEERS: 2
+EXPORT_AMBE: False
+IP:
+PORT: 54070
+PASSPHRASE: passw0rd
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+# PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
+# There are a LOT of errors in the HB Protocol specifications on this one!
+# MOST of these items are just strings and will be properly dealt with by the program
+# The TX & RX Frequencies are 9-digit numbers, and are the frequency in Hz.
+# Latitude is an 8-digit unsigned floating point number.
+# Longitude is a 9-digit signed floating point number.
+# Height is in meters
+# Setting Loose to True relaxes the validation on packets received from the master.
+# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
+#
+# ACLs:
+# See comments in the GLOBAL stanza
+[REPEATER-1]
+MODE: PEER
+ENABLED: False
+LOOSE: False
+EXPORT_AMBE: False
+IP: 
+PORT: 54001
+MASTER_IP: 172.16.1.1
+MASTER_PORT: 54000
+PASSPHRASE: homebrew
+CALLSIGN: W1ABC
+RADIO_ID: 312000
+RX_FREQ: 449000000
+TX_FREQ: 444000000
+TX_POWER: 25
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 38.0000
+LONGITUDE: -095.0000
+HEIGHT: 75
+LOCATION: Anywhere, USA
+DESCRIPTION: This is a cool repeater
+URL: www.w1abc.org
+SOFTWARE_ID: 20170620
+PACKAGE_ID: MMDVM_HBlink
+GROUP_HANGTIME: 5
+OPTIONS:
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 
+PORT: 54073
+MASTER_IP: localhost
+MASTER_PORT: 54072
+passphrase: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 9999
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: Echo Server
+URL: www.github.com/kf7eel/hblink3
+SOFTWARE_ID: 20170620
+PACKAGE_ID: MMDVM_HBlink
+GROUP_HANGTIME: 5
+OPTIONS:
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+[XLX-1]
+MODE: XLXPEER
+ENABLED: False
+LOOSE: True
+EXPORT_AMBE: False
+IP: 
+PORT: 54002
+MASTER_IP: 172.16.1.1
+MASTER_PORT: 62030
+PASSPHRASE: passw0rd
+CALLSIGN: W1ABC
+RADIO_ID: 312000
+RX_FREQ: 449000000
+TX_FREQ: 444000000
+TX_POWER: 25
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 38.0000
+LONGITUDE: -095.0000
+HEIGHT: 75
+LOCATION: Anywhere, USA
+DESCRIPTION: This is a cool repeater
+URL: www.w1abc.org
+SOFTWARE_ID: 20170620
+PACKAGE_ID: MMDVM_HBlink
+GROUP_HANGTIME: 5
+XLXMODULE: 4004
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
--- a/bridge_gps_data.py
+++ b/bridge_gps_data.py
--- a/config.py
+++ b/config.py
@ -106,6 +106,7 @@ def build_config(_config_file):
    CONFIG['GLOBAL'] = {}
    CONFIG['REPORTS'] = {}
    CONFIG['LOGGER'] = {}
+    CONFIG['GPS_DATA'] = {}
    CONFIG['ALIASES'] = {}
    CONFIG['SYSTEMS'] = {}

@ -141,6 +142,30 @@ def build_config(_config_file):
                if not CONFIG['LOGGER']['LOG_FILE']:
                    CONFIG['LOGGER']['LOG_FILE'] = '/dev/null'

+            elif section == 'GPS_DATA':
+                CONFIG['GPS_DATA'].update({
+                    'DATA_DMR_ID': config.get(section, 'DATA_DMR_ID'),
+                    'USER_APRS_SSID': config.get(section, 'USER_APRS_SSID'),
+                    'CALL_TYPE': config.get(section, 'CALL_TYPE'),
+                    'USER_APRS_COMMENT': config.get(section, 'USER_APRS_COMMENT'),
+                    'APRS_LOGIN_CALL': config.get(section, 'APRS_LOGIN_CALL'),
+                    'APRS_LOGIN_PASSCODE': config.get(section, 'APRS_LOGIN_PASSCODE'),
+                    'APRS_SERVER': config.get(section, 'APRS_SERVER'),
+                    'APRS_PORT': config.get(section, 'APRS_PORT'),
+                    'IGATE_BEACON_TIME': config.get(section, 'IGATE_BEACON_TIME'),
+                    'IGATE_BEACON_ICON': config.get(section, 'IGATE_BEACON_ICON'),
+                    'IGATE_BEACON_COMMENT': config.get(section, 'IGATE_BEACON_COMMENT'),
+                    'IGATE_LATITUDE': config.get(section, 'IGATE_LATITUDE'),
+                    'IGATE_LONGITUDE': config.get(section, 'IGATE_LONGITUDE'),
+                    'EMAIL_SENDER': config.get(section, 'EMAIL_SENDER'),
+                    'EMAIL_PASSWORD': config.get(section, 'EMAIL_PASSWORD'),
+                    'SMTP_SERVER': config.get(section, 'SMTP_SERVER'),
+                    'SMTP_PORT': config.get(section, 'SMTP_PORT'),
+
+                })
+                if not CONFIG['LOGGER']['LOG_FILE']:
+                    CONFIG['LOGGER']['LOG_FILE'] = '/dev/null'
+
            elif section == 'ALIASES':
                CONFIG['ALIASES'].update({
                    'TRY_DOWNLOAD': config.getboolean(section, 'TRY_DOWNLOAD'),
@ -182,7 +207,7 @@ def build_config(_config_file):
                        'SOFTWARE_ID': bytes(config.get(section, 'SOFTWARE_ID').ljust(40)[:40], 'utf-8'),
                        'PACKAGE_ID': bytes(config.get(section, 'PACKAGE_ID').ljust(40)[:40], 'utf-8'),
                        'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'OPTIONS': b''.join([b'Type=HBlink;', bytes(config.get(section, 'OPTIONS'), 'utf-8')]),
+                        'OPTIONS': bytes(config.get(section, 'OPTIONS'), 'utf-8'),
                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
                        'SUB_ACL': config.get(section, 'SUB_ACL'),
                        'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
--- a/gps_data-SAMPLE.cfg
+++ b/gps_data-SAMPLE.cfg
@ -0,0 +1,252 @@
+# PROGRAM-WIDE PARAMETERS GO HERE
+# PATH - working path for files, leave it alone unless you NEED to change it
+# PING_TIME - the interval that peers will ping the master, and re-try registraion
+#           - how often the Master maintenance loop runs
+# MAX_MISSED - how many pings are missed before we give up and re-register
+#           - number of times the master maintenance loop runs before de-registering a peer
+#
+# ACLs:
+#
+# Access Control Lists are a very powerful tool for administering your system.
+# But they consume packet processing time. Disable them if you are not using them.
+# But be aware that, as of now, the configuration stanzas still need the ACL
+# sections configured even if you're not using them.
+#
+# REGISTRATION ACLS ARE ALWAYS USED, ONLY SUBSCRIBER AND TGID MAY BE DISABLED!!!
+#
+# The 'action' May be PERMIT|DENY
+# Each entry may be a single radio id, or a hypenated range (e.g. 1-2999)
+# Format:
+# 	ACL = 'action:id|start-end|,id|start-end,....'
+#		--for example--
+#	SUB_ACL: DENY:1,1000-2000,4500-60000,17
+#
+# ACL Types:
+# 	REG_ACL: peer radio IDs for registration (only used on HBP master systems)
+# 	SUB_ACL: subscriber IDs for end-users
+# 	TGID_TS1_ACL: destination talkgroup IDs on Timeslot 1
+# 	TGID_TS2_ACL: destination talkgroup IDs on Timeslot 2
+#
+# ACLs may be repeated for individual systems if needed for granularity
+# Global ACLs will be processed BEFORE the system level ACLs
+# Packets will be matched against all ACLs, GLOBAL first. If a packet 'passes'
+# All elements, processing continues. Packets are discarded at the first
+# negative match, or 'reject' from an ACL element.
+#
+# If you do not wish to use ACLs, set them to 'PERMIT:ALL'
+# TGID_TS1_ACL in the global stanza is used for OPENBRIDGE systems, since all
+# traffic is passed as TS 1 between OpenBridges
+[GLOBAL]
+PATH: ./
+PING_TIME: 5
+MAX_MISSED: 3
+USE_ACL: True
+REG_ACL: PERMIT:ALL
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+
+# NOT YET WORKING: NETWORK REPORTING CONFIGURATION
+#   Enabling "REPORT" will configure a socket-based reporting
+#   system that will send the configuration and other items
+#   to a another process (local or remote) that may process
+#   the information for some useful purpose, like a web dashboard.
+#
+#   REPORT - True to enable, False to disable
+#   REPORT_INTERVAL - Seconds between reports
+#   REPORT_PORT - TCP port to listen on if "REPORT_NETWORKS" = NETWORK
+#   REPORT_CLIENTS - comma separated list of IPs you will allow clients
+#       to connect on. Entering a * will allow all.
+#
+# ****FOR NOW MUST BE TRUE - USE THE LOOPBACK IF YOU DON'T USE THIS!!!****
+[REPORTS]
+REPORT: True
+REPORT_INTERVAL: 60
+REPORT_PORT: 4323
+REPORT_CLIENTS: 127.0.0.1
+
+
+# SYSTEM LOGGER CONFIGURAITON
+#   This allows the logger to be configured without chaning the individual
+#   python logger stuff. LOG_FILE should be a complete path/filename for *your*
+#   system -- use /dev/null for non-file handlers.
+#   LOG_HANDLERS may be any of the following, please, no spaces in the
+#   list if you use several:
+#       null
+#       console
+#       console-timed
+#       file
+#       file-timed
+#       syslog
+#   LOG_LEVEL may be any of the standard syslog logging levels, though
+#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
+#   used.
+#
+[LOGGER]
+LOG_FILE: ./gps_data.log
+LOG_HANDLERS: console-timed
+LOG_LEVEL: DEBUG
+LOG_NAME: HBlink3 GPS/Data
+
+# DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
+# Ok, not the TGID, there's no master list I know of to download
+# This is intended as a facility for other applcations built on top of
+# HBlink to use, and will NOT be used in HBlink directly.
+# STALE_DAYS is the number of days since the last download before we
+# download again. Don't be an ass and change this to less than a few days.
+[ALIASES]
+TRY_DOWNLOAD: True
+PATH: ./
+PEER_FILE: peer_ids.json
+SUBSCRIBER_FILE: subscriber_ids.json
+TGID_FILE: talkgroup_ids.json
+PEER_URL: https://www.radioid.net/static/rptrs.json
+SUBSCRIBER_URL: https://www.radioid.net/static/users.json
+STALE_DAYS: 1
+
+# GPS/Data Application - by KF7EEL
+# Configure the settings for the DMR GPS to APRS position application here.
+#
+# DATA_DMR_ID - This is the DMR ID that users send DMR GPS data.
+# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
+# unit if you want users to send data as a private call, or both if you want both options.
+# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
+# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
+# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Login settings for APRS-IS.
+[GPS_DATA]
+DATA_DMR_ID: 9099
+CALL_TYPE: unit
+USER_APRS_SSID: 15
+USER_APRS_COMMENT: HBLink3 D-APRS -
+
+# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
+APRS_LOGIN_CALL: N0CALL
+APRS_LOGIN_PASSCODE: 12345
+APRS_SERVER: rotate.aprs2.net
+APRS_PORT: 14580
+
+# The following settings are only applicable if you are using the gps_data_beacon_igate script.
+# They do not affect the operation gps_data itself.
+# Time in minutes.
+IGATE_BEACON_TIME = 45
+IGATE_BEACON_COMMENT = HBLink3 D-APRS Gateway
+IGATE_BEACON_ICON = /I
+IGATE_LATITUDE = 0000.00N
+IGATE_LONGITUDE = 00000.00W
+
+# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
+# to enable the email gateway. Leave as is to disable.
+EMAIL_SENDER: test@example.org
+EMAIL_PASSWORD: letmein
+SMTP_SERVER: smtp.gmail.com
+SMTP_PORT: 465
+
+# OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
+# OpenBridge is a protocol originall created by DMR+ for connection between an
+# IPSC2 server and Brandmeister. It has been implemented here at the suggestion
+# of the Brandmeister team as a way to legitimately connect HBlink to the
+# Brandemiester network.
+# It is recommended to name the system the ID of the Brandmeister server that
+# it connects to, but is not necessary. TARGET_IP and TARGET_PORT are of the
+# Brandmeister or IPSC2 server you are connecting to. PASSPHRASE is the password
+# that must be agreed upon between you and the operator of the server you are
+# connecting to. NETWORK_ID is a number in the format of a DMR Radio ID that
+# will be sent to the other server to identify this connection.
+# other parameters follow the other system types.
+#
+# ACLs:
+# OpenBridge does not 'register', so registration ACL is meaningless.
+# Proper OpenBridge passes all traffic on TS1.
+# HBlink can extend OPB to use both slots for unit calls only.
+# Setting "BOTH_SLOTS" True ONLY affects unit traffic!
+# Otherwise ACLs work as described in the global stanza
+
+##[OBP-1]
+##MODE: OPENBRIDGE
+##ENABLED: True
+##IP:
+##PORT: 62035
+##NETWORK_ID: 3129100
+##PASSPHRASE: password
+##TARGET_IP: 1.2.3.4
+##TARGET_PORT: 62035
+##BOTH_SLOTS: True
+##USE_ACL: True
+##SUB_ACL: DENY:1
+##TGID_ACL: PERMIT:ALL
+
+# MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
+# HomeBrew Protocol Master instances go here.
+# IP may be left blank if there's one interface on your system.
+# Port should be the port you want this master to listen on. It must be unique
+# and unused by anything else.
+# Repeat - if True, the master repeats traffic to peers, False, it does nothing.
+#
+# MAX_PEERS -- maximun number of peers that may be connect to this master
+# at any given time. This is very handy if you're allowing hotspots to
+# connect, or using a limited computer like a Raspberry Pi.
+#
+# ACLs:
+# See comments in the GLOBAL stanza
+[MASTER-1]
+MODE: MASTER
+ENABLED: False
+REPEAT: True
+MAX_PEERS: 10
+EXPORT_AMBE: False
+IP:
+PORT: 54000
+PASSPHRASE: password
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+# PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
+# There are a LOT of errors in the HB Protocol specifications on this one!
+# MOST of these items are just strings and will be properly dealt with by the program
+# The TX & RX Frequencies are 9-digit numbers, and are the frequency in Hz.
+# Latitude is an 8-digit unsigned floating point number.
+# Longitude is a 9-digit signed floating point number.
+# Height is in meters
+# Setting Loose to True relaxes the validation on packets received from the master.
+# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
+#
+# ACLs:
+# See comments in the GLOBAL stanza
+
+[D-APRS]
+MODE: PEER
+ENABLED: True
+LOOSE: True
+EXPORT_AMBE: False
+IP: 
+PORT: 54071
+MASTER_IP: localhost
+MASTER_PORT: 54070
+PASSPHRASE: passw0rd
+CALLSIGN: D-APRS
+RADIO_ID: 9099
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: GPS to APRS
+URL: www.github.com/kf7eel/hblink3
+SOFTWARE_ID: 20170620
+PACKAGE_ID: MMDVM_HBlink
+GROUP_HANGTIME: 5
+OPTIONS:
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
--- a/gps_data.py
+++ b/gps_data.py
@ -0,0 +1,705 @@
+#!/usr/bin/env python3
+#
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
+#   Annotated modifications Copyright (C) 2021 Xavier FRS2013
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+###############################################################################
+
+'''
+This is a GPS and Data application. It decodes and reassambles DMR GPS packets and
+uploads them th APRS-IS.
+'''
+
+# Python modules we need
+import sys
+from bitarray import bitarray
+from time import time
+from importlib import import_module
+from types import ModuleType
+
+# Twisted is pretty important, so I keep it separate
+from twisted.internet.protocol import Factory, Protocol
+from twisted.protocols.basic import NetstringReceiver
+from twisted.internet import reactor, task
+
+# Things we import from the main hblink module
+from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, config_reports, mk_aliases, acl_check
+from dmr_utils3.utils import bytes_3, int_id, get_alias
+from dmr_utils3 import decode, bptc, const
+import config
+import log
+import const
+
+# The module needs logging logging, but handlers, etc. are controlled by the parent
+import logging
+logger = logging.getLogger(__name__)
+
+# Other modules we need for data and GPS
+from bitarray import bitarray
+from binascii import b2a_hex as ahex
+import re
+##from binascii import a2b_hex as bhex
+import aprslib
+import datetime
+from bitarray.util import ba2int as ba2num
+from bitarray.util import ba2hex as ba2hx
+import codecs
+import time
+#Needed for working with NMEA
+import pynmea2
+
+# Modules for executing commands/scripts
+import os
+from gps_functions import cmd_list
+
+# Module for maidenhead grids
+try:
+    import maidenhead as mh
+except:
+    logger.info('Error importing maidenhead module, make sure it is installed.')
+# Module for sending email
+try:
+    import smtplib
+except:
+    logger.info('Error importing smtplib module, make sure it is installed.')
+
+#Modules for APRS settings
+import ast
+from pathlib import Path
+
+
+# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
+__author__     = 'Cortney T. Buffington, N0MJS; Eric Craw, KF7EEL'
+__copyright__  = 'Copyright (c) 2020 Cortney T. Buffington'
+__credits__    = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT'
+__license__    = 'GNU GPLv3'
+__maintainer__ = 'Eric Craw, KF7EEL'
+__email__      = 'kf7eel@qsl.net'
+__status__     = 'pre-alpha'
+
+# Must have the following at line 1054 in bridge.py to forward group vcsbk, also there is a typo there:
+# self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
+
+##################################################################################################
+
+# Headers for GPS by model of radio:
+# AT-D878 - Compressed UDP
+# MD-380 - Unified Data Transport
+hdr_type = ''
+btf = ''
+ssid = ''
+
+# From dmr_utils3, modified to decode entire packet. Works for 1/2 rate coded data. 
+def decode_full(_data):
+    binlc = bitarray(endian='big')   
+    binlc.extend([_data[136],_data[121],_data[106],_data[91], _data[76], _data[61], _data[46], _data[31]])
+    binlc.extend([_data[152],_data[137],_data[122],_data[107],_data[92], _data[77], _data[62], _data[47], _data[32], _data[17], _data[2]  ])
+    binlc.extend([_data[123],_data[108],_data[93], _data[78], _data[63], _data[48], _data[33], _data[18], _data[3],  _data[184],_data[169]])
+    binlc.extend([_data[94], _data[79], _data[64], _data[49], _data[34], _data[19], _data[4],  _data[185],_data[170],_data[155],_data[140]])
+    binlc.extend([_data[65], _data[50], _data[35], _data[20], _data[5],  _data[186],_data[171],_data[156],_data[141],_data[126],_data[111]])
+    binlc.extend([_data[36], _data[21], _data[6],  _data[187],_data[172],_data[157],_data[142],_data[127],_data[112],_data[97], _data[82] ])
+    binlc.extend([_data[7],  _data[188],_data[173],_data[158],_data[143],_data[128],_data[113],_data[98], _data[83]])
+    #This is the rest of the Full LC data -- the RS1293 FEC that we don't need
+    # This is extremely important for SMS and GPS though.
+    binlc.extend([_data[68],_data[53],_data[174],_data[159],_data[144],_data[129],_data[114],_data[99],_data[84],_data[69],_data[54],_data[39]])
+    binlc.extend([_data[24],_data[145],_data[130],_data[115],_data[100],_data[85],_data[70],_data[55],_data[40],_data[25],_data[10],_data[191]])
+    return binlc
+   
+
+n_packet_assembly = 0
+
+packet_assembly = ''
+
+final_packet = ''
+
+#Convert DMR packet to binary from MMDVM packet and remove Slot Type and EMB Sync stuff to allow for BPTC 196,96 decoding
+def bptc_decode(_data):
+        binary_packet = bitarray(decode.to_bits(_data[20:]))
+        del binary_packet[98:166]
+        return decode_full(binary_packet)
+# Placeholder for future header id
+def header_ID(_data):
+    hex_hdr = str(ahex(bptc_decode(_data)))
+    return hex_hdr[2:6]
+    # Work in progress, used to determine data format
+##    pass
+
+def aprs_send(packet):
+    if aprs_callsign == 'N0CALL':
+        logger.info('APRS callsighn set to N0CALL, packet not sent.')
+        pass
+    else:
+        AIS = aprslib.IS(aprs_callsign, passwd=aprs_passcode,host=aprs_server, port=aprs_port)
+        AIS.connect()
+        AIS.sendall(packet)
+        AIS.close()
+        logger.info('Packet sent to APRS-IS.')
+
+def dashboard_loc_write(call, lat, lon, time):
+    pass
+##    #try:
+##    dash_entries = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
+##   # except:
+##    #    dash_entries = []
+##    dash_entries.insert(0, {'call': call, 'lat': lat, 'lon': lon, 'time':time})
+##    with open("/tmp/gps_data_user_loc.txt", 'w') as user_loc_file:
+##            user_loc_file.write(str(dash_entries[:15]))
+##            user_loc_file.close()
+##    logger.info('User location saved for dashboard')
+##    #logger.info(dash_entries)
+
+def dashboard_bb_write(call, dmr_id, time, bulletin):
+    pass
+##    #try:
+##    dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
+##   # except:
+##    #    dash_entries = []
+##    dash_bb.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'bulliten':bulletin})
+##    with open("/tmp/gps_data_user_bb.txt", 'w') as user_bb_file:
+##            user_bb_file.write(str(dash_bb[:10]))
+##            user_bb_file.close()
+##    logger.info('User bulletin entry saved.')
+##    #logger.info(dash_bb)
+
+# Send email via SMTP function
+def send_email(to_email, email_subject, email_message):
+    global smtp_server
+    sender_address = email_sender
+    account_password = email_password
+    smtp_server = smtplib.SMTP_SSL(smtp_server, int(smtp_port))
+    smtp_server.login(sender_address, account_password)
+    message = "From: " + aprs_callsign + " D-APRS Gateway\nTo: " + to_email + "\nContent-type: text/html\nSubject: " + email_subject + "\n\n" + '<strong>' + email_subject + '</strong><p>&nbsp;</p><h3>' + email_message + '</h3><p>&nbsp;</p><p>This message was sent to you from a D-APRS gateway operated by <strong>' + aprs_callsign + '</strong>. Do not reply as this gateway is only one way at this time.</p>'
+    smtp_server.sendmail(sender_address, to_email, message)
+    smtp_server.close()
+
+# Thanks for this forum post for this - https://stackoverflow.com/questions/2579535/convert-dd-decimal-degrees-to-dms-degrees-minutes-seconds-in-python
+
+def decdeg2dms(dd):
+   is_positive = dd >= 0
+   dd = abs(dd)
+   minutes,seconds = divmod(dd*3600,60)
+   degrees,minutes = divmod(minutes,60)
+   degrees = degrees if is_positive else -degrees
+   return (degrees,minutes,seconds)
+
+def user_setting_write(dmr_id, setting, value):
+##    try:
+    # Open file and load as dict for modification
+        with open("./user_settings.txt", 'r') as f:
+##            if f.read() == '{}':
+##                user_dict = {}
+            user_dict = ast.literal_eval(f.read())
+            logger.info('Current settings: ' + str(user_dict))
+            if dmr_id not in user_dict:
+                user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
+
+            if setting.upper() == 'ICON':
+                user_dict[dmr_id][2]['icon'] = value
+            if setting.upper() == 'SSID':
+                user_dict[dmr_id][1]['ssid'] = value  
+            if setting.upper() == 'COM':
+                user_comment = user_dict[dmr_id][3]['comment'] = value[0:35]
+            f.close()
+            logger.info('Loaded user settings. Preparing to write...')
+    # Write modified dict to file
+        with open("./user_settings.txt", 'w') as user_dict_file:
+            user_dict_file.write(str(user_dict))
+            user_dict_file.close()
+            logger.info('User setting saved')
+            f.close()
+            packet_assembly = ''
+##    except:
+##        logger.info('No data file found, creating one.')
+##        #Path('./user_settings.txt').mkdir(parents=True, exist_ok=True)
+##        Path('./user_settings.txt').touch()
+        
+# Process SMS, do something bases on message
+
+def process_sms(_rf_src, sms):
+    if sms == 'ID':
+        logger.info(str(get_alias(int_id(from_id), subscriber_ids)) + ' - ' + str(int_id(from_id)))
+    elif sms == 'TEST':
+        logger.info('It works!')
+    elif '@ICON' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@ICON| ','',sms))
+    elif '@SSID' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@SSID| ','',sms))
+    elif '@COM' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@COM |@COM','',sms))
+    elif '@BB' in sms:
+        dashboard_bb_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.strftime('%H:%M:%S - %m/%d/%y'), re.sub('@BB|@BB ','',sms))
+    elif '@' and ' E-' in sms:
+        email_message = re.sub('.*@|.* E-', '', sms)
+        to_email = re.sub(' E-.*', '', sms)
+        email_subject = 'New message from ' + str(get_alias(int_id(_rf_src), subscriber_ids))
+        logger.info('Email to: ' + to_email)
+        logger.info('Message: ' + email_message)
+        try:
+            send_email(to_email, email_subject, email_message)
+            logger.info('Email sent.')
+        except:
+            logger.info('Failed to send email.')
+    elif '@MH' in sms:
+        grid_square = re.sub('@MH ', '', sms)
+        if len(grid_square) < 6:
+            pass
+        else:
+            lat = decdeg2dms(mh.to_location(grid_square)[0])
+            lon = decdeg2dms(mh.to_location(grid_square)[1])
+            
+            if lon[0] < 0:
+                lon_dir = 'W'
+            if lon[0] > 0:
+                lon_dir = 'E'
+            if lat[0] < 0:
+                lat_dir = 'S'
+            if lat[0] > 0:
+                lat_dir = 'N'
+            #logger.info(lat)
+            #logger.info(lat_dir)
+            aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.')).zfill(5) + '  ' + lat_dir
+            aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.')).zfill(6) + '  ' + lon_dir
+        logger.info('Latitude: ' + str(aprs_lat))
+        logger.info('Longitude: ' + str(aprs_lon))
+        # 14FRS2013 simplified and moved settings retrieval
+        user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())	
+        if int_id(_rf_src) not in user_settings:	
+            ssid = str(user_ssid)	
+            icon_table = '/'	
+            icon_icon = '['	
+            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+        else:	
+            if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                ssid = user_ssid	
+            if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+            if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                icon_table = '/'	
+                icon_icon = '['	
+            if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+            if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+            if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                comment = user_settings[int_id(_rf_src)][3]['comment']	
+        aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
+        logger.info(aprs_loc_packet)
+        logger.info('User comment: ' + comment)
+        logger.info('User SSID: ' + ssid)
+        logger.info('User icon: ' + icon_table + icon_icon)
+        try:
+            aprslib.parse(aprs_loc_packet)
+            aprs_send(aprs_loc_packet)
+            dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y'))
+            #logger.info('Sent manual position to APRS')
+        except:
+            logger.info('Exception. Not uploaded')
+        packet_assembly = ''
+          
+            
+    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)
+        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'] != '':
+            ssid = user_settings[int_id(_rf_src)][1]['ssid']
+        else:
+            ssid = user_ssid
+        aprs_msg_pkt = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(ssid) + '>APHBL3,TCPIP*::' + str(aprs_dest).ljust(9).upper() + ':' + aprs_msg[0:73]
+        logger.info(aprs_msg_pkt)
+        try:
+            aprslib.parse(aprs_msg_pkt)
+            aprs_send(aprs_msg_pkt)
+            #logger.info('Packet sent.')
+        except:
+            logger.info('Error uploading MSG packet.')
+    try:
+        if sms in cmd_list:
+            logger.info('Executing command/script.')
+            os.popen(cmd_list[sms]).read()
+            packet_assembly = ''
+    except:
+        logger.info('Exception. Command possibly not in list, or other error.')
+        packet_assembly = ''
+    else:
+        pass
+
+###########
+
+    
+class DATA_SYSTEM(HBSYSTEM):
+##    global n_packet_assembly, packet_assembly
+
+    def __init__(self, _name, _config, _report):
+        HBSYSTEM.__init__(self, _name, _config, _report)
+
+    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
+        # Capture data headers
+        global n_packet_assembly, hdr_type
+        #logger.info(_dtype_vseq)
+        logger.info(time.strftime('%H:%M:%S - %m/%d/%y'))
+        #logger.info('Special debug for developement:')
+        #logger.info(ahex(bptc_decode(_data)))
+        #logger.info(hdr_type)
+        #logger.info((ba2num(bptc_decode(_data)[8:12])))
+        if int_id(_dst_id) == data_id:
+            #logger.info(type(_seq))
+            if type(_seq) is bytes:
+                pckt_seq = int.from_bytes(_seq, 'big')
+            else:
+                pckt_seq = _seq
+            # Try to classify header
+            # UDT header has DPF of 0101, which is 5.
+            # If 5 is at position 3, then this should be a UDT header for MD-380 type radios.
+            # Coordinates are usually in the very next block after the header, we will discard the rest.
+            #logger.info(ahex(bptc_decode(_data)[0:10]))
+            if _call_type == call_type and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0 or (_call_type == 'vcsbk' and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0):
+                global udt_block
+                logger.info('MD-380 type UDT header detected. Very next packet should be location.')
+                hdr_type = '380'
+            if _dtype_vseq == 6 and hdr_type == '380' or _dtype_vseq == 'group' and hdr_type == '380':
+                udt_block = 1
+            if _dtype_vseq == 7 and hdr_type == '380':
+                udt_block = udt_block - 1
+                if udt_block == 0:
+                    logger.info('MD-380 type packet. This should contain the GPS location.')
+                    logger.info('Packet: ' + str(ahex(bptc_decode(_data))))
+                    if ba2num(bptc_decode(_data)[1:2]) == 1:
+                        lat_dir = 'N'
+                    if ba2num(bptc_decode(_data)[1:2]) == 0:
+                        lat_dir = 'S'
+                    if ba2num(bptc_decode(_data)[2:3]) == 1:
+                        lon_dir = 'E'
+                    if ba2num(bptc_decode(_data)[2:3]) == 0:
+                        lon_dir = 'W'
+                    lat_deg = ba2num(bptc_decode(_data)[11:18])
+                    lon_deg = ba2num(bptc_decode(_data)[38:46])
+                    lat_min = ba2num(bptc_decode(_data)[18:24])
+                    lon_min = ba2num(bptc_decode(_data)[46:52])
+                    lat_min_dec = str(ba2num(bptc_decode(_data)[24:38])).zfill(4)
+                    lon_min_dec = str(ba2num(bptc_decode(_data)[52:66])).zfill(4)
+                    aprs_lat = str(str(lat_deg) + str(lat_min) + '.' + str(lat_min_dec)[0:2]).zfill(7) + lat_dir
+                    aprs_lon = str(str(lon_deg) + str(lon_min) + '.' + str(lon_min_dec)[0:2]).zfill(8) + lon_dir
+                    # Form APRS packet
+                    #logger.info(aprs_loc_packet)
+                    logger.info('Lat: ' + str(aprs_lat) + ' Lon: ' + str(aprs_lon))
+                    # 14FRS2013 simplified and moved settings retrieval
+                    user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())
+                    if int_id(_rf_src) not in user_settings:	
+                        ssid = str(user_ssid)	
+                        icon_table = '/'	
+                        icon_icon = '['	
+                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+                    else:	
+                        if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                            ssid = user_ssid	
+                        if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+                        if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                            icon_table = '/'	
+                            icon_icon = '['	
+                        if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                            icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                            icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+                        if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                            ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+                        if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                            comment = user_settings[int_id(_rf_src)][3]['comment']
+                    aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
+                    logger.info(aprs_loc_packet)
+                    logger.info('User comment: ' + comment)
+                    logger.info('User SSID: ' + ssid)
+                    logger.info('User icon: ' + icon_table + icon_icon)
+                    # Attempt to prevent malformed packets from being uploaded.
+                    try:
+                        aprslib.parse(aprs_loc_packet)
+                        float(lat_deg) < 91
+                        float(lon_deg) < 121
+                        aprs_send(aprs_loc_packet)
+                        dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y'))
+                        #logger.info('Sent APRS packet')
+                    except:
+                        logger.info('Error. Failed to send packet. Packet may be malformed.')
+                    udt_block = 1
+                    hdr_type = ''
+                else:
+                      pass
+            #NMEA type packets for Anytone like radios.
+            #if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3): #int.from_bytes(_seq, 'big') > 3 ):
+            # 14FRS2013 contributed improved header filtering, KF7EEL added conditions to allow both call types at the same time
+            if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'unit' and pckt_seq > 3 and call_type == 'both'): #int.from_bytes(_seq, 'big') > 3 ):
+                global packet_assembly, btf
+                if _dtype_vseq == 6 or _dtype_vseq == 'group':
+                    global btf, hdr_start
+                    hdr_start = str(header_ID(_data))
+                    logger.info('Header from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)))
+                    logger.info(ahex(bptc_decode(_data)))
+                    logger.info('Blocks to follow: ' + str(ba2num(bptc_decode(_data)[65:72])))
+                    btf = ba2num(bptc_decode(_data)[65:72])
+                    # Try resetting packet_assembly
+                    packet_assembly = ''
+                # Data blocks at 1/2 rate, see https://github.com/g4klx/MMDVM/blob/master/DMRDefines.h for data types. _dtype_seq defined here also
+                if _dtype_vseq == 7:
+                    btf = btf - 1
+                    logger.info('Block #: ' + str(btf))
+                    #logger.info(_seq)
+                    logger.info('Data block from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)) + '. Destination: ' + str(int_id(_dst_id)))
+                    logger.info(ahex(bptc_decode(_data)))
+                    if _seq == 0:
+                        n_packet_assembly = 0
+                        packet_assembly = ''
+                        
+                    #if btf < btf + 1:
+                    # 14FRS2013 removed condition, works great!
+                    n_packet_assembly = n_packet_assembly + 1
+                    packet_assembly = packet_assembly + str(bptc_decode(_data)) #str((decode_full_lc(b_packet)).strip('bitarray('))
+                    # Use block 0 as trigger. $GPRMC must also be in string to indicate NMEA.
+                    # This triggers the APRS upload
+                    if btf == 0:
+                        final_packet = str(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly)).tobytes().decode('utf-8', 'ignore'))
+                        sms_hex = str(ba2hx(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly))))
+
+                        sms_hex_string = re.sub("b'|'", '', str(sms_hex))
+                        #NMEA GPS sentence
+                        if '$GPRMC' in final_packet or '$GNRMC' in final_packet:
+                            logger.info(final_packet + '\n')
+                            # Eliminate excess bytes based on NMEA type
+                            # GPRMC
+                            if 'GPRMC' in final_packet:
+                                logger.info('GPRMC location')
+                                #nmea_parse = re.sub('A\*.*|.*\$', '', str(final_packet))
+                                nmea_parse = re.sub('A\*.*|.*\$|\n.*', '', str(final_packet))
+                            # GNRMC
+                            if 'GNRMC' in final_packet:
+                                logger.info('GNRMC location')
+                                nmea_parse = re.sub('.*\$|\n.*|V\*.*', '', final_packet)
+                            loc = pynmea2.parse(nmea_parse, check=False)
+                            logger.info('Latitude: ' + str(loc.lat) + str(loc.lat_dir) + ' Longitude: ' + str(loc.lon) + str(loc.lon_dir) + ' Direction: ' + str(loc.true_course) + ' Speed: ' + str(loc.spd_over_grnd) + '\n')
+                            try:
+                                # Begin APRS format and upload
+                                # Disable opening file for reading to reduce "collision" or reading and writing at same time.
+                                # 14FRS2013 simplified and moved settings retrieval
+                                user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())	
+                                if int_id(_rf_src) not in user_settings:	
+                                    ssid = str(user_ssid)	
+                                    icon_table = '/'	
+                                    icon_icon = '['	
+                                    comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+                                else:	
+                                    if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                                        ssid = user_ssid	
+                                    if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+                                    if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                                        icon_table = '/'	
+                                        icon_icon = '['	
+                                    if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                                        icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                                        icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+                                    if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                                        ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+                                    if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                                        comment = user_settings[int_id(_rf_src)][3]['comment']	
+                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + icon_table + str(loc.lon[0:8]) + str(loc.lon_dir) + icon_icon + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + str(comment)
+                                logger.info(aprs_loc_packet)
+                                logger.info('User comment: ' + comment)
+                                logger.info('User SSID: ' + ssid)
+                                logger.info('User icon: ' + icon_table + icon_icon)
+                            except:
+                                logger.info('Error or user settings file not found, proceeding with default settings.')
+                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
+                            try:
+                            # Try parse of APRS packet. If it fails, it will not upload to APRS-IS
+                                aprslib.parse(aprs_loc_packet)
+                            # Float values of lat and lon. Anything that is not a number will cause it to fail.
+                                float(loc.lat)
+                                float(loc.lon)
+                                aprs_send(aprs_loc_packet)
+                                dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, str(loc.lat[0:7]) + str(loc.lat_dir), str(loc.lon[0:8]) + str(loc.lon_dir), time.strftime('%H:%M:%S - %m/%d/%y'))
+                            except:
+                                logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.')
+                            #final_packet = ''
+                            # Get callsign based on DMR ID
+                            # End APRS-IS upload
+                        # Assume this is an SMS message
+                        elif '$GPRMC' not in final_packet or '$GNRMC' not in final_packet:
+                            
+####                            # Motorola type SMS header
+##                            if '824a' in hdr_start or '024a' in hdr_start:
+##                                logger.info('\nMotorola type SMS')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[74:-8].split('00'))), 'utf-8')
+##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+##                                process_sms(_rf_src, sms)
+##                                packet_assembly = ''
+##                            # ETSI? type SMS header    
+##                            elif '0244' in hdr_start or '8244' in hdr_start:
+##                                logger.info('ETSI? type SMS')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[64:-8].split('00'))), 'utf-8')
+##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+##                                #logger.info(final_packet)
+##                                #logger.info(sms_hex[64:-8])
+##                                process_sms(_rf_src, sms)
+##                                packet_assembly = ''
+####                                
+##                            else:
+                                logger.info('\nSMS detected. Attempting to parse.')
+                                #logger.info(final_packet)
+                                logger.info(sms_hex)
+##                                logger.info(type(sms_hex))
+                                logger.info('Attempting to find command...')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[:-8].split('00'))), 'utf-8', 'ignore')
+                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex_string[:-8].split('00'))), 'utf-8', 'ignore')
+                                msg_found = re.sub('.*\n', '', sms)
+                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(msg_found) + '\n')
+                                process_sms(_rf_src, msg_found)
+                                #packet_assembly = ''
+                                pass
+                                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
+                            #logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+                        # Reset the packet assembly to prevent old data from returning.
+                        # 14FRS2013 moved variable reset
+                        hdr_start = ''
+                        n_packet_assembly = 0	
+                        packet_assembly = ''	
+                        btf = 0
+                    #logger.info(_seq)
+                    #packet_assembly = '' #logger.info(_dtype_vseq)
+                #logger.info(ahex(bptc_decode(_data)).decode('utf-8', 'ignore'))
+                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
+
+        else:
+            pass
+
+
+#************************************************
+#      MAIN PROGRAM LOOP STARTS HERE
+#************************************************
+
+if __name__ == '__main__':
+    #global aprs_callsign, aprs_passcode, aprs_server, aprs_port, user_ssid, aprs_comment, call_type, data_id
+    import argparse
+    import sys
+    import os
+    import signal
+    from dmr_utils3.utils import try_download, mk_id_dict
+
+    # Change the current directory to the location of the application
+    os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
+
+    # Check if user_settings (for APRS settings of users) exists. Creat it if not.
+    if Path('./user_settings.txt').is_file():
+        pass
+    else:
+        Path('./user_settings.txt').touch()
+        with open("./user_settings.txt", 'w') as user_dict_file:
+            user_dict_file.write("{1: [{'call': 'N0CALL'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]}")
+            user_dict_file.close()
+##    # Check to see if dashboard files exist
+##    if Path('/tmp/gps_data_user_loc.txt').is_file():
+##        pass
+##    else:
+##        Path('/tmp/gps_data_user_loc.txt').touch()
+##        with open("/tmp/gps_data_user_loc.txt", 'w') as user_loc_file:
+##            user_loc_file.write("[]")
+##            user_loc_file.close()
+##    if Path('/tmp/gps_data_user_bb.txt').is_file():
+##        pass
+##    else:
+##        Path('/tmp/gps_data_user_bb.txt').touch()
+##        with open("/tmp/gps_data_user_bb.txt", 'w') as user_bb_file:
+##            user_bb_file.write("[]")
+##            user_bb_file.close()
+    # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually gps_data.cfg)')
+    parser.add_argument('-l', '--logging', action='store', dest='LOG_LEVEL', help='Override config file logging level.')
+    cli_args = parser.parse_args()
+
+    # Ensure we have a path for the config file, if one wasn't specified, then use the default (top of file)
+    if not cli_args.CONFIG_FILE:
+        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/gps_data.cfg'
+
+    # Call the external routine to build the configuration dictionary
+    CONFIG = config.build_config(cli_args.CONFIG_FILE)
+
+    data_id = int(CONFIG['GPS_DATA']['DATA_DMR_ID'])
+
+    # Group call or Unit (private) call
+    call_type = CONFIG['GPS_DATA']['CALL_TYPE']
+    # APRS-IS login information
+    aprs_callsign = CONFIG['GPS_DATA']['APRS_LOGIN_CALL']
+    aprs_passcode = int(CONFIG['GPS_DATA']['APRS_LOGIN_PASSCODE'])
+    aprs_server = CONFIG['GPS_DATA']['APRS_SERVER']
+    aprs_port = int(CONFIG['GPS_DATA']['APRS_PORT'])
+    user_ssid = CONFIG['GPS_DATA']['USER_APRS_SSID']
+    aprs_comment = CONFIG['GPS_DATA']['USER_APRS_COMMENT']
+    # EMAIL variables
+    email_sender = CONFIG['GPS_DATA']['EMAIL_SENDER']
+    email_password = CONFIG['GPS_DATA']['EMAIL_PASSWORD']
+    smtp_server = CONFIG['GPS_DATA']['SMTP_SERVER']
+    smtp_port = CONFIG['GPS_DATA']['SMTP_PORT']
+    
+    # Start the system logger
+    if cli_args.LOG_LEVEL:
+        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
+    logger = log.config_logging(CONFIG['LOGGER'])
+    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n GPS and Data decoding by Eric, KF7EEL')
+    logger.debug('Logging system started, anything from here on gets logged')
+
+    # Set up the signal handler
+    def sig_handler(_signal, _frame):
+        logger.info('SHUTDOWN: >>>GPS and Data Decoder<<< IS TERMINATING WITH SIGNAL %s', str(_signal))
+        hblink_handler(_signal, _frame)
+        logger.info('SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
+        reactor.stop()
+
+    # Set signal handers so that we can gracefully exit if need be
+    for sig in [signal.SIGTERM, signal.SIGINT]:
+        signal.signal(sig, sig_handler)
+
+    # Create the name-number mapping dictionaries
+    peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
+    
+    
+    # INITIALIZE THE REPORTING LOOP
+    if CONFIG['REPORTS']['REPORT']:
+        report_server = config_reports(CONFIG, reportFactory)
+    else:
+        report_server = None
+        logger.info('(REPORT) TCP Socket reporting not configured')
+
+    # HBlink instance creation
+    logger.info('HBlink \'gps_data.py\' -- SYSTEM STARTING...')
+    for system in CONFIG['SYSTEMS']:
+        if CONFIG['SYSTEMS'][system]['ENABLED']:
+            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
+                systems[system] = OPENBRIDGE(system, CONFIG, report_server)
+            else:
+                systems[system] = DATA_SYSTEM(system, CONFIG, report_server)
+                
+            reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
+            logger.debug('%s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
+
+    reactor.run()
+
+    
+# John 3:16 - For God so loved the world, that he gave his only Son,
+# that whoever believes in him should not perish but have eternal life.
--- a/gps_data_igate_beacon.py
+++ b/gps_data_igate_beacon.py
@ -0,0 +1,60 @@
+#!/usr/bin/env python
+#
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+###############################################################################
+
+'''
+This script uploads a beacon to APRS-IS for the GPS/Data Application itself, cuasing it to appear as an igate
+an aprs.fi.
+'''
+
+import aprslib
+import argparse
+import os
+import config
+import time
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually gps_data.cfg)')
+cli_args = parser.parse_args()
+
+if not cli_args.CONFIG_FILE:
+    cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/gps_data.cfg'
+CONFIG = config.build_config(cli_args.CONFIG_FILE)
+
+print('''
+GPS/Data Application Beacon Script by Eric, KF7EEL. https://github.com/kf7eel/hblink3 \n
+This script will upload an APRS position for the GPS/Data Application. This usually causes most APRS-IS clients to see the GPS/Data Application
+as an i-gate. \n
+Using the following setting to upload beacon.\n
+Callsign: ''' + CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + ''' - Position comment: ''' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT'] + '''
+Beacon time: ''' + CONFIG['GPS_DATA']['IGATE_BEACON_TIME'] + '''
+''')
+
+beacon_packet = CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['GPS_DATA']['IGATE_LATITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][0]) + CONFIG['GPS_DATA']['IGATE_LONGITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT']
+#print(beacon_packet)
+AIS = aprslib.IS(CONFIG['GPS_DATA']['APRS_LOGIN_CALL'], passwd=CONFIG['GPS_DATA']['APRS_LOGIN_PASSCODE'],host=CONFIG['GPS_DATA']['APRS_SERVER'], port=CONFIG['GPS_DATA']['APRS_PORT'])
+
+while int(CONFIG['GPS_DATA']['IGATE_BEACON_TIME']) > 15:
+    
+    AIS.connect()
+    AIS.sendall(beacon_packet)
+    print(beacon_packet)
+    AIS.close()
+    time.sleep(int(CONFIG['GPS_DATA']['IGATE_BEACON_TIME'])*60)
--- a/gps_functions.py
+++ b/gps_functions.py
@ -0,0 +1,11 @@
+# Various configurable options used in the GPS/Data application.
+
+# SMS message that triggers command
+
+
+cmd_list = {
+
+    'COMMAND' : 'echo "command to execute"',
+    'UPTIME' : 'uptime'
+
+    }
--- a/hblink-SAMPLE.cfg
+++ b/hblink-SAMPLE.cfg
@ -84,7 +84,7 @@ REPORT_CLIENTS: 127.0.0.1
 #   used.
 #
 [LOGGER]
-LOG_FILE: /tmp/hblink.log
+LOG_FILE: ./hblink.log
 LOG_HANDLERS: console-timed
 LOG_LEVEL: DEBUG
 LOG_NAME: HBlink
@ -126,7 +126,7 @@ STALE_DAYS: 7
 # Otherwise ACLs work as described in the global stanza
 [OBP-1]
 MODE: OPENBRIDGE
-ENABLED: True
+ENABLED: False
 IP:
 PORT: 62035
 NETWORK_ID: 3129100
@ -167,6 +167,22 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL

+[D-APRS]
+MODE: MASTER
+ENABLED: True
+REPEAT: True
+MAX_PEERS: 2
+EXPORT_AMBE: False
+IP:
+PORT: 54070
+PASSPHRASE: passw0rd
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
 # PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
 # There are a LOT of errors in the HB Protocol specifications on this one!
 # MOST of these items are just strings and will be properly dealt with by the program
@ -181,7 +197,7 @@ TGID_TS2_ACL: PERMIT:ALL
 # See comments in the GLOBAL stanza
 [REPEATER-1]
 MODE: PEER
-ENABLED: True
+ENABLED: False
 LOOSE: False
 EXPORT_AMBE: False
 IP: 
@ -211,9 +227,41 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL

+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 
+PORT: 54073
+MASTER_IP: localhost
+MASTER_PORT: 54072
+passphrase: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 9999
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: Echo Server
+URL: www.github.com/kf7eel/hblink3
+SOFTWARE_ID: 20170620
+PACKAGE_ID: MMDVM_HBlink
+GROUP_HANGTIME: 5
+OPTIONS:
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
 [XLX-1]
 MODE: XLXPEER
-ENABLED: True
+ENABLED: False
 LOOSE: True
 EXPORT_AMBE: False
 IP: 
--- a/hblink.py
+++ b/hblink.py
--- a/install.sh
+++ b/install.sh
@ -0,0 +1,5 @@
+#! /bin/bash
+
+# Install the required support programs
+apt-get install python3 python3-pip -y
+pip3 install -r requirements.txt
--- a/playback.cfg
+++ b/playback.cfg
@ -0,0 +1,209 @@
+# PROGRAM-WIDE PARAMETERS GO HERE
+# PATH - working path for files, leave it alone unless you NEED to change it
+# PING_TIME - the interval that peers will ping the master, and re-try registraion
+#           - how often the Master maintenance loop runs
+# MAX_MISSED - how many pings are missed before we give up and re-register
+#           - number of times the master maintenance loop runs before de-registering a peer
+#
+# ACLs:
+#
+# Access Control Lists are a very powerful tool for administering your system.
+# But they consume packet processing time. Disable them if you are not using them.
+# But be aware that, as of now, the configuration stanzas still need the ACL
+# sections configured even if you're not using them.
+#
+# REGISTRATION ACLS ARE ALWAYS USED, ONLY SUBSCRIBER AND TGID MAY BE DISABLED!!!
+#
+# The 'action' May be PERMIT|DENY
+# Each entry may be a single radio id, or a hypenated range (e.g. 1-2999)
+# Format:
+# 	ACL = 'action:id|start-end|,id|start-end,....'
+#		--for example--
+#	SUB_ACL: DENY:1,1000-2000,4500-60000,17
+#
+# ACL Types:
+# 	REG_ACL: peer radio IDs for registration (only used on HBP master systems)
+# 	SUB_ACL: subscriber IDs for end-users
+# 	TGID_TS1_ACL: destination talkgroup IDs on Timeslot 1
+# 	TGID_TS2_ACL: destination talkgroup IDs on Timeslot 2
+#
+# ACLs may be repeated for individual systems if needed for granularity
+# Global ACLs will be processed BEFORE the system level ACLs
+# Packets will be matched against all ACLs, GLOBAL first. If a packet 'passes'
+# All elements, processing continues. Packets are discarded at the first
+# negative match, or 'reject' from an ACL element.
+#
+# If you do not wish to use ACLs, set them to 'PERMIT:ALL'
+# TGID_TS1_ACL in the global stanza is used for OPENBRIDGE systems, since all
+# traffic is passed as TS 1 between OpenBridges
+[GLOBAL]
+PATH: ./
+PING_TIME: 5
+MAX_MISSED: 3
+USE_ACL: True
+REG_ACL: PERMIT:ALL
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+
+# NOT YET WORKING: NETWORK REPORTING CONFIGURATION
+#   Enabling "REPORT" will configure a socket-based reporting
+#   system that will send the configuration and other items
+#   to a another process (local or remote) that may process
+#   the information for some useful purpose, like a web dashboard.
+#
+#   REPORT - True to enable, False to disable
+#   REPORT_INTERVAL - Seconds between reports
+#   REPORT_PORT - TCP port to listen on if "REPORT_NETWORKS" = NETWORK
+#   REPORT_CLIENTS - comma separated list of IPs you will allow clients
+#       to connect on. Entering a * will allow all.
+#
+# ****FOR NOW MUST BE TRUE - USE THE LOOPBACK IF YOU DON'T USE THIS!!!****
+[REPORTS]
+REPORT: True
+REPORT_INTERVAL: 60
+REPORT_PORT: 4322
+REPORT_CLIENTS: 127.0.0.1
+
+
+# SYSTEM LOGGER CONFIGURAITON
+#   This allows the logger to be configured without chaning the individual
+#   python logger stuff. LOG_FILE should be a complete path/filename for *your*
+#   system -- use /dev/null for non-file handlers.
+#   LOG_HANDLERS may be any of the following, please, no spaces in the
+#   list if you use several:
+#       null
+#       console
+#       console-timed
+#       file
+#       file-timed
+#       syslog
+#   LOG_LEVEL may be any of the standard syslog logging levels, though
+#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
+#   used.
+#
+[LOGGER]
+LOG_FILE: /tmp/hb-playback.log
+LOG_HANDLERS: console
+LOG_LEVEL: DEBUG
+LOG_NAME: HBlink3 Playback
+
+# DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
+# Ok, not the TGID, there's no master list I know of to download
+# This is intended as a facility for other applcations built on top of
+# HBlink to use, and will NOT be used in HBlink directly.
+# STALE_DAYS is the number of days since the last download before we
+# download again. Don't be an ass and change this to less than a few days.
+[ALIASES]
+TRY_DOWNLOAD: False
+PATH: ./
+PEER_FILE: peer_ids.json
+SUBSCRIBER_FILE: subscriber_ids.json
+TGID_FILE: talkgroup_ids.json
+PEER_URL: https://www.radioid.net/static/rptrs.json
+SUBSCRIBER_URL: https://www.radioid.net/static/users.json
+STALE_DAYS: 7
+
+# OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
+# OpenBridge is a protocol originall created by DMR+ for connection between an
+# IPSC2 server and Brandmeister. It has been implemented here at the suggestion
+# of the Brandmeister team as a way to legitimately connect HBlink to the
+# Brandemiester network.
+# It is recommended to name the system the ID of the Brandmeister server that
+# it connects to, but is not necessary. TARGET_IP and TARGET_PORT are of the
+# Brandmeister or IPSC2 server you are connecting to. PASSPHRASE is the password
+# that must be agreed upon between you and the operator of the server you are
+# connecting to. NETWORK_ID is a number in the format of a DMR Radio ID that
+# will be sent to the other server to identify this connection.
+# other parameters follow the other system types.
+#
+# ACLs:
+# OpenBridge does not 'register', so registration ACL is meaningless.
+# OpenBridge passes all traffic on TS1, so there is only 1 TGID ACL.
+# Otherwise ACLs work as described in the global stanza
+#[OBP-1]
+#MODE: OPENBRIDGE
+#ENABLED: True
+#IP:
+#PORT: 62035
+#NETWORK_ID: 3129100
+#PASSPHRASE: password
+#TARGET_IP: 1.2.3.4
+#TARGET_PORT: 62035
+#USE_ACL: True
+#SUB_ACL: DENY:1
+#TGID_ACL: PERMIT:ALL
+
+# MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
+# HomeBrew Protocol Master instances go here.
+# IP may be left blank if there's one interface on your system.
+# Port should be the port you want this master to listen on. It must be unique
+# and unused by anything else.
+# Repeat - if True, the master repeats traffic to peers, False, it does nothing.
+#
+# MAX_PEERS -- maximun number of peers that may be connect to this master
+# at any given time. This is very handy if you're allowing hotspots to
+# connect, or using a limited computer like a Raspberry Pi.
+#
+# ACLs:
+# See comments in the GLOBAL stanza
+[MASTER]
+MODE: MASTER
+ENABLED: True
+REPEAT: True
+MAX_PEERS: 1
+EXPORT_AMBE: False
+IP:
+PORT: 54072
+PASSPHRASE: passw0rd
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+# PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
+# There are a LOT of errors in the HB Protocol specifications on this one!
+# MOST of these items are just strings and will be properly dealt with by the program
+# The TX & RX Frequencies are 9-digit numbers, and are the frequency in Hz.
+# Latitude is an 8-digit unsigned floating point number.
+# Longitude is a 9-digit signed floating point number.
+# Height is in meters
+# Setting Loose to True relaxes the validation on packets received from the master.
+# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
+#
+# ACLs:
+# See comments in the GLOBAL stanza
+#[REPEATER-1]
+#MODE: PEER
+#ENABLED: True
+#LOOSE: False
+#EXPORT_AMBE: False
+#IP: 
+#PORT: 54001
+#MASTER_IP: 172.16.1.1
+#MASTER_PORT: 54000
+#PASSPHRASE: homebrew
+#CALLSIGN: W1ABC
+#RADIO_ID: 312000
+#RX_FREQ: 449000000
+#TX_FREQ: 444000000
+#TX_POWER: 25
+#COLORCODE: 1
+#SLOTS: 1
+#LATITUDE: 38.0000
+#LONGITUDE: -095.0000
+#HEIGHT: 75
+#LOCATION: Anywhere, USA
+#DESCRIPTION: This is a cool repeater
+#URL: www.w1abc.org
+#SOFTWARE_ID: 20170620
+#PACKAGE_ID: MMDVM_HBlink
+#GROUP_HANGTIME: 5
+#OPTIONS:
+#USE_ACL: True
+#SUB_ACL: DENY:1
+#TGID_TS1_ACL: PERMIT:ALL
+#TGID_TS2_ACL: PERMIT:ALL
--- a/playback.py
+++ b/playback.py
@ -169,13 +169,13 @@ if __name__ == '__main__':

    # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
    parser = argparse.ArgumentParser()
-    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually hblink.cfg)')
+    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually playback.cfg)')
    parser.add_argument('-l', '--logging', action='store', dest='LOG_LEVEL', help='Override config file logging level.')
    cli_args = parser.parse_args()

    # Ensure we have a path for the config file, if one wasn't specified, then use the default (top of file)
    if not cli_args.CONFIG_FILE:
-        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
+        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/playback.cfg'

    # Call the external routine to build the configuration dictionary
    CONFIG = config.build_config(cli_args.CONFIG_FILE)
--- a/requirements.txt
+++ b/requirements.txt
@ -3,3 +3,8 @@ bitarray>=0.8.1
 Twisted>=16.3.0
 dmr_utils3>=0.1.19
 configparser>=3.0.0
+aprslib
+pynmea2
+maidenhead
+flask
+smtplib
--- a/rules_SAMPLE.py
+++ b/rules_SAMPLE.py
@ -33,17 +33,17 @@ configuration file.
 '''

 BRIDGES = {
-    'WORLDWIDE': [
-            {'SYSTEM': 'MASTER-1',    'TS': 1, 'TGID': 1,    'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [2,], 'OFF': [9,10], 'RESET': []},
-            {'SYSTEM': 'CLIENT-1',    'TS': 1, 'TGID': 3100, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [2,], 'OFF': [9,10], 'RESET': []},
-        ],
-    'ENGLISH': [
-            {'SYSTEM': 'MASTER-1',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
-            {'SYSTEM': 'CLIENT-2',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
-        ],
-    'STATEWIDE': [
-            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
-            {'SYSTEM': 'CLIENT-2',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+##    'ENGLISH': [
+##            {'SYSTEM': 'CHANGE_ME-1',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
+##            {'SYSTEM': 'CHANGE_ME-2',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
+##        ],
+##    'STATEWIDE': [
+##            {'SYSTEM': 'CHANGE_ME-1',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+##            {'SYSTEM': 'CHANGE_ME-2',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+##        ],
+    'ECHO': [
+            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 9999,    'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
+            {'SYSTEM': 'ECHO',    'TS': 2, 'TGID': 9999, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
        ]
 }

@ -51,7 +51,29 @@ BRIDGES = {
 list the names of each system that should bridge unit to unit (individual) calls.
 '''

-UNIT = ['ONE', 'TWO']
+UNIT = ['MASTER-1', 'CHANGE_ME']
+
+'''
+Unit Call flood timeout:
+The amount of time to keep sending private calls to a single system before
+flooding all systems with the call. A higher value should be set for systems where subscribers
+are not moving between systems often. A lower value should be set for systems that have subscribers
+moving between systems often.
+
+Time is in minutes.
+'''
+UNIT_TIME = 1
+
+'''
+Input the DMR ID and SYSTEM of a subscriber that you would like to have always have private calls routed.
+This will not flood all systems.
+'''
+STATIC_UNIT = [
+#    [ 456, 'CLIENT-1'],
+#    [ 123, 'MASTER-1'],
+     [ 9099, 'D-APRS']
+    ]
+

 '''
 This is for testing the syntax of the file. It won't eliminate all errors, but running this file
@ -62,3 +84,4 @@ if __name__ == '__main__':
    from pprint import pprint
    pprint(BRIDGES)
    print(UNIT)
+    print(STATIC_UNIT)
--- a/scripts/dashboard/dashboard.py
+++ b/scripts/dashboard/dashboard.py
@ -0,0 +1,130 @@
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+###############################################################################
+
+'''
+This is a web dashboard for the GPS/Data application.
+'''
+
+from flask import Flask, render_template
+import ast, os
+from dashboard_settings import *
+
+app = Flask(__name__)
+
+
+tbl_hdr = '''
+<table style="border-color: black; margin-left: auto; margin-right: auto;" border="2" cellspacing="6" cellpadding="2"><tbody>
+'''
+tbl_ftr = '''
+</tbody>
+</table>
+'''
+
+def get_loc_data():
+    try:
+        dash_loc = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
+        tmp_loc = ''
+        loc_hdr = '''
+    <tr>
+    <td style="text-align: center;">
+    <h2><strong>&nbsp;Callsign&nbsp;</strong></h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Latitude</strong>&nbsp; </h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Longitude</strong>&nbsp;</h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
+    </td>
+    </tr>
+    '''
+        for e in dash_loc:
+            tmp_loc = tmp_loc + '''<tr>
+    <td style="text-align: center;"><a href="https://aprs.fi/''' + e['call'] + '''"><strong>''' + e['call'] + '''</strong></a></td>
+    <td style="text-align: center;"><strong>&nbsp;''' + str(e['lat']) + '''&nbsp;</strong></td>
+    <td style="text-align: center;"><strong>&nbsp;''' + str(e['lon']) + '''&nbsp;</strong></td>
+    <td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
+    </tr>'''
+        return str(str('<h1 style="text-align: center;">Positions Received</h1>') + tbl_hdr + loc_hdr + tmp_loc + tbl_ftr)
+    except:
+        return str('<h1 style="text-align: center;">No data</h1>')
+
+
+def get_bb_data():
+    try:
+        dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
+        tmp_bb = ''
+        
+        bb_hdr = '''
+    <tr>
+    <td style="text-align: center;">
+    <h2><strong>&nbsp;Callsign&nbsp;</strong></h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>DMR ID</strong>&nbsp; </h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Bulletin</strong>&nbsp;</h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
+    </td>
+    </tr>
+    '''
+        
+        for e in dash_bb:
+            tmp_bb = tmp_bb + '''<tr>
+    <td style="text-align: center;"><strong>&nbsp;''' + e['call'] + '''&nbsp;</strong></td>
+    <td style="text-align: center;">''' + str(e['dmr_id']) + '''</td>
+    <td style="text-align: center;"><strong>&nbsp;''' + e['bulliten'] + '''&nbsp;</strong></td>
+    <td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
+    </tr>'''
+
+        return str('<h1 style="text-align: center;">Bulletin Board</h1>' + tbl_hdr + bb_hdr + tmp_bb + tbl_ftr)
+    except:
+        return str('<h1 style="text-align: center;">No data</h1>')
+
+@app.route('/')
+def index():
+    #return get_data()
+    return render_template('index.html', title = dashboard_title, logo = logo)
+@app.route('/bulletin_board')
+def dash_bb():
+    return get_bb_data()
+    #return render_template('index.html', data = str(get_data()))
+@app.route('/positions')
+def dash_loc():
+    return get_loc_data()
+    #return render_template('index.html', data = str(get_data()))
+##@app.route('/<string:page_name>/')
+##def render_static(page_name):
+##    return render_template('%s.html' % page_name, title = dashboard_title, logo = logo, description = description)
+@app.route('/help/')
+def help():
+    #return get_data()
+    return render_template('help.html', title = dashboard_title, logo = logo, description = description, data_call_type = data_call_type, data_call_id = data_call_id, aprs_ssid = aprs_ssid)
+@app.route('/about/')
+def about():
+    #return get_data()
+    return render_template('about.html', title = dashboard_title, logo = logo, contact_name = contact_name, contact_call = contact_call, contact_email = contact_email, contact_website = contact_website)
+
+if __name__ == '__main__':
+    app.run(debug = True, port=dash_port, host=dash_host)
--- a/scripts/dashboard/dashboard_settings-SAMPLE.py
+++ b/scripts/dashboard/dashboard_settings-SAMPLE.py
@ -0,0 +1,49 @@
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+###############################################################################
+
+'''
+Settings for web dashboard.
+'''
+
+# Title of the Dashboard
+dashboard_title = 'HBLink3 D-APRS Dashboard'
+# Logo used on dashboard page
+logo = 'https://raw.githubusercontent.com/kf7eel/hblink3/gps/HBlink.png'
+# Port to run server
+dash_port = 8092
+# IP to run server on
+dash_host = '127.0.0.1'
+#Description of dashboard to show on main page
+description = '''
+Welcome to the ''' + dashboard_title + '''.
+'''
+# The following will generate a help page for your users.
+
+# Data call type
+data_call_type = 'Private Call'
+# DMR ID of GPS/Data application
+data_call_id = '9099'
+# Default APRS ssid
+aprs_ssid = '15'
+
+# Gateway contact info displayed on about page.
+contact_name = 'your name'
+contact_call = 'N0CALL'
+contact_email = 'email@example.org'
+contact_website = 'https://hbl.ink'
--- a/scripts/dashboard/templates/about.html
+++ b/scripts/dashboard/templates/about.html
@ -0,0 +1,28 @@
+{% include 'page.html' %}
+{% include 'header.html' %}
+{{description}}
+<p>&nbsp;</p>
+<p>Contact information for this gateway.</p>
+<table style="margin-left: auto; margin-right: auto;" border="black">
+<tbody>
+<tr>
+<td><strong>Name</strong></td>
+<td>{{contact_name}} </td>
+</tr>
+<tr>
+<td><strong>Callsign</strong></td>
+<td>&nbsp;{{contact_call}}</td>
+</tr>
+<tr>
+<td><strong>E-Mail</strong></td>
+<td>&nbsp;{{contact_email}}</td>
+</tr>
+<tr>
+<td><strong>Website</strong></td>
+<td>&nbsp;{{contact_website}}</td>
+</tr>
+</tbody>
+</table>
+<p>&nbsp;</p>
+{% include 'footer.html' %}
+
--- a/scripts/dashboard/templates/footer.html
+++ b/scripts/dashboard/templates/footer.html
@ -0,0 +1,5 @@
+<div>
+<hr />
+<div style="text-align: center;">Dashboard created by KF7EEL - <a href="https://github.com/kf7eel/hblink3">https://github.com/kf7eel/hblink3</a><br />HBLink created by N0MJS.<br /><a href="https://github.com/HBLink-org">HBLink GitHub page</a><br />This is branch: <strong>gps<strong></div>
+</body>
+ </html>
--- a/scripts/dashboard/templates/header.html
+++ b/scripts/dashboard/templates/header.html
@ -0,0 +1,13 @@
+<p><img style="display: block; margin-left: auto; margin-right: auto;" src="{{logo}}" alt="Logo" width="300" height="144" /></p>
+<h1 style="text-align: center;">{{title}}</h1>
+<hr />
+<table style="width: 500px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
+<tbody>
+<tr>
+<td style="text-align: center;"><button onclick="window.location.href='/';"> D-APRS Dashboard </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='/help';"> D-APRS Help </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='/about';"> Gateway Contact </button></td>
+</tr>
+</tbody>
+</table>
+<hr />
--- a/scripts/dashboard/templates/help.html
+++ b/scripts/dashboard/templates/help.html
@ -0,0 +1,79 @@
+{% include 'page.html' %}
+{% include 'header.html' %}
+<h2 style="text-align: center;">Attention:</h2>
+<p><span style="color: #ff0000;"><strong>Please be aware that many (if not all) DMR radios DO NOT transmit your callsign when sending a GPS position. It is your responsibility to identify your station per the regulations of your country.</strong></span></p>
+<p>&nbsp;</p>
+<p>{{description}}</p>
+<p>Configure your radio to send GPS positions with the following settings:</p>
+<table style="margin-left: auto; margin-right: auto;" border="black">
+<tbody>
+<tr>
+<td style="text-align: center;"><strong>Data Call Type</strong></td>
+<td style="text-align: center;"><strong>DMR ID</strong></td>
+</tr>
+<tr>
+<td style="text-align: center;">&nbsp;{{data_call_type}}</td>
+<td style="text-align: center;">&nbsp;{{data_call_id}}</td>
+</tr>
+</tbody>
+</table>
+<p>&nbsp;</p>
+<p>When a position is received by this gateway, it will extract the coordinates and create an APRS position packet. This gateway will find your callsign based your radio's DMR ID. It is essential to have your information up to date with <a href="https://radioid.net/">RadioID.net</a>. A predefined APRS SSID of <strong>{{aprs_ssid}}</strong> is appended your callsign. The APRS location packet is then uploaded to APRS-IS. No setup or account creation is required beforehand. This is pretty much "plug and play."</p>
+<p>For example, N0CALL has a DMR ID of 1234567. N0CALL's radio sends a position to this gateway with the call type settings above. This gateway will query the <a href="https://radioid.net/">RadioID.net</a> database for DMR ID 1234567. The result will be an APRS location packet with APRS SSID&nbsp;{{aprs_ssid}}. </p>
+<p>You can change the default APRS settings for your radio via SMS.</p>
+<h2 style="text-align: center;">Commands</h2>
+<table style="margin-left: auto; margin-right: auto;" border="black">
+<tbody>
+<tr>
+<td style="text-align: center;">
+<h4><strong>Command</strong></h4>
+</td>
+<td style="text-align: center;">
+<h4><strong>Description</strong></h4>
+</td>
+<td style="text-align: center;">
+<h4><strong>Example</strong></h4>
+</td>
+</tr>
+<tr>
+<td><strong>@COM</strong></td>
+<td>Change the comment of the APRS.</td>
+<td><em><code>@COM This is a test comment.</code></em></td>
+</tr>
+<tr>
+<td><strong>@ICON</strong></td>
+<td>Change the icon of the APRS position. *See <a href="http://aprs.net/vm/DOS/SYMBOLS.HTM" rel="nofollow">http://aprs.net/vm/DOS/SYMBOLS.HTM</a> for icon list.</td>
+<td><em><code>@ICON /p</code></em></td>
+</tr>
+<tr>
+<td><strong>@SSID</strong></td>
+<td>Change SSID of your callsign.</td>
+<td><em><code>@SSID 7</code></em></td>
+</tr>
+<tr>
+<td><strong>@MH</strong></td>
+<td>Set you location by maidenhead grid square. Designed for radios with no GPS or that are not compatable yet.</td>
+<td><em><code>@MH DN97uk</code></em></td>
+</tr>
+<tr>
+<td><strong>@BB</strong></td>
+<td>Post a bulliten to the web dashboard.</td>
+<td><em><code>@BB This is a test bulletin.</code></em></td>
+</tr>
+<tr>
+<td><strong>@[CALLSIGN W/ SSID] A-[MESSAGE]</strong></td>
+<td>Send a message to another station via APRS.</td>
+<td><em><code>@N0CALL-15 A-This is a test.</code></em></td>
+</tr>
+<tr>
+<td><strong>[EMAIL ADDRESS] E-[MESSAGE]</strong></td>
+<td>Send an email to an email address.</td>
+<td><em><code>test@example.org E-This is a test.</code></em></td>
+</tr>  
+</tbody>
+</table>
+<p>&nbsp;</p>
+<p><strong>Commands should be in upper case.</strong> Send an SMS to <strong>{{data_call_id}}</strong> as a <strong>{{data_call_type}}</strong> with the desired command followed by the value. For example, to change your icon to a dog, the command would be <code>@ICON /p</code> (see the icon table for values). Changing your SSID is as simple as <code>@SSID 7</code>, and <code>@COM Testing 123</code> will change the comment.</p>
+<p>Sending <code>@BB Test</code> will result in a post to the bulletin board with the messaage of "Test".</p>
+<p><strong>To remove any of the stored values, just send the appropriate command without any input.</strong> <code>@COM</code> will remove the stored comment, <code>@ICON</code> will remove the stored icon, and <code>@ICON</code> will remove the strored icon. Any position reports sent will have the default settings.</p>
+{% include 'footer.html' %}
--- a/scripts/dashboard/templates/index.html
+++ b/scripts/dashboard/templates/index.html
@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="refresh" content="120" > 
+    <title>{{title}}</title>
+    <style>
+body {background-color: D3D3D3;}
+h1   {color: green;}
+p {
+  padding: 10px;
+  margin: 20px;
+
+}
+.content {
+  max-width: 1200px;
+  min-width: 1200px;
+  margin: auto;
+}
+</style>
+</head>
+<div class="content">
+<body>
+{% include 'header.html' %}
+<p style="text-align: center;"><em>Page automatically reloads every 2 minutes.</em></p>
+<table>
+<tbody>
+<tr>
+<td><div><p align="center"><iframe style="border: none;" title="Bulletin Board" src="bulletin_board" width="480" height="950"></iframe></p></div></td>
+<td><div>
+<p align="center"><iframe style="border: none;" title="Positions Received" src="positions" width="620" height="950"></iframe></p>
+</div></td>
+</tr>
+</tbody>
+</table>
+ {% include 'footer.html' %}
+
--- a/scripts/dashboard/templates/page.html
+++ b/scripts/dashboard/templates/page.html
@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{{title}}</title>
+    <style>
+body {background-color: D3D3D3;}
+h1   {color: green;}
+p {
+  padding: 10px;
+  margin: 20px;
+
+}
+.content {
+  max-width: 1200px;
+  min-width: 1200px;
+  margin: auto;
+}
+</style>
+</head>
+<div class="content">
+<body>
Author	SHA1	Message	Date
KF7EEL	dba4a5692d	Update README.md	2021-02-08 14:55:08 -08:00
KF7EEL	bcb55b7d72	disable dashboard stuff	2021-02-08 14:46:11 -08:00
KF7EEL	74ca23af73	add example config for combined application	2021-02-08 12:38:45 -08:00
KF7EEL	76cadf01a4	fix typo	2021-02-07 15:02:52 -08:00
KF7EEL	ccd197a8c1	add combined bridge/D-APRS	2021-02-07 13:52:03 -08:00
KF7EEL	1a96434c78	fix typo	2021-02-04 12:58:16 -08:00
KF7EEL	3047b55bcc	add 14FRS2013 contributions, add both option for call type	2021-02-04 12:45:14 -08:00
KF7EEL	21a0c95ad3	add option to disable APRS upload	2021-02-04 10:06:09 -08:00
Roby	08f53ee1a4	Update help.html (#22 ) Add new commands	2021-02-03 13:37:54 -08:00
KF7EEL	82ce4995ae	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-02-02 12:04:19 -08:00
KF7EEL	dc5dbc0f7f	fix typo for GNRMC	2021-02-02 12:04:03 -08:00
KF7EEL	85d085d563	Update README.md	2021-02-02 11:57:24 -08:00
KF7EEL	5e349a9705	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-02-02 11:36:17 -08:00
KF7EEL	664cc46b63	potential fix for RT73	2021-02-02 11:35:56 -08:00
KF7EEL	45dca64490	Update README.md	2021-02-01 17:31:19 -08:00
KF7EEL	bc8bb8b298	Update README.md	2021-02-01 17:29:35 -08:00
KF7EEL	40fa5372ce	change email syntax, bug fix	2021-02-01 17:28:11 -08:00
KF7EEL	586533ac4c	Update README.md	2021-02-01 07:32:55 -08:00
KF7EEL	f99451b0a4	Update gps_data-SAMPLE.cfg	2021-01-31 12:56:48 -08:00
KF7EEL	afb249c418	fix bugs	2021-01-31 12:45:43 -08:00
KF7EEL	a750dedab0	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-01-31 12:36:35 -08:00
KF7EEL	84f7baf9b4	Update requirements.txt	2021-01-31 12:35:22 -08:00
KF7EEL	fccbdc908c	Update README.md	2021-01-31 12:34:58 -08:00
KF7EEL	2affa319d4	Update README.md	2021-01-31 12:33:57 -08:00
KF7EEL	54f4ad799e	imrove email template	2021-01-31 11:55:09 -08:00
KF7EEL	372bb845b2	add email sending	2021-01-31 11:42:15 -08:00
KF7EEL	fcb0f1bd05	fix manual positions	2021-01-31 09:17:45 -08:00
KF7EEL	14f4eafa6e	Update footer.html	2021-01-30 11:22:53 -08:00
KF7EEL	bebf487936	Update help.html	2021-01-30 11:18:28 -08:00
KF7EEL	9def4fbfec	Update help.html	2021-01-30 09:58:10 -08:00
KF7EEL	33f499a32a	Update gps_data.py	2021-01-30 09:15:18 -08:00
KF7EEL	2d94dbe045	fix MD-380 and SMS positions	2021-01-26 08:54:48 -08:00
KF7EEL	0b5ecaa04f	Update README.md	2021-01-21 15:50:47 -08:00
KF7EEL	becbffed8e	Update README.md	2021-01-12 14:23:54 -08:00
KF7EEL	24e5329ac7	add sending messages to APRS	2021-01-12 13:54:53 -08:00
KF7EEL	e7b76acaff	fix typo	2021-01-12 10:00:38 -08:00
KF7EEL	c9b9c307d6	add GNRMC to filter to allow RT73 compatability	2021-01-12 09:56:17 -08:00
M0GLJ	22d371a8f6	Update README.md (#19 ) Model Correction	2021-01-10 10:01:49 -08:00
KF7EEL	f81e5dae78	Update README.md	2021-01-08 10:19:28 -08:00
KF7EEL	bd4bb0b611	Change example to allow D-APRS out of the box	2021-01-07 15:10:34 -08:00
KF7EEL	d76a808e4a	Update gps_data.py	2021-01-06 11:31:22 -08:00
KF7EEL	e6e9600e73	fix grammar	2021-01-02 18:13:35 -08:00
KF7EEL	22e04f6ff3	fix dash width	2021-01-02 18:02:55 -08:00
KF7EEL	a943748c94	fix missing templates	2021-01-02 16:17:34 -08:00
KF7EEL	674f9102d1	improve dash	2021-01-02 15:58:45 -08:00
KF7EEL	3dde015e5d	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-01-02 14:58:58 -08:00
KF7EEL	3b36b44c5d	add page, split header and footer	2021-01-02 14:58:38 -08:00
KF7EEL	e4ef4383fe	Update gps_data-SAMPLE.cfg	2021-01-02 08:46:56 -08:00
KF7EEL	f2675d885c	clean up pages	2021-01-01 15:10:12 -08:00
KF7EEL	105f4bdc7a	fix html	2021-01-01 14:46:05 -08:00
KF7EEL	1df3026a59	update dashboard theme	2021-01-01 14:44:08 -08:00
KF7EEL	79fe60fc3f	add about page	2021-01-01 14:35:15 -08:00
KF7EEL	3a3f4719a0	fix description yet again	2021-01-01 14:16:57 -08:00
KF7EEL	dcc1b4ff40	fix description again	2021-01-01 14:15:43 -08:00
KF7EEL	e753f4f56b	fix description location	2021-01-01 14:12:38 -08:00
KF7EEL	215af2ea6c	add description to dashboard	2021-01-01 14:09:14 -08:00
KF7EEL	944e3bf1af	Update requirements.txt	2021-01-01 13:51:45 -08:00
M0GLJ	ecba8f75bd	Added install.sh and appended requirements.txt (#16 ) * Create install.sh * Update requirements.txt Add additional for gps operation	2021-01-01 13:51:20 -08:00
M0GLJ	1af61d184a	Update README.md (#17 )	2021-01-01 13:50:21 -08:00
KF7EEL	f411531bd0	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-01-01 09:58:33 -08:00
KF7EEL	15111563ed	fix bug, improve index template	2021-01-01 09:58:13 -08:00
KF7EEL	b6adc461c6	Update README.md	2021-01-01 09:43:19 -08:00
KF7EEL	6fc4dcfe27	Update README.md	2021-01-01 09:37:22 -08:00
KF7EEL	8cb40cbe2c	add host to dashboard	2020-12-30 16:41:51 -08:00
KF7EEL	7cd73740b4	add port settings	2020-12-30 09:35:25 -08:00
KF7EEL	6da1c4de0d	update web dashboard, add template	2020-12-30 09:10:23 -08:00
KF7EEL	e4b55b05fe	basic functioning web dashboard	2020-12-29 20:36:07 -08:00
KF7EEL	54bdbd72e8	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps add backend code for upcoming web dashboard	2020-12-27 20:39:42 -08:00
KF7EEL	3a8e111443	add backend code for upcoming web dashboard	2020-12-27 20:39:17 -08:00
KF7EEL	a04f8e8cc3	Update README.md	2020-12-27 08:33:02 -08:00
KF7EEL	350b366ffd	Update README.md	2020-12-26 15:30:58 -08:00
KF7EEL	636246c664	Update README.md	2020-12-26 14:47:52 -08:00
KF7EEL	2a752487d0	add UDT SAP requirement to reduce fake packets	2020-12-26 14:31:11 -08:00
KF7EEL	c6ebf86b0f	add UDT UAB criteria to reduce inaccurate packets	2020-12-26 13:43:19 -08:00
KF7EEL	4900f859f8	fix parse bug, md-380 working again	2020-12-26 12:53:50 -08:00
KF7EEL	17999eb3f4	fix typo	2020-12-26 10:38:03 -08:00
KF7EEL	c09d2ea734	fix hdr_type error for non MD-380 radios	2020-12-26 09:59:08 -08:00
KF7EEL	84eaaf70f7	remove code from accidental commit	2020-12-24 13:53:44 -08:00
KF7EEL	a0d49b5175	Update README.md	2020-12-23 22:59:52 -08:00
KF7EEL	423d269e78	Update README.md	2020-12-23 22:53:23 -08:00
KF7EEL	9c73c70d71	fix typo in gps_data.py	2020-12-23 16:09:45 -08:00
KF7EEL	11e5aba3fc	fix typo	2020-12-23 15:27:59 -08:00
KF7EEL	f6a501a42e	initial commit for MD-380 type radios	2020-12-23 15:19:10 -08:00
KF7EEL	6902b3bd4c	fix beacon time to minutes	2020-12-11 13:05:59 -08:00
KF7EEL	fe1daeb406	add APRS beacon script for gps_data	2020-12-11 12:49:34 -08:00
KF7EEL	76ad6adea4	add APRS beacon script for gps_data	2020-12-11 12:47:43 -08:00
KF7EEL	542e7496ca	fix import time	2020-12-06 16:39:05 -08:00
KF7EEL	05a90944e2	add official tocall, add timestamp, and hook for MD-380 GPS	2020-12-06 12:30:20 -08:00
KF7EEL	804cb1c025	Update README.md	2020-12-01 13:35:32 -08:00
KF7EEL	b2fda94746	Update README.md	2020-12-01 13:34:39 -08:00
KF7EEL	6d934096aa	Update README.md	2020-12-01 13:21:26 -08:00
KF7EEL	a583ff92d2	parse all SMS for command string instead of header	2020-12-01 12:15:17 -08:00
KF7EEL	43e6e6d6b1	change handling of unknown SMS	2020-12-01 09:15:57 -08:00
KF7EEL	579ba3d282	add ETSI like SMS	2020-11-30 17:25:33 -08:00
KF7EEL	5c8be7c177	add debug statements	2020-11-30 14:08:33 -08:00
KF7EEL	28a2e7ba70	APRS position via SMS for grid square	2020-11-30 12:38:50 -08:00
KF7EEL	b47d70142d	Update README.md	2020-11-30 10:03:59 -08:00
KF7EEL	896ba4fbae	change file read, move global declaration	2020-11-30 09:59:15 -08:00
KF7EEL	d202f4d0ce	fix group SMS for Motorola, fix typo	2020-11-29 15:36:44 -08:00
KF7EEL	4beaf3000d	added blank variables to attempt to fix bug	2020-11-29 15:08:53 -08:00
KF7EEL	7e19e705ef	Update README.md	2020-11-28 23:53:53 -08:00
KF7EEL	821c57b381	Update README.md	2020-11-28 19:57:37 -08:00
KF7EEL	ffdfe55cb8	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2020-11-28 09:15:26 -08:00
KF7EEL	9e40195161	attempt to fix bug with assembled packets	2020-11-28 09:14:26 -08:00
KF7EEL	7fd8500105	Update README.md	2020-11-27 23:53:22 -08:00
KF7EEL	d9e5085765	Update README.md	2020-11-27 09:39:18 -08:00
KF7EEL	d7afa94a5a	added user settings, added speed and course	2020-11-27 09:31:38 -08:00
KF7EEL	00e3ea840c	update readme, sample, and functions	2020-11-26 19:40:43 -08:00
KF7EEL	9dc7ce12e1	fix another bug	2020-11-26 17:44:19 -08:00
KF7EEL	a21393313f	revert change, remove UNIT_MAP changes	2020-11-26 15:23:33 -08:00
KF7EEL	e736893543	time for static unit now generated at start	2020-11-26 11:50:28 -08:00
KF7EEL	e88d545955	add hooks in code for shell commands	2020-11-25 15:53:42 -08:00
KF7EEL	eca8619153	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2020-11-25 14:52:41 -08:00
KF7EEL	8e8836057b	fix typo for unit calls	2020-11-25 14:50:49 -08:00
KF7EEL	471feee9c3	implement static routes for unit calls	2020-11-25 14:39:28 -08:00
KF7EEL	d4e1ebd4ec	Update README.md	2020-11-25 12:35:06 -08:00
KF7EEL	ee40ad1e34	Update README.md	2020-11-25 12:17:51 -08:00
KF7EEL	37521fc7f1	implement custom UNIT time	2020-11-25 12:02:58 -08:00
KF7EEL	64ee23788a	Update README.md	2020-11-24 11:56:40 -08:00
KF7EEL	c07edcdc91	ensure lat and lon are float	2020-11-23 13:43:54 -08:00
KF7EEL	29fb602fcb	Update README.md	2020-11-23 13:19:04 -08:00
KF7EEL	6b9ae44256	add info to README	2020-11-23 13:15:22 -08:00
KF7EEL	72a9bd015b	fix typo again	2020-11-23 12:54:44 -08:00
KF7EEL	0ffd119994	implement basic SMS processing	2020-11-23 12:52:40 -08:00
KF7EEL	0056e1e09e	moved config to file	2020-11-23 10:08:31 -08:00
KF7EEL	84dee59b37	fix typo	2020-11-22 22:03:02 -08:00
KF7EEL	696e0bc128	fix typo	2020-11-22 21:58:45 -08:00
KF7EEL	f233e50516	fix old data bug	2020-11-22 20:39:45 -08:00
KF7EEL	6293497b61	decode motorola type sms	2020-11-22 18:51:46 -08:00
KF7EEL	6c3cab0827	added debug stuff	2020-11-22 13:55:06 -08:00
KF7EEL	0c6912c55f	fix typo	2020-11-22 12:44:52 -08:00
KF7EEL	e838fc3423	now using NMEA parser	2020-11-22 12:43:38 -08:00
KF7EEL	6224c84772	initial commit of GPS/Data application	2020-11-21 22:54:01 -08:00