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

mc4plus double pinout #87

Merged
merged 10 commits into from
Sep 15, 2023
Merged

mc4plus double pinout #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9fc9347
changes for [200~parallalerized motor drivers
davidetome Jul 24, 2023
7746aac
mc4plus - renamed fake connectors for double current
davidetome Jul 27, 2023
7c69516
mc4plus doble pin - fixed conn names
davidetome Jul 31, 2023
f001586
updated revision
davidetome Sep 6, 2023
0eba6cc
changes for [200~parallalerized motor drivers
davidetome Jul 24, 2023
bf25acd
mc4plus - renamed fake connectors for double current
davidetome Jul 27, 2023
1c26a30
Add status and maps for handling status strings
MSECode Jul 4, 2023
56a9a9b
Bump minor number
Nicogene Sep 11, 2023
36a3bf2
updated revision 1.36.1
davidetome Sep 14, 2023
3641ed7
Merge branch 'devel' into fix/mc4plus-double-pinout
davidetome Sep 14, 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.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
View file
Open in desktop
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
View file
Open in desktop
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