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

180 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Wagner
822a27aa45 Merge branch 'add-errorregister-mnf-bit' into neuberger-master 2018-09-05 08:34:13 +02:00
Martin Wagner
71072b7bdd Merge branch 'fix-emcy-overflow-clear' into neuberger-master 2018-09-05 08:34:05 +02:00
Martin Wagner
d189532337 Merge branch 'fix-emcy-timing' into neuberger-master 2018-09-05 08:33:30 +02:00
Martin Wagner
2eac9dd10c Merge branch 'memory-sync' into neuberger-master 2018-09-05 08:33:11 +02:00
Martin Wagner
8ac86884ca Merge branch 'fix-RPDO_CALLS_EXTENSION' into neuberger-master 2018-09-05 08:33:06 +02:00
Martin Wagner
0af8fbac59 Fix build with gcc 2018-09-05 08:23:49 +02:00
Martin Wagner
d5e31d6e06 lss init return value was ignored 2018-09-05 08:23:03 +02:00
Martin Wagner
8bad7d2e29
Merge pull request #2 from gotocoffee1/add-lss 
forgot to change CANopen.c
 2018-05-03 07:37:54 +02:00
gotocoffee
99e7dcc488 - forgot to change CANopen.c 2018-05-02 16:21:58 +02:00
Martin Wagner
32035de7b1
Merge pull request #1 from gotocoffee1/add-lss 
Some changes for older compilers and big endian machines
 2018-05-02 15:11:52 +02:00
gotocoffee
680caf3125 - changed unnamed struct CO_LSS_address_t 
- added missing support for big endian in LSSslave
 2018-05-02 12:55:44 +02:00
Olivier Desenfans
2dceaa1853 Fix signed/unsigned comparisons 
Fix warning from -Wsign-compare.
 2018-04-12 17:18:15 +02:00
Olivier Desenfans
c236b455d1 Fix switch case fallthrough warnings 
Fix warnings from -Wimplicit-fallthrough.

Changed the implementation of CO_TPDOisCOS to avoid fallthrough.
Added documentation for case fallthroughs that are voluntary.
 2018-04-12 17:11:46 +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
Martin Wagner
be815bd282 emergency processing generates emcy queue overflow cleared message 2018-03-26 11:11:21 +02:00
Martin Wagner
efc252ab11 manufacturer bit in error register didn't work 
if profile is implemented this needs to be separated in more detail to also set profile bit
 2018-03-22 09:18:19 +01:00
Wilkins White
b6688f4bc8 Switched to 16 bit identifier 2017-12-06 11:29:54 -08:00
Wilkins White
ecc4056bb4 Expanded info passed through Emergency callback 2017-11-29 10:48:03 -08: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
1755df7814 memory barrier doesn't work with inline functions... 
needs pointer to pointer then
 2017-09-05 10:48:34 +02:00
Martin Wagner
6307931275 fix missing semicolon 2017-09-01 14:00:11 +02:00
Martin Wagner
2439d1abf3 Added memory barrier to all objects 2017-09-01 13:45:34 +02:00
Martin Wagner
17676495ac Moved RPDO_CALLS_EXTENSION functionallity out of receive poll loop... 
the loop is there because the received data can be overwritten while copying. Calling a callback with potenially half-valid data is a bad idea.
 2017-09-01 10:35:24 +02:00
Martin Wagner
e3bed95204 Fixed SDO read/write callback race condition... 
with multithreading applications it was possible to modify entries in between calling OD function and copying to/from sdo buffer
 2017-09-01 10:34:01 +02:00
