mmr/can
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Remove indents

Browse Source
This commit is contained in:
Stefano Calabretti
2022-02-20 12:49:00 +01:00
parent 81f64d0b17
commit dd53c8f4cc
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/mmr_can_header.c
+9 -9
View File
@@ -4,20 +4,20 @@
uint32_t MMR_CAN_HeaderToBits(MmrCanHeader header) { uint32_t MMR_CAN_HeaderToBits(MmrCanHeader header) {
return 0 return 0
| ((uint32_t)header.priority << 26) | ((uint32_t)header.priority << 26)
| ((uint32_t)header.messageId << 23) | ((uint32_t)header.messageId << 23)
| ((uint32_t)header.senderId << 13) | ((uint32_t)header.senderId << 13)
| ((uint32_t)header.seqNumber << 3) | ((uint32_t)header.seqNumber << 3)
| ((uint32_t)header.messageType); | ((uint32_t)header.messageType);
} }
MmrCanHeader MMR_CAN_HeaderFromBits(uint32_t bits) { MmrCanHeader MMR_CAN_HeaderFromBits(uint32_t bits) {
return (MmrCanHeader) { return (MmrCanHeader) {
.priority = bits >> 26, .priority = bits >> 26,
.messageId = bits >> 23, .messageId = bits >> 23,
.senderId = bits >> 13, .senderId = bits >> 13,
.seqNumber = bits >> 3, .seqNumber = bits >> 3,
.messageType = bits, .messageType = bits,
}; };
} }
Src/mmr_can_receive.c
+5 -4
View File
@@ -55,7 +55,8 @@ static HalStatus receiveAll(ReceptionParams *rp) {
do { do {
rp->result += MMR_CAN_MAX_DATA_LENGTH; rp->result += MMR_CAN_MAX_DATA_LENGTH;
status |= receiveOne(rp); status |= receiveOne(rp);
} while ( }
while (
headerIsMultiFrame(&rp->headers.mmr, targetId) && status == HAL_OK headerIsMultiFrame(&rp->headers.mmr, targetId) && status == HAL_OK
); );
@@ -66,9 +67,9 @@ static HalStatus receiveAll(ReceptionParams *rp) {
static HalStatus receiveOne(ReceptionParams *rp) { static HalStatus receiveOne(ReceptionParams *rp) {
HalStatus status = HAL_CAN_GetRxMessage( HalStatus status = HAL_CAN_GetRxMessage(
rp->handle, rp->handle,
rp->fifo, rp->fifo,
&rp->headers.rx, &rp->headers.rx,
rp->result rp->result
); );
rp->headers.mmr = MMR_CAN_HeaderFromBits(rp->headers.rx.ExtId); rp->headers.mmr = MMR_CAN_HeaderFromBits(rp->headers.rx.ExtId);
Src/mmr_can_scs_manager.c
+6 -6
View File
@@ -47,11 +47,11 @@ HalStatus MMR_CAN_SendScs(
.senderId = senderId, .senderId = senderId,
.messageId = scsId, .messageId = scsId,
.priority = MMR_CAN_MESSAGE_PRIORITY_HIGH, .priority = MMR_CAN_MESSAGE_PRIORITY_HIGH,
.messageType = MMR_CAN_MESSAGE_TYPE_SCS, .messageType = MMR_CAN_MESSAGE_TYPE_SCS,
}; };
if (putEntry(header) == NULL) { if (putEntry(header) == NULL) {
return HAL_ERROR; return HAL_ERROR;
} }
return sendScs(hcan, header); return sendScs(hcan, header);
@@ -66,13 +66,13 @@ HalStatus MMR_CAN_HandleNextScs(CanHandle *hcan) {
counter %= MMR_CAN_SCS_ENTRIES_COUNT; counter %= MMR_CAN_SCS_ENTRIES_COUNT;
if (MMR_CAN_HeaderToBits(entry->header) == 0) { if (MMR_CAN_HeaderToBits(entry->header) == 0) {
return HAL_OK; return HAL_OK;
} }
switch (checkScs(entry)) { switch (checkScs(entry)) {
case MMR_CAN_SCS_CHECK_ERROR: return HAL_ERROR; case MMR_CAN_SCS_CHECK_ERROR: return HAL_ERROR;
case MMR_CAN_SCS_CHECK_OK: return HAL_OK; case MMR_CAN_SCS_CHECK_OK: return HAL_OK;
default: break; default: break;
} }
entry->counter = getCurrentTime(); entry->counter = getCurrentTime();
Src/mmr_can_send.c
+2 -2
View File
@@ -31,7 +31,7 @@ HalStatus MMR_CAN_Send(CanHandle *hcan, MmrCanPacket packet) {
TransmissionParams tp = { TransmissionParams tp = {
.handle = hcan, .handle = hcan,
.packet = &packet, .packet = &packet,
.headers.mmr = packet.header, .headers.mmr = packet.header,
.headers.tx = { .headers.tx = {
.IDE = CAN_ID_EXT, .IDE = CAN_ID_EXT,
.RTR = CAN_RTR_DATA, .RTR = CAN_RTR_DATA,
@@ -51,7 +51,7 @@ HalStatus MMR_CAN_SendNoTamper(CanHandle *hcan, MmrCanPacket packet) {
TransmissionParams tp = { TransmissionParams tp = {
.handle = hcan, .handle = hcan,
.packet = &packet, .packet = &packet,
.headers.mmr = packet.header, .headers.mmr = packet.header,
.headers.tx = { .headers.tx = {
.IDE = CAN_ID_EXT, .IDE = CAN_ID_EXT,
.RTR = CAN_RTR_DATA, .RTR = CAN_RTR_DATA,