Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/vo1 245 gps delta crystal oscillator #71

Merged
2 commits merged into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ArduPlane/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -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
----------------------------------

Expand Down
2 changes: 1 addition & 1 deletion ArduPlane/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tools/AP_Periph/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading