Skip to content

Commit

Permalink
Remove CarbonixL496
Browse files Browse the repository at this point in the history
SW-159
  • Loading branch information
robertlong13 committed Jun 6, 2024
1 parent e823581 commit 9287cee
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 295 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/carbonix_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
- name: build Carbonix Periph boards
shell: bash
run: |
boards=("CarbonixF405" "CarbonixF405-no-crystal" "CarbonixL496")
boards=("CarbonixF405" "CarbonixF405-no-crystal")
for board in "${boards[@]}"; do
echo "Compiling AP_Periph for $board..."
./waf configure --board "$board" --define=CARBOPILOT=1
Expand All @@ -195,7 +195,7 @@ jobs:
id: check_files
uses: andstor/file-existence-action@v2
with:
files: "build/CubeOrange/*, build/CubeOrange-Volanti/*, build/CubeOrange-Ottano/*, build/sitl/*, build/CarbonixF405/*, build/CarbonixF405-no-crystal/*, build/CarbonixL496/*"
files: "build/CubeOrange/*, build/CubeOrange-Volanti/*, build/CubeOrange-Ottano/*, build/sitl/*, build/CarbonixF405/*, build/CarbonixF405-no-crystal/*"
fail: true
- name: Extract firmware version and commit id
id: extract_info
Expand All @@ -208,7 +208,7 @@ jobs:
- name: Gather build output
run: |
mkdir -p temp
for dir in CubeOrange CubeOrange-Volanti CubeOrange-Ottano sitl CarbonixF405 CarbonixF405-no-crystal CarbonixL496; do
for dir in CubeOrange CubeOrange-Volanti CubeOrange-Ottano sitl CarbonixF405 CarbonixF405-no-crystal; do
mkdir -p temp/$dir/bin
cp -v build/$dir/bin/* temp/$dir/bin/
done
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cx_build_compare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
exclude:
- gcc: 10
toolchain: chibios-clang
board: ["CubeOrange-Volanti", "CubeOrange-Ottano", "CarbonixF405", "CarbonixF405-no-crystal", "CarbonixL496"]
board: ["CubeOrange-Volanti", "CubeOrange-Ottano", "CarbonixF405", "CarbonixF405-no-crystal"]
steps:
# git checkout the PR
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Tools/Carbonix_scripts/carbonix_waf_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ for board in "${main_boards[@]}"; do
./waf plane
done

periph_boards=("CarbonixF405" "CarbonixF405-no-crystal" "CarbonixL496")
periph_boards=("CarbonixF405" "CarbonixF405-no-crystal")

for board in "${periph_boards[@]}"; do
echo "Compiling AP_Periph for $board..."
Expand Down
66 changes: 0 additions & 66 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/cpn-bl.inc

This file was deleted.

135 changes: 0 additions & 135 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/cpn.inc

This file was deleted.

67 changes: 66 additions & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,71 @@
# MCU class and specific type
MCU STM32F4xx STM32F405xx

include ../CarbonixCommon/cpn-bl.inc
FLASH_RESERVE_START_KB 0
FLASH_BOOTLOADER_LOAD_KB 60

# reserve some space for params
APP_START_OFFSET_KB 4

# board ID for firmware load
APJ_BOARD_ID 1064

# setup build for a peripheral firmware
env AP_PERIPH 1

# 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

STDOUT_SERIAL SD2
STDOUT_BAUDRATE 57600

# order of UARTs
SERIAL_ORDER OTG1 USART2

# a fault LED
PA15 LED_BOOTLOADER OUTPUT HIGH # blue
define HAL_LED_ON 0

# USART1
PA2 USART2_TX USART2 SPEED_HIGH NODMA
PA3 USART2_RX USART2 SPEED_HIGH NODMA

# USB
PA11 OTG_FS_DM OTG1
PA12 OTG_FS_DP OTG1

define HAL_USE_SERIAL TRUE

define STM32_SERIAL_USE_USART2 TRUE

define HAL_NO_GPIO_IRQ

define SERIAL_BUFFERS_SIZE 32
define HAL_USE_EMPTY_IO TRUE
define PORT_INT_REQUIRED_STACK 64

define DMA_RESERVE_SIZE 0

MAIN_STACK 0x800
PROCESS_STACK 0x800

define HAL_DISABLE_LOOP_DELAY

# enable CAN support
PB8 CAN1_RX CAN1
PB9 CAN1_TX CAN1

# debugger support
PA13 JTMS-SWDIO SWD
PA14 JTCK-SWCLK SWD

# make bl baudrate match debug baudrate for easier debugging
define BOOTLOADER_BAUDRATE 57600

# use a small bootloader timeout
define HAL_BOOTLOADER_TIMEOUT 1000

define CAN_APP_NODE_NAME "org.ardupilot.CarbonixF405"
Loading

0 comments on commit 9287cee

Please sign in to comment.