Merge pull request #71 from CarbonixUAV/feature/VO1-245-gps-delta-cry…

…stal-oscillator Feature/vo1 245 gps delta crystal oscillator
CarbonixUAV · Sep 18, 2023 · dc28f8f · dc28f8f
2 parents 10ff8fe + cbdb3c9
commit dc28f8f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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

diff --git 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
@@ -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
@@ -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