Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_TemperatureSensor: add Dummy methods so that Sub can use this feature by default but everything else not

This commit is contained in:
Tom Pittenger 2022-09-29 14:07:06 -07:00 committed by Andrew Tridgell
parent b3a4219b06
commit 1205e26ace
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/AP_TemperatureSensor/AP_TemperatureSensor.cpp
View File

@ -16,6 +16,15 @@
#include "AP_TemperatureSensor.h"
#if AP_TEMPERATURE_SENSOR_ENABLED
#include <AP_Vehicle/AP_Vehicle_Type.h>
#ifndef AP_TEMPERATURE_SENSOR_DUMMY_METHODS_ENABLED
#define AP_TEMPERATURE_SENSOR_DUMMY_METHODS_ENABLED (!APM_BUILD_TYPE(APM_BUILD_ArduSub) && !AP_TEMPERATURE_SENSOR_ENABLED_BY_USER)
#endif
#if !AP_TEMPERATURE_SENSOR_DUMMY_METHODS_ENABLED
#include "AP_TemperatureSensor_TSYS01.h"
#include "AP_TemperatureSensor_MCP9600.h"
@ -24,8 +33,6 @@
extern const AP_HAL::HAL& hal;
AP_TemperatureSensor *AP_TemperatureSensor::_singleton;
const AP_Param::GroupInfo AP_TemperatureSensor::var_info[] = {
// SKIP INDEX 0
@ -197,6 +204,22 @@ int32_t AP_TemperatureSensor::get_source_id(const uint8_t instance) const
{
return healthy(instance) ? _params[instance].source_id.get() : 0;
}
#else
const AP_Param::GroupInfo AP_TemperatureSensor::var_info[] = { AP_GROUPEND };
void AP_TemperatureSensor::init() { };
void AP_TemperatureSensor::update() { };
bool AP_TemperatureSensor::get_temperature(float &temp, const uint8_t instance) const { return false; };
bool AP_TemperatureSensor::healthy(const uint8_t instance) const { return false; };
AP_TemperatureSensor::Type AP_TemperatureSensor::get_type(const uint8_t instance) const { return AP_TemperatureSensor::Type::NONE; };
AP_TemperatureSensor::Source AP_TemperatureSensor::get_source(const uint8_t instance) const { return AP_TemperatureSensor::Source::None; };
int32_t AP_TemperatureSensor::get_source_id(const uint8_t instance) const { return false; };
AP_TemperatureSensor::AP_TemperatureSensor() {}
#endif // AP_TEMPERATURE_SENSOR_DUMMY_METHODS_ENABLED
AP_TemperatureSensor *AP_TemperatureSensor::_singleton;
namespace AP {
AP_TemperatureSensor &temperature_sensor() {

7
libraries/AP_TemperatureSensor/AP_TemperatureSensor.h
View File

@ -16,8 +16,11 @@
#include <AP_HAL/AP_HAL.h>
#ifndef AP_TEMPERATURE_SENSOR_ENABLED
#define AP_TEMPERATURE_SENSOR_ENABLED (!HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024)
#ifdef AP_TEMPERATURE_SENSOR_ENABLED
#define AP_TEMPERATURE_SENSOR_ENABLED_BY_USER AP_TEMPERATURE_SENSOR_ENABLED
#else
#define AP_TEMPERATURE_SENSOR_ENABLED_BY_USER 0
#define AP_TEMPERATURE_SENSOR_ENABLED (!HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024)
#endif
#if AP_TEMPERATURE_SENSOR_ENABLED