Homec4science

Merge branch 'arne'

Authored by Arne Nordmann <anordman@cor-lab.uni-bielefeld.de> on Oct 29 2013, 17:29.

Description

Merge branch 'arne'

  • Merged branch 'arne' to master as it is provides a first working implementation of upstream and downstream for SBCP (brushless motors) and RTIO (servos)

Conflicts:
src/liboncilla-hw/config/Config.cpp
src/liboncilla-hw/config/Config.h
src/liboncilla-hw/config/MotorSection.cpp
src/liboncilla-hw/config/MotorSection.h
src/liboncilla-hw/nodes/L1L2.h
src/liboncilla-hw/nodes/L3.h
src/liboncilla-hw/nodes/Trunk.cpp
src/liboncilla-hw/nodes/Trunk.h
src/liboncilla-hw/synchronization/Synchronizer.cpp

Event Timeline

Arne Nordmann <anordman@cor-lab.uni-bielefeld.de> committed R6623:7d459d736e9c: Merge branch 'arne' (authored by Arne Nordmann <anordman@cor-lab.uni-bielefeld.de>).Oct 29 2013, 17:29

Merged Changes

CommitAuthorDetailsCommitted
586e3f49589eMostafa Ajallooeian/oncilla
Knee downstream conversion corrected 
Oct 28 2013
69e3830b35fcArne Nordmann
Working upstream and downstream. Not fully tested and conversions still off 
Oct 25 2013
aaa167643dbcArne Nordmann
Formatting, coding style 
Oct 22 2013
9db63f713b45Arne Nordmann
Formatting, coding style 
Oct 22 2013
4f3f6e65bb3fArne Nordmann
Latest updates 
Oct 22 2013
41019f2b2e65Arne Nordmann
Lots of debugging output. handling disconnected motorboard 
Oct 18 2013
fe714c0125e6Arne Nordmann
Manage workflow and transfers 
Oct 12 2013
52c372265075Arne Nordmann
Adds empty DeinitializeIO 
Oct 12 2013
2cc4108627f5Arne Nordmann
Adds pure virtual DeinitializeIO and call it when stopping task 
Oct 12 2013
19ae74e34627Arne Nordmann
Forgot to push header 
Aug 15 2013
a460cee7152fArne Nordmann
Debugging 
Aug 6 2013
0376770baf07Arne Nordmann
Debugging 
Aug 6 2013
2b8152368332Arne Nordmann
Debugging 
Aug 6 2013
3a877d081050Alexandre Tuleu
Links configuration and motor 
Jul 4 2013
467374b1fc40Alexandre Tuleu
Adds reference to MotorSection 
Jul 4 2013
17427c1a32c9Alexandre Tuleu
Errors if symbols are undefined 
Jul 4 2013
3ef3bb0ada7cAlexandre Tuleu
Refactors board opening 
Jul 4 2013
21e2c6059f1bAlexandre Tuleu
Refactors configuration propagation 
Jul 4 2013
ff2cc5c45654Alexandre Tuleu
Sets default board IDs 
Jul 4 2013
faa52572ca23Alexandre Tuleu
Refactors Motor config section for simplicity 
Jul 4 2013
4b67c707208fAlexandre Tuleu
Removes DeepCopyable 
Jul 4 2013