Remove indents
This commit is contained in:
@@ -4,20 +4,20 @@
|
||||
|
||||
uint32_t MMR_CAN_HeaderToBits(MmrCanHeader header) {
|
||||
return 0
|
||||
| ((uint32_t)header.priority << 26)
|
||||
| ((uint32_t)header.messageId << 23)
|
||||
| ((uint32_t)header.senderId << 13)
|
||||
| ((uint32_t)header.seqNumber << 3)
|
||||
| ((uint32_t)header.messageType);
|
||||
| ((uint32_t)header.priority << 26)
|
||||
| ((uint32_t)header.messageId << 23)
|
||||
| ((uint32_t)header.senderId << 13)
|
||||
| ((uint32_t)header.seqNumber << 3)
|
||||
| ((uint32_t)header.messageType);
|
||||
}
|
||||
|
||||
MmrCanHeader MMR_CAN_HeaderFromBits(uint32_t bits) {
|
||||
return (MmrCanHeader) {
|
||||
.priority = bits >> 26,
|
||||
.priority = bits >> 26,
|
||||
.messageId = bits >> 23,
|
||||
.senderId = bits >> 13,
|
||||
.seqNumber = bits >> 3,
|
||||
.messageType = bits,
|
||||
.senderId = bits >> 13,
|
||||
.seqNumber = bits >> 3,
|
||||
.messageType = bits,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,8 @@ static HalStatus receiveAll(ReceptionParams *rp) {
|
||||
do {
|
||||
rp->result += MMR_CAN_MAX_DATA_LENGTH;
|
||||
status |= receiveOne(rp);
|
||||
} while (
|
||||
}
|
||||
while (
|
||||
headerIsMultiFrame(&rp->headers.mmr, targetId) && status == HAL_OK
|
||||
);
|
||||
|
||||
@@ -66,9 +67,9 @@ static HalStatus receiveAll(ReceptionParams *rp) {
|
||||
static HalStatus receiveOne(ReceptionParams *rp) {
|
||||
HalStatus status = HAL_CAN_GetRxMessage(
|
||||
rp->handle,
|
||||
rp->fifo,
|
||||
&rp->headers.rx,
|
||||
rp->result
|
||||
rp->fifo,
|
||||
&rp->headers.rx,
|
||||
rp->result
|
||||
);
|
||||
|
||||
rp->headers.mmr = MMR_CAN_HeaderFromBits(rp->headers.rx.ExtId);
|
||||
|
||||
@@ -47,11 +47,11 @@ HalStatus MMR_CAN_SendScs(
|
||||
.senderId = senderId,
|
||||
.messageId = scsId,
|
||||
.priority = MMR_CAN_MESSAGE_PRIORITY_HIGH,
|
||||
.messageType = MMR_CAN_MESSAGE_TYPE_SCS,
|
||||
.messageType = MMR_CAN_MESSAGE_TYPE_SCS,
|
||||
};
|
||||
|
||||
if (putEntry(header) == NULL) {
|
||||
return HAL_ERROR;
|
||||
return HAL_ERROR;
|
||||
}
|
||||
|
||||
return sendScs(hcan, header);
|
||||
@@ -66,13 +66,13 @@ HalStatus MMR_CAN_HandleNextScs(CanHandle *hcan) {
|
||||
counter %= MMR_CAN_SCS_ENTRIES_COUNT;
|
||||
|
||||
if (MMR_CAN_HeaderToBits(entry->header) == 0) {
|
||||
return HAL_OK;
|
||||
return HAL_OK;
|
||||
}
|
||||
|
||||
switch (checkScs(entry)) {
|
||||
case MMR_CAN_SCS_CHECK_ERROR: return HAL_ERROR;
|
||||
case MMR_CAN_SCS_CHECK_OK: return HAL_OK;
|
||||
default: break;
|
||||
case MMR_CAN_SCS_CHECK_ERROR: return HAL_ERROR;
|
||||
case MMR_CAN_SCS_CHECK_OK: return HAL_OK;
|
||||
default: break;
|
||||
}
|
||||
|
||||
entry->counter = getCurrentTime();
|
||||
|
||||
+2
-2
@@ -31,7 +31,7 @@ HalStatus MMR_CAN_Send(CanHandle *hcan, MmrCanPacket packet) {
|
||||
TransmissionParams tp = {
|
||||
.handle = hcan,
|
||||
.packet = &packet,
|
||||
.headers.mmr = packet.header,
|
||||
.headers.mmr = packet.header,
|
||||
.headers.tx = {
|
||||
.IDE = CAN_ID_EXT,
|
||||
.RTR = CAN_RTR_DATA,
|
||||
@@ -51,7 +51,7 @@ HalStatus MMR_CAN_SendNoTamper(CanHandle *hcan, MmrCanPacket packet) {
|
||||
TransmissionParams tp = {
|
||||
.handle = hcan,
|
||||
.packet = &packet,
|
||||
.headers.mmr = packet.header,
|
||||
.headers.mmr = packet.header,
|
||||
.headers.tx = {
|
||||
.IDE = CAN_ID_EXT,
|
||||
.RTR = CAN_RTR_DATA,
|
||||
|
||||
Reference in New Issue
Block a user