From 3aab3bac524ef80f509312c6fa32964b256ed506 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 15 Jan 2024 14:49:35 +1100 Subject: [PATCH] Tools/AP_HAL_ChibiOS: move defaults from tools to hwdef directory Tools: move defaults from tools to hwdef directory --- .../AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm | 0 libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat | 4 ---- .../AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/defaults.parm | 1 + libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/defaults.parm | 1 + .../AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm | 0 libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat | 2 -- .../AP_HAL_ChibiOS/hwdef/skyviper-v2450}/defaults.parm | 0 libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat | 2 -- 11 files changed, 2 insertions(+), 16 deletions(-) rename Tools/Frame_params/Solo_Copter-4_GreenCube.param => libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm (100%) create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/defaults.parm create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/defaults.parm rename Tools/Frame_params/Solo_Copter-4.param => libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm (100%) rename {Tools/Frame_params/SkyViper-2450GPS => libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450}/defaults.parm (100%) diff --git a/Tools/Frame_params/Solo_Copter-4_GreenCube.param b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm similarity index 100% rename from Tools/Frame_params/Solo_Copter-4_GreenCube.param rename to libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat index 0266753fe1..c02f667fd2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat @@ -6,10 +6,6 @@ include ../CubeBlack/hwdef.dat -# pull Solo's default parameters from /Tools/Frame_params -# these are parameters the Solo requires for proper operation that are different from the 4 standard defaults. -env DEFAULT_PARAMETERS 'Tools/Frame_params/Solo_Copter-4_GreenCube.param' - undef AP_NOTIFY_OREOLED_ENABLED define AP_NOTIFY_OREOLED_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/defaults.parm new file mode 100644 index 0000000000..e189e7c801 --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/defaults.parm @@ -0,0 +1 @@ +@include ../CubeOrange/defaults.parm diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/hwdef.dat index 4f3c0cd9ba..6666bb2186 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-bdshot/hwdef.dat @@ -10,5 +10,3 @@ PE11 TIM1_CH2 TIM1 PWM(3) GPIO(52) BIDIR PE9 TIM1_CH1 TIM1 PWM(4) GPIO(53) # this will automatically be shared with TIM1_CH1 PD13 TIM4_CH2 TIM4 PWM(5) GPIO(54) BIDIR PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) BIDIR - -env DEFAULT_PARAMETERS libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/defaults.parm diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/defaults.parm new file mode 100644 index 0000000000..591b784776 --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/defaults.parm @@ -0,0 +1 @@ +@include ../CubeOrangePlus/defaults.parm diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/hwdef.dat index 4962342835..d2f45607b7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-bdshot/hwdef.dat @@ -10,5 +10,3 @@ PE11 TIM1_CH2 TIM1 PWM(3) GPIO(52) BIDIR PE9 TIM1_CH1 TIM1 PWM(4) GPIO(53) # this will automatically be shared with TIM1_CH1 PD13 TIM4_CH2 TIM4 PWM(5) GPIO(54) BIDIR PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) BIDIR - -env DEFAULT_PARAMETERS libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus/defaults.parm diff --git a/Tools/Frame_params/Solo_Copter-4.param b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm similarity index 100% rename from Tools/Frame_params/Solo_Copter-4.param rename to libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat index 8f15b713ac..899a75f1e9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat @@ -12,10 +12,6 @@ env OPTIMIZE -O2 SPIDEV icm20948_ext SPI4 DEVID1 MPU_EXT_CS MODE3 4*MHZ 8*MHZ SPIDEV icm20602_ext SPI4 DEVID3 GYRO_EXT_CS MODE3 4*MHZ 8*MHZ -# pull Solo's default parameters from /Tools/Frame_params -# these are parameters the Solo requires for proper operation that are different from the copter defaults. -env DEFAULT_PARAMETERS 'Tools/Frame_params/Solo_Copter-4.param' - # three IMUs, but allow for different variants. First two IMUs are # isolated, 3rd isn't IMU Invensense SPI:mpu9250_ext ROTATION_PITCH_180 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat index b79ad277a9..e3d937b832 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat @@ -188,7 +188,5 @@ BARO MS56XX SPI:ms5611_int # reserve plenty of memory for DMA for LED buffers define DMA_RESERVE_SIZE 32768 -# .env DEFAULT_PARAMETERS 'Tools/Frame_params/LuminousBee4_outdoor.param' - # bootloader embedding / bootloader flashing not available define AP_BOOTLOADER_FLASHING_ENABLED 0 diff --git a/Tools/Frame_params/SkyViper-2450GPS/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/defaults.parm similarity index 100% rename from Tools/Frame_params/SkyViper-2450GPS/defaults.parm rename to libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/defaults.parm diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat index 831c079648..7ca9230dff 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat @@ -61,8 +61,6 @@ PA1 UART4_RX UART4 NODMA # use flash storage STORAGE_FLASH_PAGE 22 -env DEFAULT_PARAMETERS 'Tools/Frame_params/SkyViper-2450GPS/defaults.parm' - # the web UI uses an abin file for firmware uploads env BUILD_ABIN True