update for olaf v2

oresat · Apr 29, 2023 · 374a639 · 374a639
1 parent 9c2118b
commit 374a639
Show file tree

Hide file tree

Showing 9 changed files with 450 additions and 481 deletions.
diff --git a/oresat_gps/__init__.py b/oresat_gps/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.2.0'
diff --git a/oresat_gps/__main__.py b/oresat_gps/__main__.py
@@ -1,23 +1,28 @@
 import os
 
-from flask import Blueprint, render_template
-from olaf import app, rest_api, olaf_run
+from olaf import app, rest_api, olaf_setup, olaf_run, render_olaf_template
 
 from .gps_resource import GPSResource
 
-gps_bp = Blueprint('gps_template', __name__, template_folder='templates')
 
-
-@gps_bp.route('/skytraq')
+@rest_api.app.route('/skytraq')
 def skytraq_template():
-    return render_template('skytraq.html', title=os.uname()[1], name='SkyTraq')
+    return render_olaf_template('skytraq.html', name='SkyTraq')
 
 
 def main():
-    app.add_resource(GPSResource)
-    rest_api.add_blueprint(gps_bp)
 
-    olaf_run(f'{os.path.dirname(os.path.abspath(__file__))}/data/oresat_gps.dcf')
+    path = os.path.dirname(os.path.abspath(__file__))
+
+    args = olaf_setup(f'{path}/data/oresat_gps.dcf')
+    mock_args = [i.lower() for i in args.mock_hw]
+    mock_skytraq = 'skytraq' in mock_args or 'all' in mock_args
+
+    app.add_resource(GPSResource(mock_skytraq))
+
+    rest_api.add_template(f'{path}/templates/skytraq.html')
+
+    olaf_run()
 
 
 if __name__ == '__main__':