Skip to content
This repository has been archived by the owner on Dec 1, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Olavhaasie
Olavhaasie committed Aug 28, 2020
2 parents 74c5550 + 7db9482 commit 514e360
Show file tree
Hide file tree
Showing 49 changed files with 1,315 additions and 1,399 deletions.
10 changes: 10 additions & 0 deletions march_monitor/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
cmake_minimum_required(VERSION 3.0.2)
project(march_monitor)

find_package(catkin REQUIRED)

catkin_package()

install(DIRECTORY config launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
138 changes: 138 additions & 0 deletions march_monitor/config/full_monitor.perspective
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
{
"keys": {},
"groups": {
"pluginmanager": {
"keys": {
"running-plugins": {
"type": "repr",
"repr": "{u'march_rqt_input_device/InputDevicePlugin': [1], u'rqt_robot_monitor/RobotMonitor': [1], u'march_rqt_gait_selection/GaitSelectionPlugin': [1], u'march_rqt_note_taker/NotesPlugin': [1]}"
}
},
"groups": {
"plugin__march_rqt_gait_selection__GaitSelectionPlugin__1": {
"keys": {},
"groups": {
"dock_widget__GaitSelection": {
"keys": {
"dockable": {
"type": "repr",
"repr": "True"
},
"parent": {
"type": "repr",
"repr": "None"
},
"dock_widget_title": {
"type": "repr",
"repr": "u'March Gait Selection'"
}
},
"groups": {}
}
}
},
"plugin__march_rqt_note_taker__NotesPlugin__1": {
"keys": {},
"groups": {
"dock_widget__notes_widget": {
"keys": {
"dockable": {
"type": "repr",
"repr": "True"
},
"parent": {
"type": "repr",
"repr": "None"
},
"dock_widget_title": {
"type": "repr",
"repr": "u'Note taker'"
}
},
"groups": {}
}
}
},
"plugin__march_rqt_input_device__InputDevicePlugin__1": {
"keys": {},
"groups": {
"dock_widget__main_widget": {
"keys": {
"dockable": {
"type": "repr",
"repr": "True"
},
"parent": {
"type": "repr",
"repr": "None"
},
"dock_widget_title": {
"type": "repr",
"repr": "u'March Input Device'"
}
},
"groups": {}
}
}
},
"plugin__rqt_robot_monitor__RobotMonitor__1": {
"keys": {},
"groups": {
"dock_widget__Robot Monitor": {
"keys": {
"dockable": {
"type": "repr",
"repr": "True"
},
"parent": {
"type": "repr",
"repr": "None"
},
"dock_widget_title": {
"type": "repr",
"repr": "u'Robot Monitor'"
}
},
"groups": {}
},
"plugin": {
"keys": {
"splitter": {
"type": "repr(QByteArray.hex)",
"repr(QByteArray.hex)": "QtCore.QByteArray('000000ff00000001000000030000006400000064000000c80100000009010000000200')",
"pretty-print": " d d "
}
},
"groups": {}
}
}
}
}
},
"mainwindow": {
"keys": {
"geometry": {
"type": "repr(QByteArray.hex)",
"repr(QByteArray.hex)": "QtCore.QByteArray('01d9d0cb00020000000000000000001b0000077f0000043700000000000000370000077f0000043700000000000000000780')",
"pretty-print": " 7 7 7 "
},
"state": {
"type": "repr(QByteArray.hex)",
"repr(QByteArray.hex)": "QtCore.QByteArray('000000ff00000000fd000000010000000300000780000003d5fc0100000005fb00000072006d0061007200630068005f007200710074005f0069006e007000750074005f006400650076006900630065005f005f0049006e0070007500740044006500760069006300650050006c007500670069006e005f005f0032005f005f006d00610069006e005f0077006900640067006500740100000286000002d90000000000000000fb0000004c007200710074005f0074006f007000690063005f005f0054006f0070006900630050006c007500670069006e005f005f0031005f005f0054006f0070006900630057006900640067006500740100000000000004ab0000000000000000fc00000000000005780000025300fffffffc0200000002fc0000001600000295000000c300080014fc0100000002fb00000072006d0061007200630068005f007200710074005f0069006e007000750074005f006400650076006900630065005f005f0049006e0070007500740044006500760069006300650050006c007500670069006e005f005f0031005f005f006d00610069006e005f0077006900640067006500740100000000000002f0000000f70007fffffb00000064006d0061007200630068005f007200710074005f006e006f00740065005f00740061006b00650072005f005f004e006f0074006500730050006c007500670069006e005f005f0031005f005f006e006f007400650073005f00770069006400670065007401000002f6000002820000015600fffffffb0000007e006d0061007200630068005f007200710074005f0067006100690074005f00730065006c0065006300740069006f006e005f005f004700610069007400530065006c0065006300740069006f006e0050006c007500670069006e005f005f0031005f005f004700610069007400530065006c0065006300740069006f006e01000002b10000013a0000008100fffffffc000003a2000004720000000000fffffffa000000000200000001fb00000030005f005f0044006f0063006b0057006900640067006500740043006f006e007400610069006e00650072005f005f003101000000190000040a0000000000000000fb00000062007200710074005f0072006f0062006f0074005f006d006f006e00690074006f0072005f005f0052006f0062006f0074004d006f006e00690074006f0072005f005f0031005f005f0052006f0062006f00740020004d006f006e00690074006f0072010000057e00000202000000dd00ffffff000007800000000000000004000000040000000800000008fc00000001000000030000000100000036004d0069006e0069006d0069007a006500640044006f0063006b00570069006400670065007400730054006f006f006c0062006100720000000000ffffffff0000000000000000')",
"pretty-print": " rmarch_rqt_input_device__InputDevicePlugin__2__main_widget Lrqt_topic__TopicPlugin__1__TopicWidget x S rmarch_rqt_input_device__InputDevicePlugin__1__main_widget dmarch_rqt_note_taker__NotesPlugin__1__notes_widget ~march_rqt_gait_selection__GaitSelectionPlugin__1__GaitSelection r ~ "
}
},
"groups": {
"toolbar_areas": {
"keys": {
"MinimizedDockWidgetsToolbar": {
"type": "repr",
"repr": "8"
}
},
"groups": {}
}
}
}
}
}
11 changes: 11 additions & 0 deletions march_monitor/launch/monitor.launch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<launch>
<node name="march_monitor"
pkg="rqt_gui"
type="rqt_gui"
output="screen"
args="--perspective-file $(find march_monitor)/config/full_monitor.perspective"/>

<include file="$(find march_rqt_robot_monitor)/launch/march_rqt_robot_monitor.launch">
<arg name="rqt" value="false"/>
</include>
</launch>
18 changes: 18 additions & 0 deletions march_monitor/package.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>march_monitor</name>
<version>0.0.0</version>
<description>Configuration package for march monitor packages.</description>

<maintainer email="[email protected]">Project March</maintainer>
<license>TODO</license>

<buildtool_depend>catkin</buildtool_depend>

<exec_depend>march_rqt_gait_selection</exec_depend>
<exec_depend>march_rqt_input_device</exec_depend>
<exec_depend>march_rqt_note_taker</exec_depend>
<exec_depend>march_rqt_robot_monitor</exec_depend>
<exec_depend>rqt_gui</exec_depend>
</package>
7 changes: 6 additions & 1 deletion march_rqt_gait_selection/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
RQT plugin to configure which version of gaits will be performed at runtime.
</description>
<qtgui>
<group>
<label>March</label>
<icon>resource/img/march-walking.png</icon>
<statustip>Plugins related to the March exoskeleton.</statustip>
</group>
<label>March Gait Selection</label>
<icon>resource/img/march-walking.png</icon>
<statustip>March IV Gait Selection</statustip>
<statustip>GUI to select gait versions for the March exoskeleton.</statustip>
</qtgui>
</class>
</library>
Loading

0 comments on commit 514e360

Please sign in to comment.