From cb81c3d575f8232150b5cc197c1addec69bd8f58 Mon Sep 17 00:00:00 2001 From: AntonioViscomi Date: Thu, 23 Jan 2025 14:11:58 +0100 Subject: [PATCH] Control board now named 'ankle_setup_control_board', works with linear motion in range 0-100 [mm], fixed indentation --- experimentalSetups/ankleSetup/ankle-setup.xml | 2 +- experimentalSetups/ankleSetup/general.xml | 6 +- .../hardware/electronics/ankle-setup-eln.xml | 4 +- .../hardware/mechanicals/ankle-setup-mec.xml | 15 +- .../hardware/motorControl/ankle-setup-mc.xml | 158 ++++++++---------- .../motorControl/ankle-setup-mc_service.xml | 87 +++------- .../motorControl/ankle-setup-mc_wrapper.xml | 2 +- .../ankleSetup/yarpScopeFile.xml | 90 +++++----- .../ankleSetup/yarpmotorgui.ini | 2 +- 9 files changed, 156 insertions(+), 210 deletions(-) diff --git a/experimentalSetups/ankleSetup/ankle-setup.xml b/experimentalSetups/ankleSetup/ankle-setup.xml index ccc50e548..f5f691bc7 100644 --- a/experimentalSetups/ankleSetup/ankle-setup.xml +++ b/experimentalSetups/ankleSetup/ankle-setup.xml @@ -1,7 +1,7 @@ - + diff --git a/experimentalSetups/ankleSetup/general.xml b/experimentalSetups/ankleSetup/general.xml index 7d80a52fe..8bedc704a 100644 --- a/experimentalSetups/ankleSetup/general.xml +++ b/experimentalSetups/ankleSetup/general.xml @@ -2,11 +2,11 @@ - + - true + false false false false - + \ No newline at end of file diff --git a/experimentalSetups/ankleSetup/hardware/electronics/ankle-setup-eln.xml b/experimentalSetups/ankleSetup/hardware/electronics/ankle-setup-eln.xml index ee5c45422..c17b99f8e 100644 --- a/experimentalSetups/ankleSetup/hardware/electronics/ankle-setup-eln.xml +++ b/experimentalSetups/ankleSetup/hardware/electronics/ankle-setup-eln.xml @@ -1,7 +1,7 @@ - + @@ -16,7 +16,7 @@ - "ankle-setup" + "ankle_setup_control_board" 1000 400 diff --git a/experimentalSetups/ankleSetup/hardware/mechanicals/ankle-setup-mec.xml b/experimentalSetups/ankleSetup/hardware/mechanicals/ankle-setup-mec.xml index 1e2411a1c..44ccecc37 100644 --- a/experimentalSetups/ankleSetup/hardware/mechanicals/ankle-setup-mec.xml +++ b/experimentalSetups/ankleSetup/hardware/mechanicals/ankle-setup-mec.xml @@ -11,16 +11,16 @@ 182.044 32000 1000.0 - 1 - 1 + 72 + 1 1 "MECAPION_APM-SA01ACN-8" - 0 + 0 - 0 - 0 + 0 + -100 0 0 @@ -34,7 +34,7 @@ 1 0 105 - 8 + 8 @@ -61,7 +61,8 @@ - 1 + 1 + 0 none diff --git a/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc.xml b/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc.xml index dab949044..e2ea7d520 100644 --- a/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc.xml +++ b/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc.xml @@ -1,7 +1,6 @@ - @@ -9,119 +8,102 @@ - - - 0 - 0 - 100 - 5000 - 10000 - 15000 - 32000 + + -0.002 + -99 + 100 + 5000 + 10000 + 15000 + 32000 - - 100 + 100 - - 0 - 0 + 0 + 0 - - POS_PID_DEFAULT - POS_PID_DEFAULT - POS_PID_DEFAULT - TRQ_PID_DEFAULT - 2FOC_CUR_CONTROL - 2FOC_VEL_CONTROL + POS_PID_DEFAULT + POS_PID_DEFAULT + POS_PID_DEFAULT + TRQ_PID_DEFAULT + 2FOC_CUR_CONTROL + 2FOC_VEL_CONTROL - - - - minjerk - pwm - metric_units - machine_units - 500 - 0 - 100 - 32000 - 3000 - 0 - 0 - 0 + minjerk + pwm + metric_units + machine_units + 500 + 0 + 100 + 32000 + 3000 + 0 + 0 + 0 - - - - torque - current - machine_units - machine_units - 1.8 - 0 - 0 - 2000 - 1000 - 0.55 - 0 - 0 - 0 - 0 - 3 - 0 - 1.0 - 1.0 - 0.0 - 0.0 + torque + current + machine_units + machine_units + 1.8 + 0 + 0 + 2000 + 1000 + 0.55 + 0 + 0 + 0 + 0 + 3 + 0 + 1.0 + 1.0 + 0.0 + 0.0 - - - - low_lev_current - machine_units - machine_units - 8 - 0 - 2 - 10 - 32000 - 32000 - 0 + low_lev_current + machine_units + machine_units + 8 + 0 + 2 + 10 + 32000 + 32000 + 0 - low_lev_speed - machine_units - machine_units - 0 - 12 - 0 - 16 - 10 - 32000 - 32000 + low_lev_speed + machine_units + machine_units + 0 + 12 + 0 + 16 + 10 + 32000 + 32000 - - - - 0.0049 + 0.0049 - diff --git a/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc_service.xml b/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc_service.xml index d356e7a4c..d29907f7d 100644 --- a/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc_service.xml +++ b/experimentalSetups/ankleSetup/hardware/motorControl/ankle-setup-mc_service.xml @@ -2,82 +2,45 @@ - - eomn_serv_MC_foc - - - - ems4 + + ems4 - - - foc + + foc - 1 - 6 - + 1 + 6 + 0 - 0 + 0 0 - - - - - - foc - CAN1:1:0 - - - - - none - none - none - none - none + + foc + CAN1:1:0 + + + none + none + none + none + none - - - - mrie - CAN1:1:0 - atmotor - 8192 - 3.6 + + mrie + CAN1:1:0 + atmotor + 8192 + 0.2 - - - - - - - - - - + - - - diff --git a/experimentalSetups/ankleSetup/wrappers/motorControl/ankle-setup-mc_wrapper.xml b/experimentalSetups/ankleSetup/wrappers/motorControl/ankle-setup-mc_wrapper.xml index 4e09369cf..e0cfcc478 100644 --- a/experimentalSetups/ankleSetup/wrappers/motorControl/ankle-setup-mc_wrapper.xml +++ b/experimentalSetups/ankleSetup/wrappers/motorControl/ankle-setup-mc_wrapper.xml @@ -3,7 +3,7 @@ 0.002 - /ankleSetup/ankle-setup + /ankleSetup/ankle_setup_control_board ankle-setup-mc_remapper diff --git a/experimentalSetups/ankleSetup/yarpScopeFile.xml b/experimentalSetups/ankleSetup/yarpScopeFile.xml index f6fd28742..7b36b0e1a 100644 --- a/experimentalSetups/ankleSetup/yarpScopeFile.xml +++ b/experimentalSetups/ankleSetup/yarpScopeFile.xml @@ -8,57 +8,57 @@ maxval="10000" title="Joint Position" bgcolor="LightSlateGrey"> - + - + gridy="0" + hspan="1" + vspan="1" + title="Motor Position" + minval="-500000" + maxval="500000" + bgcolor="LightSlateGrey"> + - + gridy="1" + hspan="1" + vspan="1" + title="Current Plot" + minval="-20" + maxval="20" + bgcolor="LightSlateGrey"> + - + gridy="1" + hspan="1" + vspan="1" + title="Joint speed Plot" + minval="-100" + maxval="100" + bgcolor="LightSlateGrey"> +