Skip to content

Commit

Permalink
mc4plus double pinout (#87)
Browse files Browse the repository at this point in the history
Co-authored-by: Jacopo <[email protected]>
Co-authored-by: Nicogene <[email protected]>
  • Loading branch information
3 people authored Sep 15, 2023
1 parent e9050f9 commit e219fea
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
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.36.0)
VERSION 1.36.1)

find_package(YCM 0.11.0 REQUIRED)

Expand Down
6 changes: 5 additions & 1 deletion eth/embobj/plus/comm-v2/icub/EoBoards.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ static const eOmap_str_str_u08_t s_eoboards_map_of_connectors[] =
{"J31", "eobrd_conn_J31", eobrd_conn_J31},
{"J32", "eobrd_conn_J32", eobrd_conn_J32},
{"J33", "eobrd_conn_J33", eobrd_conn_J33},

{"P3P", "eobrd_conn_P3P", eobrd_conn_P3P},
{"P4P", "eobrd_conn_P4P", eobrd_conn_P4P},

{"none", "eobrd_conn_none", eobrd_conn_none},
{"unknown", "eobrd_conn_unknown", eobrd_conn_unknown}
}; EO_VERIFYsizeof(s_eoboards_map_of_connectors, (eobrd_connectors_numberof+2)*sizeof(eOmap_str_str_u08_t))
Expand All @@ -193,6 +195,8 @@ static const eOmap_str_str_u08_u08_u08_t s_eoboards_map_of_ports[] =
{"mc4plusP3", "eobrd_port_mc4plusP3", eobrd_port_mc4plusP3, eobrd_mc4plus, eobrd_conn_P3},
{"mc4plusP4", "eobrd_port_mc4plusP4", eobrd_port_mc4plusP4, eobrd_mc4plus, eobrd_conn_P4},
{"mc4plusP5", "eobrd_port_mc4plusP5", eobrd_port_mc4plusP5, eobrd_mc4plus, eobrd_conn_P5},
{"mc4plusP3P", "eobrd_port_mc4plusP3P", eobrd_port_mc4plusP3P, eobrd_mc4plus, eobrd_conn_P3P},
{"mc4plusP4P", "eobrd_port_mc4plusP4P", eobrd_port_mc4plusP4P, eobrd_mc4plus, eobrd_conn_P4P},
{"mc4plusP10", "eobrd_port_mc4plusP10", eobrd_port_mc4plusP10, eobrd_mc4plus, eobrd_conn_P10},
{"mc4plusP11", "eobrd_port_mc4plusP11", eobrd_port_mc4plusP11, eobrd_mc4plus, eobrd_conn_P11},

Expand Down
8 changes: 6 additions & 2 deletions eth/embobj/plus/comm-v2/icub/EoBoards.h
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,14 @@ typedef enum
eobrd_conn_J31 = 32,
eobrd_conn_J32 = 33,
eobrd_conn_J33 = 34,
eobrd_conn_P3P = 35,
eobrd_conn_P4P = 36,

eobrd_conn_none = 0,
eobrd_conn_unknown = 255
} eObrd_connector_t;

enum { eobrd_connectors_numberof = 34 };
enum { eobrd_connectors_numberof = 36 };


typedef enum
Expand All @@ -341,6 +343,8 @@ typedef enum
eobrd_port_mc4plusP3 = 0, // PWM & QUADENC: hal_motor1, hal_quad_enc1
eobrd_port_mc4plusP4 = 2, // PWM & QUADENC: hal_motor3, hal_quad_enc3
eobrd_port_mc4plusP5 = 3, // PWM & QUADENC: hal_motor4, hal_quad_enc4
eobrd_port_mc4plusP3P = 4, // PWM & QUADENC: hal_motor1, hal_quad_enc1 parrallelized driver
eobrd_port_mc4plusP4P = 5, // PWM & QUADENC: hal_motor3, hal_quad_enc3 parrallelized driver
eobrd_port_mc4plusP10 = 0, // SPI encoder: hal_encoder1
eobrd_port_mc4plusP11 = 1, // SPI encoder: hal_encoder2

Expand Down Expand Up @@ -390,7 +394,7 @@ typedef enum

} eObrd_port_t;

enum { eobrd_ports_numberof = 47 };
enum { eobrd_ports_numberof = 49 };


typedef enum
Expand Down

0 comments on commit e219fea

Please sign in to comment.