merge develop

Author: previ

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: coderbot/python-gpac:3.5
+      - image: coderbot/python-gpac:3.5-tf2
 
     working_directory: ~/repo
 
@@ -26,6 +26,7 @@ jobs:
           command: |
             python3 -m venv venv
             . venv/bin/activate
+            pip install --upgrade pip
             pip install -r requirements_stub.txt
 
       - save_cache:
@@ -38,11 +39,11 @@ jobs:
           name: run tests
           command: |
             . venv/bin/activate
-            export PYTHONPATH=./stub
+            export PYTHONPATH=./stub:test
             mkdir test-reports
             python3 -m unittest test/coderbot_test.py 2>&1 | tee test-reports/test_report.txt
-            #python3 -m unittest test/cnn_test.py 2>&1 | tee test-reports/test_report.txt
             python3 -m unittest test/camera_test.py 2>&1 | tee test-reports/test_report.txt
+            #python3 -m unittest test/cnn_test.py 2>&1 | tee test-reports/test_report.txt
             echo "test complete"
       - store_artifacts:
           path: test-reports/

.gitignore

@@ -37,6 +37,7 @@ photos/*.jpg
 photos/*.mp4
 photos/*.h264
 photos/*.json
+saved_photos
 
 #cnn models
 cnn_models/*
@@ -64,6 +65,7 @@ static/blockly-tutorial
 .Trashes
 ehthumbs.db
 Thumbs.db
+.vscode
 
 # Swap files
 *.swp

MPU6050.py

@@ -30,7 +30,7 @@ pip3 install -r requirements_stub.txt
 pip3 install -r requirements.txt
 
 # Start the backend in stub mode
-PYTHONPATH=stub python3 init.py
+PYTHONPATH=stub:test python3 init.py
 
 # or, run the real thing if you're on a physical RPi
 python3 init.py