30 system implement ride task

.github/workflows/build.yml

@@ -24,7 +24,36 @@ jobs:
             path: |
                 ${{ steps.compile.outputs.firmware-path }}
                 ${{ steps.compile.outputs.target-path }}
+  test:
+    needs: [compile]
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Create folder
+        run: mkdir -p external/ 
+
+      - name: Set up environment
+        run: |
+          sudo apt-get update && sudo apt-get install -y cmake g++
+      - name: add googletest
+        run: | 
+          git submodule init
+          git submodule update
+
+
 
+      - name: Build and run tests
+        run: | 
+          mkdir -p tests/build
+          cd tests/build
+          cmake ..
+          make
+          ./googletests.o        
   release:
     needs: [compile]
     runs-on: ubuntu-latest
@@ -66,4 +95,4 @@ jobs:
       env:
         github-token: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        npx semantic-release@23
+        npx semantic-release@23

.gitignore

@@ -1,5 +1,5 @@
-# Created by https://www.toptal.com/developers/gitignore/api/c++,linux,macos,windows,particle,python
-# Edit at https://www.toptal.com/developers/gitignore?templates=c++,linux,macos,windows,particle,python
+# Created by https://www.toptal.com/developers/gitignore/api/c++,linux,macos,python,windows,particle,cmake
+# Edit at https://www.toptal.com/developers/gitignore?templates=c++,linux,macos,python,windows,particle,cmake
 
 ### C++ ###
 # Prerequisites
@@ -35,6 +35,23 @@
 *.out
 *.app
 
+### CMake ###
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+### CMake Patch ###
+# External projects
+*-prefix/
+
 ### Linux ###
 *~
 
@@ -287,10 +304,11 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.toptal.com/developers/gitignore/api/c++,linux,macos,windows,particle,python
+# End of https://www.toptal.com/developers/gitignore/api/c++,linux,macos,python,windows,particle,cmake
 smartfin-fw3.cpp
 target/
 *.bin
 nul
 out/docs/application/Service Diagram.png
 out/docs/fw_flow/Firmware Flowchart.png
+

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "lib/SparkFun_ICM-20948_ParticleLibrary"]
 	path = lib/SparkFun_ICM-20948_ParticleLibrary
 	url = https://github.com/UCSD-E4E/SparkFun_ICM-20948_ParticleLibrary.git
+[submodule "external/googletest"]
+	path = external/googletest
+	url = https://github.com/google/googletest.git

.vscode/c_cpp_properties.json

@@ -34,6 +34,47 @@
                     "${workspaceFolder}\\src"
                 ]
             }
+        },
+        {
+            "name": "Particle_nix",
+            "includePath": 
+            [
+                "${workspaceFolder}/src",
+                "~/.particle/toolchains/deviceOS/5.3.0/user/inc",
+                "/usr/include/"
+
+            ],
+            "defines": 
+            [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ],
+            "compilerPath": "/usr/bin/gcc",
+            "intelliSenseMode": "linux-gcc-arm",
+            "cStandard": "c14",
+            "cppStandard": "c++14",
+            "configurationProvider": "particle.particle-vscode-core",
+            "mergeConfigurations": true,
+            "browse": 
+            {
+                "limitSymbolsToIncludedHeaders": true,
+                "path": 
+                [
+                    "${default}",
+                    "~/.particle/toolchains/deviceOS/5.3.0/user/inc",
+                    "~/.particle/toolchains/deviceOS/5.3.0/hal/inc",
+                    "~/.particle/toolchains/deviceOS/5.3.0/hal/shared",
+                    "~/.particle/toolchains/deviceOS/5.3.0/hal/src/gcc",
+                    "~/.particle/toolchains/deviceOS/5.3.0/hal/src/nRF52840/posix",
+                    "~/.particle/toolchains/deviceOS/5.3.0/services/inc",
+                    "~/.particle/toolchains/deviceOS/5.3.0/system",
+                    "~/.particle/toolchains/deviceOS/5.3.0/wiring",
+                    "~/.particle/toolchains/deviceOS/5.3.0/third_party/nrf5_sdk/nrf5_sdk/modules/nrfx/mdk",
+                    "${workspaceFolder}/src"
+                ]
+            },
+            "compilerArgs": []
         }
     ],
     "version": 4

