Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IMU sensors: add sensorName tag in FT IMU xml #637

Merged
merged 3 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ergoCubSN000/hardware/inertials/head-inertial.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@
</group>

<group name="SENSORS">
<param name="id"> rfeimu_acc rfeimu_gyro rfeimu_mag rfeimu_eul rfeimu_status
</param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_mag eoas_imu_eul eoas_imu_status
</param>
<param name="boardType"> rfe rfe rfe rfe rfe
</param>
<param name="location"> CAN1:1 CAN1:1 CAN1:1 CAN1:1 CAN1:1
</param>
<param name="id"> rfeimu_acc rfeimu_gyro rfeimu_mag rfeimu_eul rfeimu_status </param>
<param name="sensorName"> head_imu_0 head_imu_0 head_imu_0 head_imu_0 head_imu_0 </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_mag eoas_imu_eul eoas_imu_status </param>
<param name="boardType"> rfe rfe rfe rfe rfe </param>
<param name="location"> CAN1:1 CAN1:1 CAN1:1 CAN1:1 CAN1:1 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> l_arm_ft_acc l_arm_ft_gyro l_arm_ft_eul l_arm_ft_mag l_arm_ft_stat </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
<param name="id"> l_arm_ft_acc l_arm_ft_gyro l_arm_ft_eul l_arm_ft_mag l_arm_ft_stat </param>
<param name="sensorName"> l_arm_ft_imu l_arm_ft_imu l_arm_ft_imu l_arm_ft_imu l_arm_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> l_leg_ft_acc l_leg_ft_gyro l_leg_ft_eul l_leg_ft_mag l_leg_ft_stat</param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status</param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2</param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
<param name="id"> l_leg_ft_acc l_leg_ft_gyro l_leg_ft_eul l_leg_ft_mag l_leg_ft_stat </param>
<param name="sensorName"> l_leg_ft_imu l_leg_ft_imu l_leg_ft_imu l_leg_ft_imu l_leg_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> l_foot_rear_ft_acc l_foot_rear_ft_gyro l_foot_rear_ft_eul l_foot_rear_ft_mag l_foot_rear_ft_stat l_foot_front_ft_acc l_foot_front_ft_gyro l_foot_front_ft_eul l_foot_front_ft_mag l_foot_front_ft_stat</param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status</param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2</param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:14 CAN2:14 CAN2:14 CAN2:14 CAN2:14</param>
<param name="id"> l_foot_rear_ft_acc l_foot_rear_ft_gyro l_foot_rear_ft_eul l_foot_rear_ft_mag l_foot_rear_ft_stat l_foot_front_ft_acc l_foot_front_ft_gyro l_foot_front_ft_eul l_foot_front_ft_mag l_foot_front_ft_stat </param>
<param name="sensorName"> l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:14 CAN2:14 CAN2:14 CAN2:14 CAN2:14 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> r_arm_ft_acc r_arm_ft_gyro r_arm_ft_eul r_arm_ft_mag r_arm_ft_stat </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
<param name="id"> r_arm_ft_acc r_arm_ft_gyro r_arm_ft_eul r_arm_ft_mag r_arm_ft_stat </param>
<param name="sensorName"> r_arm_ft_imu r_arm_ft_imu r_arm_ft_imu r_arm_ft_imu r_arm_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> r_leg_ft_acc r_leg_ft_gyro r_leg_ft_eul r_leg_ft_mag r_leg_ft_stat </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status</param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
<param name="id"> r_leg_ft_acc r_leg_ft_gyro r_leg_ft_eul r_leg_ft_mag r_leg_ft_stat </param>
<param name="sensorName"> r_leg_ft_imu r_leg_ft_imu r_leg_ft_imu r_leg_ft_imu r_leg_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> r_foot_rear_ft_acc r_foot_rear_ft_gyro r_foot_rear_ft_eul r_foot_rear_ft_mag r_foot_rear_ft_stat r_foot_front_ft_acc r_foot_front_ft_gyro r_foot_front_ft_eul r_foot_front_ft_mag r_foot_front_ft_stat</param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status</param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2</param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:14 CAN2:14 CAN2:14 CAN2:14 CAN2:14</param>
<param name="id"> r_foot_rear_ft_acc r_foot_rear_ft_gyro r_foot_rear_ft_eul r_foot_rear_ft_mag r_foot_rear_ft_stat r_foot_front_ft_acc r_foot_front_ft_gyro r_foot_front_ft_eul r_foot_front_ft_mag r_foot_front_ft_stat </param>
<param name="sensorName"> r_foot_rear_ft_imu r_foot_rear_ft_imu r_foot_rear_ft_imu r_foot_rear_ft_imu r_foot_rear_ft_imu r_foot_front_ft_imu r_foot_front_ft_imu r_foot_front_ft_imu r_foot_front_ft_imu r_foot_front_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:14 CAN2:14 CAN2:14 CAN2:14 CAN2:14 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="alljoints-inertials_remapper" type="multipleanalogsensorsremapper">
<param name="OrientationSensorsNames">
(head_imu_0 l_arm_ft l_leg_ft l_foot_rear_ft l_foot_front_ft r_arm_ft r_leg_ft r_foot_rear_ft r_foot_front_ft waist_imu_0)
(head_imu_0 l_arm_ft_imu l_leg_ft_imu l_foot_rear_ft_imu l_foot_front_ft_imu r_arm_ft_imu r_leg_ft_imu r_foot_rear_ft_imu r_foot_front_ft_imu waist_imu_0)
</param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
Expand All @@ -15,7 +15,7 @@
<elem name="r_arm_imu"> right_arm-eb1-j0_1-inertial </elem>
<elem name="r_leg_imu"> right_leg-eb6-j0_3-inertial </elem>
<elem name="r_foot_imu"> right_leg-eb7-j4_5-inertial </elem>
<elem name="waist_imu"> waist_inertial </elem>
<elem name="waist_imu"> waist-inertial </elem>
</paramlist>
</action>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<param name="period"> 10 </param>
<param name="name"> /${portprefix}/alljoints/inertials </param>

