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

Added the mrie encoder. Increase version to 1.34.2 #82

Merged
merged 2 commits into from
May 11, 2023
Merged

Added the mrie encoder. Increase version to 1.34.2 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a029433
added mrie in eOmc_encoder_t enum
valegagge Apr 28, 2023
3b32b57
bumped version 1.34.2
valegagge May 5, 2023
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required(VERSION 3.12)

project(icub_firmware_shared
VERSION 1.34.1)
VERSION 1.34.2)

find_package(YCM 0.11.0 REQUIRED)

Expand Down
2 changes: 2 additions & 0 deletions eth/embobj/plus/comm-v2/icub/EoMotionControl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ static const eOmap_str_str_u08_t s_eomc_map_of_encoders[] =
{"amo", "eomc_enc_amo", eomc_enc_amo},
{"psc", "eomc_enc_psc", eomc_enc_psc},
{"pos", "eomc_enc_pos", eomc_enc_pos},
{"mrie", "eomc_enc_mrie", eomc_enc_mrie},

{"none", "eomc_enc_none", eomc_enc_none},
{"unknown", "eomc_enc_unknown", eomc_enc_unknown}
Expand Down Expand Up @@ -277,6 +278,7 @@ extern uint8_t eomc_encoder_get_numberofcomponents(eOmc_encoder_t encoder)
case eomc_enc_hallmotor:
case eomc_enc_amo:
case eomc_enc_aksim2:
case eomc_enc_mrie:
{
ret = 1;
} break;
Expand Down
3 changes: 2 additions & 1 deletion eth/embobj/plus/comm-v2/icub/EoMotionControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,12 +1141,13 @@ typedef enum
eomc_enc_pos = 11,
eomc_enc_aea3 = 12,
eomc_enc_aksim2 = 13,
eomc_enc_mrie = 14,

eomc_enc_none = 0,
eomc_enc_unknown = 255
} eOmc_encoder_t;

enum { eomc_encoders_numberof = 13 };
enum { eomc_encoders_numberof = 14 };
enum { eomc_encoders_maxnumberofcomponents = 4 };


Expand Down