From 9f8819176786869907d0a47e3ecc1c15a53c1a9f Mon Sep 17 00:00:00 2001 From: Koen Dergent Date: Mon, 15 Feb 2021 14:24:38 +0100 Subject: [PATCH] only use SDO segmented fields when enabled --- 301/CO_SDOserver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/301/CO_SDOserver.c b/301/CO_SDOserver.c index 3409d62..ec353df 100644 --- a/301/CO_SDOserver.c +++ b/301/CO_SDOserver.c @@ -333,7 +333,9 @@ CO_ReturnError_t CO_SDOserver_init(CO_SDOserver_t *SDO, /* Configure object variables */ SDO->OD = OD; SDO->nodeId = nodeId; +#if ((CO_CONFIG_SDO_SRV) & CO_CONFIG_SDO_SRV_SEGMENTED) SDO->SDOtimeoutTime_us = (uint32_t)SDOtimeoutTime_ms * 1000; +#endif #if (CO_CONFIG_SDO_SRV) & CO_CONFIG_SDO_SRV_BLOCK SDO->block_SDOtimeoutTime_us = (uint32_t)SDOtimeoutTime_ms * 700; #endif @@ -1137,7 +1139,9 @@ CO_SDO_return_t CO_SDOserver_process(CO_SDOserver_t *SDO, SDO->state = CO_SDO_ST_ABORT; } } /* switch (SDO->state) */ +#if (CO_CONFIG_SDO_SRV) & CO_CONFIG_SDO_SRV_SEGMENTED SDO->timeoutTimer = 0; +#endif timeDifference_us = 0; CO_FLAG_CLEAR(SDO->CANrxNew); } /* if (isNew) */ @@ -1206,7 +1210,9 @@ CO_SDO_return_t CO_SDOserver_process(CO_SDOserver_t *SDO, SDO->CANtxBuff->data[3] = SDO->subIndex; /* reset timeout timer and send message */ +#if (CO_CONFIG_SDO_SRV) & CO_CONFIG_SDO_SRV_SEGMENTED SDO->timeoutTimer = 0; +#endif CO_CANsend(SDO->CANdevTx, SDO->CANtxBuff); #if (CO_CONFIG_SDO_SRV) & CO_CONFIG_SDO_SRV_SEGMENTED if (SDO->finished) {