Skip to content

Cleanup CanMap, CanSdo and Stm32Can declarations #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2025
Merged

Cleanup CanMap, CanSdo and Stm32Can declarations #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions include/canmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions include/cansdo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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:
Expand Down
1 change: 0 additions & 1 deletion include/stm32_can.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
};
Expand Down