src/cellular/dataUpload.cpp

@@ -66,7 +66,7 @@ STATES_e DataUpload::run(void)
 
     if (!this->initSuccess)
     {
-        SF_OSAL_printf("Failed to init\n");
+        SF_OSAL_printf("Failed to init" __NL__);
         return STATE_DEEP_SLEEP;
     }
 

src/cellular/recorder.cpp

@@ -448,7 +448,7 @@ int Recorder::closeSession(void)
 {
     if (nullptr == this->pSession)
     {
-        SF_OSAL_printf("REC::CLOSE Already closed\n");
+        SF_OSAL_printf("REC::CLOSE Already closed"  __NL__);
         return 1;
     }
 
@@ -482,15 +482,15 @@ int Recorder::putBytes(const void* pData, size_t nBytes)
         {
             this->dataBuffer[this->dataIdx] = 0;
         }
-        // SF_OSAL_printf("Flushing\n");
+        // SF_OSAL_printf("Flushing"  __NL__);
         this->pSession->write(this->dataBuffer, SF_PACKET_SIZE);
 
         memset(this->dataBuffer, 0, REC_MEMORY_BUFFER_SIZE);
         this->dataIdx = 0;
     }
 
     // data guaranteed to fit
-    // SF_OSAL_printf("Putting %u bytes\n", nBytes);
+    // SF_OSAL_printf("Putting %u bytes"  __NL__, nBytes);
     memcpy(&this->dataBuffer[this->dataIdx], pData, nBytes);
     this->dataIdx += nBytes;
     return 0;

src/cli/conio.cpp

@@ -23,7 +23,7 @@ char SF_OSAL_printfBuffer[SF_OSAL_PRINTF_BUFLEN];
 extern "C"
 {
     // Determines if key has been pressed
-    int kbhit(void) 
+    int kbhit(void)
     {
         return Serial.available();
     }
@@ -41,7 +41,7 @@ extern "C"
     // Write character
     int putch(int ch)
     {
-        Serial.print((char) ch);
+        Serial.print((char)ch);
         return ch;
     }
 
@@ -56,31 +56,33 @@ extern "C"
             if (kbhit())
             {
                 userInput = getch();
-                switch(userInput)
+                switch (userInput)
                 {
-                    case '\b':
-                        i--;
-                        putch('\b');
-                        putch(' ');
-                        putch('\b');
-                        break;
-                    default:
-                        buffer[i++] = userInput;
-                        putch(userInput);
-                        break;
-                    case '\r':
-                        buffer[i++] = 0;
-                        putch('\r');
-                        putch('\n');
-                        return i;
+                case '\b':
+                    i--;
+                    putch('\b');
+                    putch(' ');
+                    putch('\b');
+                    break;
+                default:
+                    buffer[i++] = userInput;
+                    putch(userInput);
+                    break;
+                case '\r':
+                    buffer[i++] = 0;
+                    putch('\r');
+                    putch('\n');
+                    return i;
                 }
             }
         }
         return i;
     }
-
+
+
     // Print char array to terminal
-    int SF_OSAL_printf(const char* fmt, ...) {
+    int SF_OSAL_printf(const char* fmt, ...)
+    {
         va_list vargs;
         int nBytes = 0;
         va_start(vargs, fmt);
@@ -89,4 +91,5 @@ extern "C"
         Serial.write(SF_OSAL_printfBuffer);
         return nBytes;
     }
+
 }

src/cli/conio.hpp

@@ -11,39 +11,40 @@ extern "C"
 #endif
     /**
      * @brief Gets character from serial
-     * 
+     *
      * @return int key thats pressed
      */
     int getch(void);
     /**
      * @brief Checks if key is pressed
-     * 
+     *
      * @return int whether key is pressed
      */
     int kbhit(void);
     /**
      * @brief Pushes character to serial
-     * 
+     *
      * @param ch character to push
      * @return int Sucsess value
      */
     int putch(int ch);
     /**
      * @brief Printf equivilent
-     * 
+     *
      * @param fmt initial text
      * @param ... values to push
-     * @return int 1 if sucssesful 
+     * @return int 1 if sucssesful
      */
     int SF_OSAL_printf(const char* fmt, ...);
 
