updated conflicts from cherry pick

Author: zradlicz

.github/workflows/manual-flash.yaml

@@ -41,7 +41,7 @@ jobs:
 
       - name: Download latest firmware artifact
         if: github.event.inputs.use_latest_artifact == 'yes'
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
         with:
           workflow: manual-compile.yaml
           name: firmware-binary

.github/workflows/manual-upload.yaml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Download release artifacts
         if: github.event.inputs.use_release_artifact == 'yes'
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
         with:
           workflow: manual-release.yaml
           name: release-artifacts

.github/workflows/pr-workflow.yaml

@@ -3,7 +3,7 @@ name: Pull Request Workflow
 on:
   # Runs on PR open
   pull_request:
-    types: [opened, reopened, synchronize]
+    types: [opened, reopened, synchronize, edited]
     branches:
       - master  # or 'main' depending on your main branch
 

.gitmodules

@@ -131,3 +131,9 @@
 [submodule "test/external/fff"]
 	path = test/external/fff
 	url = https://github.com/meekrosoft/fff.git
+[submodule "lib/FlightControl-platform-dependencies"]
+	path = lib/FlightControl-platform-dependencies
+	url = https://github.com/gemsiot/FlightControl-platform-dependencies
+[submodule "lib/FlightControl-hardware-dependencies"]
+	path = lib/FlightControl-hardware-dependencies
+	url = https://github.com/gemsiot/FlightControl-hardware-dependencies

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project(FlightControl_Demo_Tests)
 
 # Specify C++ standard
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Add test directory

lib/Driver_-_Li710

@@ -79,6 +79,7 @@ SDI12Talon sdi12(0, 0x14); //Instantiate SDI12 talon with alt - null port and ha
 PCAL9535A ioAlpha(0x20);
 PCAL9535A ioBeta(0x21);
 SDI12TalonAdapter realSdi12(sdi12);
+ParticleTimeProvider realTimeProvider;
 
 String globalNodeID = ""; //Store current node ID