From 43fb6bfdd15d30fce14b58f19e063d2b3d7398a7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 2 Oct 2019 18:47:08 +1000 Subject: [PATCH] HAL_ChibiOS: split out f103-GPS from base f103-periph this makes it easier to create more peripheral variants --- libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat | 6 ++++++ libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat | 10 ++++++++++ .../AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat | 4 ---- 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat new file mode 100644 index 0000000000..f4e4b03fc0 --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat @@ -0,0 +1,6 @@ +include ../f103-periph/hwdef-bl.dat + +# start with a fixed node ID so the board is usable without DNA +define HAL_CAN_DEFAULT_NODE_ID 117 + +define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat new file mode 100644 index 0000000000..ff8700eced --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat @@ -0,0 +1,10 @@ +include ../f103-periph/hwdef.dat + +# start with a fixed node ID so the board is usable without DNA +define HAL_CAN_DEFAULT_NODE_ID 117 + +define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" + +# GPS+MAG +define HAL_PERIPH_ENABLE_GPS +define HAL_PERIPH_ENABLE_MAG diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat index cfa8291c6b..00e8c863ba 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat @@ -91,10 +91,6 @@ define STM32_CAN_USE_CAN1 TRUE define CAN_APP_VERSION_MAJOR 1 define CAN_APP_VERSION_MINOR 0 -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph" - -# start with a fixed node ID so the board is usable without DNA -define HAL_CAN_DEFAULT_NODE_ID 117 # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat index 408a9540d2..924ba2e89b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat @@ -96,12 +96,8 @@ PA12 CAN_TX CAN define HAL_USE_CAN TRUE define STM32_CAN_USE_CAN1 TRUE -# start with a fixed node ID so the board is usable without DNA -define HAL_CAN_DEFAULT_NODE_ID 117 - define CAN_APP_VERSION_MAJOR 1 define CAN_APP_VERSION_MINOR 0 -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph" define HAL_USE_I2C TRUE define STM32_I2C_USE_I2C1 TRUE