From f5ab1bc7e4233b7aea6637edbf19dc1fcdf43141 Mon Sep 17 00:00:00 2001 From: "David J. Fiddes" Date: Sat, 4 Oct 2025 18:43:12 +0100 Subject: [PATCH] Cleanup CanMap, CanSdo and Stm32Can declarations Make single parameter constructors explicit. Use "override" on all overridden virtual methods. Remove unused timestamp from CanMap. Remove unused GetFlashAddress from Stm32Can. Tests: - Build as part of VCU project --- include/canmap.h | 3 +-- include/cansdo.h | 6 +++--- include/stm32_can.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/canmap.h b/include/canmap.h index a344111..b075b72 100644 --- a/include/canmap.h +++ b/include/canmap.h @@ -59,7 +59,7 @@ class CanMap: CanCallback uint8_t next; }; - CanMap(CanHardware* hw, bool loadFromFlash = true); + explicit CanMap(CanHardware* hw, bool loadFromFlash = true); CanHardware* GetHardware() { return canHardware; } void HandleClear() override; void HandleRx(uint32_t canId, uint32_t data[2], uint8_t dlc) override; @@ -95,7 +95,6 @@ class CanMap: CanCallback CANIDMAP canSendMap[MAX_MESSAGES]; CANIDMAP canRecvMap[MAX_MESSAGES]; CANPOS canPosMap[MAX_ITEMS + 1]; //Last item is a "tail" - uint32_t lastRxTimestamp; void ClearMap(CANIDMAP *canMap); int Add(CANIDMAP *canMap, Param::PARAM_NUM param, uint32_t canId, uint8_t offsetBits, int8_t length, float gain, int8_t offset); diff --git a/include/cansdo.h b/include/cansdo.h index 4395b51..af62027 100644 --- a/include/cansdo.h +++ b/include/cansdo.h @@ -52,9 +52,9 @@ class CanSdo: CanCallback, public IPutChar } __attribute__((packed)); /** Default constructor */ - CanSdo(CanHardware* hw, CanMap* cm = 0); + explicit CanSdo(CanHardware* hw, CanMap* cm = 0); CanHardware* GetHardware() { return canHardware; } - void HandleClear(); + void HandleClear() override; void HandleRx(uint32_t canId, uint32_t data[2], uint8_t dlc) override; void SDOWrite(uint8_t nodeId, uint16_t index, uint8_t subIndex, uint32_t data); void SDORead(uint8_t nodeId, uint16_t index, uint8_t subIndex); @@ -64,7 +64,7 @@ class CanSdo: CanCallback, public IPutChar int GetPrintRequest() { return printRequest; } SdoFrame* GetPendingUserspaceSdo() { return pendingUserSpaceSdo ? &pendingUserSpaceSdoFrame : 0; } void SendSdoReply(SdoFrame* sdoFrame); - void PutChar(char c); + void PutChar(char c) override; void TriggerTimeout(int callingFrequency); private: diff --git a/include/stm32_can.h b/include/stm32_can.h index 0487978..ed47682 100644 --- a/include/stm32_can.h +++ b/include/stm32_can.h @@ -51,7 +51,6 @@ class Stm32Can: public CanHardware void SetFilterBank(int& idIndex, int& filterId, uint16_t* idList); void SetFilterBankMask(int& idIndex, int& filterId, uint16_t* idMaskList); void SetFilterBank29(int& idIndex, int& filterId, uint32_t* idList); - uint32_t GetFlashAddress(); static Stm32Can* interfaces[]; };