1
0
Fork 0
Commit graph

216 commits

Author SHA1 Message Date
Janez
9c2f0a1c64 License changed to Apache 2.0 - main part 2020-01-08 14:52:56 +01:00
Martin Wagner
e1244868db
Merge pull request #137 from JuPrgn/trace-optional
guard CO_trace to be optionnal
2019-12-20 07:47:43 +01:00
Martin Wagner
f6fb0894f6
Merge pull request #128 from wilkinsw/sync-optional
change SYNC module to be optional
2019-12-20 07:34:46 +01:00
Martin Wagner
41e982962e Merge branch 'odesenfans-common-header-for-drivers' 2019-12-18 08:26:34 +01:00
Martin Wagner
175574ef1f Merge branch 'common-header-for-drivers' of https://github.com/odesenfans/CANopenNode into odesenfans-common-header-for-drivers 2019-12-18 08:21:13 +01:00
Martin Wagner
d6299ef4bb Fix: makefile missed timer compile 2019-12-18 08:19:05 +01:00
Martin Wagner
da096728c4 Fix: cast for new type 2019-12-18 08:18:33 +01:00
Martin Wagner
7c33f978d1 Merge branch 'odesenfans-fix-bool-equality-checks' 2019-12-18 08:04:06 +01:00
Martin Wagner
4b89ca387c Merge branch 'fix-bool-equality-checks' of https://github.com/odesenfans/CANopenNode into odesenfans-fix-bool-equality-checks 2019-12-18 07:58:50 +01:00
Wilkins White
0a4b2d3624
Merge branch 'master' into sync-optional 2019-12-16 13:59:34 -08:00
Martin Wagner
0069df9013
Merge pull request #135 from JuPrgn/FeatTimestamp
fix: CO_delete free TIME
2019-12-16 08:17:50 +01:00
Wilkins White
1c019bb48a add guard to deletion of CO->SYNC object 2019-12-10 16:33:21 -08:00
Wilkins White
bdfe25f7da update examples with CO_process_SYNC_RPDO changes 2019-12-10 16:33:21 -08:00
Wilkins White
f6d93fc300 change SYNC module to be optional
allows CO_NO_SYNC to be zero
2019-12-10 16:33:21 -08:00
Julien PEYREGNE
0cdec897c2 guard CO_trace to be optionnal 2019-12-09 13:03:10 +01:00
Julien PEYREGNE
fef15a1ced fix: CO_delete free TIME 2019-12-09 11:43:36 +01:00
Martin Wagner
f9ea788caa
Merge pull request #124 from heliochronix/conditional_led
Conditionally compile LED state code
2019-12-09 08:36:12 +01:00
Martin Wagner
88e2513072
Merge pull request #88 from JuPrgn/patch-1
Fix dsPIC33 CO_driver.h
2019-12-09 08:25:12 +01:00
Martin Wagner
96fd0aa02b
Merge pull request #110 from JuPrgn/FeatTimestamp
feat: Add TimeStamp feature
2019-12-09 08:23:16 +01:00
Julien PEYREGNE
15a0cdbc0f doc: update TIME doc and add an example 2019-12-06 15:34:02 +01:00
Martin Wagner
4f87ccb749
Merge pull request #126 from heliochronix/ident_abstraction
Fixed direct use of msg->ident to use driver abstraction function
2019-11-22 14:03:17 +01:00
Miles Simpson
b506e74ca3 Changed drivers to conditionally compile LED code if application specifies CO_USE_LEDS 2019-11-19 13:35:59 -08:00
Miles Simpson
4ad282d716 Fixed direct use of msg->ident to use driver abstraction function instead, since not all drivers employ the same msg struct 2019-11-15 14:38:54 -08:00
Miles Simpson
79994e0ec9 Conditionally compile LED state code 2019-11-15 14:26:02 -08:00
Olivier Desenfans
07c61316b3 Single project-wide header for driver functions
Created a single header file (`CO_driver.h`) to declare the functions
of the drivers API. This forces drivers to use a common API.

Previously, each driver declared these functions in its specific
`CO_driver.h` file. This causes two issues:
1. while these functions are used in target-independent code,
   the declarations could be target specific, leading to API/ABI
   compatibility issues.
2. the declarations were duplicated for each driver.

The `CO_driver.h` files for each driver were renamed to
`CO_driver_target.h`. This file is included from `CO_driver.h`.

