1
0
Fork 0
Commit graph

244 commits

Author SHA1 Message Date
Oleg
b92b4bb5b1
fix SDO block download process continuity after sequence breaks (#171)
Now additional state CO_SDO_ST_DOWNLOAD_BL_SUB_RESP_2 is used to send response without resetting SDO sequence.
Refactoring timeout halding logic in sub-block transfer.
Also add missed unsigned indicators for several constants.

issue #170
2020-03-13 09:29:25 +01:00
Martin Wagner
03613cc8a1 neuberger-socketcan: fix invalid memory access
store name string by copy, not by reference as source can be moved
2020-02-27 16:06:11 +01:00
Martin Wagner
85a31861c5 neuberger-socketcan: add comment to init function
the init function needs the interface index, not a pointer.
Alternative: use proper init struct.
2020-02-27 16:06:06 +01:00
Martin Wagner
dc02ad8310 neuberger-socketcan: fix error from c36d73b5
that's why I don't like to change this stuff.
2020-02-27 16:06:00 +01:00
Martin Wagner
bf91f41f38 neuberger-socketcan: add logging stuff 2020-02-27 12:50:51 +01:00
Martin Wagner
8d5ecac9d4 neuberger-socketcan: Fix sync compilation 2020-02-27 12:50:47 +01:00
Martin Wagner
1052aac684 neuberger-socketcan: fix driver
fix errors introduced within the last few commits:
    - data type mismatch
    - wrong return value
    - change handle to void pointer - added "const"
2020-02-27 12:50:42 +01:00
Martin Wagner
2785b2491d remove merging hell
this one-liner has bitten us more than once
2020-02-26 08:59:38 +01:00
Miles Simpson
a1f36cbe15 Removed maximum time restriction on timerNext_ms 2020-01-31 17:23:31 +01:00
Janez
06a0493c78 fix NMTstartup handling - update README and default values 2020-01-16 08:06:16 +01:00
Oleg
2fb8dfd223 fix NMTstartup handling if device is NOT the NMT Master (#150)
* fix NMTstartup handling if device is NOT the NMT Master and now OD_NMTStartup (0x1F80 OD) can be optional

issue #149

* Correctly use of NMTstartup to self start slave

According to DSP302, part2, V4.1.0, 2009 for object 1F80h (NMT startup):
bit0=0 - "CANopen device is not NMT master. The entries of the object 1F81h shall be ignored. All other bits of object 1F80h shall be ignored with the exception: value = 00000000 00000000 00000000 00001000b - "NMT slave that shall enter the NMT state Operational after the NMT state Initialisation autonomously (self starting)"
2020-01-16 07:58:01 +01:00
Martin Wagner
ec70c2b182
Merge pull request #153 from gotocoffee1/patch-1
Fix RX Buffer size
2020-01-15 16:21:07 +01:00
gotocoffee
cf015f2259
Update CANopen.c
#151
2020-01-15 15:48:24 +01:00
Oleg
f2283e3ca9 Warnings omitted (#144)
* All Warnings omitted
Now all warnings that came up in previous versions are fixed in a clean way directly in the code.
Inlcudes:
Shadowing
Missing default cases
Missing cases in switch statements
unused variables
Pointer problems
Function declarations' visibility

* Default case for NMTsendCommand
Default case was not catched before and could led to errors.

* fix typo when omitting warnings

* Omitting more warnings, and fix TIME->CANrxNew nulling

Inlcudes:
large integer implicitly truncated to unsigned type
this statement may fall through

* rename CO_this to co

* fix CO_process_SYNC name (CANopenNode master merging issue)

Co-authored-by: Michele B. <MicheleBlank@gmx-topmail.de>

----
Verified before merge. It is cleanup, no deep changes.
2020-01-15 13:40:30 +01:00
Martin Wagner
3d41f20adb Merge branch 'master' of https://github.com/CANopenNode/CANopenNode 2020-01-14 15:50:01 +01:00
Martin Wagner
5ff3493859 License changed to Apache 2.0 - Neuberger part 2020-01-14 15:45:41 +01:00
Janez
57f264c2c4 Coding style defined more precisely. Issue #117. 2020-01-14 15:35:53 +01:00
Janez
ce2ac80a97 Fixed CO_OD_NoOfElements in example CO_OD.h 2020-01-13 20:05:58 +01:00
Martin Wagner
98fdcd988c
Merge pull request #143 from wilkinsw/time-optional
change TIME module to be optional
2020-01-13 09:15:19 +01:00
Martin Wagner
d7f28f8743
Merge branch 'master' into time-optional 2020-01-13 09:15:08 +01:00
Martin Wagner
aa08ebf51d
Merge pull request #142 from wilkinsw/add-missing-sync-guards
fix missing SYNC guards
2020-01-13 09:13:19 +01:00
Janez
8bd43334e9 Unsupported RTR mentiond in README #99 2020-01-10 13:44:55 +01:00
Janez
cb780aa4d0
Update device support and OD editor in README 2020-01-09 13:09:58 +01:00
Janez
dadf5023df License changed to Apache 2.0 - part3 2020-01-09 08:16:31 +01:00
Janez
eab1f2d54f License changed to Apache 2.0 - part2 2020-01-08 18:31:31 +01:00
Wilkins White
511a773151
Merge branch 'master' into time-optional 2020-01-08 08:46:54 -08:00
Janez
9c2f0a1c64 License changed to Apache 2.0 - main part 2020-01-08 14:52:56 +01:00
Wilkins White
36d49ee713
change TIME module to be optional 2019-12-20 10:21:58 -08:00
Wilkins White
8d6f25de40
fix missing SYNC guards 2019-12-20 10:14:49 -08: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