Skip to content

Commit

Permalink
REVERT: HAL_ChibiOS: Rename STM32F412 hw definition file
Browse files Browse the repository at this point in the history 
This reverts commit 5de6c69.

That commit broke the build for the affected board as the chibios
headers rely on the name of the file matching a ifdef
  • Loading branch information
@tridge @peterbarker
tridge authored and peterbarker committed Sep 7, 2021
1 parent 8366a16 commit 532396e
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# MCU class and specific type
# note: the device is STM32F412CE, not all F412 pins are available
MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

FLASH_RESERVE_START_KB 0
# two sectors for bootloader, two for storage
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# MCU class and specific type
# note: the device is STM32F412CE, not all F412 pins are available
MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

# bootloader starts firmware at 64k
FLASH_RESERVE_START_KB 64
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# hw definition file for processing by chibios_pins.py

# MCU class and specific type
MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

FLASH_RESERVE_START_KB 0
# two sectors for bootloader, two for storage
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# MCU class and specific type

# MCU class and specific type
MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

# bootloader starts firmware at 64k
FLASH_RESERVE_START_KB 64
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# hw definition file for processing by chibios_pins.py

# MCU class and specific type
MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

FLASH_RESERVE_START_KB 0

Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# MCU class and specific type

# MCU class and specific type
MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

# bootloader starts firmware at 64k
FLASH_RESERVE_START_KB 64
Expand Down
0 ..._HAL_ChibiOS/hwdef/scripts/STM32F412xx.py → ..._HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# hw definition file for processing by chibios_pins.py
# old F412 layout

MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

# board ID for firmware load
APJ_BOARD_ID 9
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# hw definition file for processing by chibios_pins.py
# new SkyViper 2018 Journey

MCU STM32F4xx STM32F412xx
MCU STM32F4xx STM32F412Rx

# board ID for firmware load
APJ_BOARD_ID 9
Expand Down

0 comments on commit 532396e

Please sign in to comment.