Skip to content
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.

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

Jump to bottom

CAN: Fix signness mismatch in CANMessage constructors #9111

Merged
merged 2 commits into from Apr 1, 2019
Merged

CAN: Fix signness mismatch in CANMessage constructors #9111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0210cef
Add unsigned everywhere in the driver for
embeddedteam103 Dec 16, 2018
6f3ad9a
CR: Add signed overload
Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 25 additions & 7 deletions drivers/CAN.h
View file
Open in desktop
Expand Up @@ -41,10 +41,10 @@ class CANMessage : public CAN_Message {
*/
CANMessage() : CAN_Message()
{
len = 8;
len = 8U;
type = CANData;
format = CANStandard;
id = 0;
id = 0U;
memset(data, 0, 8);
}

Expand All @@ -56,7 +56,25 @@ class CANMessage : public CAN_Message {
* @param _type Type of Data: Use enum CANType for valid parameter values
* @param _format Data Format: Use enum CANFormat for valid parameter values
*/
CANMessage(unsigned _id, const char *_data, char _len = 8, CANType _type = CANData, CANFormat _format = CANStandard)
CANMessage(unsigned int _id, const unsigned char *_data, unsigned char _len = 8, CANType _type = CANData, CANFormat _format = CANStandard)
{
len = _len & 0xF;
type = _type;
format = _format;
id = _id;
memcpy(data, _data, _len);
}


/** Creates CAN message with specific content.
*
* @param _id Message ID
* @param _data Mesaage Data
* @param _len Message Data length
* @param _type Type of Data: Use enum CANType for valid parameter values
* @param _format Data Format: Use enum CANFormat for valid parameter values
*/
CANMessage(unsigned int _id, const char *_data, unsigned char _len = 8, CANType _type = CANData, CANFormat _format = CANStandard)
{
len = _len & 0xF;
type = _type;
Expand All @@ -70,7 +88,7 @@ class CANMessage : public CAN_Message {
* @param _id Message ID
* @param _format Data Format: Use enum CANType for valid parameter values
*/
CANMessage(unsigned _id, CANFormat _format = CANStandard)
CANMessage(unsigned int _id, CANFormat _format = CANStandard)
{
len = 0;
type = CANRemote;
Expand Down Expand Up @@ -104,10 +122,10 @@ class CAN : private NonCopyable<CAN> {
* CAN can1(MBED_CONF_APP_CAN1_RD, MBED_CONF_APP_CAN1_TD);
* CAN can2(MBED_CONF_APP_CAN2_RD, MBED_CONF_APP_CAN2_TD);
*
* char counter = 0;
* unsigned char counter = 0;
*
* void send() {
* if(can1.write(CANMessage(1337, &counter, 1))) {
* if(can1.write(CANMessage(1337U, &counter, 1))) {
* printf("Message sent: %d\n", counter);
* counter++;
* }
Expand All @@ -116,7 +134,7 @@ class CAN : private NonCopyable<CAN> {
*
* int main() {
* ticker.attach(&send, 1);
* CANMessage msg;
* CANMessage msg;
* while(1) {
* if(can2.read(msg)) {
* printf("Message received: %d\n\n", msg.data[0]);
Expand Down