From 3bd8f1a3dfb5b548d62ec760e4158f30a7a7df4d Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Mon, 4 Sep 2023 17:01:18 +1000
Subject: [PATCH] AP_Periph: rename rx-protocol-stats ins local to avoid
 conflict with ins singleton

---
 Tools/AP_Periph/can.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Tools/AP_Periph/can.cpp b/Tools/AP_Periph/can.cpp
index 4cb0d495ed..dc3aa334ed 100644
--- a/Tools/AP_Periph/can.cpp
+++ b/Tools/AP_Periph/can.cpp
@@ -1225,19 +1225,19 @@ void AP_Periph_FW::update_rx_protocol_stats(int16_t res)
 void AP_Periph_FW::processRx(void)
 {
     AP_HAL::CANFrame rxmsg;
-    for (auto &ins : instances) {
-        if (ins.iface == NULL) {
+    for (auto &instance : instances) {
+        if (instance.iface == NULL) {
             continue;
         }
 #if HAL_NUM_CAN_IFACES >= 2
-        if (can_protocol_cached[ins.index] != AP_CAN::Protocol::DroneCAN) {
+        if (can_protocol_cached[instance.index] != AP_CAN::Protocol::DroneCAN) {
             continue;
         }
 #endif
         while (true) {
             bool read_select = true;
             bool write_select = false;
-            ins.iface->select(read_select, write_select, nullptr, 0);
+            instance.iface->select(read_select, write_select, nullptr, 0);
             if (!read_select) { // No data pending
                 break;
             }
@@ -1246,7 +1246,7 @@ void AP_Periph_FW::processRx(void)
             //palToggleLine(HAL_GPIO_PIN_LED);
             uint64_t timestamp;
             AP_HAL::CANIface::CanIOFlags flags;
-            if (ins.iface->receive(rxmsg, timestamp, flags) <= 0) {
+            if (instance.iface->receive(rxmsg, timestamp, flags) <= 0) {
                 break;
             }
 #if HAL_PERIPH_CAN_MIRROR
@@ -1267,7 +1267,7 @@ void AP_Periph_FW::processRx(void)
 #endif
             rx_frame.id = rxmsg.id;
 #if CANARD_MULTI_IFACE
-            rx_frame.iface_id = ins.index;
+            rx_frame.iface_id = instance.index;
 #endif
 
             const int16_t res = canardHandleRxFrame(&dronecan.canard, &rx_frame, timestamp);
@@ -1362,14 +1362,14 @@ void AP_Periph_FW::node_status_send(void)
                                     buffer,
                                     len);
         }
-        for (auto &ins : instances) {
+        for (auto &instance : instances) {
             uint8_t buffer[DRONECAN_PROTOCOL_CANSTATS_MAX_SIZE];
             dronecan_protocol_CanStats can_stats;
-            const AP_HAL::CANIface::bus_stats_t *bus_stats = ins.iface->get_statistics();
+            const AP_HAL::CANIface::bus_stats_t *bus_stats = instance.iface->get_statistics();
             if (bus_stats == nullptr) {
                 return;
             }
-            can_stats.interface = ins.index;
+            can_stats.interface = instance.index;
             can_stats.tx_requests = bus_stats->tx_requests;
             can_stats.tx_rejected = bus_stats->tx_rejected;
             can_stats.tx_overflow = bus_stats->tx_overflow;