unixweb/ttn-resin-gateway-rpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip port from URL

Browse Source 
Fix print bugs
This commit is contained in:
jpmeijers 2017-02-26 18:58:09 +01:00
parent 8cf0b09efc
commit f8ea6b5186
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
run.py
View File

@ -10,6 +10,7 @@ import sys
import urllib2 import urllib2
import time import time
import uuid import uuid
import json
import subprocess import subprocess
try: try:
import RPi.GPIO as GPIO import RPi.GPIO as GPIO
@ -65,8 +66,8 @@ print ("Gateway Type:\t"+os.environ.get("GW_TYPE"))
print ("Gateway ID:\t"+os.environ.get("GW_ID")) print ("Gateway ID:\t"+os.environ.get("GW_ID"))
print ("Gateway EUI:\t"+my_eui) print ("Gateway EUI:\t"+my_eui)
print ("Gateway Key:\t"+os.environ.get("GW_KEY")) print ("Gateway Key:\t"+os.environ.get("GW_KEY"))
print ("Has hardware GPS: "+str(os.getenv('GW_GPS', False))) print ("Has hardware GPS:\t"+str(os.getenv('GW_GPS', False)))
print ("Hardware GPS port: "+os.getenv('GW_GPS_PORT', "/dev/ttyAMA0")) print ("Hardware GPS port:\t"+os.getenv('GW_GPS_PORT', "/dev/ttyAMA0"))
print ("*******************") print ("*******************")
@ -105,6 +106,7 @@ if(os.getenv('SERVER_TTN', True)):
frequency_plan = ttn_config.get('frequency_plan')#, "EU_863_870") frequency_plan = ttn_config.get('frequency_plan')#, "EU_863_870")
frequency_plan_url = ttn_config.get('frequency_plan_url')#, "https://account.thethingsnetwork.org/api/v2/frequency-plans/EU_863_870") frequency_plan_url = ttn_config.get('frequency_plan_url')#, "https://account.thethingsnetwork.org/api/v2/frequency-plans/EU_863_870")
router = ttn_config.get('router')#, "router.dev.thethings.network:1883") router = ttn_config.get('router')#, "router.dev.thethings.network:1883")
router = router[:router.index(':')] #strip port from url, as the ttn library also adds this
if "attributes" in ttn_config: if "attributes" in ttn_config:
description = ttn_config['attributes'].get('description', "") description = ttn_config['attributes'].get('description', "")
@ -120,8 +122,8 @@ if(os.getenv('SERVER_TTN', True)):
print ("Frequency plan url:\t"+frequency_plan_url) print ("Frequency plan url:\t"+frequency_plan_url)
print ("Gateway description:\t"+description) print ("Gateway description:\t"+description)
print ("Gateway placement:\t"+placement) print ("Gateway placement:\t"+placement)
print ("Latitude:\t"+latitude) print ("Latitude:\t"+str(latitude))
print ("Longitude:\t"+longitude) print ("Longitude:\t"+str(longitude))
# Done fetching config from TTN # Done fetching config from TTN