nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

Another cast data after bitwise

Browse source
This commit is contained in:
Janez 2024-06-03 17:11:41 +02:00
parent 2d1ecce21e
commit 83b358abb5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
304/CO_SRDO.c
View file

@ -778,7 +778,7 @@ CO_SRDO_process(CO_SRDO_t* SRDO, uint32_t timeDifference_us, uint32_t* timerNext
dataSRDO[plain_inverted] += mappedLength; dataSRDO[plain_inverted] += mappedLength;
} }
if (verifyLength[0]!=verifyLength[1] || verifyLength[0] > CO_SRDO_MAX_SIZE || verifyLength[0] != SRDO->dataLength) { if (verifyLength[0] != verifyLength[1] || verifyLength[0] > CO_SRDO_MAX_SIZE || verifyLength[0] != SRDO->dataLength) {
SRDO->internalState = CO_SRDO_state_error_internal; /* should not happen */ SRDO->internalState = CO_SRDO_state_error_internal; /* should not happen */
} }
else { else {
@ -786,7 +786,7 @@ CO_SRDO_process(CO_SRDO_t* SRDO, uint32_t timeDifference_us, uint32_t* timerNext
#if (CO_CONFIG_SRDO) & CO_CONFIG_SRDO_CHECK_TX #if (CO_CONFIG_SRDO) & CO_CONFIG_SRDO_CHECK_TX
/* check data before sending (optional) */ /* check data before sending (optional) */
for (uint8_t i = 0; i < SRDO->dataLength; i++) { for (uint8_t i = 0; i < SRDO->dataLength; i++) {
if (~SRDO->CANtxBuff[0]->data[i] != SRDO->CANtxBuff[1]->data[i]) { if ((uint8_t)(~SRDO->CANtxBuff[0]->data[i]) != SRDO->CANtxBuff[1]->data[i]) {
SRDO->internalState = CO_SRDO_state_error_txNotInverted; SRDO->internalState = CO_SRDO_state_error_txNotInverted;
data_ok = false; data_ok = false;
break; break;
@ -843,7 +843,7 @@ CO_SRDO_process(CO_SRDO_t* SRDO, uint32_t timeDifference_us, uint32_t* timerNext
/* Verify, if normal and inverted data matches properly */ /* Verify, if normal and inverted data matches properly */
for (uint8_t i = 0; i < SRDO->dataLength; i++) { for (uint8_t i = 0; i < SRDO->dataLength; i++) {
if ( (uint8_t)(~dataSRDO[0][i]) != dataSRDO[1][i]) { if ((uint8_t)(~dataSRDO[0][i]) != dataSRDO[1][i]) {
data_ok = false; data_ok = false;
SRDO->internalState = CO_SRDO_state_error_rxNotInverted; SRDO->internalState = CO_SRDO_state_error_rxNotInverted;
break; break;
@ -911,7 +911,7 @@ CO_SRDO_process(CO_SRDO_t* SRDO, uint32_t timeDifference_us, uint32_t* timerNext
} /* for (uint8_t i = 0; i < SRDO->mappedObjectsCount; i++) */ } /* for (uint8_t i = 0; i < SRDO->mappedObjectsCount; i++) */
/* safety check, this should not happen */ /* safety check, this should not happen */
if (verifyLength[0]!=verifyLength[1] || verifyLength[0] > CO_SRDO_MAX_SIZE || verifyLength[0] != SRDO->dataLength) { if (verifyLength[0] != verifyLength[1] || verifyLength[0] > CO_SRDO_MAX_SIZE || verifyLength[0] != SRDO->dataLength) {
SRDO->internalState = CO_SRDO_state_error_internal; SRDO->internalState = CO_SRDO_state_error_internal;
} }
else { else {