From 6f9fda5094becf7757862ac700d6eb295b2110b3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 25 Oct 2019 12:06:11 +1100 Subject: [PATCH] HAL_ChibiOS: removed CAN_APP_VERSION_MAJOR from hwdef.dat --- libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat | 3 --- 4 files changed, 10 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat index 92782b4b8a..388605f3b9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat @@ -94,8 +94,6 @@ PB5 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW define HAL_USE_CAN TRUE 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.cuav_gps" # start with a fixed node ID so the board is usable without DNA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat index cc2170beca..c9f7317963 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat @@ -132,8 +132,6 @@ 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 116 -define CAN_APP_VERSION_MAJOR 1 -define CAN_APP_VERSION_MINOR 0 define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps" define CH_DBG_ENABLE_STACK_CHECK TRUE 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 21dbd092b4..7aafa5750f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat @@ -81,9 +81,6 @@ PA12 CAN_TX CAN define HAL_USE_CAN TRUE define STM32_CAN_USE_CAN1 TRUE -define CAN_APP_VERSION_MAJOR 1 -define CAN_APP_VERSION_MINOR 0 - # 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 2b3bc6999b..b259565bdc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat @@ -99,9 +99,6 @@ PA12 CAN_TX CAN define HAL_USE_CAN TRUE define STM32_CAN_USE_CAN1 TRUE -define CAN_APP_VERSION_MAJOR 1 -define CAN_APP_VERSION_MINOR 0 - define HAL_USE_I2C TRUE define STM32_I2C_USE_I2C1 TRUE