From e7002c712c4417cb03e1017814f31e7c8a8b85e9 Mon Sep 17 00:00:00 2001
From: W1CDN <matthew.burtonkelly@gmail.com>
Date: Mon, 11 Dec 2023 21:41:57 -0600
Subject: [PATCH] Flail.

---
 constants.py   |  3 +++
 kiss_and_db.py | 44 ++++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/constants.py b/constants.py
index 8689d11..aea9984 100644
--- a/constants.py
+++ b/constants.py
@@ -3,6 +3,7 @@ db_frames_fields = ("id",
 "addresse",
 "alive",
 "altitude",
+"body",
 "comment",
 "course",
 "created",
@@ -11,6 +12,7 @@ db_frames_fields = ("id",
 "frame",
 "from",
 "gpsfixstatus",
+"id",
 "latitude",
 "longitude",
 "mbits",
@@ -44,6 +46,7 @@ db_frames_fields = ("id",
 "tEQNS",
 "tPARM",
 "tUNIT",
+"type",
 "via",
 "weather",
 "wx_raw_timestamp")
diff --git a/kiss_and_db.py b/kiss_and_db.py
index e3141a4..9d4739f 100644
--- a/kiss_and_db.py
+++ b/kiss_and_db.py
@@ -24,18 +24,10 @@ def refresh_kiss_connection(kiss_conn):
     logging.debug("Restarting KISS connection on schedule")
     logging.debug("Stopping current connection")
     kiss_conn.stop()
-    logging.debug("Waiting 5 seconds")
-    time.sleep(5)
+    #logging.debug("Waiting 5 seconds")
+    #time.sleep(5)
     logging.debug("Starting new connection")
     kiss_conn.start()
-    # alive_frame = aprs.APRSFrame.ui(
-    #     destination="TEST",
-    #     source=config['Settings']['mycall'],
-    #     path=None,
-    #     info=b">None",
-    # )
-    # logging.debug("Sending empty frame to keep connection alive")
-    # kiss_conn.write(alive_frame)
 
 def main():
 
@@ -47,33 +39,35 @@ def main():
 
     logging.basicConfig(filename=config['Settings']['log_path'], level=logging.DEBUG, \
                         format='%(asctime)s - %(message)s')
-    logging.debug('kiss_and_db.py running')
+    logging.debug('============= kiss_and_db.py running =============')
 
     ki = aprs.TCPKISS(host=config['Settings']['kiss_host'], port=int(config['Settings']['kiss_port']))
     ki.start()
-    print(str(ki))
-    ki.stop()
-    print(str(ki))
 
-    scheduler = AsyncIOScheduler()
-    scheduler.add_job(refresh_kiss_connection, 'interval', minutes = 1, args = [ki])
-    scheduler.start()
+    #scheduler = AsyncIOScheduler()
+    #scheduler.add_job(refresh_kiss_connection, 'interval', hours = 1, args = [ki])
+    #scheduler.start()
 
     # Make a simple frame and send it
-    # frame = aprs.APRSFrame.ui(
-    #     destination="APZ001",
-    #     source=config['Settings']['mycall'],
-    #     path=['WIDE1-1'],
-    #     info=b">Hello World!",
-    # )
+#     frame = aprs.APRSFrame.ui(
+#         destination="APZ001",
+#         source=config['Settings']['mycall'],
+#         path=["WIDE1-1"],
+#         info=b">Hello World!",
+#     )
+    #ki.write(frame)
 
     # Watch for new packets to come in
     while True:
         conn = get_db_connection()
         for frame in ki.read(min_frames=1):
             logging.debug("New packet, trying to parse")
+            logging.debug(str(frame))
             try:
-                a = aprslib.parse(str(frame))
+                try:
+                    a = aprslib.parse(str(frame))
+                except:
+                    logging.error("Error with aprslib!")
                 a['station_call'] = config['Settings']['station_call']
                 a['station_lat'] = config['Settings']['station_lat']
                 a['station_lon'] = config['Settings']['station_lon']
@@ -90,6 +84,8 @@ def main():
                 # Build an INSERT statement based on the fields we have from the frame
                 attrib_names = ', '.join('"%s"' % w for w in a.keys())
                 attrib_values = ", ".join("?" * len(a.keys()))
+                logging.debug(attrib_names)
+                logging.debug(a.values())
 
                 logging.debug("Inserting into database")
                 try: