Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-07 16:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Servo_Telem: servo telem rename valid_types to present_types

Browse Source
This commit is contained in:
Iampete1 2025-01-13 20:27:53 +00:00 committed by Andrew Tridgell
parent 00e920b79d
commit d47c9e2768
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Servo_Telem/AP_Servo_Telem.cpp
View File

@ -34,7 +34,7 @@ AP_Servo_Telem::AP_Servo_Telem()
// return true if the requested types of data are available // return true if the requested types of data are available
bool AP_Servo_Telem::TelemetryData::present(const uint16_t type_mask) const volatile bool AP_Servo_Telem::TelemetryData::present(const uint16_t type_mask) const volatile
{ {
return (valid_types & type_mask) != 0; return (present_types & type_mask) != 0;
} }
// record an update to the telemetry data together with timestamp // record an update to the telemetry data together with timestamp
@ -46,7 +46,7 @@ void AP_Servo_Telem::update_telem_data(const uint8_t servo_index, const Telemetr
// can only get slightly more up-to-date information that perhaps they were expecting or might // can only get slightly more up-to-date information that perhaps they were expecting or might
// read data that has just gone stale - both of these are safe and avoid the overhead of locking // read data that has just gone stale - both of these are safe and avoid the overhead of locking
if (servo_index >= ARRAY_SIZE(_telem_data) || (new_data.valid_types == 0)) { if (servo_index >= ARRAY_SIZE(_telem_data) || (new_data.present_types == 0)) {
return; return;
} }
active_mask |= 1U << servo_index; active_mask |= 1U << servo_index;
@ -84,7 +84,7 @@ void AP_Servo_Telem::update_telem_data(const uint8_t servo_index, const Telemetr
telemdata.status_flags = new_data.status_flags; telemdata.status_flags = new_data.status_flags;
} }
telemdata.valid_types |= new_data.valid_types; telemdata.present_types |= new_data.present_types;
telemdata.last_update_ms = AP_HAL::millis(); telemdata.last_update_ms = AP_HAL::millis();
} }

2
libraries/AP_Servo_Telem/AP_Servo_Telem.h
View File

@ -51,7 +51,7 @@ public:
PCB_TEMP = 1 << 8, PCB_TEMP = 1 << 8,
STATUS = 1 << 9, STATUS = 1 << 9,
}; };
uint16_t valid_types; uint16_t present_types;
// return true if the requested types of data are available // return true if the requested types of data are available
bool present(const uint16_t type_mask) const volatile; bool present(const uint16_t type_mask) const volatile;