From ef95313a060efaea541cdb4c5727f69255664b5d Mon Sep 17 00:00:00 2001
From: shmget
Date: Sun, 12 Apr 2020 12:17:18 -0400
Subject: [PATCH] fixed indents
---
nxcm_log_icom/nxcm_icom_log.py | 86 +++++++++++++++++-----------------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/nxcm_log_icom/nxcm_icom_log.py b/nxcm_log_icom/nxcm_icom_log.py
index e66b9d7..762f198 100644
--- a/nxcm_log_icom/nxcm_icom_log.py
+++ b/nxcm_log_icom/nxcm_icom_log.py
@@ -20,20 +20,20 @@
def writeout():
- while True:
- time.sleep(15)
- outfile = open(OUTPUT_HTMLFILE, 'w')
- outfile.write("Icom NXDN Log")
- outfile.write("")
- outfile.write("N1XDN Connecticut NXCM Icom Log
")
- outfile.write("
")
- outfile.write("
Last Heard | User / UID | \
- Talkgroup / GID | Repeater | RX RAN | Status |
")
- for i in range(0,len(packetlist)):
- outfile.write(packetlist[i])
- outfile.write("\n")
- outfile.write("
")
- outfile.close()
+ while True:
+ time.sleep(15)
+ outfile = open(OUTPUT_HTMLFILE, 'w')
+ outfile.write("Icom NXDN Log")
+ outfile.write("")
+ outfile.write("N1XDN Connecticut NXCM Icom Log
")
+ outfile.write("
")
+ outfile.write("
Last Heard | User / UID | \
+ Talkgroup / GID | Repeater | RX RAN | Status |
")
+ for i in range(0,len(packetlist)):
+ outfile.write(packetlist[i])
+ outfile.write("\n")
+ outfile.write("
")
+ outfile.close()
t = threading.Thread(target=writeout)
@@ -41,16 +41,16 @@ def writeout():
uid_dict = {}
with open('uid.csv') as csvfile:
- uidreader = csv.reader(csvfile, delimiter=',', quotechar='|')
- for row in uidreader:
- if row[0].isdigit():
- tempstr = row[1] + " - " + row[2]
- if len(row[3]) > 0:
- tempstr += " - " + row[3]
- tempstr += "
(" + row[0] + ")"
- uid_dict[row[0]] = tempstr
- else:
- uid_dict[row[0]] = row[0]
+ uidreader = csv.reader(csvfile, delimiter=',', quotechar='|')
+ for row in uidreader:
+ if row[0].isdigit():
+ tempstr = row[1] + " - " + row[2]
+ if len(row[3]) > 0:
+ tempstr += " - " + row[3]
+ tempstr += "
(" + row[0] + ")"
+ uid_dict[row[0]] = tempstr
+ else:
+ uid_dict[row[0]] = row[0]
@@ -60,27 +60,27 @@ def writeout():
if ((ord(data[38]) == 0x1c) and (ord(data[39]) == 0x21)):
- UID = (ord(data[48]) << 8) + ord(data[49])
- GID = (ord(data[50]) << 8) + ord(data[51])
- RAN = ord(data[41])
- if (UID == 0):
- continue
+ UID = (ord(data[48]) << 8) + ord(data[49])
+ GID = (ord(data[50]) << 8) + ord(data[51])
+ RAN = ord(data[41])
+ if (UID == 0):
+ continue
- rpt = ""
+ rpt = ""
- for item in rpt_list:
- if (ord(data[97])==item[3]) and (ord(data[98])==item[2]) and (ord(data[99])==item[1]) and (ord(data[100])==item[0]):
- rpt = item[4]
+ for item in rpt_list:
+ if (ord(data[97])==item[3]) and (ord(data[98])==item[2]) and (ord(data[99])==item[1]) and (ord(data[100])==item[0]):
+ rpt = item[4]
- gidstr = tg_dict.get(GID)
- if not gidstr:
- gidstr = str(GID)
+ gidstr = tg_dict.get(GID)
+ if not gidstr:
+ gidstr = str(GID)
- uidstr = uid_dict.get(str(UID))
- if not uidstr:
- uidstr = str(UID)
+ uidstr = uid_dict.get(str(UID))
+ if not uidstr:
+ uidstr = str(UID)
- if ord(data[45]) == 1:
- packetlist.appendleft(" "+ time.strftime("%c, %z") + " | " + uidstr + " | " + gidstr + " | " + rpt + " | " + str(RAN) + " | PTT On |
")
- if ord(data[45]) == 8:
- packetlist.appendleft(" "+ time.strftime("%c, %z") + " | " + uidstr + " | " + gidstr + " | " + rpt + " | " + str(RAN) + " | PTT Off |
")
+ if ord(data[45]) == 1:
+ packetlist.appendleft(" "+ time.strftime("%c, %z") + " | " + uidstr + " | " + gidstr + " | " + rpt + " | " + str(RAN) + " | PTT On |
")
+ if ord(data[45]) == 8:
+ packetlist.appendleft(" "+ time.strftime("%c, %z") + " | " + uidstr + " | " + gidstr + " | " + rpt + " | " + str(RAN) + " | PTT Off |
")