nikon/CANopenNode
1
0
Fork 0
Code Activity Actions
792 commits 3 branches 8 tags 5.5 MiB
Commit graph

147 commits

Author SHA1 Message Date
Wilkins White
8d6f25de40
fix missing SYNC guards 2019-12-20 10:14:49 -08: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
f6d93fc300 change SYNC module to be optional 
allows CO_NO_SYNC to be zero
 2019-12-10 16:33:21 -08: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
96fd0aa02b
Merge pull request #110 from JuPrgn/FeatTimestamp 
feat: Add TimeStamp feature
 2019-12-09 08:23:16 +01:00
Miles Simpson
79994e0ec9 Conditionally compile LED state code 2019-11-15 14:26:02 -08: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
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
trojanobelix
46a78ff308
Update CANopen.c 
- correct handling if there is more than one SDO client configured.
 2019-10-11 14:34:49 +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
e8262dc88f feat: Add TimeStamp feature 2019-10-09 14:31:26 +02:00
Martin Wagner
fa5f81e0a9 Merge branch 'master' of https://github.com/wilkinsw/CANopenNode 2019-10-08 10:01:50 +02:00
Martin Wagner
5601770589 Changed sdo client to support multiple sdo servers. 
for existing code, you need to add "[0]" to the sdo function parameter CO->SDOclient (so you get CO->SDOclient[0]).
 2018-09-13 09:12:21 +02:00
Benoit Rapidel
c0ec1da5ef CO_sendNMTcommand must return a CO_ReturnError_t, not a uint16_t 2018-09-05 09:10:15 +02:00
Martin Wagner
8512fec801 Merge branch 'add-lss' into neuberger-master 2018-09-05 08:34:21 +02:00
Martin Wagner
d189532337 Merge branch 'fix-emcy-timing' into neuberger-master 2018-09-05 08:33:30 +02:00
Martin Wagner
d5e31d6e06 lss init return value was ignored 2018-09-05 08:23:03 +02:00
gotocoffee
99e7dcc488 - forgot to change CANopen.c 2018-05-02 16:21:58 +02:00
Martin Wagner
360170cb70 enhanced emergency processing... 
- emergency processing now affects CO_process() timerNext_ms
- timerNext_ms is gets set when either a message is ready to send, but inhibit time is not elapsed or when a message was sent to re-check the queue
- be aware that timer resolution is 1ms, whereas emergency inhibit time resolution is 100us. We round this up to the next ms.
 2018-03-26 11:16:53 +02:00
Wilkins White
ee9d809d0f Expanded Emergency callback to take action when an emergency message is received. 2017-11-29 09:30:51 -08:00
Martin Wagner
f025b07ecd fix building LSS master 2017-09-07 10:15:37 +02:00
Martin Wagner
006b71e19d Added LSS fastscan master/slave 
- other limitations still apply
 2017-07-13 09:34:10 +02:00
Martin Wagner
9dbd2fc966 First try on LSS master addon... 
- needs #define CO_NO_LSS_CLIENT 1 in CO_OD.h. This will need a change in the OD editor.
- still no fastscan support
- bitrate settin API untested
- some changes on LSS slave where necessary
 2017-07-03 11:14:07 +02:00
Martin Wagner
03982ad8e3 First try on LSS slave addon... 
- needs #define CO_NO_LSS_SERVER 1 in CO_OD.h. This will need a change in the OD editor.
- no Fastscan support yet
- bitrate setting API untested
- https://github.com/CANopenNode/CANopenNode/issues/46 (driver stuff)
- changed some of the other stack files, tried my best to remain compatible with standard non LSS CANopenNode
 2017-06-26 13:04:02 +02:00
CANopenNode
43a37e2a7f Merge pull request #34 from martinwag/add-custom-crc 
Compiler switch enables providing own CRC16 implemetation.
 2017-05-20 16:25:48 +02:00
Martin Wagner
ba09c22be8 Assuming valid address is not acceptable in professional environment 2017-05-10 15:29:54 +02:00
Martin Wagner
9e6b1c296c Compiler switch enables providing own CRC16 implemetation. 
This enables the stack user to use a different calculation method. This
is needed to save space (no table) or to use hardware crc unit.
Implementation can be located in driver directory.
 2017-05-10 15:29:08 +02:00
Janez
5df11b9d74 SYNC timeout bugfix; synchronous PDOs are now processed after next sync. 2016-09-07 16:08:07 +02:00
Janez
85fc85482e Added trace interface for monitoring variables. 2016-03-24 22:01:44 +01:00
Janez
e6db254c63 Added CO->CANmodule[x]->CANnormal to all drivers. example/main.c updated. 2016-01-12 13:48:16 +01:00
Janez
41b8d903b7 License changed to the GNU General Public License version 2 with the classpath exception. 2016-01-10 00:15:50 +01:00
Janez
8d0420b432 PIC24, dsPIC33 - EDS and DMA macros changed and moved from CANopen.c to CO_driver.c. 
directory PIC24H_dsPIC33F renamed to PIC24_dsPIC33.
https://sourceforge.net/p/canopennode/discussion/387151/thread/281ffd7f
 2016-01-07 15:28:49 +01:00
Janez
3bf4b812ed Merge branch 'master' of https://github.com/CANopenNode/CANopenNode 2015-12-13 22:50:57 +01:00
Janez
5924c3dc69 NMT master updated. 2015-12-12 17:52:29 +01:00
Jens Nielsen
13be332db3 Allow multiple SDO objects 2015-12-07 18:37:01 +01:00
JanezXD
b716643845 timerNext_ms returned from CO_process() and others. 2015-09-04 18:31:21 +02:00
JanezXD
bbc165c218 First run of socketCan. 2015-08-29 01:13:54 +02:00
Janez_dw
69293ab422 CANopen.c: Node ID and CAN bit rate added as argument to CO_init(). 2015-08-28 07:27:40 +02:00
Janez_dw
345b37b573 Some cleanup. 2015-08-27 18:57:34 +02:00
Janez_DW
8427cbcc90 Added testing against null pointers in _init functions. 
Updated CO_process_SYNC_RPDO and CO_process_TPDO in CANopen.c.
 2015-08-26 15:41:21 +02:00
Janez_DW
730bc57a42 Revision of the CANopen SYNC message. Received synchronous PDOs are now processed after the SYNC. 2015-08-25 19:17:18 +02:00
JanezXD
12f33a4a7b Example files moved to base directory. Added template for socketCAN drivers (based on BECK SC 243) 2015-07-30 19:58:06 +02:00
Renamed from example/CANopen.c (Browse further)