From ea51aea2e59106eba09571d444d2698b16b1b3da Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 2 Sep 2023 08:53:30 +1000 Subject: [PATCH] hwdef: removed most CAN_APP_NODE_NAME defines both bootloader and AP_Periph now default to "org.ardupilot.BOARD_NAME". This makes it much easier to find the right firmware for update --- libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat | 1 - .../AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef-bl.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef.inc | 2 -- libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat | 5 ----- libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat | 3 --- .../AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekL431-RC/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef-bl.dat | 1 - .../AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekL431-bdshot/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef.dat | 5 ----- libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat | 5 ----- libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat | 5 ----- libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef.dat | 2 -- 128 files changed, 265 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef-bl.dat index 6dfa08b93b..156dcb3da4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef-bl.dat @@ -63,8 +63,6 @@ PA12 CAN1_TX CAN1 PB12 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW PB13 GPIO_CAN1_TERM OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.ARK_GPS" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat index 764df2bcac..091463e4a0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat @@ -123,7 +123,6 @@ define HAL_PERIPH_ENABLE_NOTIFY # GPS on 2nd port define HAL_PERIPH_GPS_PORT_DEFAULT 1 -define CAN_APP_NODE_NAME "org.ardupilot.ARK_GPS" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef-bl.dat index 969c8bc6a4..60b60d4c43 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef-bl.dat @@ -63,8 +63,6 @@ PA12 CAN1_TX CAN1 PB12 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW PB13 GPIO_CAN1_TERM OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.ARK_RTK_GPS" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat index a5677ff249..138ab20ea1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat @@ -135,4 +135,3 @@ define HAL_PERIPH_ENABLE_RC_OUT # GPS on 2nd port define HAL_PERIPH_GPS_PORT_DEFAULT 1 -define CAN_APP_NODE_NAME "org.ardupilot.ARK_RTK_GPS" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef-bl.dat index 642299c17d..3eba2b385c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef-bl.dat @@ -1,7 +1,5 @@ include ../f103-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_DLVR_Airspeed" - # board ID for firmware load APJ_BOARD_ID 1104 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef.dat index 4665dd2f53..e5de5c06aa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed-DLVR/hwdef.dat @@ -3,8 +3,6 @@ include ../f103-periph/hwdef.inc # board ID for firmware load APJ_BOARD_ID 1104 -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_DLVR_Airspeed" - define HAL_COMPASS_MAX_SENSORS 1 define HAL_AIRSPEED_BUS_DEFAULT 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef-bl.dat index eb5785215e..f928771615 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef-bl.dat @@ -1,7 +1,5 @@ include ../f103-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_Airspeed" - # board ID for firmware load APJ_BOARD_ID 1077 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef.dat index 964323ba78..fafea28b33 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-Airspeed/hwdef.dat @@ -3,8 +3,6 @@ include ../f103-periph/hwdef.inc # board ID for firmware load APJ_BOARD_ID 1077 -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_Airspeed" - define HAL_COMPASS_MAX_SENSORS 1 define HAL_AIRSPEED_BUS_DEFAULT 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef-bl.dat index 983481f5a3..b2acb25ac2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef-bl.dat @@ -3,8 +3,6 @@ MCU STM32L431 STM32L431xx APJ_BOARD_ID 1109 -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_GNSS_F9P" - OSCILLATOR_HZ 8000000 env AP_PERIPH 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef.dat index f56700a712..0c1f53c17c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef.dat @@ -1,8 +1,6 @@ # MCU class and specific type MCU STM32L431 STM32L431xx -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_GNSS_F9P" - # bootloader starts firmware at 36k + 4k (STORAGE_FLASH) FLASH_RESERVE_START_KB 40 FLASH_SIZE_KB 256 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef-bl.dat index 8df1455cbd..115b32e475 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../AeroFox-PMU/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_PMU" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef.inc b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef.inc index 4e017ba076..afa41b7665 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef.inc @@ -1,8 +1,6 @@ # MCU class and specific type MCU STM32L431 STM32L431xx -define CAN_APP_NODE_NAME "org.ardupilot.AeroFox_PMU" - # bootloader starts firmware at 36k + 4k (STORAGE_FLASH) FLASH_RESERVE_START_KB 40 FLASH_SIZE_KB 256 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat index c304c0ae6c..afe6830664 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat @@ -67,9 +67,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PB2 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.birdcandy" - - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat index 6fca9fdc6f..9d1acaebd7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat @@ -96,11 +96,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PB2 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW - - - -define CAN_APP_NODE_NAME "org.ardupilot.birdcandy" - define HAL_GCS_ENABLED 0 define HAL_NO_LOGGING define HAL_NO_MONITOR_THREAD diff --git a/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef-bl.dat index 1e99237f8f..c1de57c0e1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef-bl.dat @@ -67,9 +67,6 @@ define HAL_DISABLE_LOOP_DELAY PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 -define CAN_APP_NODE_NAME "org.ardupilot.C-RTK2-HP" - - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef.dat index 52a9c8de09..dfafb629c4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/C-RTK2-HP/hwdef.dat @@ -92,8 +92,6 @@ PA4 RTK_RESET_N OUTPUT HIGH # PPS PA7 PPS INPUT PULLUP -define CAN_APP_NODE_NAME "org.ardupilot.C-RTK2-HP" - define HAL_NO_MONITOR_THREAD define HAL_DEVICE_THREAD_STACK 768 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 d5f53cfa82..fe01e221bd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat @@ -69,9 +69,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PB5 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps" - - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat index 67d70da010..7b9daff935 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat @@ -126,10 +126,6 @@ PB9 CAN1_TX CAN1 PB5 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW - - -define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps" - define HAL_NO_MONITOR_THREAD diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat index c9b65a069f..ef2963d19d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef-bl.dat @@ -69,6 +69,3 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 - - -define CAN_APP_NODE_NAME "org.ardupilot.CarbonixF405" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat index 011bf96f83..2849e1e3bb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat @@ -115,8 +115,6 @@ define HAL_NO_MONITOR_THREAD define AP_PARAM_MAX_EMBEDDED_PARAM 512 -define CAN_APP_NODE_NAME "org.ardupilot.CarbonixF405" - define HAL_PERIPH_ENABLE_MAG define HAL_PERIPH_ENABLE_BARO define HAL_PERIPH_ENABLE_RC_OUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef-bl.dat index 68b3974cbb..9600da15a6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef-bl.dat @@ -70,5 +70,3 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 - -define CAN_APP_NODE_NAME "org.ardupilot.CarbonixL496" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat index 1b5ff08dc7..34782ac10c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat @@ -118,8 +118,6 @@ define HAL_NO_MONITOR_THREAD define AP_PARAM_MAX_EMBEDDED_PARAM 512 -define CAN_APP_NODE_NAME "org.ardupilot.CarbonixL496" - define HAL_PERIPH_ENABLE_MAG define HAL_PERIPH_ENABLE_BARO define HAL_PERIPH_ENABLE_RC_OUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat index 61cfed1890..effd49fee7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat @@ -58,6 +58,3 @@ PD1 CAN1_TX CAN1 PB6 CAN2_TX CAN2 PB12 CAN2_RX CAN2 - - -define CAN_APP_NODE_NAME "org.ardupilot.CubeBlack-periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat index f0a09c9a4c..9de8b26907 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat @@ -49,8 +49,6 @@ define HAL_BARO_ALLOW_INIT_NO_BARO define HAL_PERIPH_ENABLE_BATTERY -define CAN_APP_NODE_NAME "org.ardupilot.CubeBlack-periph" - define AP_SCRIPTING_ENABLED 0 # use blue LED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat index d951b46478..290b72c031 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat @@ -47,9 +47,6 @@ define HAL_NO_RCIN_THREAD define HAL_BARO_ALLOW_INIT_NO_BARO -define CAN_APP_NODE_NAME "org.ardupilot.CubeOrange-periph" - - define AP_SCRIPTING_ENABLED 0 # use blue LED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat index 0b79d42073..6d10b336b8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat @@ -58,6 +58,3 @@ PD1 CAN1_TX CAN1 PB6 CAN2_TX CAN2 PB12 CAN2_RX CAN2 - - -define CAN_APP_NODE_NAME "org.ardupilot.CubeOrange-periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat index 6da1f6c095..8aef94756f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat @@ -43,9 +43,6 @@ define HAL_NO_RCIN_THREAD define HAL_BARO_ALLOW_INIT_NO_BARO -define CAN_APP_NODE_NAME "org.ardupilot.CubeOrange-periph" - - define AP_SCRIPTING_ENABLED 0 # use blue LED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef-bl.dat index 5fab213070..e6f4405627 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef-bl.dat @@ -50,4 +50,3 @@ PG0 SHUTDOWNCAN OUTPUT PUSHPULL SPEED_LOW LOW PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define CAN_APP_NODE_NAME "com.cubepilot.CubePilotCANMod-periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat index 05377d79f0..4994a739fb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat @@ -52,8 +52,6 @@ PG0 SHUTDOWNCAN OUTPUT PUSHPULL SPEED_LOW LOW PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define CAN_APP_NODE_NAME "com.cubepilot.CubePilotCANMod-periph" - # override following defines as needed define HAL_USE_ADC FALSE STORAGE_FLASH_PAGE 14 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat index 53d875020d..d8f7c7c1ba 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat @@ -63,8 +63,6 @@ define HAL_DISABLE_LOOP_DELAY PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 -define CAN_APP_NODE_NAME "org.ardupilot.FreeflyRTK" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat index 8cd958b4df..636e8351a5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat @@ -116,8 +116,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 -define CAN_APP_NODE_NAME "org.ardupilot.FreeflyRTK" - define HAL_NO_MONITOR_THREAD define HAL_DEVICE_THREAD_STACK 768 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat index 3da9e35f65..ccce62d4c6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat @@ -85,7 +85,5 @@ define HAL_BOOTLOADER_TIMEOUT 1000 -define CAN_APP_NODE_NAME "org.ardupilot.G4-ESC" - # Add CS pins to ensure they are high in bootloader PB12 IMU_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat index 4042240ca8..be950cc2f2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat @@ -149,7 +149,5 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 512 env ROMFS_UNCOMPRESSED True -define CAN_APP_NODE_NAME "org.ardupilot.G4-ESC" - # don't share any DMA channels (there are enough for everyone) DMA_NOSHARE * diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat index 25f7b8bba4..350f832c1f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat @@ -70,6 +70,4 @@ QSPIDEV mt25q QUADSPI1 MODE1 120*MHZ 24 8 PB13 VBUS INPUT OPENDRAIN - -define CAN_APP_NODE_NAME "org.cubepilot.H757" define BOOTLOADER_DEBUG SD1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef.dat index 5943064919..5e1ad94f21 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef.dat @@ -81,8 +81,6 @@ PG6 QUADSPI_BK1_NCS QUADSPI1 PB2 QUADSPI_CLK QUADSPI1 -define CAN_APP_NODE_NAME "org.cubepilot.H757" - EXT_FLASH_SIZE_MB 32 # bootloader embedding / bootloader flashing not available diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat index 95ecce0939..ff5682382d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat @@ -71,5 +71,4 @@ QSPIDEV mt25q QUADSPI1 MODE1 120*MHZ 24 8 PB13 VBUS INPUT OPENDRAIN -define CAN_APP_NODE_NAME "org.cubepilot.H757" define BOOTLOADER_DEBUG SD1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat index 4193265ab4..2b82e1555e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat @@ -81,8 +81,6 @@ PG6 QUADSPI_BK1_NCS QUADSPI1 PB2 QUADSPI_CLK QUADSPI1 -define CAN_APP_NODE_NAME "org.cubepilot.H757" - # EXT_FLASH_SIZE_MB 32 # bootloader embedding / bootloader flashing not available diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef-bl.dat index ec2e0ab7c9..8d3a751a23 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef-bl.dat @@ -53,8 +53,6 @@ PA14 JTCK-SWCLK SWD define AP_PERIPH_HAVE_LED -define CAN_APP_NODE_NAME "com.cubepilot.here4" - # order of UARTs SERIAL_ORDER define HAL_USE_UART FALSE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat index 6869d1c855..d91a47cd1e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat @@ -106,8 +106,6 @@ SPIDEV ms5611 SPI1 DEVID3 BARO_CS MODE3 20*MHZ 20*MHZ BARO MS56XX SPI:ms5611 -define CAN_APP_NODE_NAME "com.cubepilot.Here4AP" - # WS2812 LED PB8 TIM4_CH3 TIM4 PWM(1) PB9 TIM4_CH4 TIM4 PWM(2) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat index ce9c39a205..36f1f97280 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat @@ -147,6 +147,4 @@ PB2 BOOT1 INPUT # passthrough CAN1 define HAL_DEFAULT_CPORT 1 -define CAN_APP_NODE_NAME "com.cubepilot.herepro" - FULL_CHIBIOS_BOOTLOADER 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat index 5bb33140ec..fb4c2e8245 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat @@ -195,8 +195,6 @@ PB2 BOOT1 INPUT -define CAN_APP_NODE_NAME "com.cubepilot.herepro" - # disabled compass cal as it doesn't work for now # define COMPASS_CAL_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat index f74d53921f..f4c1f84a17 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat @@ -70,9 +70,5 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 - - -define CAN_APP_NODE_NAME "org.ardupilot.Hitec-Airspeed" - # Add CS pins to ensure they are high in bootloader PB12 IMU_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef.dat index a41af41cdc..caac8eab57 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef.dat @@ -112,8 +112,6 @@ define HAL_NO_RCOUT_THREAD env ROMFS_UNCOMPRESSED True -define CAN_APP_NODE_NAME "org.ardupilot.Hitec-Airspeed" - # don't share any DMA channels (there are enough for everyone) DMA_NOSHARE * diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat index 86a2ee1e0b..6ba10c98fd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat @@ -87,5 +87,3 @@ define HAL_STAY_IN_BOOTLOADER_VALUE 0 # Add CS pins to ensure they are high in bootloader PB1 MAG_CS CS - -define CAN_APP_NODE_NAME "org.ardupilot.HitecMosaic" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat index 312495b0b7..fccfde74a8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat @@ -148,8 +148,6 @@ PA7 LED_BUS_I2C OUTPUT LOW env ROMFS_UNCOMPRESSED True -define CAN_APP_NODE_NAME "org.ardupilot.HitecMosaic" - define HAL_PERIPH_ENABLE_GPS define HAL_PERIPH_ENABLE_MAG define HAL_PERIPH_ENABLE_BARO diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef-bl.dat index 11644f49d7..d47e84b28a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef-bl.dat @@ -68,8 +68,6 @@ PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 PC13 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.HolybroG4_Compass" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef.dat index 411e722b57..f13290b84d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_Compass/hwdef.dat @@ -90,8 +90,6 @@ PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 PC13 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.HolybroG4_Compass" - define HAL_NO_LOGGING define HAL_NO_MONITOR_THREAD diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef-bl.dat index ced540c3e4..c2355f91e3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef-bl.dat @@ -72,8 +72,6 @@ PB12 CAN2_RX CAN2 PB13 CAN2_TX CAN2 PB14 GPIO_CAN2_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.HolybroG4_GPS" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef.dat index bb27ad6823..be09c07fd2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef.dat @@ -118,8 +118,6 @@ PB12 CAN2_RX CAN2 PB13 CAN2_TX CAN2 PB14 GPIO_CAN2_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.HolybroG4_GPS" - define HAL_NO_LOGGING define HAL_NO_MONITOR_THREAD diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat index edd6296d36..68beff06e9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat @@ -72,9 +72,6 @@ PB12 CAN2_RX CAN2 PB13 CAN2_TX CAN2 PA4 GPIO_CAN2_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.HolybroGPS" - - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat index d219f37af3..c55bd73938 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat @@ -137,8 +137,6 @@ PB13 CAN2_TX CAN2 PA4 GPIO_CAN2_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.HolybroGPS" - define HAL_NO_LOGGING define HAL_NO_MONITOR_THREAD diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat index b763dfe2b3..0d979d5354 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat @@ -7,4 +7,3 @@ PD1 CAN1_TX CAN1 env AP_PERIPH 1 -define CAN_APP_NODE_NAME "org.ardupilot.MatekH743-periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat index 542c1f7e52..e4195fdc27 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat @@ -26,8 +26,6 @@ define HAL_PERIPH_ENABLE_RC_OUT define HAL_PERIPH_ENABLE_BATTERY -define CAN_APP_NODE_NAME "org.ardupilot.MatekH743-periph" - # single GPS, compass and RF for peripherals define GPS_MAX_RECEIVERS 1 define GPS_MAX_INSTANCES 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef-bl.dat index 887b18aeac..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Airspeed" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef.dat index 302d5c8d88..63c15f8cce 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Airspeed/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Airspeed" - define HAL_USE_ADC FALSE define STM32_ADC_USE_ADC1 FALSE define HAL_DISABLE_ADC_DRIVER TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef-bl.dat index 1313cca1eb..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-BattMon" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat index 633a185624..ea4e70b099 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-BattMon" - # enable battery monitor define HAL_PERIPH_ENABLE_BATTERY define AP_BATTERY_INA239_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef-bl.dat index fe94bb635e..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-DShot" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef.dat index 3d809de636..76a29aa2c2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-DShot" - define HAL_USE_ADC FALSE undef SERIAL_ORDER diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef-bl.dat index 173d1fc2fc..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-EFI" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat index 2b122aa0c5..6200911d7d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-EFI" - define HAL_USE_ADC FALSE define STM32_ADC_USE_ADC1 FALSE define HAL_DISABLE_ADC_DRIVER TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef-bl.dat index ce9861506d..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-GPS" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef.dat index b8801bdbff..5c858285a7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-GPS/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-GPS" - # enable GPS and compass define HAL_PERIPH_ENABLE_GPS define GPS_MAX_RATE_MS 200 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef-bl.dat index a26340d7f3..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-HWtelem" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef.dat index 05bacae3d7..6abfb3548d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-HWTelem/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-HWtelem" - define HAL_USE_ADC FALSE define STM32_ADC_USE_ADC1 FALSE define HAL_DISABLE_ADC_DRIVER TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef-bl.dat index dd6b5cc887..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat index 74c9949e33..242986bc1e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Periph" - # --------------------- PWM ----------------------- PA8 TIM1_CH1 TIM1 PWM(1) GPIO(50) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef-bl.dat index 9b1ad2a20f..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Proximity" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef.dat index 4420df6108..ccceb906ee 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Proximity/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Proximity" - define HAL_USE_ADC FALSE define STM32_ADC_USE_ADC1 FALSE define HAL_DISABLE_ADC_DRIVER TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-RC/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-RC/hwdef.dat index 66534adc70..693bb3f476 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-RC/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-RC/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-RC" - define HAL_USE_ADC FALSE define STM32_ADC_USE_ADC1 FALSE define HAL_DISABLE_ADC_DRIVER TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef-bl.dat index ffb40904b0..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Rangefinder" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef.dat index fa6f279544..0a2ddad959 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Rangefinder/hwdef.dat @@ -1,7 +1,5 @@ include ../MatekL431/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-Rangefinder" - define HAL_USE_ADC FALSE define STM32_ADC_USE_ADC1 FALSE define HAL_DISABLE_ADC_DRIVER TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-bdshot/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-bdshot/hwdef-bl.dat index 8963039c76..b9005f8494 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-bdshot/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-bdshot/hwdef-bl.dat @@ -1,3 +1,2 @@ include ../MatekL431/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-BDShot" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat index 6c685fde90..c4613198b0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat @@ -70,6 +70,3 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 - - -define CAN_APP_NODE_NAME "org.ardupilot.Nucleo-L476" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef.dat index e3c1c56fec..8a9a640cc0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef.dat @@ -94,11 +94,6 @@ define HAL_NO_MONITOR_THREAD define AP_PARAM_MAX_EMBEDDED_PARAM 512 - - - -define CAN_APP_NODE_NAME "org.ardupilot.Nucleo-L476" - define HAL_PERIPH_ENABLE_GPS define HAL_PERIPH_GPS_PORT_DEFAULT 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat index 4a4d40ff2f..8abcbbae53 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat @@ -76,6 +76,3 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 - - -define CAN_APP_NODE_NAME "org.ardupilot.Nucleo-L496" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat index fcad5f0940..00a5622d58 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat @@ -101,11 +101,6 @@ define HAL_NO_MONITOR_THREAD define AP_PARAM_MAX_EMBEDDED_PARAM 512 - - - -define CAN_APP_NODE_NAME "org.ardupilot.Nucleo-L496" - define HAL_PERIPH_ENABLE_GPS define HAL_PERIPH_ENABLE_MAG define HAL_PERIPH_ENABLE_BARO diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat index af225d2434..6677e8a94b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat @@ -50,8 +50,4 @@ PE15 MAG_CS CS PD0 CAN1_RX CAN1 PD1 CAN1_TX CAN1 -define CAN_APP_NODE_NAME "org.ardupilot.Pixracer-periph" - - - PB8 STAY_IN_BOOTLOADER INPUT FLOATING # if pulled low stay in bootloader diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat index 5b1a2781f9..7b4acfe486 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat @@ -51,9 +51,6 @@ define STM32_ADC_USE_ADC1 TRUE define HAL_DISABLE_ADC_DRIVER FALSE -define CAN_APP_NODE_NAME "org.ardupilot.Pixracer_periph" - - define AP_SCRIPTING_ENABLED 0 MAIN_STACK 0x2000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat index 6d4291af9f..a4581750c5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat @@ -50,8 +50,6 @@ PA14 JTCK-SWCLK SWD PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F405" - # use DNA define HAL_CAN_DEFAULT_NODE_ID 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat index c37556d7be..fd75416be1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat @@ -67,8 +67,6 @@ CAN_ORDER 1 # use DNA for node allocation -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F405" - # order of UARTs SERIAL_ORDER USART1 EMPTY EMPTY USART2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef-bl.dat index 72794d3b27..e0a5ef36a7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef-bl.dat @@ -47,8 +47,6 @@ PA14 JTCK-SWCLK SWD PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F412" - # use DNA define HAL_CAN_DEFAULT_NODE_ID 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat index f786c236ca..1e8df2f261 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat @@ -98,7 +98,6 @@ PA12 CAN1_TX CAN1 # use DNA define HAL_CAN_DEFAULT_NODE_ID 0 -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F412" define HAL_NO_MONITOR_THREAD define HAL_BUILD_AP_PERIPH diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef-bl.dat index 59024672db..bcb61628a1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef-bl.dat @@ -60,8 +60,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PC1 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F9P" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef.dat index c11605a37b..295bde2ced 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef.dat @@ -108,8 +108,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PC1 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F9P" - define HAL_NO_MONITOR_THREAD define HAL_BUILD_AP_PERIPH define HAL_DEVICE_THREAD_STACK 768 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat index ca62f80361..43e872faa1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat @@ -67,7 +67,5 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-L431" - # Add CS pins to ensure they are high in bootloader PB12 MAG_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef.dat index 1b3f6a787d..c156bdaf2a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef.dat @@ -99,8 +99,6 @@ define HAL_NO_MONITOR_THREAD define HAL_NO_LOGGING define AP_PARAM_MAX_EMBEDDED_PARAM 512 -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-L431" - define HAL_PERIPH_ENABLE_MAG define HAL_PERIPH_ENABLE_AIRSPEED define AIRSPEED_MAX_SENSORS 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat index 53f4626d9e..93e1ae4447 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat @@ -16,9 +16,6 @@ env AP_PERIPH 1 define HAL_BOARD_AP_PERIPH_ZUBAXGNSS -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_ZubaxGNSS" - - # crystal frequency OSCILLATOR_HZ 16000000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat index a508ceda53..fb747418cf 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat @@ -7,8 +7,6 @@ define STM32F107_MCUCONF define HAL_BOARD_AP_PERIPH_ZUBAXGNSS -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_ZubaxGNSS" - # bootloader starts firmware at 34k FLASH_RESERVE_START_KB 34 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat index 5afebaac58..aa8b8b5a85 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat @@ -1,5 +1,4 @@ include ../f103-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_adsb" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef.dat index 322adffe2d..333f3120cb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef.dat @@ -3,9 +3,6 @@ include ../f103-periph/hwdef.inc #STDOUT_SERIAL SD1 #STDOUT_BAUDRATE 115200 -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_adsb" - - define HAL_AIRSPEED_BUS_DEFAULT 0 define AIRSPEED_MAX_SENSORS 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat index 2caf38d993..aa8b8b5a85 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat @@ -1,5 +1,4 @@ include ../f103-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.f103_airspeed" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef.dat index 1b6a8301c6..e2d6cd654a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef.dat @@ -1,7 +1,5 @@ include ../f103-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.f103_airspeed" - define HAL_AIRSPEED_BUS_DEFAULT 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat index 751f46aa65..3f51ff6133 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat @@ -1,4 +1,3 @@ include ../f103-periph/hwdef-bl.inc -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 index d4130ac8e6..fa460f05c9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef.dat @@ -1,8 +1,6 @@ include ../f103-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" - # and support all external compass types define HAL_PROBE_EXTERNAL_I2C_COMPASSES # .... except BMM150: diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat index 7cc46df6fa..9d4fdbc25f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat @@ -2,4 +2,3 @@ include ../f103-periph/hwdef-bl.inc # start with a fixed node ID so the board is usable without DNA -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef.dat index e5943d8ea4..1148897580 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef.dat @@ -1,6 +1,4 @@ include ../f103-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC" - define HAL_PERIPH_ENABLE_HWESC diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat index 6b957507a1..aa8b8b5a85 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat @@ -1,5 +1,4 @@ include ../f103-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.f103Qiotek_Periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef.dat index b5010ad49f..bbfec631fa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef.dat @@ -1,7 +1,5 @@ include ../f103-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.f103Qiotek_Periph" - undef HAL_COMPASS_MAX_SENSORS 1 define HAL_COMPASS_MAX_SENSORS 2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat index 3ec41d6f5a..aa8b8b5a85 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat @@ -1,6 +1,4 @@ include ../f103-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_rangefinder" - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef.dat index d09f33d048..f5d9a57489 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef.dat @@ -1,7 +1,5 @@ include ../f103-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_rangefinder" - define HAL_AIRSPEED_BUS_DEFAULT 0 define AIRSPEED_MAX_SENSORS 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat index 83eb480cb9..3f51ff6133 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat @@ -1,4 +1,3 @@ include ../f103-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef.dat index 9aaac36f97..14424c7a58 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef.dat @@ -6,8 +6,6 @@ include ../f103-periph/hwdef.inc env AP_PERIPH 1 -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger" - # PWM input to hardpoint out define HAL_PERIPH_ENABLE_PWM_HARDPOINT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat index ac5591ab64..98ddd5c83f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat @@ -1,4 +1,3 @@ include ../f303-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef.dat index 67e512fa46..74679b18c5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef.dat @@ -1,8 +1,6 @@ include ../f303-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" - # added rm3100 mag on SPI SPIDEV rm3100 SPI1 DEVID1 MAG_CS MODE0 1*MHZ 1*MHZ COMPASS RM3100 SPI:rm3100 false ROTATION_NONE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat index f0582a1505..98ddd5c83f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat @@ -1,4 +1,3 @@ include ../f303-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef.dat index 43a756f5e1..0b451af91d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef.dat @@ -1,6 +1,4 @@ include ../f303-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC" - define HAL_PERIPH_ENABLE_HWESC diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat index 0ea72cbdaa..2ebf261d90 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat @@ -2,4 +2,3 @@ include ../f303-periph/hwdef-bl.inc # start as DNA -define CAN_APP_NODE_NAME "org.ardupilot.mro_m10025" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef.dat index 667514ecea..4d8a73e5ed 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef.dat @@ -2,8 +2,6 @@ include ../f303-periph/hwdef.inc # start as DNA -define CAN_APP_NODE_NAME "org.ardupilot.mro_m10025" - # added rm3100 mag on SPI SPIDEV rm3100 SPI1 DEVID1 MAG_CS MODE0 1*MHZ 1*MHZ COMPASS RM3100 SPI:rm3100 false ROTATION_NONE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat index da417ac195..d70ec3175b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat @@ -3,6 +3,3 @@ include ../f303-periph/hwdef-bl.inc # mRo Location One CAN GPS # M10084 -# start as DNA - -define CAN_APP_NODE_NAME "io.mrobotics.m10070_loc1_BL" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef.dat index 8e9236ca7d..31d44a99bd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef.dat @@ -3,8 +3,6 @@ include ../f303-periph/hwdef.inc # mRo Location One CAN GPS # M10070B -# start as DNA - define CAN_APP_NODE_NAME "io.mrobotics.m10070_loc1" # added rm3100 mag on SPI diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat index 261d1e6b38..202494dbf8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat @@ -82,6 +82,3 @@ define HAL_BOOTLOADER_TIMEOUT 1000 # want to stay in the bootloader PB6 STAY_IN_BOOTLOADER INPUT FLOATING - - -define CAN_APP_NODE_NAME "org.ardupilot.f303_MatekGPS" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat index 45f83e68ec..5fbe6af4be 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat @@ -118,8 +118,6 @@ PB11 USART3_RX USART3 SPEED_HIGH # use DNA for node allocation -define CAN_APP_NODE_NAME "org.ardupilot.f303_MatekGPS" - # added QMC5883L mag on I2C COMPASS QMC5883L I2C:0:0xd false ROTATION_PITCH_180_YAW_90 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat index fd1e5c332f..817e00be92 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat @@ -1,4 +1,2 @@ include ../f303-periph/hwdef-bl.inc - -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_PWM" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef.dat index 898d0715e8..9e8694b6ec 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef.dat @@ -1,8 +1,6 @@ include ../f303-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_PWM" - undef PA2 undef PA3 undef PB14 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef-bl.dat index 6314ef31bd..98ddd5c83f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef-bl.dat @@ -1,4 +1,3 @@ include ../f303-periph/hwdef-bl.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_tempsensor" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef.dat index 27f0acfbb0..827a5d339e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef.dat @@ -1,7 +1,5 @@ include ../f303-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.TempSensor" - # These are tied to ground undef PA5 undef PA6 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat index bc24ce71f5..817e00be92 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat @@ -1,4 +1,2 @@ include ../f303-periph/hwdef-bl.inc - -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef.dat index afb04ead2b..9c0a941a1e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef.dat @@ -1,8 +1,6 @@ include ../f303-periph/hwdef.inc -define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal" - # and support all external compass and baro types define HAL_PROBE_EXTERNAL_I2C_COMPASSES diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef-bl.dat index af5a0423d3..d563bd589f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef-bl.dat @@ -5,7 +5,4 @@ env AP_PERIPH 1 include ../f405-MatekGPS/hwdef-bl.dat -# Rename to f405_MatekAirspeed -undef CAN_APP_NODE_NAME -define CAN_APP_NODE_NAME "org.ardupilot.f405_MatekAirspeed" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef.dat index b7e5a57989..7633eb0fee 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekAirspeed/hwdef.dat @@ -5,10 +5,6 @@ env AP_PERIPH 1 include ../f405-MatekGPS/hwdef.dat -# Rename to f405_MatekAirspeed -undef CAN_APP_NODE_NAME -define CAN_APP_NODE_NAME "org.ardupilot.f405_MatekAirspeed" - # Setup Airspeed Sensor to be I2C-DLVR-10in undef HAL_AIRSPEED_TYPE_DEFAULT define HAL_AIRSPEED_TYPE_DEFAULT 9 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat index 3bd3da29b9..92a17a0db2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat @@ -45,9 +45,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PC13 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.f405_MatekGPS" - - # Add CS pins to ensure they are high in bootloader PA4 MPU_CS CS PB12 MAG_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat index 4ed9c4e433..6ac2a044f7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat @@ -102,11 +102,6 @@ PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PC13 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -# use DNA for node allocation - -define CAN_APP_NODE_NAME "org.ardupilot.f405_MatekGPS" - - # ---------------------- UARTs --------------------------- # | sr0 | sr1 | sr2 | GPS | MSP | SERIAL_ORDER USART1 USART2 USART3 UART4 UART5 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat index b08cf14d94..4e94f0a10d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat @@ -105,7 +105,6 @@ define HAL_PERIPH_ENABLE_NETWORKING #Communications and debug # use DNA define HAL_CAN_DEFAULT_NODE_ID 0 -define CAN_APP_NODE_NAME "com.kha.eth" ################################# # Multi-purpose pins like SPI, I2C, GPIO, PWMs, LEDs, ADC diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat index 5e70fb3b80..511ace701b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat @@ -60,4 +60,3 @@ PA14 JTCK-SWCLK SWD # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -define CAN_APP_NODE_NAME "org.ardupilot.mRo-M10095" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef-bl.dat index 6b8ecbaece..3f1c74106d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef-bl.dat @@ -75,8 +75,6 @@ PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 #PC13 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.mRoCANPWM-M10126" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef-bl.dat index ca478c4b61..c7967bab9b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef-bl.dat @@ -69,8 +69,6 @@ PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 PA15 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.rGNSS" - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef.dat index 17c58b673e..203abe3c82 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef.dat @@ -107,8 +107,6 @@ PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 PA15 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW -define CAN_APP_NODE_NAME "org.ardupilot.rGNSS" - define HAL_NO_LOGGING define HAL_NO_MONITOR_THREAD