Skip to content

Commit

Permalink
Fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@christoph2
christoph2 committed Jul 23, 2024
1 parent 105a64a commit 550fa4a
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 26 deletions.
2 changes: 1 addition & 1 deletion inc/xcp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ extern "C" {
#error XCP_ENABLE_WRITE_DAQ_MULTIPLE requires XCP_MAX_CTO of at least 10
#endif

#define XCP_DAQ_ODT_ENTRY_OFFSET ((1) + (1)) /* Currently fixed (only abs. ODT numbers supported). */
#define XCP_DAQ_ODT_ENTRY_OFFSET ((1)) /* Currently fixed (only abs. ODT numbers supported). */
#define XCP_DAQ_MAX_ODT_ENTRY_SIZE (XCP_MAX_DTO - XCP_DAQ_ODT_ENTRY_OFFSET) /* Max. payload. */

#if XCP_TRANSPORT_LAYER == XCP_ON_CAN
Expand Down
5 changes: 3 additions & 2 deletions src/tl/can/arduino_can.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ void XcpTl_Init(void) {
}

Serial.println("CAN init OK!");

// #if 0
CAN.init_Mask(0, XCP_ON_CAN_IS_EXTENDED_IDENTIFIER(XCP_ON_CAN_INBOUND_IDENTIFIER), filter_mask(XCP_ON_CAN_INBOUND_IDENTIFIER));
CAN.init_Mask(
Expand Down Expand Up @@ -203,9 +204,9 @@ void XcpTl_Send(uint8_t const *buf, uint16_t len) {

uint32_t filter_mask(uint32_t identifier) {
if (XCP_ON_CAN_IS_EXTENDED_IDENTIFIER(identifier)) {
return (2 << (29 - 1)) - 1;
return (2UL << (29 - 1)) - 1;
} else {
return (2 << (11 - 1)) - 1;
return (2UL << (11 - 1)) - 1;
}
}

Expand Down
10 changes: 4 additions & 6 deletions src/xcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,8 +656,6 @@ void Xcp_Init(void) {
#endif /* XCP_ENABLE_MASTER_BLOCKMODE */
#if XCP_ENABLE_DAQ_COMMANDS == XCP_ON
XcpDaq_Init();
Xcp_State.daqProcessor.state = XCP_DAQ_STATE_STOPPED;
XcpDaq_SetPointer(0, 0, 0);
#endif /* XCP_ENABLE_DAQ_COMMANDS */
#if XCP_ENABLE_PGM_COMMANDS == XCP_ON
Xcp_State.pgmProcessor.state = XCP_PGM_STATE_UNINIT;
Expand Down Expand Up @@ -747,7 +745,7 @@ void Xcp_SendCto(void) {
Xcp_CtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE] = XCP_LOBYTE(Xcp_State.counter);
Xcp_State.counter++;
#elif XCP_TRANSPORT_LAYER_COUNTER_SIZE == 2
Xcp_CtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE] = XCP_LOBYTE(Xcp_State.counter);
Xcp_CtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE] = XCP_LOBYTE(Xcp_State.counter);
Xcp_CtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE + 1] = XCP_HIBYTE(Xcp_State.counter);
Xcp_State.counter++;
#endif /* XCP_TRANSPORT_LAYER_COUNTER_SIZE */
Expand Down Expand Up @@ -777,7 +775,7 @@ void Xcp_SendDto(void) {
Xcp_DtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE] = XCP_LOBYTE(Xcp_State.counter);
Xcp_State.counter++;
#elif XCP_TRANSPORT_LAYER_COUNTER_SIZE == 2
Xcp_DtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE] = XCP_LOBYTE(Xcp_State.counter);
Xcp_DtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE] = XCP_LOBYTE(Xcp_State.counter);
Xcp_DtoOut.data[XCP_TRANSPORT_LAYER_LENGTH_SIZE + 1] = XCP_HIBYTE(Xcp_State.counter);
Xcp_State.counter++;
#endif /* XCP_TRANSPORT_LAYER_COUNTER_SIZE */
Expand Down Expand Up @@ -1124,7 +1122,7 @@ XCP_STATIC void Xcp_GetId_Res(Xcp_PduType const * const pdu) {
#else
else {
response_len = 0;
valid = XCP_FALSE;
valid = XCP_FALSE;
}
#endif /* XCP_ENABLE_GET_ID_HOOK */
if (valid) {
Expand Down Expand Up @@ -2186,7 +2184,7 @@ INLINE void Xcp_SetWord(Xcp_PduType const * const pdu, uint8_t offs, uint16_t va
(*(pdu->data + offs)) = value & UINT8(0xff);
(*(pdu->data + UINT8(1) + offs)) = (value & UINT16(0xff00)) >> UINT8(8);
#elif XCP_BYTE_ORDER == XCP_BYTE_ORDER_MOTOROLA
(*(pdu->data + offs)) = (value & UINT16(0xff00)) >> UINT8(8);
(*(pdu->data + offs)) = (value & UINT16(0xff00)) >> UINT8(8);
(*(pdu->data + UINT8(1) + offs)) = value & UINT8(0xff);
#endif
}
Expand Down
24 changes: 13 additions & 11 deletions src/xcp_daq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,12 @@ XCP_DAQ_ENTITY_TYPE XcpDaq_GetDynamicDaqEntityCount(void) {
void XcpDaq_Init(void) {
#if XCP_DAQ_ENABLE_PREDEFINED_LISTS == XCP_ON
XcpDaq_ListIntegerType idx = 0;
#endif /* XCP_DAQ_ENABLE_PREDEFINED_LISTS */

XcpDaq_StopAllLists();
XcpDaq_SetProcessorState(XCP_DAQ_STATE_STOPPED);

XcpDaq_SetPointer(0, 0, 0);
#if XCP_DAQ_ENABLE_PREDEFINED_LISTS == XCP_ON
for (idx = (XcpDaq_ListIntegerType)0; idx < XcpDaq_PredefinedListCount; ++idx) {
XcpDaq_PredefinedListsState[idx].mode = UINT8(0);
#if XCP_DAQ_ENABLE_PRESCALER == XCP_ON
Expand Down Expand Up @@ -483,16 +485,16 @@ void XcpDaq_AddEventChannel(XcpDaq_ListIntegerType daqListNumber, uint16_t event
* @param eventChannelNumber Number of event to trigger.
*/
void XcpDaq_TriggerEvent(uint8_t eventChannelNumber) {
Xcp_StateType const *state = XCP_NULL;
XcpDaq_ListIntegerType daqListNumber = 0;
XcpDaq_ODTIntegerType odtIdx = 0;
XcpDaq_ODTIntegerType pid = 0;
XcpDaq_ODTEntryIntegerType odtEntryIdx = 0;
XcpDaq_ODTType const *odt = XCP_NULL;
XcpDaq_ODTEntryType *entry = XCP_NULL;
XcpDaq_ListConfigurationType const *listConf = XCP_NULL;
uint16_t offset = UINT16(0);
uint8_t data[k] = { 0 };
Xcp_StateType const *state = XCP_NULL;
XcpDaq_ListIntegerType daqListNumber = 0;
XcpDaq_ODTIntegerType odtIdx = 0;
XcpDaq_ODTIntegerType pid = 0;
XcpDaq_ODTEntryIntegerType odtEntryIdx = 0;
XcpDaq_ODTType const *odt = XCP_NULL;
XcpDaq_ODTEntryType *entry = XCP_NULL;
XcpDaq_ListConfigurationType const *listConf = XCP_NULL;
uint16_t offset = UINT16(0);
uint8_t data[XCP_MAX_DTO] = { 0 };
#if XCP_DAQ_ENABLE_TIMESTAMPING == XCP_ON
XcpDaq_ListStateType *listState = XCP_NULL;
uint32_t timestamp = UINT32(0);
Expand Down
13 changes: 7 additions & 6 deletions tools/arduino/hello_xcp/xcp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ extern "C" {
#error XCP_ENABLE_WRITE_DAQ_MULTIPLE requires XCP_MAX_CTO of at least 10
#endif

#define XCP_DAQ_ODT_ENTRY_OFFSET ((1) + (1)) /* Currently fixed (only abs. ODT numbers supported). */
#define XCP_DAQ_ODT_ENTRY_OFFSET ((1)) /* Currently fixed (only abs. ODT numbers supported). */
#define XCP_DAQ_MAX_ODT_ENTRY_SIZE (XCP_MAX_DTO - XCP_DAQ_ODT_ENTRY_OFFSET) /* Max. payload. */

#if XCP_TRANSPORT_LAYER == XCP_ON_CAN
Expand Down Expand Up @@ -2466,8 +2466,6 @@ void Xcp_Init(void) {
#endif /* XCP_ENABLE_MASTER_BLOCKMODE */
#if XCP_ENABLE_DAQ_COMMANDS == XCP_ON
XcpDaq_Init();
Xcp_State.daqProcessor.state = XCP_DAQ_STATE_STOPPED;
XcpDaq_SetPointer(0, 0, 0);
#endif /* XCP_ENABLE_DAQ_COMMANDS */
#if XCP_ENABLE_PGM_COMMANDS == XCP_ON
Xcp_State.pgmProcessor.state = XCP_PGM_STATE_UNINIT;
Expand Down Expand Up @@ -4847,10 +4845,12 @@ XCP_DAQ_ENTITY_TYPE XcpDaq_GetDynamicDaqEntityCount(void) {
void XcpDaq_Init(void) {
#if XCP_DAQ_ENABLE_PREDEFINED_LISTS == XCP_ON
XcpDaq_ListIntegerType idx = 0;
#endif /* XCP_DAQ_ENABLE_PREDEFINED_LISTS */

XcpDaq_StopAllLists();
XcpDaq_SetProcessorState(XCP_DAQ_STATE_STOPPED);

XcpDaq_SetPointer(0, 0, 0);
#if XCP_DAQ_ENABLE_PREDEFINED_LISTS == XCP_ON
for (idx = (XcpDaq_ListIntegerType)0; idx < XcpDaq_PredefinedListCount; ++idx) {
XcpDaq_PredefinedListsState[idx].mode = UINT8(0);
#if XCP_DAQ_ENABLE_PRESCALER == XCP_ON
Expand Down Expand Up @@ -5870,6 +5870,7 @@ void XcpTl_Init(void) {
}

Serial.println("CAN init OK!");

// #if 0
CAN.init_Mask(0, XCP_ON_CAN_IS_EXTENDED_IDENTIFIER(XCP_ON_CAN_INBOUND_IDENTIFIER), filter_mask(XCP_ON_CAN_INBOUND_IDENTIFIER));
CAN.init_Mask(
Expand Down Expand Up @@ -5987,9 +5988,9 @@ void XcpTl_Send(uint8_t const *buf, uint16_t len) {

uint32_t filter_mask(uint32_t identifier) {
if (XCP_ON_CAN_IS_EXTENDED_IDENTIFIER(identifier)) {
return (2 << (29 - 1)) - 1;
return (2UL << (29 - 1)) - 1;
} else {
return (2 << (11 - 1)) - 1;
return (2UL << (11 - 1)) - 1;
}
}

Expand Down
1 change: 1 addition & 0 deletions tools/arduino/hello_xcp/xcp_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
#define XCP_DAQ_CONFIG_TYPE XCP_DAQ_CONFIG_TYPE_DYNAMIC
#define XCP_DAQ_DTO_BUFFER_SIZE (40)
#define XCP_DAQ_ENABLE_PREDEFINED_LISTS (XCP_OFF)
#define XCP_DAQ_ENABLE_TIMESTAMPING (XCP_ON)
#define XCP_DAQ_TIMESTAMP_UNIT (XCP_DAQ_TIMESTAMP_UNIT_1US)
#define XCP_DAQ_TIMESTAMP_SIZE (XCP_DAQ_TIMESTAMP_SIZE_4)
#define XCP_DAQ_ENABLE_PRESCALER (XCP_OFF)
Expand Down
2 changes: 2 additions & 0 deletions tools/build.cmd
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
python amalgam8.py
cp -v xcp.h arduino/hello_xcp
cp -v xcp_config.h arduino/hello_xcp
cp -v xcp.h arduino/external_inputs
cp -v xcp_config.h arduino/external_inputs
1 change: 1 addition & 0 deletions tools/xcp_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
#define XCP_DAQ_CONFIG_TYPE XCP_DAQ_CONFIG_TYPE_DYNAMIC
#define XCP_DAQ_DTO_BUFFER_SIZE (40)
#define XCP_DAQ_ENABLE_PREDEFINED_LISTS (XCP_OFF)
#define XCP_DAQ_ENABLE_TIMESTAMPING (XCP_ON)
#define XCP_DAQ_TIMESTAMP_UNIT (XCP_DAQ_TIMESTAMP_UNIT_1US)
#define XCP_DAQ_TIMESTAMP_SIZE (XCP_DAQ_TIMESTAMP_SIZE_4)
#define XCP_DAQ_ENABLE_PRESCALER (XCP_OFF)
Expand Down

0 comments on commit 550fa4a

Please sign in to comment.