<action phase="startup" level="15" type="attach">
<action phase="startup" level="10" type="attach">
<paramlist name="networks">
<elem name="FirstStrain"> alljoints-inertials_remapper </elem>
</paramlist>
Expand Down
13 changes: 5 additions & 8 deletions ergoCubSN001/hardware/inertials/head-inertial.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@
</group>

<group name="SENSORS">
<param name="id"> rfeimu_acc rfeimu_gyro rfeimu_mag rfeimu_eul rfeimu_status
</param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_mag eoas_imu_eul eoas_imu_status
</param>
<param name="boardType"> rfe rfe rfe rfe rfe
</param>
<param name="location"> CAN1:1 CAN1:1 CAN1:1 CAN1:1 CAN1:1
</param>
<param name="id"> rfeimu_acc rfeimu_gyro rfeimu_mag rfeimu_eul rfeimu_status </param>
<param name="sensorName"> head_imu_0 head_imu_0 head_imu_0 head_imu_0 head_imu_0 </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_mag eoas_imu_eul eoas_imu_status </param>
<param name="boardType"> rfe rfe rfe rfe rfe </param>
<param name="location"> CAN1:1 CAN1:1 CAN1:1 CAN1:1 CAN1:1 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> l_arm_ft_acc l_arm_ft_gyro l_arm_ft_eul l_arm_ft_mag l_arm_ft_stat </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
<param name="id"> l_arm_ft_acc l_arm_ft_gyro l_arm_ft_eul l_arm_ft_mag l_arm_ft_stat </param>
<param name="sensorName"> l_arm_ft_imu l_arm_ft_imu l_arm_ft_imu l_arm_ft_imu l_arm_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> l_leg_ft_acc l_leg_ft_gyro l_leg_ft_eul l_leg_ft_mag l_leg_ft_stat</param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status</param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2</param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
<param name="id"> l_leg_ft_acc l_leg_ft_gyro l_leg_ft_eul l_leg_ft_mag l_leg_ft_stat </param>
<param name="sensorName"> l_leg_ft_imu l_leg_ft_imu l_leg_ft_imu l_leg_ft_imu l_leg_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 </param>
</group>

</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
</group>

<group name="SENSORS">
<param name="id"> l_foot_rear_ft_acc l_foot_rear_ft_gyro l_foot_rear_ft_eul l_foot_rear_ft_mag l_foot_rear_ft_stat l_foot_front_ft_acc l_foot_front_ft_gyro l_foot_front_ft_eul l_foot_front_ft_mag l_foot_front_ft_stat</param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status</param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2</param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:14 CAN2:14 CAN2:14 CAN2:14 CAN2:14</param>
<param name="id"> l_foot_rear_ft_acc l_foot_rear_ft_gyro l_foot_rear_ft_eul l_foot_rear_ft_mag l_foot_rear_ft_stat l_foot_front_ft_acc l_foot_front_ft_gyro l_foot_front_ft_eul l_foot_front_ft_mag l_foot_front_ft_stat </param>
<param name="sensorName"> l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_rear_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu l_foot_front_ft_imu </param>
<param name="type"> eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status eoas_imu_acc eoas_imu_gyr eoas_imu_eul eoas_imu_mag eoas_imu_status </param>
<param name="boardType"> strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 strain2 </param>
<param name="location"> CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:13 CAN2:14 CAN2:14 CAN2:14 CAN2:14 CAN2:14 </param>
</group>

</group>
Expand Down
Loading