From 74e5d68ea399d67b56282a65de8910f1c33a522b Mon Sep 17 00:00:00 2001 From: Rahul Date: Fri, 26 Apr 2024 12:49:51 +0530 Subject: [PATCH] fixed ci errors-4 --- .../AP_TemperatureSensor/AP_TemperatureSensor_MLX90614.h | 4 ++++ libraries/AP_TemperatureSensor/AP_TemperatureSensor_config.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/AP_TemperatureSensor/AP_TemperatureSensor_MLX90614.h b/libraries/AP_TemperatureSensor/AP_TemperatureSensor_MLX90614.h index 8bacbad14c55c4..d92c5bc316e421 100644 --- a/libraries/AP_TemperatureSensor/AP_TemperatureSensor_MLX90614.h +++ b/libraries/AP_TemperatureSensor/AP_TemperatureSensor_MLX90614.h @@ -1,6 +1,10 @@ #pragma once #include "AP_TemperatureSensor_Backend.h" +#ifndef AP_TEMPERATURE_SENSOR_MLX90614_ENABLED + #define AP_TEMPERATURE_SENSOR_MLX90614_ENABLED AP_TEMPERATURE_SENSOR_ENABLED +#endif + #if AP_TEMPERATURE_SENSOR_MLX90614_ENABLED #define MLX90614_I2CDEFAULTADDR 0x5A // Device default slave address diff --git a/libraries/AP_TemperatureSensor/AP_TemperatureSensor_config.h b/libraries/AP_TemperatureSensor/AP_TemperatureSensor_config.h index ccd7a8b4e122f0..47fd9d9909dbb5 100644 --- a/libraries/AP_TemperatureSensor/AP_TemperatureSensor_config.h +++ b/libraries/AP_TemperatureSensor/AP_TemperatureSensor_config.h @@ -31,9 +31,6 @@ #error AP_TEMPERATURE_SENSOR_DRONECAN_ENABLED requires HAL_ENABLE_DRONECAN_DRIVERS #endif -#ifndef AP_TEMPERATURE_SENSOR_MLX90614_ENABLED - #define AP_TEMPERATURE_SENSOR_MLX90614_ENABLED 1 -#endif // maximum number of Temperature Sensors #ifndef AP_TEMPERATURE_SENSOR_MAX_INSTANCES