Realigned types for skin type ERGOHAND (#101)

robotology · Oct 30, 2024 · 2e26af1 · 2e26af1
1 parent 56e7353
commit 2e26af1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/can/canProtocolLib/iCubCanProto_types.h b/can/canProtocolLib/iCubCanProto_types.h
@@ -84,9 +84,12 @@ extern "C" {
 #define ICUBCANPROTO_BOARDTYPE__UNKNOWN  255
 
 // skin types
-#define ICUBCANPROTO_SKINTYPE__WITHTEMPCOMP    0  
-#define ICUBCANPROTO_SKINTYPE__PALMFINGERTIP   1    
-#define ICUBCANPROTO_SKINTYPE__WITHOUTTEMPCOMP 2    
+#define ICUBCANPROTO_SKINTYPE__WITHTEMPCOMP     0  
+#define ICUBCANPROTO_SKINTYPE__PALMFINGERTIP    1    
+#define ICUBCANPROTO_SKINTYPE__WITHOUTTEMPCOMP  2 
+#define ICUBCANPROTO_SKINTYPE__ERGOHAND         3
+#define ICUBCANPROTO_SKINTYPE__TESTMODERAW      7
+#define ICUBCANPROTO_SKINTYPE__WITHTEMPCOMPV2   8
 
 // - declaration of public user-defined types ------------------------------------------------------------------------- 
 
@@ -472,7 +475,10 @@ typedef enum
 {
     icubCanProto_skinType__withtempcomp       = ICUBCANPROTO_SKINTYPE__WITHTEMPCOMP,
     icubCanProto_skinType__palmfingertip      = ICUBCANPROTO_SKINTYPE__PALMFINGERTIP,
-    icubCanProto_skinType__withouttempcomp    = ICUBCANPROTO_SKINTYPE__WITHOUTTEMPCOMP
+    icubCanProto_skinType__withouttempcomp    = ICUBCANPROTO_SKINTYPE__WITHOUTTEMPCOMP,
+    icubCanProto_skinType__ergohand           = ICUBCANPROTO_SKINTYPE__ERGOHAND,
+    icubCanProto_skinType__testmoderaw        = ICUBCANPROTO_SKINTYPE__TESTMODERAW,
+    icubCanProto_skinType__withtempcompv2     = ICUBCANPROTO_SKINTYPE__WITHTEMPCOMPV2    
 } icubCanProto_skinType_t;
 
 

diff --git a/eth/embobj/plus/comm-v2/icub/EoSkin.h b/eth/embobj/plus/comm-v2/icub/EoSkin.h
@@ -82,7 +82,10 @@ typedef enum
 {   // they must be equal to what the can protocol specifies
     eosk_skintype_withtempcomp                      = icubCanProto_skinType__withtempcomp,      /**< 0 */  
     eosk_skintype_palmfingertip                     = icubCanProto_skinType__palmfingertip,     /**< 1 */
-    eosk_skintype_withouttempcomp                   = icubCanProto_skinType__withouttempcomp    /**< 2 */   
+    eosk_skintype_withouttempcomp                   = icubCanProto_skinType__withouttempcomp,   /**< 2 */   
+    eosk_skintype_ergohand                          = icubCanProto_skinType__ergohand,          /**< 3 */  
+    eosk_skintype_testmoderaw                       = icubCanProto_skinType__testmoderaw,       /**< 7 */
+    eosk_skintype_withtempcompv2                    = icubCanProto_skinType__withtempcompv2     /**< 8 */       
 } eOsk_skintype_t;
 
 // -- all the possible data service structures