more refactoring and lib bumps

.circleci/config.yml

@@ -40,7 +40,7 @@ jobs:
           name: Run tests & generate coverage reports
           command: |
             ./software/common/common.sh test --cov --no-checks
-            ./software/common/common.sh cov_cleanup
+            ./software/common/common.sh cov-cleanup
       - codecov/upload:
           file: './software/common/coverage_reports/coverage.info'
           flags: 'common'
@@ -64,7 +64,7 @@ jobs:
           name: Run tests & generate coverage reports
           command: |
             ./software/controller/controller.sh test --cov --no-checks
-            ./software/controller/controller.sh cov_cleanup
+            ./software/controller/controller.sh cov-cleanup
       - codecov/upload:
           file: './software/controller/coverage_reports/coverage.info'
           flags: 'controller'

.gitignore

@@ -1,9 +1,3 @@
-#network protocol output files
-software/common/generated_libs/protocols/*.c
-software/common/generated_libs/protocols/*.h
-software/gui/src/protocols/*.cc
-software/gui/src/protocols/*.h
-
 build/
 build_autotests/
 .pio/
@@ -17,9 +11,7 @@ source/config/*
 
 #IDE
 software/controller/CMakeLists*
-software/controller/.gitignore
 software/common/CMakeLists*
-software/common/.gitignore
 cmake-build-*/
 .idea/
 .idea

software/common/.gitignore

@@ -0,0 +1,3 @@
+#network protocol output files
+generated_libs/protocols/*.c
+generated_libs/protocols/*.h

software/common/common.sh

@@ -49,7 +49,7 @@ The following options are available:
   test          Builds and runs all unit tests, integration tests, static checks, generates coverage
                   [--no-checks] - do not run static checks (for CI)
                   [--cov]       - generate coverage reports
-  cov_cleanup   Prepare coverage reports for uploading to server
+  cov-cleanup   Prepare coverage reports for uploading to server
   unit          Builds and runs unit tests only (and generates coverage reports)
                   <name>  - run specific unit test, may include wildcards, i.e. '*checksum*'
                   [-o]    - open coverage report in browser when done
@@ -261,7 +261,7 @@ elif [ "$1" == "test" ]; then
 ####################
 # CLEANUP COVERAGE #
 ####################
-elif [ "$1" == "cov_cleanup" ]; then
+elif [ "$1" == "cov-cleanup" ]; then
   cleanup_coverage_reports
   exit_good
 

software/controller/README.md

@@ -102,7 +102,7 @@ If this is the only device connected, you can deploy with
 ```
 
 If you have multiple devices connected to your development machine, you should:
-* run `./controller.sh patch_ocd` to patch ST-Link scripts
+* run `./controller.sh patch-ocd` to patch ST-Link scripts
 * add your devices to manifest spreadsheet on Google Drive in [this directory](https://drive.google.com/drive/folders/1EBQReayx557hWeHTPxkbUI4eeUq-1AWw?usp=sharing) (you will need team write access).
 * run `./controller.sh debug -c "device update"` which will fetch you a copy of that manifest
 

software/controller/controller.sh

@@ -48,7 +48,7 @@ Utility script for the RespiraWorks Ventilator controller.
 
 The following options are available:
   configure   One-time configuring of udev rules for deployment to controller
-  patch_ocd   One-time patching of OCD script for ST-Link for multi-device deployment environments
+  patch-ocd   One-time patching of OCD script for ST-Link for multi-device deployment environments
   devices     List all devices available for deploying to
   check       Runs static checks only
   clean       Clean build directories
@@ -64,7 +64,7 @@ The following options are available:
   integrate   Run integration tests
                 all [delay_time] - run all integration tests, pause for [delay_time] in between
                 <test_name> [parameters...] - run specific integration test with parameters
-  cov_cleanup Prepare coverage reports for uploading to server
+  cov-cleanup Prepare coverage reports for uploading to server
   help/-h     Display this help info
 
 Additionally, the following environment variables may be evaluated:
@@ -386,7 +386,7 @@ elif [ "$1" == "test" ]; then
 ####################
 # CLEANUP COVERAGE #
 ####################
-elif [ "$1" == "cov_cleanup" ]; then
+elif [ "$1" == "cov-cleanup" ]; then
   cleanup_coverage_reports
   exit_good
 

software/controller/platformio.ini

@@ -84,7 +84,7 @@ check_src_filters =
   ; Do not include ../common/generated_libs
 
 [env:stm32]
-platform = ststm32@15.4.1
+platform = ststm32@17.6.0
 board = custom_stm32
 build_flags =
   ${env.build_flags}
@@ -98,7 +98,7 @@ build_src_filter = +<src/>
 lib_deps = nanopb/Nanopb@^0.4.7
 
 [env:integration-test]
-platform = ststm32@15.4.1
+platform = ststm32@17.6.0
 board = custom_stm32
 build_flags =
   ${env.build_flags}

software/controller/platformio/README.md

@@ -10,7 +10,7 @@ In order to deploy to multiple STM32 devices on the same system, a file in your
 `$HOME/.platformio/packages/tool-openocd/scripts/interface/stlink.cfg`
 must be replaced with the [`stlink.cfg`](stlink.cfg) provided here.
 
-This patching is now handled by running `controller.sh patch_ocd`.
+This patching is now handled by running `controller.sh patch-ocd`.
 
 This solution is based on a post on the platformio forums
 [here](https://community.platformio.org/t/choosing-stlink-v2-programmer/10716).

software/gui/.gitignore

@@ -0,0 +1,3 @@
+#network protocol output files
+src/protocols/*.cc
+src/protocols/*.h