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

AP_ADSB: params always use set method

Browse Source
This commit is contained in:
Iampete1 2022-07-05 04:08:56 +01:00 committed by Peter Hall
parent 6875ef17a0
commit cb6e6c82e5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_ADSB/AP_ADSB.cpp
View File

@ -190,7 +190,7 @@ void AP_ADSB::init(void)
{
if (in_state.vehicle_list == nullptr) {
// sanity check param
in_state.list_size_param = constrain_int16(in_state.list_size_param, 1, INT16_MAX);
in_state.list_size_param.set(constrain_int16(in_state.list_size_param, 1, INT16_MAX));
in_state.vehicle_list = new adsb_vehicle_t[in_state.list_size_param];
@ -350,7 +350,7 @@ void AP_ADSB::update(void)
// param changed, check that it's a valid octal
if (!is_valid_callsign(out_state.cfg.squawk_octal_param)) {
// invalid, reset it to default
out_state.cfg.squawk_octal_param = ADSB_SQUAWK_OCTAL_DEFAULT;
out_state.cfg.squawk_octal_param.set(ADSB_SQUAWK_OCTAL_DEFAULT);
}
out_state.cfg.squawk_octal = (uint16_t)out_state.cfg.squawk_octal_param;
}
@ -616,16 +616,16 @@ void AP_ADSB::handle_out_cfg(const mavlink_uavionix_adsb_out_cfg_t &packet)
out_state.cfg.was_set_externally = true;
out_state.cfg.ICAO_id = packet.ICAO;
out_state.cfg.ICAO_id_param = out_state.cfg.ICAO_id_param_prev = packet.ICAO & 0x00FFFFFFFF;
out_state.cfg.ICAO_id_param.set(out_state.cfg.ICAO_id_param_prev = packet.ICAO & 0x00FFFFFFFF);
// May contain a non-null value at the end so accept it as-is with memcpy instead of strcpy
memcpy(out_state.cfg.callsign, packet.callsign, sizeof(out_state.cfg.callsign));
out_state.cfg.emitterType = packet.emitterType;
out_state.cfg.lengthWidth = packet.aircraftSize;
out_state.cfg.gpsOffsetLat = packet.gpsOffsetLat;
out_state.cfg.gpsOffsetLon = packet.gpsOffsetLon;
out_state.cfg.rfSelect = packet.rfSelect;
out_state.cfg.emitterType.set(packet.emitterType);
out_state.cfg.lengthWidth.set(packet.aircraftSize);
out_state.cfg.gpsOffsetLat.set(packet.gpsOffsetLat);
out_state.cfg.gpsOffsetLon.set(packet.gpsOffsetLon);
out_state.cfg.rfSelect.set(packet.rfSelect);
out_state.cfg.stall_speed_cm = packet.stallSpeed;
// guard against string with non-null end char

2
libraries/AP_ADSB/AP_ADSB.h
View File

@ -150,7 +150,7 @@ public:
bool get_vehicle_by_ICAO(const uint32_t icao, adsb_vehicle_t &vehicle) const;
uint32_t get_special_ICAO_target() const { return (uint32_t)_special_ICAO_target; };
void set_special_ICAO_target(const uint32_t new_icao_target) { _special_ICAO_target = (int32_t)new_icao_target; };
void set_special_ICAO_target(const uint32_t new_icao_target) { _special_ICAO_target.set((int32_t)new_icao_target); };
bool is_special_vehicle(uint32_t icao) const { return _special_ICAO_target != 0 && (_special_ICAO_target == (int32_t)icao); }
// confirm a value is a valid callsign