ua1zbe
/
gps
mirror of https://github.com/kf7eel/hbnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix maidenhead issue

This commit is contained in:
KF7EEL 2022-02-21 09:57:07 -08:00
parent 1725a9b802
commit c144011047
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data_gateway.py
View File

@ -744,6 +744,11 @@ def decdeg2dms(dd):
minutes,seconds = divmod(dd*3600,60) minutes,seconds = divmod(dd*3600,60)
degrees,minutes = divmod(minutes,60) degrees,minutes = divmod(minutes,60)
degrees = degrees if is_positive else -degrees degrees = degrees if is_positive else -degrees
print(degrees)
print(minutes)
print(seconds)
return (degrees,minutes,seconds) return (degrees,minutes,seconds)
def user_setting_write(dmr_id, setting, value, call_type): def user_setting_write(dmr_id, setting, value, call_type):
@ -887,7 +892,7 @@ def process_sms(_rf_src, sms, call_type, system_name):
else: else:
lat = decdeg2dms(mh.to_location(grid_square)[0]) lat = decdeg2dms(mh.to_location(grid_square)[0])
lon = decdeg2dms(mh.to_location(grid_square)[1]) lon = decdeg2dms(mh.to_location(grid_square)[1])
if lon[0] < 0: if lon[0] < 0:
lon_dir = 'W' lon_dir = 'W'
if lon[0] > 0: if lon[0] > 0:
@ -898,8 +903,8 @@ def process_sms(_rf_src, sms, call_type, system_name):
lat_dir = 'N' lat_dir = 'N'
#logger.info(lat) #logger.info(lat)
#logger.info(lat_dir) #logger.info(lat_dir)
aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.')).zfill(5) + ' ' + lat_dir aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))).zfill(2) + str(re.sub('\..*', '', str(lat[1])).zfill(2) + '.')) + ' ' + lat_dir
aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.')).zfill(6) + ' ' + lon_dir aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))).zfill(3) + str(re.sub('\..*', '', str(lon[1])).zfill(2) + '.')) + ' ' + lon_dir
logger.info('Latitude: ' + str(aprs_lat)) logger.info('Latitude: ' + str(aprs_lat))
logger.info('Longitude: ' + str(aprs_lon)) logger.info('Longitude: ' + str(aprs_lon))
# 14FRS2013 simplified and moved settings retrieval # 14FRS2013 simplified and moved settings retrieval
@ -1895,20 +1900,22 @@ if __name__ == '__main__':
user_ssid = CONFIG['DATA_CONFIG']['USER_APRS_SSID'] user_ssid = CONFIG['DATA_CONFIG']['USER_APRS_SSID']
aprs_comment = CONFIG['DATA_CONFIG']['USER_APRS_COMMENT'] aprs_comment = CONFIG['DATA_CONFIG']['USER_APRS_COMMENT']
aprs_filter = CONFIG['DATA_CONFIG']['APRS_FILTER'] aprs_filter = CONFIG['DATA_CONFIG']['APRS_FILTER']
# EMAIL variables # EMAIL variables
## email_sender = CONFIG['DATA_CONFIG']['EMAIL_SENDER'] ## email_sender = CONFIG['DATA_CONFIG']['EMAIL_SENDER']
## email_password = CONFIG['DATA_CONFIG']['EMAIL_PASSWORD'] ## email_password = CONFIG['DATA_CONFIG']['EMAIL_PASSWORD']
## smtp_server = CONFIG['DATA_CONFIG']['SMTP_SERVER'] ## smtp_server = CONFIG['DATA_CONFIG']['SMTP_SERVER']
## smtp_port = CONFIG['DATA_CONFIG']['SMTP_PORT'] ## smtp_port = CONFIG['DATA_CONFIG']['SMTP_PORT']
##
# Dashboard files ## # Dashboard files
## bb_file = CONFIG['DATA_CONFIG']['BULLETIN_BOARD_FILE'] ## bb_file = CONFIG['DATA_CONFIG']['BULLETIN_BOARD_FILE']
## loc_file = CONFIG['DATA_CONFIG']['LOCATION_FILE'] ## loc_file = CONFIG['DATA_CONFIG']['LOCATION_FILE']
## the_mailbox_file = CONFIG['DATA_CONFIG']['MAILBOX_FILE'] ## the_mailbox_file = CONFIG['DATA_CONFIG']['MAILBOX_FILE']
## emergency_sos_file = CONFIG['DATA_CONFIG']['EMERGENCY_SOS_FILE'] ## emergency_sos_file = CONFIG['DATA_CONFIG']['EMERGENCY_SOS_FILE']
## sms_file = CONFIG['DATA_CONFIG']['SMS_FILE'] ## sms_file = CONFIG['DATA_CONFIG']['SMS_FILE']
# User APRS settings ## # User APRS settings
user_settings_file = CONFIG['DATA_CONFIG']['USER_SETTINGS_FILE'] user_settings_file = CONFIG['DATA_CONFIG']['USER_SETTINGS_FILE']
#### use_api = CONFIG['DATA_CONFIG']['USE_API'] #### use_api = CONFIG['DATA_CONFIG']['USE_API']