+#ifdef PARTICLE
     /**
      * @brief Gets user input lin
      * @param buffer buffer to write too
      * @param buflen length of buffer
      */
     int getline(char* buffer, int buflen);
-
+#endif
 #ifdef __cplusplus
 }
 #endif

src/cli/flog.cpp

@@ -134,14 +134,14 @@ void FLOG_DisplayLog(void)
     uint32_t i;
     if (!FLOG_IsInitialized())
     {
-        SF_OSAL_printf("Fault Log not initialized!\n");
+        SF_OSAL_printf("Fault Log not initialized!"  __NL__);
         return;
     }
 
     i = 0;
     if (flogData.numEntries > FLOG_NUM_ENTRIES)
     {
-        SF_OSAL_printf("Fault Log overrun!\n");
+        SF_OSAL_printf("Fault Log overrun!"  __NL__);
         i = flogData.numEntries - FLOG_NUM_ENTRIES;
     }
 
@@ -152,7 +152,7 @@ void FLOG_DisplayLog(void)
             FLOG_FindMessage((FLOG_CODE_e)flogData.flogEntries[i & (FLOG_NUM_ENTRIES - 1)].errorCode),
             flogData.flogEntries[i & (FLOG_NUM_ENTRIES - 1)].param);
     }
-    SF_OSAL_printf("\n");
+    SF_OSAL_printf(""  __NL__);
 }
 void FLOG_ClearLog(void)
 {

src/cli/menuItems/debugCommands.cpp

@@ -67,7 +67,7 @@ void CLI_createTestFile(void)
 
     if (fd != -1) {
         for(int ii = 0; ii < 100; ii++) {
-            String msg = String::format("testing %d\n", ii);
+            String msg = String::format("testing %d"  __NL__, ii);
             SF_OSAL_printf("Creating file with msg %s" __NL__, msg.c_str());
 
             int i = write(fd, msg.c_str(), msg.length());

src/cli/menuItems/systemCommands.cpp

@@ -56,7 +56,7 @@ void CLI_doUpload(void)
 
 void CLI_self_identify(void)
 {
-    SF_OSAL_printf("Smartfin ID: %s\n", pSystemDesc->deviceID);
+    SF_OSAL_printf("Smartfin ID: %s"  __NL__, pSystemDesc->deviceID);
     VERS_printBanner();
 }
 

src/ensembles.cpp

@@ -0,0 +1,37 @@
+#include "ensembles.hpp"
+
+#ifndef TEST_VERSION
+#include "Particle.h"
+#else
+#include "../tests/scheduler_test_system.hpp"
+#endif
+
+
+void SS_ensembleAInit(DeploymentSchedule_t* pDeployment)
+{
+    return;
+}
+void SS_ensembleAFunc(DeploymentSchedule_t* pDeployment)
+{
+    delay(400);
+}
+
+
+void SS_ensembleBInit(DeploymentSchedule_t* pDeployment)
+{
+    return;
+}
+void SS_ensembleBFunc(DeploymentSchedule_t* pDeployment)
+{
+    delay(200);
+
+}
+
+void SS_ensembleCInit(DeploymentSchedule_t* pDeployment)
+{
+    return;
+}
+void SS_ensembleCFunc(DeploymentSchedule_t* pDeployment)
+{
+    delay(600);
+}

src/ensembles.hpp

@@ -0,0 +1,8 @@
+#include "scheduler.hpp"
+
+void SS_ensembleAInit(DeploymentSchedule_t* pDeployment);
+void SS_ensembleAFunc(DeploymentSchedule_t* pDeployment);
+void SS_ensembleBInit(DeploymentSchedule_t* pDeployment);
+void SS_ensembleBFunc(DeploymentSchedule_t* pDeployment);
+void SS_ensembleCInit(DeploymentSchedule_t* pDeployment);
+void SS_ensembleCFunc(DeploymentSchedule_t* pDeployment);