zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

HAL_ChibiOS: use DNA by default for all AP_Periph builds 

this makes multiple sensors of the same type on the bus easier
c415-sdk
Andrew Tridgell 5 years ago
parent
6139860a64
commit
41b74ec014
17 changed files with 35 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
  2. 4
      libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
  3. 4
      libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat
  4. 3
      libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat
  5. 3
      libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat
  6. 3
      libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef.dat
  7. 4
      libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat
  8. 4
      libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat
  9. 3
      libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat
  10. 3
      libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef.dat
  11. 4
      libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat
  12. 4
      libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef.dat
  13. 4
      libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat
  14. 4
      libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef.dat
  15. 4
      libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat
  16. 4
      libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef.dat
  17. 4
      libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat

4
libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
Unescape View File

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

4
libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
Unescape View File

@ -144,8 +144,8 @@ PB5 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW @@ -144,8 +144,8 @@ PB5 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW
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 116
# use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps"

4
libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat
Unescape View File

@ -17,7 +17,9 @@ env AP_PERIPH 1 @@ -17,7 +17,9 @@ env AP_PERIPH 1
define HAL_BOARD_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
OSCILLATOR_HZ 16000000

3
libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat
Unescape View File

@ -156,7 +156,8 @@ BARO MS56XX SPI:ms5611 @@ -156,7 +156,8 @@ BARO MS56XX SPI:ms5611
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_LOGGING

3
libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat
Unescape View File

@ -2,5 +2,6 @@ include ../f103-periph/hwdef-bl.dat @@ -2,5 +2,6 @@ include ../f103-periph/hwdef-bl.dat
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

3
libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef.dat
Unescape View File

@ -5,7 +5,8 @@ include ../f103-periph/hwdef.dat @@ -5,7 +5,8 @@ include ../f103-periph/hwdef.dat
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 AIRSPEED_MAX_SENSORS 1

4
libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +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
# use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"

4
libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
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
# use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"

3
libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat
Unescape View File

@ -2,6 +2,7 @@ include ../f103-periph/hwdef-bl.dat @@ -2,6 +2,7 @@ include ../f103-periph/hwdef-bl.dat
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

3
libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef.dat
Unescape View File

@ -2,7 +2,8 @@ include ../f103-periph/hwdef.dat @@ -2,7 +2,8 @@ include ../f103-periph/hwdef.dat
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 AIRSPEED_MAX_SENSORS 1

4
libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +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 113
# use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger"

4
libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef.dat
Unescape View File

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

4
libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat
Unescape View File

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

4
libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef.dat
Unescape View File

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

4
libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat
Unescape View File

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

4
libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef.dat
Unescape View File

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

4
libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat
Unescape View File

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

Write Preview
Loading…
Cancel
Save