iurly
5338015740 CO_trace: remove compiler warnings (#49) 
snprintf() calls will raise warnings when using %u/%d
format strings with uint32_t/int32_t arguments.
Use %lu/%ld instead.
 2017-08-01 17:19:52 +02:00
Martin Wagner
006b71e19d Added LSS fastscan master/slave 
- other limitations still apply
 2017-07-13 09:34:10 +02:00
Janez
dee8503da0 SDO block transfer issue #39 2017-07-04 15:07:38 +02:00
Janez
78ce0fd55d Merge branch 'fix-invalid-access' of https://github.com/martinwag/CANopenNode into martinwag-fix-invalid-access 2017-07-04 14:11:13 +02:00
Janez
96a5858a19 Merge branch 'fix-testcase-pdo23_24_25' of https://github.com/martinwag/CANopenNode into martinwag-fix-testcase-pdo23_24_25 2017-07-04 13:50:08 +02:00
Janez
dc390f0fd2 return CO_SDO_AB_INVALID_VALUE for wrong value on object 1019 (SYNC) 2017-07-04 13:22:18 +02:00
Janez
9acf0d3ad3 Merge branch 'fix-testcase-sync05' of https://github.com/martinwag/CANopenNode into martinwag-fix-testcase-sync05 2017-07-04 13:09:40 +02:00
Janez
ba07ad763d Merge branch 'fix-testcase-sdo26_2' of https://github.com/martinwag/CANopenNode into martinwag-fix-testcase-sdo26_2 2017-07-04 13:00:36 +02:00
Janez
6acf18da5b Merge branch 'fix-testcase-sdo27' of https://github.com/martinwag/CANopenNode into martinwag-fix-testcase-sdo27 2017-07-04 12:53:49 +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
Martin Wagner
f9a913e3e1 PDO dummy mapping caused invalid memory access 2017-06-02 14:39:04 +02:00
Martin Wagner
9fa1787441 write invalid PDO mapping error codes... 
according to DSP310, those values should be returned (Page 28, 29).  There's nothing about this error behavior in CiA301, this only describes value errors, but not sequence errors in mapping change.
 2017-05-29 14:55:32 +02:00
Martin Wagner
f04bc1bb31 SYNC write OD 0x1019 add value check... 
according to DSP310, when writing a "reserved" value to this index, a error response should be created (page 39). There's nothing about this behavior in CiA301.
 2017-05-23 15:19:54 +02:00
Martin Wagner
33e2c91850 SDO upload block initiate invalid block size created abort message... 
instead of invalid block size error. Fixes CANopen conformance test tool test case SDO 26
 2017-05-23 10:51:10 +02:00
Martin Wagner
a07726fa31 SDO upload block invalid sequence generated block size error... 
instead of invalid sequence error. Fixes CANopen conformance test tool test case SDO 27
 2017-05-23 10:15:01 +02:00
Martin Wagner
467ad78047 OD 1003-0 now clears errors 2017-05-22 08:49:38 +02:00
CANopenNode
efc6876c1b Merge pull request #37 from martinwag/add-errorbit-defines 
Add definition to make application specific error bit macros more clear
 2017-05-20 16:56:18 +02:00
CANopenNode
a7e56e27cb Merge pull request #36 from martinwag/add-nmt-callback 
Added callback and query function for NMT state
 2017-05-20 16:52:46 +02:00
CANopenNode
3a4be8eb83 Update CO_NMT_Heartbeat.c 2017-05-20 16:51:11 +02:00
CANopenNode
9c04d69974 Merge branch 'master' into add-nmt-callback 2017-05-20 16:33:17 +02:00
CANopenNode
895e2f6ff4 Merge pull request #35 from martinwag/add-cpp-guards 
Added guards for c++ compilation
 2017-05-20 16:28:25 +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
CANopenNode
93bd4b4dff Merge pull request #33 from martinwag/add-sdo-usage-example 
Add usage example for SDO access by ID
 2017-05-20 16:21:41 +02:00
CANopenNode
31fe17bb05 Merge pull request #32 from martinwag/fix-invalid-address-init 
CO_init assumed node ID 16 if invalid. Now it returns an error.
 2017-05-20 16:17:33 +02:00