From 072ec6f4da2e7790887eb77bf89363c7f28c5956 Mon Sep 17 00:00:00 2001 From: Lokesh-Ramina Date: Wed, 20 Dec 2023 14:31:04 -0800 Subject: [PATCH 1/2] hwdef: CarbonixCubeOrange default param update EK3_ENABLE 1 @READONLY BRD_SAFETYOPTION 3 @READONLY BATT2_TYPE 28 @READONLY BATT3_TYPE 28 @READONLY SW-42 --- .../AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/defaults.parm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/defaults.parm index 0fdf757113..e99689696f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/defaults.parm @@ -9,3 +9,7 @@ SERVO8_FUNCTION -1 @READONLY SERVO9_FUNCTION 94 @READONLY SERVO10_FUNCTION 4 @READONLY SERVO11_FUNCTION 19 @READONLY +EK3_ENABLE 1 @READONLY +BRD_SAFETYOPTION 3 @READONLY +BATT2_TYPE 28 @READONLY +BATT3_TYPE 28 @READONLY From 29d9d3a2952fea23d8f2e064c5e8e4c10a216222 Mon Sep 17 00:00:00 2001 From: Lokesh-Ramina Date: Wed, 20 Dec 2023 14:18:55 -0800 Subject: [PATCH 2/2] CxPilot 5.0.0-beta3 Release notes SW-42 --- ArduPlane/ReleaseNotes.txt | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ArduPlane/ReleaseNotes.txt b/ArduPlane/ReleaseNotes.txt index c98df645d7..902a02a609 100644 --- a/ArduPlane/ReleaseNotes.txt +++ b/ArduPlane/ReleaseNotes.txt @@ -1,3 +1,7 @@ +Release 5.0.0-beta3 21st Dec 2023 +------------------------------ + - Updated default CarbonixCubeOrange Param + Release 5.0.0-beta2 15th Dec 2023 ------------------------------ - AP_Periph: fix arm_update_status missing update diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/hwdef.dat index 0037eaf07d..e51c834226 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/hwdef.dat @@ -2,7 +2,7 @@ include ../CubeOrange/hwdef.dat -define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta2" +define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta3" undef HAL_NAVEKF3_AVAILABLE undef HAL_NAVEKF2_AVAILABLE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat index 61a6ba9351..458186bed6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat @@ -19,7 +19,7 @@ env AP_PERIPH 1 # crystal frequency set to 0 to use internal clock; currently configured for external crystal 12MHZ OSCILLATOR_HZ 12000000 -define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta2" +define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta3" #MCU F405 Flash 1024 FLASH_SIZE_KB 1024 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat index 4b65bf726d..563a8981da 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat @@ -21,7 +21,7 @@ env AP_PERIPH 1 # crystal frequency OSCILLATOR_HZ 12000000 -define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta2" +define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta3" # assume the 256k flash part FLASH_SIZE_KB 256