HAL_ChibiOS: use DNA by default for all AP_Periph builds

this makes multiple sensors of the same type on the bus easier
This commit is contained in:
Andrew Tridgell 2020-02-22 10:07:10 +11:00
parent 6139860a64
commit 41b74ec014
17 changed files with 35 additions and 28 deletions

View File

@ -96,8 +96,8 @@ define STM32_CAN_USE_CAN1 TRUE
define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps" define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps"
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 116 define HAL_CAN_DEFAULT_NODE_ID 0
# make bl baudrate match debug baudrate for easier debugging # make bl baudrate match debug baudrate for easier debugging
define BOOTLOADER_BAUDRATE 57600 define BOOTLOADER_BAUDRATE 57600

View File

@ -144,8 +144,8 @@ PB5 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW
define HAL_USE_CAN TRUE define HAL_USE_CAN TRUE
define STM32_CAN_USE_CAN1 TRUE define STM32_CAN_USE_CAN1 TRUE
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 116 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps" define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps"

View File

@ -17,7 +17,9 @@ env AP_PERIPH 1
define HAL_BOARD_AP_PERIPH_ZUBAXGNSS define HAL_BOARD_AP_PERIPH_ZUBAXGNSS
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_ZubaxGNSS" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_ZubaxGNSS"
define HAL_CAN_DEFAULT_NODE_ID 114
# use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
# crystal frequency # crystal frequency
OSCILLATOR_HZ 16000000 OSCILLATOR_HZ 16000000

View File

@ -156,7 +156,8 @@ BARO MS56XX SPI:ms5611
define HAL_BARO_ALLOW_INIT_NO_BARO define HAL_BARO_ALLOW_INIT_NO_BARO
define HAL_CAN_DEFAULT_NODE_ID 114 # use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define HAL_NO_GCS define HAL_NO_GCS
define HAL_NO_LOGGING define HAL_NO_LOGGING

View File

@ -2,5 +2,6 @@ include ../f103-periph/hwdef-bl.dat
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_adsb" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_adsb"
define HAL_CAN_DEFAULT_NODE_ID 116 # use DNA
define HAL_CAN_DEFAULT_NODE_ID 0

View File

@ -5,7 +5,8 @@ include ../f103-periph/hwdef.dat
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_adsb" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_adsb"
define HAL_CAN_DEFAULT_NODE_ID 116 # use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define HAL_AIRSPEED_BUS_DEFAULT 0 define HAL_AIRSPEED_BUS_DEFAULT 0
define AIRSPEED_MAX_SENSORS 1 define AIRSPEED_MAX_SENSORS 1

View File

@ -1,6 +1,6 @@
include ../f103-periph/hwdef-bl.dat include ../f103-periph/hwdef-bl.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 117 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"

View File

@ -1,7 +1,7 @@
include ../f103-periph/hwdef.dat include ../f103-periph/hwdef.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 117 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"

View File

@ -2,6 +2,7 @@ include ../f103-periph/hwdef-bl.dat
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_rangefinder" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_rangefinder"
define HAL_CAN_DEFAULT_NODE_ID 115 # use DNA
define HAL_CAN_DEFAULT_NODE_ID 0

View File

@ -2,7 +2,8 @@ include ../f103-periph/hwdef.dat
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_rangefinder" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_rangefinder"
define HAL_CAN_DEFAULT_NODE_ID 115 # use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define HAL_AIRSPEED_BUS_DEFAULT 0 define HAL_AIRSPEED_BUS_DEFAULT 0
define AIRSPEED_MAX_SENSORS 1 define AIRSPEED_MAX_SENSORS 1

View File

@ -1,6 +1,6 @@
include ../f103-periph/hwdef-bl.dat include ../f103-periph/hwdef-bl.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 113 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger"

View File

@ -2,8 +2,8 @@
include ../f103-periph/hwdef.dat include ../f103-periph/hwdef.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 113 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger"

View File

@ -1,6 +1,6 @@
include ../f303-periph/hwdef-bl.dat include ../f303-periph/hwdef-bl.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 117 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"

View File

@ -1,7 +1,7 @@
include ../f303-periph/hwdef.dat include ../f303-periph/hwdef.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 117 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"

View File

@ -1,6 +1,6 @@
include ../f303-periph/hwdef-bl.dat include ../f303-periph/hwdef-bl.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 112 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal"

View File

@ -1,7 +1,7 @@
include ../f303-periph/hwdef.dat include ../f303-periph/hwdef.dat
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 112 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal"

View File

@ -96,7 +96,7 @@ PB6 STAY_IN_BOOTLOADER INPUT FLOATING
# reserve 256 bytes for comms between app and bootloader # reserve 256 bytes for comms between app and bootloader
RAM_RESERVE_START 256 RAM_RESERVE_START 256
# start with a fixed node ID so the board is usable without DNA # use DNA
define HAL_CAN_DEFAULT_NODE_ID 117 define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"