From 076deb4d97e4864587eb7127ba6d6a15205d5d52 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 14 Dec 2022 12:14:18 +1100 Subject: [PATCH] ArduSub: code-generate chan-fetching methods A recent PR had to change every single one of these methods, which was kind of unfortunate. So generate the methods using a #define so the duplication happens at preprocessor-time. --- ArduSub/GCS_Sub.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/ArduSub/GCS_Sub.h b/ArduSub/GCS_Sub.h index a037553bc5..b0b6c373f5 100644 --- a/ArduSub/GCS_Sub.h +++ b/ArduSub/GCS_Sub.h @@ -9,21 +9,12 @@ class GCS_Sub : public GCS public: - // return GCS link at offset ofs - GCS_MAVLINK_Sub *chan(const uint8_t ofs) override { - if (ofs > _num_gcs) { - INTERNAL_ERROR(AP_InternalError::error_t::gcs_offset); - return nullptr; - } - return (GCS_MAVLINK_Sub*)_chan[ofs]; - } - const GCS_MAVLINK_Sub *chan(const uint8_t ofs) const override { - if (ofs > _num_gcs) { - INTERNAL_ERROR(AP_InternalError::error_t::gcs_offset); - return nullptr; - } - return (GCS_MAVLINK_Sub*)_chan[ofs]; - } + // the following define expands to a pair of methods to retrieve a + // pointer to an object of the correct subclass for the link at + // offset ofs. These are of the form: + // GCS_MAVLINK_XXXX *chan(const uint8_t ofs) override; + // const GCS_MAVLINK_XXXX *chan(const uint8_t ofs) override const; + GCS_MAVLINK_CHAN_METHOD_DEFINITIONS(GCS_MAVLINK_Sub); void update_vehicle_sensor_status_flags() override;