Merge branch 'groovy_dev' of https://github.com/ipa320/cob_robots into fix/raw3-3_bringup
Merge branch 'groovy_dev' of https://github.com/ipa320/cob_robots into fix/raw3-3_bringup
base is at pcan0 connected
Merge pull request #16 from ipa-fxm/groovy_dev_cob4

Groovy dev cob4
Merge pull request #147 from ipa-raw3-3/fix/raw3-3_bringup

fixed cantrl configuration
Merge pull request #144 from ipa-fxm/groovy_dev_cob4

Groovy dev cob4
renamed phidgets.lauch to tray_sensors.launch and added launch and config files for real phidget driver
changed ns
Merge pull request #149 from ipa-bnm/refactor/phidgets

Refactored phidget launch
adjust rviz config
fix diagnostics in simulation
move rviz config to robot folder
fix rviz soft links
fix simulated cam3d topics
add tray sensors to simulation
set fixed frame to base_link
fix desire dual sdh
setup tests
Merge branch 'groovy_dev' of github.com:ipa320/cob_robots into groovy_dev
Merge pull request #4 from ipa320/groovy_dev

Upstream changes