Skip to content

Fixed compiler warnings and bug in sendCAN() #1

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

Open
matthias-bs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed compiler warnings and bug in sendCAN() #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96132bf
fixed compiler warning
matthias-bs Jul 29, 2022
1301701
sendCAN(): fixed handling of IDs > 0xFF
matthias-bs Aug 8, 2022
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
10 changes: 4 additions & 6 deletions can.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include "can.h"
#include "avr/interrupt.h"
#include "../dash/lightControl.h"
#include "../daq/heartbeat.h"

#include <util/delay.h>
#include <avr/io.h>
Expand All @@ -22,7 +20,7 @@ uint8_t lastError = 0;
* Reset and configure the AT90 to use CAN.
*
*/
void initCAN()
void initCAN(void)
{
// Issue a software reset of the CAN Controller
CANGCON |= ( 1 << SWRES );
Expand Down Expand Up @@ -57,7 +55,7 @@ void initCAN()
* @return free MOB index, otherwise 0xFF
*
*/
uint8_t getFreeMob()
uint8_t getFreeMob(void)
{
// This commented out code is to prevent context switching when using this function.
// When it's not commented, it caused both CAN RX and TX to fail. The reasons for this are being investigated.
Expand Down Expand Up @@ -124,8 +122,8 @@ uint8_t sendCAN( CANMessage* message )
// This library currently only supports standard CAN IDs
CANIDT4 = 0;
CANIDT3 = 0;
CANIDT2 = (uint8_t) message->id << 5;
CANIDT1 = (uint8_t) message->id >> 3;
CANIDT2 = (uint8_t) (message->id << 5);
CANIDT1 = (uint8_t) (message->id >> 3);

// Ensure nothing bigger than 8 is written to the CANCDMOB register
if( message->length > 8 )
Expand Down
6 changes: 3 additions & 3 deletions can.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ typedef struct
uint8_t acknowledgement : 1;
} CANErrorStatus;

void initCAN();
void initCAN(void);

CANErrorStatus getLastCANError();
CANErrorStatus getLastCANError(void);

uint8_t listenForMessage( uint16_t id, uint8_t expectedLength );

uint8_t getMessage( CANMessage * message );

uint8_t sendCAN( CANMessage* message );

#endif // CAN_H
#endif // CAN_H