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

update templates, fix data_gateway bug

This commit is contained in:
KF7EEL 2021-10-30 16:07:01 -07:00
parent 48e2d812b3
commit 1f22718793
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data_gateway.py
View File

@ -1339,7 +1339,7 @@ def aprs_rx(aprs_rx_login, aprs_passcode, aprs_server, aprs_port, aprs_filter, u
logger.info(e)
def aprs_beacon_send():
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']
beacon_packet = CONFIG['DATA_CONFIG']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['DATA_CONFIG']['IGATE_LATITUDE'] + str(CONFIG['DATA_CONFIG']['IGATE_BEACON_ICON'][0]) + CONFIG['DATA_CONFIG']['IGATE_LONGITUDE'] + str(CONFIG['DATA_CONFIG']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['DATA_CONFIG']['IGATE_BEACON_COMMENT']
aprs_send(beacon_packet)
logger.info(beacon_packet)

5
web/app.py
View File

@ -4462,6 +4462,8 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
<p style="text-align: center;"><strong><a href="/data_wizard/''' + str(s.name) + '''">Add options for Data Gateway</a></strong></p>
<strong>Note: </strong>If <strong>IP/DNS</strong> is left blank, this server will not be listed on the Passphrase(s) page. This can be used to hide a server that users shouldn't connect to directly, such as a data gateway.
<form action="manage_servers?save_mode=edit&server=''' + str(s.name) + '''" method="post">
<p style="text-align: center;">&nbsp;</p>
<h3 style="text-align: center;"><strong>Server<br /></strong></h3>
@ -4669,6 +4671,9 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
# Add new server
elif request.args.get('add'): # == 'yes':
content = '''
<strong>Note: </strong>If <strong>IP/DNS</strong> is left blank, this server will not be listed on the Passphrase(s) page. This can be used to hide a server that users shouldn't connect to directly, such as a data gateway.
<form action="manage_servers?save_mode=new" method="post">
<p style="text-align: center;">&nbsp;</p>
<h3 style="text-align: center;"><strong>Server<br /></strong></h3>

3
web/templates/data_gateway_wizard.html
View File

@ -6,6 +6,9 @@
<br />
<strong>Note: </strong> Setting the APRS Login Call to <strong>N0CALL</strong> will disable APRS features. You will still be able to see station positions on the map though.
<strong>Note: </strong> Setting iGate Time to 0 will disable beaconing of iGate packets.
<br />
<br />

7
web/templates/map.html
View File

@ -10,19 +10,16 @@
<tbody>
<tr>
<td><span style="color: #ff0000;"><strong>Red</strong></span> = Peer location (no APRS)</td>
<td><span style="color: #0000ff;"><strong>Blue</strong></span> = GPS location (APRS)</td>
<td><span style="color: #0000ff;"> <strong>Blue</strong></span> = GPS location (APRS)</td>
<!-- <td><strong><span style="color: #00ff00;">Green</span></strong> = Peer location (APRS)</td> -->
</tr>
</tbody>
</table>
</div>
<div class="row container-fluid" >
<div class="col-xs-12">
<div class="row" >
{{markup_content}}
</div>
</div>
<p>&nbsp;</p>
{% endblock %}