HAL_ChibiOS: fixed build warnings for bootloader builds

5 years ago · 0994655f5b
5 changed files with 4 additions and 10 deletions
--- a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat
@ -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 111
+define HAL_CAN_DEFAULT_NODE_ID 0

 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC"
--- a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef.dat
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 include ../f103-periph/hwdef.dat

-define HAL_CAN_DEFAULT_NODE_ID 111
+define HAL_CAN_DEFAULT_NODE_ID 0

 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC"

--- a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat
@ -1,6 +1,5 @@
				@@ -1,6 +1,5 @@
 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 111
+define HAL_CAN_DEFAULT_NODE_ID 0

 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC"
--- a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef.dat
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 include ../f303-periph/hwdef.dat

-define HAL_CAN_DEFAULT_NODE_ID 111
+define HAL_CAN_DEFAULT_NODE_ID 0

 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC"

--- a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat
@ -94,10 +94,5 @@ PB6 STAY_IN_BOOTLOADER INPUT FLOATING
				@@ -94,10 +94,5 @@ PB6 STAY_IN_BOOTLOADER INPUT FLOATING
 # reserve 256 bytes for comms between app and bootloader
 RAM_RESERVE_START 256

-# use DNA
-define HAL_CAN_DEFAULT_NODE_ID 0
-
-define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps"
-
 # Add CS pins to ensure they are high in bootloader
 PB0 MAG_CS CS