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.

Sign up for GitHub

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

Realigned types for skin type ERGOHAND #101

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Realigned types for skin type ERGOHAND #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions can/canProtocolLib/iCubCanProto_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -------------------------------------------------------------------------

Expand Down Expand Up @@ -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;


Expand Down
5 changes: 4 additions & 1 deletion eth/embobj/plus/comm-v2/icub/EoSkin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down