Merge branch 'CxPilot' into feature/SW-233-lua-binding-addition-suppo…

…rt-to-new-escx-telem
CarbonixUAV · Jun 6, 2024 · 98ba423 · 98ba423
2 parents b3dc8b4 + fab15ea
commit 98ba423
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/carbonix_build.yml b/.github/workflows/carbonix_build.yml
@@ -202,7 +202,7 @@ jobs:
       - name: Extract firmware version and commit id
         id: extract_info
         run: |
-          FIRMWARE_VERSION=$(grep -oP '#define AP_CUSTOM_FIRMWARE_STRING "\K(.*)(?=")' libraries/AP_Common/AP_FWVersionDefine.h)
+          FIRMWARE_VERSION=$(grep -oP '#define AP_CUSTOM_FIRMWARE_STRING "\K(.*)(?=")' libraries/AP_Common/CxVersion.h)
           COMMIT_ID=$(git rev-parse --short HEAD)
           echo "firmware_version=$FIRMWARE_VERSION" >> $GITHUB_ENV
           echo "commit_id=$COMMIT_ID" >> $GITHUB_ENV

diff --git a/Tools/AP_Periph/AP_Periph.h b/Tools/AP_Periph/AP_Periph.h
@@ -21,6 +21,7 @@
 #include <AP_Scripting/AP_Scripting.h>
 #include <AP_HAL/CANIface.h>
 #include <AP_Stats/AP_Stats.h>
+#include <AP_Common/CxVersion.h>
 
 #if HAL_GCS_ENABLED
 #include "GCS_MAVLink.h"

diff --git a/libraries/AP_Common/AP_FWVersionDefine.h b/libraries/AP_Common/AP_FWVersionDefine.h
@@ -22,10 +22,7 @@
 
 #include <AP_Common/AP_FWVersion.h>
 #include <AP_Vehicle/AP_Vehicle_Type.h>
-
-#ifdef CARBOPILOT
-#define AP_CUSTOM_FIRMWARE_STRING "CxPilot-5.1.1"
-#endif
+#include <AP_Common/CxVersion.h>
 
 /*
   allow vendors to set AP_CUSTOM_FIRMWARE_STRING in hwdef.dat

diff --git a/libraries/AP_Common/CxVersion.h b/libraries/AP_Common/CxVersion.h
@@ -0,0 +1,5 @@
+#ifdef CARBOPILOT
+#ifndef AP_CUSTOM_FIRMWARE_STRING
+#define AP_CUSTOM_FIRMWARE_STRING "CxPilot-5.1.1"
+#endif
+#endif