From 6923f20ce699a0b6cd697a17616c004ef1328898 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 22 Jun 2022 11:15:51 +1000 Subject: [PATCH] AP_RangeFinder: stop persisting detections in LeddarOne driver We don't use these readings except immediately after where we store them - so don't store them persistently. --- libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.cpp | 4 +--- libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.cpp b/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.cpp index 759c35e205..da973bee38 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.cpp +++ b/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.cpp @@ -172,12 +172,10 @@ LeddarOne_Status AP_RangeFinder_LeddarOne::parse_response(uint8_t &number_detect return LEDDARONE_STATE_ERR_NUMBER_DETECTIONS; } - memset(detections, 0, sizeof(detections)); sum_distance = 0; for (index=0; index(read_buffer[index_offset])*256 + read_buffer[index_offset+1]) / 10; - sum_distance += detections[index]; + sum_distance += (static_cast(read_buffer[index_offset])*256 + read_buffer[index_offset+1]) / 10; // add index offset (4) to read next detection data index_offset += LEDDARONE_DETECTION_DATA_OFFSET; diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h b/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h index 4dd68e930e..13e6e2a27a 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h @@ -69,7 +69,6 @@ private: uint32_t last_sending_request_ms; uint32_t last_available_ms; - uint16_t detections[LEDDARONE_DETECTIONS_MAX]; uint32_t sum_distance; LeddarOne_ModbusStatus modbus_status = LEDDARONE_MODBUS_STATE_INIT;