From 137915ab46f67a6a7cf9492abbe013f8d531848f Mon Sep 17 00:00:00 2001
From: Tom Pittenger <tom.pittenger@khaero.com>
Date: Thu, 5 Dec 2024 12:34:32 -0800
Subject: [PATCH] AP_ADSB: refactor IDENT and add gcs_sendtext feedback

---
 libraries/AP_ADSB/AP_ADSB.cpp | 17 ++++++++++++++++-
 libraries/AP_ADSB/AP_ADSB.h   |  8 +-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/libraries/AP_ADSB/AP_ADSB.cpp b/libraries/AP_ADSB/AP_ADSB.cpp
index 3ca9af98a9..1e773fa567 100644
--- a/libraries/AP_ADSB/AP_ADSB.cpp
+++ b/libraries/AP_ADSB/AP_ADSB.cpp
@@ -697,7 +697,6 @@ void AP_ADSB::handle_out_control(const mavlink_uavionix_adsb_out_control_t &pack
 {
     out_state.ctrl.baroCrossChecked = packet.state & UAVIONIX_ADSB_OUT_CONTROL_STATE::UAVIONIX_ADSB_OUT_CONTROL_STATE_EXTERNAL_BARO_CROSSCHECKED;
     out_state.ctrl.airGroundState = packet.state & UAVIONIX_ADSB_OUT_CONTROL_STATE::UAVIONIX_ADSB_OUT_CONTROL_STATE_ON_GROUND;
-    out_state.ctrl.identActive = packet.state & UAVIONIX_ADSB_OUT_CONTROL_STATE::UAVIONIX_ADSB_OUT_CONTROL_STATE_IDENT_BUTTON_ACTIVE;
     out_state.ctrl.modeAEnabled = packet.state & UAVIONIX_ADSB_OUT_CONTROL_STATE::UAVIONIX_ADSB_OUT_CONTROL_STATE_MODE_A_ENABLED;
     out_state.ctrl.modeCEnabled = packet.state & UAVIONIX_ADSB_OUT_CONTROL_STATE::UAVIONIX_ADSB_OUT_CONTROL_STATE_MODE_C_ENABLED;
     out_state.ctrl.modeSEnabled = packet.state & UAVIONIX_ADSB_OUT_CONTROL_STATE::UAVIONIX_ADSB_OUT_CONTROL_STATE_MODE_S_ENABLED;
@@ -707,6 +706,10 @@ void AP_ADSB::handle_out_control(const mavlink_uavionix_adsb_out_control_t &pack
     out_state.ctrl.emergencyState = packet.emergencyStatus;
     memcpy(out_state.ctrl.callsign, packet.flight_id, sizeof(out_state.ctrl.callsign));
     out_state.ctrl.x_bit = packet.x_bit;
+
+    if (packet.state & UAVIONIX_ADSB_OUT_CONTROL_STATE::UAVIONIX_ADSB_OUT_CONTROL_STATE_IDENT_BUTTON_ACTIVE) {
+        IGNORE_RETURN(ident_start());
+    }
 }
 
 /*
@@ -930,6 +933,18 @@ uint32_t AP_ADSB::convert_base_to_decimal(const uint8_t baseIn, uint32_t inputNu
     return outputNumber;
 }
 
+// Trigger a Mode 3/A transponder IDENT. This should only be done when requested to do so by an Air Traffic Controller.
+// See wikipedia for IDENT explanation https://en.wikipedia.org/wiki/Transponder_(aeronautics)
+bool AP_ADSB::ident_start()
+{
+    if (!healthy()) {
+        return false;
+    }
+    out_state.ctrl.identActive = true;
+    GCS_SEND_TEXT(MAV_SEVERITY_INFO,"ADSB: IDENT!");
+    return true;
+}
+
 // methods for embedded class Location
 bool AP_ADSB::Loc::speed_accuracy(float &sacc) const
 {
diff --git a/libraries/AP_ADSB/AP_ADSB.h b/libraries/AP_ADSB/AP_ADSB.h
index de87f7d01c..45cce0f328 100644
--- a/libraries/AP_ADSB/AP_ADSB.h
+++ b/libraries/AP_ADSB/AP_ADSB.h
@@ -216,13 +216,7 @@ public:
 
     // Trigger a Mode 3/A transponder IDENT. This should only be done when requested to do so by an Air Traffic Controller.
     // See wikipedia for IDENT explanation https://en.wikipedia.org/wiki/Transponder_(aeronautics)
-    bool ident_start() {
-        if (!healthy() || ((out_state.cfg.rfSelect & UAVIONIX_ADSB_OUT_RF_SELECT_TX_ENABLED) == 0)) {
-            return false;
-        }
-        out_state.ctrl.identActive = true;
-        return true;
-    }
+    bool ident_start();
 
     AP_ADSB::Type get_type(uint8_t instance) const;