1
0
Fork 0
Commit graph

131 commits

Author SHA1 Message Date
Martin Wagner
817ddcb786 Revert "nmt: delete double declaration"
This reverts commit 9c7faddd32.
2018-12-14 09:13:26 +01:00
Martin Wagner
691c8095b2 heartbeat consumer: added callback for first received heartbeat
This callback is called when the first heartbeat is received (after BOOTUP)
and when there was a pause between heartbeats (TIMEOUT). This allows
the user to get an event when a bus segment is disconnected and then
reconnected from the server (nodes just start sending heartbeats again
without BOOTUP first).
2018-12-14 09:06:39 +01:00
Martin Wagner
5743e1c998 hb consumer: added query function for current NMT state...
this only works on monitored nodes!
2018-12-14 09:06:16 +01:00
Martin Wagner
9c7faddd32 nmt: delete double declaration 2018-12-14 09:06:07 +01:00
Martin Wagner
54f80b119b LSS slave: LSS startup did not confirm to CiA DSP 305 Figure 47
Added function and changed example code so that NMT boot-up is only started
after receiving LSS switch state global waiting. This also fixes problems
where doing CANopenNode initialization (-> change can HW Filter settings)
lead to missing the LSS switch state global waiting message.

However, now we do not fully comply to the specified sequence in 8.3.1.2
as we do all the startup stuff after switching to LSS waiting. This can't
be split in CANopenNode.
2018-12-14 09:04:49 +01:00
Martin Wagner
8ba7084fb7 fixed null pointer dereference
timerNext_ms is given from user and can be null.
2018-10-09 07:49:03 +02:00
Martin Wagner
ac0b82be35 lss master: Deselect all work in all states and cleans up the master state machine 2018-10-09 07:48:41 +02:00
Martin Wagner
65161afb7f heartbeat consumer: initialization of single consumer is now possible from within code 2018-10-09 07:48:31 +02:00
Martin Wagner
1a85de0bec hearbeat consumer: bootup callback was only called when a heartbeat was received before 2018-10-01 15:13:41 +02:00
Martin Wagner
37c2c4230a sdo master: callback for local OD is not triggered by message rx, so trigger it manually 2018-10-01 15:13:33 +02:00
Martin Wagner
13068f6e44 fixed uninitialized variable 2018-10-01 15:13:15 +02:00
Martin Wagner
cf8d0978c9 sdo: added out-of-bound check to getDataPointer 2018-10-01 15:13:05 +02:00
Martin Wagner
11ef04f828 sdo master: fix missing break, fix typo...
no functional changes
2018-09-13 09:13:13 +02:00
Martin Wagner
94b3eac941 sdo client: use SDO client parameter default entries as start values
to keep current behaviour (auto configuration), just set the default values to "0"
2018-09-13 09:12:48 +02:00
Martin Wagner
0860923e9c Revert "Fix switch case fallthrough warnings"
this commit breaks TPDO generation

This reverts commit c236b455d1.
2018-09-10 14:30:00 +02:00
Martin Wagner
7b8756fcc5 heartbeat consumer: added callback functions for each consumer...
example usage: ASCII heartbeat consumer/event protocol
2018-09-10 14:29:52 +02:00
Martin Wagner
36ca8ae0a8 heartbeat consumer: added query functions, fixed emergencies...
HB emergency was only set but never cleared, so only the first error ever
was reported. We now get an emergency when the first node is missing and
a clear emergency when the last node turns up again.
The same applies for HB Remote Reset, however while clearing this emergency
is required by the CO_Emergency module, it's not required for the network.
2018-09-10 14:29:42 +02:00
Martin Wagner
b5534e32c4 lost one line somewhere in merging 2018-09-05 10:50:35 +02:00
Gerlando Falauto
bb17f698b5 lssmaster: allow configuration of nodeId 255 in global mode
Allow LSS configure node to also run in global mode, but only to
set node ID to 255 (0xFF), i.e. to remove configuration.
This way we can easily un-configure all nodes and start all over
with e.g. fastscan.
2018-09-05 10:04:27 +02:00
Gerlando Falauto
bbea9de3ad lssmaster: let inquiry functions run also when in global mode
LSS has two selection modes: global (all nodes) and selective
(just one).
The current implementation defensively refuses to perform some
operations in global mode which are potentially disruptive
(e.g. set node id).
However, reading the node ID and/or LSS identity should not
be dangerous at all since in some cases it might be useful
to just read the identity of a single connected node.
Not quite sure what the behavior with multiple nodes will
be though, since it's theoretically possible to get inconsistent
results by mixing up answers from different nodes.
2018-09-05 10:03:40 +02:00
Gerlando Falauto
c6f2cc6f07 LSSmaster: remove warning 2018-09-05 10:03:18 +02:00
Gerlando Falauto
a67f5b4a22 lss: implement LED logic
We would like a simple way to give feedback when LSS
is involved. Particularly, we would like to identify
a node that is not configured (factory settings), or
that is currently being configured.
Implement a special logic, which can be used to override
the standard LED behavior if your device does not have
a dedicated LED. After all, LSS can be seen as a
maintenance mode so it can be acceptable to deviate
from the standard.
2018-09-05 10:02:28 +02:00
Olivier Desenfans
a3bad0e1fe Fix useless comparison
Fix warning from -Wtype-limits.
Removed a (uint8_t <= 255) comparison.
2018-09-05 09:52:39 +02:00
Martin Wagner
4a1fe12344 Merge remote-tracking branch 'odesenfans/CANopenNode/fix-warnings-sign-compare' into neuberger-master 2018-09-05 09:51:43 +02:00
Martin Wagner
78d55c6f5f Merge remote-tracking branch 'odesenfans/CANopenNode/fix-warnings-fallthrough' into neuberger-master 2018-09-05 09:51:28 +02:00
Martin Wagner
8512fec801 Merge branch 'add-lss' into neuberger-master 2018-09-05 08:34:21 +02:00
Martin Wagner
822a27aa45 Merge branch 'add-errorregister-mnf-bit' into neuberger-master 2018-09-05 08:34:13 +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
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
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
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