Added a new header for types: `CO_types.h`. This file currently
holds the definition of `CO_ReturnError_t` that was previously
duplicated for all drivers. Added a few enum values to support
the `neuberger-socketCAN` code.
2019-11-13 13:28:21 +01:00
Martin Wagner
10cf9a30b0
Merge pull request #116 from odesenfans/can-base-address-void-ptr
Use a void pointer for the CAN device address
2019-11-13 08:54:34 +01:00
Olivier Desenfans
02fd8ee9da Renaming CANdevicePtr to CANdriverState 2019-11-13 08:34:42 +01:00
Julien PEYREGNE
bba140f943 feat: Add TIME producer and refactor TIME consumer 2019-11-12 12:28:33 +01:00
Olivier Desenfans
eb4293c4e5 Fix inverted 1003 condition 2019-11-12 08:41:08 +01:00
Martin Wagner
2e7e3a4c02
Merge pull request #119 from odesenfans/fix-sync-ptr-to-int-cast-warning
Sync: fix cast to integer of different size

Didn't even know this existed...
2019-11-12 07:56:12 +01:00
Olivier Desenfans
c36d73b590 Fix bool equality checks
Removed comparisons of boolean values to `false` and `true`. Evaluating
them is enough.
2019-11-11 16:36:55 +01:00
Olivier Desenfans
c7349b9dde Sync: fix cast to integer of different size
Cast the pointer to `uintptr_t` instead of `int` in the implementations
of `IS_CANrxNew`.
2019-11-11 16:34:09 +01:00
Olivier Desenfans
e7d9652658 Use a void pointer for the CAN device address
Previously, the address of the CAN device (`CANbaseAddress`)
was specified as a signed or unsigned integer of variable size.
This made the ABI specific for each driver and is not generic
enough for some use cases.

Replaced all usages by using a void pointer instead.
Renamed `CANbaseAddress` to `CANdevicePtr`.
Refactored the code where it needed to be (some comparisons to -1).

Use a pointer to a user-defined variable/structure instead of
a 32-bit integer for CANbaseAddress. Renamed CANbaseAddress
to CANbaseStruct to reflect that change in behavior.

This is more modular and avoids casts.
2019-11-10 13:14:53 +01:00
Martin Wagner
3f1a636453
Merge pull request #112 from trojanobelix/patch-1
Correct handling if there is more than one SDO client configured
2019-10-14 07:34:22 +02:00
trojanobelix
46a78ff308
Update CANopen.c
- correct handling if there is more than one SDO client configured.
2019-10-11 14:34:49 +02:00
Martin Wagner
6ac1c62c34
Merge pull request #106 from vestas-wind-systems/co_trace_format_specifiers
Use inttypes.h for 32 bit signed/unsigned format specifiers.
2019-10-09 17:11:12 +02:00
Martin Wagner
15328bf734
Merge pull request #109 from JuPrgn/FixTypoEMCY
fix: Typo CO_ERR_ERG_TEMPERATUR
2019-10-09 17:08:49 +02:00
JuPrgn
8bd037bb1b
Added TIME protocol (Time stamp) 2019-10-09 17:00:45 +02:00
JuPrgn
afa3a29f13
Fix mistake removed semicolon for dynamic aloc
Fix removed semicolon in CO_memoryUsed initialisation
2019-10-09 15:25:56 +02:00
JuPrgn
84577b72a4
Fix tabs and spaces 2019-10-09 14:56:14 +02:00
Julien PEYREGNE
b411ebb48c fix: Typo CO_ERR_ERG_TEMPERATUR 2019-10-09 14:32:54 +02:00
Julien PEYREGNE
e8262dc88f feat: Add TimeStamp feature 2019-10-09 14:31:26 +02:00
Martin Wagner
e336b3ad26 Changed for two callbacks, as one is called inside ISR context. This also keeps backward compatibility for current useres that don't need RX EMCY events 2019-10-08 10:17:03 +02:00
Martin Wagner
fa5f81e0a9 Merge branch 'master' of https://github.com/wilkinsw/CANopenNode 2019-10-08 10:01:50 +02:00
Martin Wagner
8b01062eb6 Merge branch 'martinwag-neuberger-master' 2019-10-08 08:28:29 +02:00
Martin Wagner
0bd08bef1a
Merge branch 'master' into neuberger-master 2019-10-08 08:25:37 +02:00
Martin Wagner
d200264301 Merge branch 'martinwag-fix-emcy-overflow-clear' 2019-10-08 08:07:33 +02:00
Martin Wagner
8d565f7fbc Merge branch 'fix-emcy-overflow-clear' of https://github.com/martinwag/CANopenNode into martinwag-fix-emcy-overflow-clear 2019-10-08 08:07:26 +02:00
Martin Wagner
8a766530d2 Merge branch 'martinwag-add-errorregister-mnf-bit' 2019-10-08 08:06:47 +02:00
Martin Wagner
8d1955ab6d Merge branch 'add-errorregister-mnf-bit' of https://github.com/martinwag/CANopenNode into martinwag-add-errorregister-mnf-bit 2019-10-08 08:06:21 +02:00