From 45dc8c05223ccbc56790b8c07c6adf42d8ec2a48 Mon Sep 17 00:00:00 2001 From: bugobliterator Date: Fri, 20 Sep 2024 15:39:22 +1000 Subject: [PATCH] AP_DroneCAN: Fix constructor initialization order bad ordering was leading to dronecan dna server getting initialised before canard interface is initialised leading --- libraries/AP_DroneCAN/AP_DroneCAN.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_DroneCAN/AP_DroneCAN.h b/libraries/AP_DroneCAN/AP_DroneCAN.h index 8b37c2528b..ea54c83399 100644 --- a/libraries/AP_DroneCAN/AP_DroneCAN.h +++ b/libraries/AP_DroneCAN/AP_DroneCAN.h @@ -231,10 +231,12 @@ private: uint32_t *mem_pool; - AP_DroneCAN_DNA_Server _dna_server; - uint8_t _driver_index; + CanardInterface canard_iface; + + AP_DroneCAN_DNA_Server _dna_server; + char _thread_name[13]; bool _initialized; ///// SRV output ///// @@ -288,8 +290,6 @@ private: } _relay; #endif - CanardInterface canard_iface; - #if AP_DRONECAN_SERIAL_ENABLED AP_DroneCAN_Serial serial; #endif