From b53036c2d74aaf774741392757d8ac71e1ce44ee Mon Sep 17 00:00:00 2001 From: Ashwani Sihag Date: Thu, 2 Apr 2026 12:07:13 +0530 Subject: [PATCH] fix(pr26902): scope cleanup and copyright attribution --- boards/airmind/mindpx-v2/default.px4board | 3 --- boards/airmind/mindpx-v2/init/rc.board_sensors | 18 ++++++++++-------- boards/airmind/mindpx-v2/src/spi.cpp | 7 ++++--- boards/saam/saampixv1_1/src/can.c | 4 ++-- boards/saam/saampixv1_1/src/led.c | 4 ++-- boards/saam/saampixv1_1/src/usb.c | 4 ++-- .../stm32_common/include/px4_arch/io_timer.h | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/boards/airmind/mindpx-v2/default.px4board b/boards/airmind/mindpx-v2/default.px4board index 513cef603b..10e061af3e 100644 --- a/boards/airmind/mindpx-v2/default.px4board +++ b/boards/airmind/mindpx-v2/default.px4board @@ -19,12 +19,9 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y CONFIG_DRIVERS_IMU_INVENSENSE_MPU6500=y CONFIG_DRIVERS_IMU_ST_L3GD20=y CONFIG_DRIVERS_IMU_ST_LSM303D=y -CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y -CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y CONFIG_DRIVERS_IRLOCK=y CONFIG_COMMON_LIGHT=y CONFIG_COMMON_MAGNETOMETER=y -CONFIG_DRIVERS_MAGNETOMETER_LIS3MDL=y CONFIG_DRIVERS_PCA9685_PWM_OUT=y CONFIG_DRIVERS_POWER_MONITOR_INA226=y CONFIG_DRIVERS_PWM_INPUT=y diff --git a/boards/airmind/mindpx-v2/init/rc.board_sensors b/boards/airmind/mindpx-v2/init/rc.board_sensors index ac3b7582b8..30fca7a7ed 100644 --- a/boards/airmind/mindpx-v2/init/rc.board_sensors +++ b/boards/airmind/mindpx-v2/init/rc.board_sensors @@ -1,16 +1,18 @@ #!/bin/sh # -# Hybrid SaamPix sensor init on stable MindPXv2 platform +# Airmind Mindpx-v2 specific board sensors init #------------------------------------------------------------------------------ board_adc start -# external I2C compasses, if present -hmc5883 -X start -qmc5883l -X start +# Internal I2C bus +hmc5883 -T -I -R 12 start +qmc5883l -I -R 6 start -# internal SPI sensors +mpu6000 -s -R 2 start +mpu6500 -s -R 2 start +lsm303d -s -R 10 start +l3gd20 -s -R 14 start + +# Internal SPI ms5611 -s start -icm20602 -s start -mpu9250 -s start -lis3mdl -s start diff --git a/boards/airmind/mindpx-v2/src/spi.cpp b/boards/airmind/mindpx-v2/src/spi.cpp index 6d83ea7494..2d44f1d8ef 100644 --- a/boards/airmind/mindpx-v2/src/spi.cpp +++ b/boards/airmind/mindpx-v2/src/spi.cpp @@ -43,10 +43,11 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = { initSPIConfigExternal(SPI::CS{GPIO::PortD, GPIO::Pin7}), }), initSPIBus(SPI::Bus::SPI4, { - initSPIDevice(DRV_IMU_DEVTYPE_ICM20602, SPI::CS{GPIO::PortB, GPIO::Pin2}, SPI::DRDY{GPIO::PortE, GPIO::Pin4}), - initSPIDevice(DRV_MAG_DEVTYPE_LIS3MDL, SPI::CS{GPIO::PortD, GPIO::Pin11}), + initSPIDevice(DRV_GYR_DEVTYPE_L3GD20, SPI::CS{GPIO::PortB, GPIO::Pin2}, SPI::DRDY{GPIO::PortE, GPIO::Pin4}), + initSPIDevice(DRV_IMU_DEVTYPE_LSM303D, SPI::CS{GPIO::PortD, GPIO::Pin11}), initSPIDevice(DRV_BARO_DEVTYPE_MS5611, SPI::CS{GPIO::PortC, GPIO::Pin15}), - initSPIDevice(DRV_IMU_DEVTYPE_MPU9250, SPI::CS{GPIO::PortE, GPIO::Pin3}, SPI::DRDY{GPIO::PortE, GPIO::Pin10}), + initSPIDevice(DRV_IMU_DEVTYPE_MPU6000, SPI::CS{GPIO::PortE, GPIO::Pin3}, SPI::DRDY{GPIO::PortE, GPIO::Pin10}), + initSPIDevice(DRV_IMU_DEVTYPE_MPU6500, SPI::CS{GPIO::PortE, GPIO::Pin3}, SPI::DRDY{GPIO::PortE, GPIO::Pin10}), }), }; diff --git a/boards/saam/saampixv1_1/src/can.c b/boards/saam/saampixv1_1/src/can.c index 882fe0f23b..8b649ff7da 100644 --- a/boards/saam/saampixv1_1/src/can.c +++ b/boards/saam/saampixv1_1/src/can.c @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2020-2026 Saam Drones Development Team. All rights reserved. + * Copyright (c) 2020-2026 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Saam Drones nor the names of its contributors may be + * 3. Neither the name PX4 nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/boards/saam/saampixv1_1/src/led.c b/boards/saam/saampixv1_1/src/led.c index 424451c1e0..d332227614 100644 --- a/boards/saam/saampixv1_1/src/led.c +++ b/boards/saam/saampixv1_1/src/led.c @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2020-2026 Saam Drones Development Team. All rights reserved. + * Copyright (c) 2020-2026 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Saam Drones nor the names of its contributors may be + * 3. Neither the name PX4 nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/boards/saam/saampixv1_1/src/usb.c b/boards/saam/saampixv1_1/src/usb.c index 6ddc4db003..49c4e7e9d3 100644 --- a/boards/saam/saampixv1_1/src/usb.c +++ b/boards/saam/saampixv1_1/src/usb.c @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2020-2026 Saam Drones Development Team. All rights reserved. + * Copyright (c) 2020-2026 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Saam Drones nor the names of its contributors may be + * 3. Neither the name PX4 nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/io_timer.h b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/io_timer.h index 267bbfdf00..009207a279 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/io_timer.h +++ b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/io_timer.h @@ -47,12 +47,12 @@ __BEGIN_DECLS #ifdef BOARD_NUM_IO_TIMERS #define MAX_IO_TIMERS BOARD_NUM_IO_TIMERS #else -#define MAX_IO_TIMERS 4 +#define MAX_IO_TIMERS 2 #endif #if DIRECT_PWM_OUTPUT_CHANNELS > 8 #define MAX_TIMER_IO_CHANNELS DIRECT_PWM_OUTPUT_CHANNELS #else -#define MAX_TIMER_IO_CHANNELS 16 +#define MAX_TIMER_IO_CHANNELS 8 #endif #define MAX_LED_TIMERS 2