last minute fixes and version bump

oresat · Apr 25, 2021 · 8a38ddf · 8a38ddf
1 parent 52881a4
commit 8a38ddf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+oresat-gps (0.1.2-0) unstable; urgency=high
+
+  * last minute bug fixes
+
+ -- PSAS <oresat@pdx.edu>  Sun, 25 Apr 2021 03:45:33 -0700
+
 oresat-gps (0.1.1-0) unstable; urgency=high
 
   * bug fixes from real data

diff --git a/debian/control b/debian/control
@@ -7,5 +7,5 @@ Homepage: https://github.com/oresat/oresat-gps-software
 
 Package: oresat-gps
 Architecture: all
-Depends: libsystemd-dev, python3, python3-pydbus, python3-serial
+Depends: libsystemd-dev, python3, python3-pydbus, python3-serial, python3-setuptools
 Description: A quick gps daemon with a D-Bus interface.
diff --git a/oresat-gpsd.service b/oresat-gpsd.service
@@ -3,7 +3,7 @@ Description=OreSat SDR GPS
 
 [Service]
 Type=forking
-PIDFile=/run/oresat-gps.pid
+PIDFile=/run/oresat-gpsd.pid
 ExecStart=/usr/bin/oresat-gps -d -s
 Restart=on-failure
 User=root

diff --git a/oresat_gps/main.py b/oresat_gps/main.py
@@ -68,7 +68,7 @@ def main():
     """The main for the oresat linux gps daemon"""
 
     ret = 0
-    pid_file = "/run/oresat-linux-gpsd.pid"
+    pid_file = "/run/oresat-gpsd.pid"
 
     parser = ArgumentParser()
     parser.add_argument("-d", "--daemon", action="store_true",
@@ -78,7 +78,7 @@ def main():
     parser.add_argument("-s", "--sync", action="store_true",
                         help="sync the system time on 1st lock")
     parser.add_argument("-m", "--mock", metavar="FILE", type=str,
-                        help="mock skytraq with file")
+                        default="", help="mock skytraq with file")
     args = parser.parse_args()
 
     if args.daemon:
@@ -97,6 +97,9 @@ def main():
 
     log = logging.getLogger('oresat-gpsd')
 
+    if args.mock == "":
+        power_on()
+
     # make gps
     gps = GPSServer(log, sync_time=args.sync, mock=args.mock)
 
@@ -105,9 +108,6 @@ def main():
     bus.publish(DBUS_INTERFACE_NAME, gps)
     loop = GLib.MainLoop()
 
-    if args.mock == "":
-        power_on()
-
     try:
         gps.run()
         loop.run()

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name="oresat-gps",
-    version="0.1.1",
+    version="0.1.2",
     author="PSAS",
     author_email="oresat@pdx.edu",
     license="GPL-3.0",