Skip to content

Commit d941dc4

Browse files
authored
Cleanup redundant packages for conda packaging (#116)
* deleted rviz_simu and no easy robot control anymore * renamed tuto, docs and auto pakge ms * updated md docs and bump version * packaged the operator * updated install and credits
1 parent 93ace0f commit d941dc4

File tree

95 files changed

+14607
-2524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+14607
-2524
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ venv
44
build-*/
55
install-*/
66
.pixi/
7+
src/**/pixi.lock
78
*.conda
89
files.txt
910
*.log

LAUNCH.bash

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,13 @@ UP_TO=1
1515

1616
cd "${ROS2_MOONBOT_WS}" || echo No folder shortcut, working in $PWD
1717
. "${ROS2_INSTALL_PATH}"/setup.bash || source /opt/ros/humble/setup.bash || source /opt/ros/foxy/setup.bash || echo Ros2 not found for auto-sourcing, continuing
18-
# rm -r install/rviz_basic
19-
# rm -r build/rviz_basic
20-
# rm -r log/rviz_basic
21-
# rm -r install/easy_robot_control
22-
# rm -r build/easy_robot_control
23-
# rm -r log/easy_robot_control
24-
# rm -r log/ build/ install/
25-
# . install/setup.bash
2618
export RCUTILS_COLORIZED_OUTPUT=1
2719
# colcon build --symlink-install --cmake-args -Wno-dev
2820
# colcon build --cmake-args -Wno-dev
2921
doit -n 16 build
3022
. install/setup.bash
31-
# colcon test --packages-select motion_stack easy_robot_control ros2_m_hero_pkg rviz_basic --event-handlers console_cohesion+
3223
# colcon test-result --verbose
3324
export RCUTILS_CONSOLE_OUTPUT_FORMAT="{message}"
3425
export NUMBA_CACHE_DIR="./numba_cache" # this will compile numba in a permanant file
3526

36-
ros2 run moonbot_zero_tuto high_dbg
37-
# ros2 run motion_stack trial
38-
# ros2 launch motion_stack moonbot_zero.launch.py MS_up_to_level:=$UP_TO
39-
# ros2 launch moonbot_zero_tuto myrobot.launch.py
40-
# ros2 launch moonbot_zero_tuto real_moonbot.launch.py MS_up_to_level:=4
27+
ros2 launch motion_stack_tuto myrobot.launch.py

README.md

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,6 @@ people can take control and do their experiment seamlessly.
101101

102102
* [ms_operator package](docs/build/md/markdown/api/ms_operator/ms_operator.md)
103103
* [Submodules](docs/build/md/markdown/api/ms_operator/ms_operator.md#submodules)
104-
* [ms_operator.operator_node module](docs/build/md/markdown/api/ms_operator/ms_operator.md#module-ms_operator.operator_node)
105-
* [ms_operator.operator_tui module](docs/build/md/markdown/api/ms_operator/ms_operator.md#module-ms_operator.operator_tui)
106-
* [ms_operator.operator_utils module](docs/build/md/markdown/api/ms_operator/ms_operator.md#module-ms_operator.operator_utils)
107-
108-
# Deprecated Code:
109-
110-
* [easy_robot_control package](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md)
111-
* [Subpackages](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#subpackages)
112-
* [Submodules](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#submodules)
113-
* [easy_robot_control.EliaNode module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.EliaNode)
114-
* [easy_robot_control.gait_key_dev module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.gait_key_dev)
115-
* [easy_robot_control.gait_node module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.gait_node)
116-
* [easy_robot_control.ik_heavy_node module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.ik_heavy_node)
117-
* [easy_robot_control.joint_state_interface module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.joint_state_interface)
118-
* [easy_robot_control.lazy_joint_state_publisher module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.lazy_joint_state_publisher)
119-
* [easy_robot_control.leg_api module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.leg_api)
120-
* [easy_robot_control.leg_node module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.leg_node)
121-
* [easy_robot_control.mover_node module](docs/build/md/markdown/api/easy_robot_control/easy_robot_control.md#module-easy_robot_control.mover_node)
104+
* [ms_operator.operator_node module](docs/build/md/markdown/api/ms_operator/ms_operator.md#ms-operator-operator-node-module)
105+
* [ms_operator.operator_tui module](docs/build/md/markdown/api/ms_operator/ms_operator.md#ms-operator-operator-tui-module)
106+
* [ms_operator.operator_utils module](docs/build/md/markdown/api/ms_operator/ms_operator.md#ms-operator-operator-utils-module)

docs/build/md/markdown/api/motion_stack/motion_stack.api.injection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Features
2525
- You should provide this object an initialized JointCore.
2626
- You need to call by yourself:
2727
> - [`OffsetterLvl0.apply_offset()`](#motion_stack.api.injection.offsetter.OffsetterLvl0.apply_offset)
28-
> - [`OffsetterLvl0.save_angle_as_offset()`](../easy_robot_control/easy_robot_control.injection.md#easy_robot_control.injection.offsetter.OffsetterLvl0.save_angle_as_offset)
28+
> - `OffsetterLvl0.save_angle_as_offset()`
2929
> - [`OffsetterLvl0.save_current_offset()`](#motion_stack.api.injection.offsetter.OffsetterLvl0.save_current_offset)
3030
- [`OffsetterLvl0.load_offset()`](#motion_stack.api.injection.offsetter.OffsetterLvl0.load_offset) is called on object initialization.
3131
- See the ros2 wrapper if you running the core through ros2.

docs/build/md/markdown/api/motion_stack/motion_stack.api.launch.md

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Example:
3030
from motion_stack.api.launch.builder import LevelBuilder, xacro_path_from_pkg
3131
3232
urdf_path = xacro_path_from_pkg(
33-
package_name="moonbot_zero_tuto", xacro_path="urdf/moonbot_zero.xacro"
33+
package_name="motion_stack_tuto", xacro_path="urdf/moonbot_zero.xacro"
3434
)
3535
LEGS_DIC = {
3636
1: "end1",
@@ -178,15 +178,6 @@ Along each lvl1 node, it creates:
178178
* **Return type:**
179179
`List`[`List`[`Node`]]
180180

181-
### motion_stack.api.launch.builder.xacro_path_from_packer(robot_name)
182-
183-
retieves the .urdf/.xacro path in the install share folder of urdf_packer.
184-
185-
* **Parameters:**
186-
**robot_name** (*str*) – corresponds to <robot_name>.xacro
187-
188-
Returns:
189-
190181
### motion_stack.api.launch.builder.xacro_path_from_pkg(package_name, xacro_path, options=None)
191182

192183
Gets a path from a package, adding options, in view of xacro compilation.
@@ -208,22 +199,16 @@ Creates ROS2 command to compile xacro at launch time.
208199
* **path** (*str*)
209200
* **options** (*str* *|* *None*)
210201

211-
### motion_stack.api.launch.builder.T *= TypeVar(T)*
212-
213-
**Type:**    `TypeVar`
214-
215-
Invariant `TypeVar`.
216-
217202
### motion_stack.api.launch.builder.get_cli_argument(arg_name, default)
218203

219204
Returns the CLI argument as a string, or default is none inputed.
220205
Can be much better optimised, I don’t care.
221206

222207
* **Return type:**
223-
`Union`[[`~T`](#motion_stack.api.launch.builder.T), `str`]
208+
`Union`[`~_T`, `str`]
224209
* **Parameters:**
225210
* **arg_name** (*str*)
226-
* **default** (*T*)
211+
* **default** ( *\_T*)
227212

228213
## motion_stack.api.launch.default_params module
229214

@@ -235,15 +220,6 @@ Provides and explains all parameters to launch the motion stack
235220

236221
Default parameters taken from the python core.
237222

238-
### motion_stack.api.launch.default_params.get_xacro_path(robot_name)
239-
240-
retieves the .urdf/.xacro path in the install share folder
241-
242-
* **Parameters:**
243-
**robot_name** (*str*) – corresponds to <robot_name>.xacro
244-
245-
Returns:
246-
247223
### motion_stack.api.launch.default_params.enforce_params_type(parameters)
248224

249225
enforces types to dic in place

docs/build/md/markdown/api/motion_stack/motion_stack.core.rtb_fix.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ bad.URDF._recursive_axis_definition = fix.URDF._recursive_axis_definition
2020
bad.URDF.finalize_linking = fix.URDF.finalize_linking
2121
```
2222

23-
#### NOTE
24-
easy_robot_control/_\_init_\_.py overwrites it, so importing easy_robot_control will change your rtb
25-
2623
@author (Original) Matthew Matl, Github: mmatl
2724
@author (Adapted by) Jesse Haviland
2825
@author (Fixed by) Elian Neppel

docs/build/md/markdown/api/motion_stack/motion_stack.ros2.default_node.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,64 @@ Refer to [`ros2.base_node.lvl2.Lvl2Node`](motion_stack.ros2.base_node.md#motion_
130130

131131
### motion_stack.ros2.default_node.lvl2.main(\*args, \*\*kwargs)
132132

133+
## motion_stack.ros2.default_node.mini_sim module
134+
135+
### *class* motion_stack.ros2.default_node.mini_sim.MiniSim
136+
137+
Bases: `Node`
138+
139+
#### display_new_joints()
140+
141+
#### jsRecieved(jsMSG)
142+
143+
* **Return type:**
144+
`None`
145+
* **Parameters:**
146+
**jsMSG** (*JointState*)
147+
148+
#### updateJS(state)
149+
150+
* **Return type:**
151+
`None`
152+
* **Parameters:**
153+
**state** ([*JState*](motion_stack.core.utils.md#motion_stack.core.utils.joint_state.JState))
154+
155+
#### integrateSpeed(state, updateTime)
156+
157+
* **Return type:**
158+
[`JState`](motion_stack.core.utils.md#motion_stack.core.utils.joint_state.JState)
159+
* **Parameters:**
160+
* **state** ([*JState*](motion_stack.core.utils.md#motion_stack.core.utils.joint_state.JState))
161+
* **updateTime** ([*Time*](motion_stack.core.utils.md#motion_stack.core.utils.time.Time) *|* *None*)
162+
163+
#### refreshRviz(names=None)
164+
165+
* **Return type:**
166+
`None`
167+
* **Parameters:**
168+
**names** (*List* *[**str* *]* *|* *None*)
169+
170+
#### send_upward(names=None)
171+
172+
* **Return type:**
173+
`None`
174+
* **Parameters:**
175+
**names** (*List* *[**str* *]* *|* *None*)
176+
177+
#### *static* jsIsMoving(js)
178+
179+
* **Return type:**
180+
`bool`
181+
* **Parameters:**
182+
**js** ([*JState*](motion_stack.core.utils.md#motion_stack.core.utils.joint_state.JState))
183+
184+
#### getSpeedControledNames()
185+
186+
* **Return type:**
187+
`List`[`str`]
188+
189+
### motion_stack.ros2.default_node.mini_sim.main(args=None)
190+
133191
## motion_stack.ros2.default_node.trial module
134192

135193
### *class* motion_stack.ros2.default_node.trial.TestNode

docs/build/md/markdown/api/motion_stack/motion_stack.ros2.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Non-ROS2-related opertation must NOT be implemented here.
2121
* [Submodules](motion_stack.ros2.default_node.md#submodules)
2222
* [motion_stack.ros2.default_node.lvl1 module](motion_stack.ros2.default_node.md#module-motion_stack.ros2.default_node.lvl1)
2323
* [motion_stack.ros2.default_node.lvl2 module](motion_stack.ros2.default_node.md#module-motion_stack.ros2.default_node.lvl2)
24+
* [motion_stack.ros2.default_node.mini_sim module](motion_stack.ros2.default_node.md#module-motion_stack.ros2.default_node.mini_sim)
2425
* [motion_stack.ros2.default_node.trial module](motion_stack.ros2.default_node.md#module-motion_stack.ros2.default_node.trial)
2526
* [motion_stack.ros2.ros2_asyncio package](motion_stack.ros2.ros2_asyncio.md)
2627
* [`sleep()`](motion_stack.ros2.ros2_asyncio.md#motion_stack.ros2.ros2_asyncio.sleep)

docs/build/md/markdown/api/ms_operator/modules.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
* [ms_operator package](ms_operator.md)
44
* [Submodules](ms_operator.md#submodules)
5-
* [ms_operator.operator_node module](ms_operator.md#module-ms_operator.operator_node)
6-
* [ms_operator.operator_tui module](ms_operator.md#module-ms_operator.operator_tui)
7-
* [ms_operator.operator_utils module](ms_operator.md#module-ms_operator.operator_utils)
5+
* [ms_operator.operator_node module](ms_operator.md#ms-operator-operator-node-module)
6+
* [ms_operator.operator_tui module](ms_operator.md#ms-operator-operator-tui-module)
7+
* [ms_operator.operator_utils module](ms_operator.md#ms-operator-operator-utils-module)

0 commit comments

Comments
 (0)