From f6b4ba2a3e1ee9a9c963df37f10611ebf6c10c90 Mon Sep 17 00:00:00 2001 From: Lokesh Ramina Date: Wed, 23 Aug 2023 20:12:50 -0700 Subject: [PATCH 1/2] Hwdef: CarbonixF405 add 12MHz crystal oscillator - VO1-245 --- libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat index c9b65a069f..e048f428f4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat @@ -15,8 +15,8 @@ APJ_BOARD_ID 1064 # setup build for a peripheral firmware env AP_PERIPH 1 -# crystal frequency set to 0 to use internal clock -OSCILLATOR_HZ 0 +# crystal frequency set to 0 to use internal clock; currently configured for external crystal 12MHZ +OSCILLATOR_HZ 12000000 # assume 1024K flash part FLASH_SIZE_KB 1024 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat index 2b129675f2..65997774e2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat @@ -16,8 +16,8 @@ APJ_BOARD_ID 1064 # setup build for a peripheral firmware env AP_PERIPH 1 -# crystal frequency set to 0 to use internal clock -OSCILLATOR_HZ 0 +# crystal frequency set to 0 to use internal clock; currently configured for external crystal 12MHZ +OSCILLATOR_HZ 12000000 #MCU F405 Flash 1024 FLASH_SIZE_KB 1024 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h b/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h index e49257d360..9a9fb6e011 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h +++ b/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h @@ -178,6 +178,11 @@ #define STM32_PLLN_VALUE 336 #define STM32_PLLP_VALUE 2 #define STM32_PLLQ_VALUE 7 +#elif STM32_HSECLK == 12000000U +#define STM32_PLLM_VALUE 12 +#define STM32_PLLN_VALUE 336 +#define STM32_PLLP_VALUE 2 +#define STM32_PLLQ_VALUE 7 #elif STM32_HSECLK == 16000000U #define STM32_PLLM_VALUE 16 #define STM32_PLLN_VALUE 336 From cbdb3c999c6a1812d07b617e3d17e122d3654a45 Mon Sep 17 00:00:00 2001 From: Lokesh Ramina Date: Sun, 17 Sep 2023 19:00:31 -0700 Subject: [PATCH 2/2] Volanti: 4.3.6 Release Notes & Version - VO1-245 --- ArduPlane/ReleaseNotes.txt | 8 ++++++++ ArduPlane/version.h | 2 +- Tools/AP_Periph/version.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ArduPlane/ReleaseNotes.txt b/ArduPlane/ReleaseNotes.txt index 1187ad4e19..de6e528eae 100644 --- a/ArduPlane/ReleaseNotes.txt +++ b/ArduPlane/ReleaseNotes.txt @@ -1,3 +1,11 @@ +Release Volanti Carbopilot V4.3.6 18th Sep 2023 +---------------------------------- + +This Release includes +- feature/VO1-245-gps-delta-crystal-oscillator + +Happy Flying! + Release Volanti Carbopilot V4.3.5 18th Sep 2023 ---------------------------------- diff --git a/ArduPlane/version.h b/ArduPlane/version.h index b18fdc67fb..2d1ef57190 100644 --- a/ArduPlane/version.h +++ b/ArduPlane/version.h @@ -6,7 +6,7 @@ #include "ap_version.h" -#define THISFIRMWARE "Volanti Carbopilot V4.3.5" +#define THISFIRMWARE "Volanti Carbopilot V4.3.6" // the following line is parsed by the autotest scripts #define FIRMWARE_VERSION 4,2,1,FIRMWARE_VERSION_TYPE_OFFICIAL diff --git a/Tools/AP_Periph/version.h b/Tools/AP_Periph/version.h index dd81cc0d76..6141288917 100644 --- a/Tools/AP_Periph/version.h +++ b/Tools/AP_Periph/version.h @@ -3,7 +3,7 @@ #ifndef __AP_PERIPH_FW_VERSION__ #define __AP_PERIPH_FW_VERSION__ -#define THISFIRMWARE "Volanti Carbopilot V4.3.5" +#define THISFIRMWARE "Volanti Carbopilot V4.3.6" // the following line is parsed by the autotest scripts #define FIRMWARE_VERSION 1,3,0,FIRMWARE_VERSION_TYPE_DEV