Merge lp:~shadowrobot/sr-ros-interface-ethercat/tactiles_software_version into lp:sr-ros-interface-ethercat
Proposed by
Ugo
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 521 | ||||
Proposed branch: | lp:~shadowrobot/sr-ros-interface-ethercat/tactiles_software_version | ||||
Merge into: | lp:sr-ros-interface-ethercat | ||||
Diff against target: |
298 lines (+132/-16) 6 files modified
sr_robot_lib/include/sr_robot_lib/tactile_sensors.hpp (+48/-5) sr_robot_lib/src/biotac.cpp (+2/-2) sr_robot_lib/src/generic_tactiles.cpp (+1/-1) sr_robot_lib/src/shadow_PSTs.cpp (+2/-2) sr_robot_lib/src/sr_robot_lib.cpp (+13/-2) sr_robot_lib/src/tactile_sensors.cpp (+66/-4) |
||||
To merge this branch: | bzr merge lp:~shadowrobot/sr-ros-interface-ethercat/tactiles_software_version | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Hugo Elias (community) | Approve | ||
Review via email: mp+84764@code.launchpad.net |
Description of the change
Fixed the software version for the tactiles.
To post a comment you must log in.
this should now work.