From 53bcc645cb5689c4d989f3b1182d5f1a3a668e03 Mon Sep 17 00:00:00 2001 From: valentina gaggero Date: Tue, 25 Jul 2023 23:13:09 +0000 Subject: [PATCH 1/2] Add wrist joint set configuration --- eth/embobj/plus/comm-v2/icub/EoMotionControl.c | 3 ++- eth/embobj/plus/comm-v2/icub/EoMotionControl.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eth/embobj/plus/comm-v2/icub/EoMotionControl.c b/eth/embobj/plus/comm-v2/icub/EoMotionControl.c index 5cb7c8bc..7e686d53 100644 --- a/eth/embobj/plus/comm-v2/icub/EoMotionControl.c +++ b/eth/embobj/plus/comm-v2/icub/EoMotionControl.c @@ -169,7 +169,8 @@ static const eOmap_str_str_u08_t s_eomc_map_of_jsetconstraints[] = {"cerhand", "eomc_jsetconstraint_cerhand", eomc_jsetconstraint_cerhand}, {"trifid", "eomc_jsetconstraint_trifid", eomc_jsetconstraint_trifid}, {"cerhand2", "eomc_jsetconstraint_cerhand2", eomc_jsetconstraint_cerhand2}, - + {"ergocubwrist", "eomc_jsetconstraint_ergocubwrist", eomc_jsetconstraint_ergocubwrist}, + {"unknown", "eomc_jsetconstraint_unknown", eomc_jsetconstraint_unknown} }; EO_VERIFYsizeof(s_eomc_map_of_jsetconstraints, (eomc_jsetconstraints_numberof + 1)*sizeof(eOmap_str_str_u08_t)); diff --git a/eth/embobj/plus/comm-v2/icub/EoMotionControl.h b/eth/embobj/plus/comm-v2/icub/EoMotionControl.h index 97ac5e85..91a7f20d 100644 --- a/eth/embobj/plus/comm-v2/icub/EoMotionControl.h +++ b/eth/embobj/plus/comm-v2/icub/EoMotionControl.h @@ -1285,12 +1285,13 @@ typedef enum eomc_jsetconstraint_cerhand = 1, eomc_jsetconstraint_trifid = 2, eomc_jsetconstraint_cerhand2 = 3, + eomc_jsetconstraint_ergocubwrist = 4, eomc_jsetconstraint_unknown = 255 } eOmc_jsetconstraint_t; -enum { eomc_jsetconstraints_numberof = 4 }; +enum { eomc_jsetconstraints_numberof = 5 }; // size is From fcd3ab7317cc77576657eda8081435af9aeadc7f Mon Sep 17 00:00:00 2001 From: Valentina Gaggero Date: Mon, 9 Oct 2023 12:24:05 +0200 Subject: [PATCH 2/2] Increased patch version to 1.36.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 260a2068..f2b9841b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.12) project(icub_firmware_shared - VERSION 1.36.1) + VERSION 1.36.2) find_package(YCM 0.11.0 REQUIRED)