usb_cables: add cb2 cables

This commit is contained in:
King Kévin 2019-12-11 22:27:22 +01:00
parent 34f24a5ce3
commit ab47587a15
2 changed files with 218 additions and 2 deletions

View File

@ -1405,7 +1405,6 @@ static const uint8_t usb__a_host__c_host_sidea__ac2_pins[][2] = {
{usb_a_host_pins[3], usb_c_host_sidea_pins[6]}, // D+, A6 Dp1
{usb_a_host_pins[1], usb_c_host_sidea_pins[5]}, // VBUS - A5 CC1 (56kO)
};
static const uint8_t usb__a_host__c_host_sideb__ac2_pins[][2] = {
// A internal connections
{usb_a_host_pins[0], usb_a_host_pins[4]}, // shield, GND
@ -2153,6 +2152,194 @@ static const uint8_t usb__a_device__c_device_sideb__ac3g2_pins[][2] = {
{usb_a_device_pins[5], usb_c_device_sideb_pins[12 + 10]}, // SSTX-, B10 SSRXn1
};
/** list of connectors for C-B cables (using C host connector) */
static const struct usb_connector_t* usb_c_host_b_device_connectors[] = {
&usb_c_host_connector,
&usb_b_device_connector,
};
/** list of connectors for C-B cables (using C device connector) */
static const struct usb_connector_t* usb_c_device_b_device_connectors[] = {
&usb_c_device_connector,
&usb_b_device_connector,
};
/** USB type C to type B USB 2.0 cable pin pairs
* @implements CB2-3 from USB Type-C Cable and Connector Specification (https://www.usb.org/document-library/usb-type-cr-cable-and-connector-specification-revision-20-august-2019)
*/
static const uint8_t usb__c_host_sidea__b_device__cb2_pins[][2] = {
// B internal connections
{usb_b_device_pins[0], usb_b_device_pins[4]}, // shield, GND
// C internal connections
{usb_c_host_sidea_pins[0], usb_c_host_sidea_pins[1]}, // shield, A1 GND
{usb_c_host_sidea_pins[0], usb_c_host_sidea_pins[12]}, // shield, A12 GND
{usb_c_host_sidea_pins[0], usb_c_host_sidea_pins[12 + 12]}, // shield, B12 GND
{usb_c_host_sidea_pins[0], usb_c_host_sidea_pins[12 + 1]}, // shield, B1 GND
{usb_c_host_sidea_pins[1], usb_c_host_sidea_pins[12]}, // A1 GND, A12 GND
{usb_c_host_sidea_pins[1], usb_c_host_sidea_pins[12 + 12]}, // A1 GND, B12 GND
{usb_c_host_sidea_pins[1], usb_c_host_sidea_pins[12 + 1]}, // A1 GND, B1 GND
{usb_c_host_sidea_pins[12], usb_c_host_sidea_pins[12 + 12]}, // A12 GND, B12 GND
{usb_c_host_sidea_pins[12], usb_c_host_sidea_pins[12 + 1]}, // A12 GND, B1 GND
{usb_c_host_sidea_pins[12 + 1], usb_c_host_sidea_pins[12 + 12]}, // B1 GND, B12 GND
{usb_c_host_sidea_pins[4], usb_c_host_sidea_pins[9]}, // A4 VBUS, A9 VBUS
{usb_c_host_sidea_pins[4], usb_c_host_sidea_pins[12 + 9]}, // A4 VBUS, B9 VBUS
{usb_c_host_sidea_pins[4], usb_c_host_sidea_pins[12 + 4]}, // A4 VBUS, B4 VBUS
{usb_c_host_sidea_pins[9], usb_c_host_sidea_pins[12 + 9]}, // A9 VBUS, B9 VBUS
{usb_c_host_sidea_pins[9], usb_c_host_sidea_pins[12 + 4]}, // A9 VBUS, B4 VBUS
{usb_c_host_sidea_pins[12 + 9], usb_c_host_sidea_pins[12 + 4]}, // B9 VBUS, B4 VBUS
{usb_c_host_sidea_pins[5], usb_c_host_sidea_pins[4]}, // CC1, A4 VBUS (56kO)
{usb_c_host_sidea_pins[5], usb_c_host_sidea_pins[9]}, // CC1, A9 VBUS (56kO)
{usb_c_host_sidea_pins[5], usb_c_host_sidea_pins[16]}, // CC1, B9 VBUS (56kO)
{usb_c_host_sidea_pins[5], usb_c_host_sidea_pins[21]}, // CC1, B4 VBUS (56kO)
// B-C connections
{usb_b_device_pins[1], usb_c_host_sidea_pins[4]}, // VBUS, A4 VBUS
{usb_b_device_pins[1], usb_c_host_sidea_pins[9]}, // VBUS, A9 VBUS
{usb_b_device_pins[1], usb_c_host_sidea_pins[12 + 9]}, // VBUS, B9 VBUS
{usb_b_device_pins[1], usb_c_host_sidea_pins[12 + 4]}, // VBUS, B4 VBUS
{usb_b_device_pins[0], usb_c_host_sidea_pins[0]}, // shield, shield
{usb_b_device_pins[0], usb_c_host_sidea_pins[1]}, // shield, A1 GND
{usb_b_device_pins[0], usb_c_host_sidea_pins[12]}, // shield, A12 GND
{usb_b_device_pins[0], usb_c_host_sidea_pins[12 + 12]}, // shield, B12 GND
{usb_b_device_pins[0], usb_c_host_sidea_pins[12 + 1]}, // shield, B1 GND
{usb_b_device_pins[4], usb_c_host_sidea_pins[0]}, // GND, shield
{usb_b_device_pins[4], usb_c_host_sidea_pins[1]}, // GND, A1 GND
{usb_b_device_pins[4], usb_c_host_sidea_pins[12]}, // GND, A12 GND
{usb_b_device_pins[4], usb_c_host_sidea_pins[12 + 12]}, // GND, B12 GND
{usb_b_device_pins[4], usb_c_host_sidea_pins[12 + 1]}, // GND, B1 GND
{usb_b_device_pins[2], usb_c_host_sidea_pins[7]}, // D-, A7 Dn1
{usb_b_device_pins[3], usb_c_host_sidea_pins[6]}, // D+, A6 Dp1
{usb_b_device_pins[1], usb_c_host_sidea_pins[5]}, // VBUS - A5 CC1 (56kO)
};
static const uint8_t usb__c_host_sideb__b_device__cb2_pins[][2] = {
// B internal connections
{usb_b_device_pins[0], usb_b_device_pins[4]}, // shield, GND
// C internal connections
{usb_c_host_sideb_pins[0], usb_c_host_sideb_pins[1]}, // shield, A1 GND
{usb_c_host_sideb_pins[0], usb_c_host_sideb_pins[12]}, // shield, A12 GND
{usb_c_host_sideb_pins[0], usb_c_host_sideb_pins[12 + 12]}, // shield, B12 GND
{usb_c_host_sideb_pins[0], usb_c_host_sideb_pins[12 + 1]}, // shield, B1 GND
{usb_c_host_sideb_pins[1], usb_c_host_sideb_pins[12]}, // A1 GND, A12 GND
{usb_c_host_sideb_pins[1], usb_c_host_sideb_pins[12 + 12]}, // A1 GND, B12 GND
{usb_c_host_sideb_pins[1], usb_c_host_sideb_pins[12 + 1]}, // A1 GND, B1 GND
{usb_c_host_sideb_pins[12], usb_c_host_sideb_pins[12 + 12]}, // A12 GND, B12 GND
{usb_c_host_sideb_pins[12], usb_c_host_sideb_pins[12 + 1]}, // A12 GND, B1 GND
{usb_c_host_sideb_pins[12 + 1], usb_c_host_sideb_pins[12 + 12]}, // B1 GND, B12 GND
{usb_c_host_sideb_pins[4], usb_c_host_sideb_pins[9]}, // A4 VBUS, A9 VBUS
{usb_c_host_sideb_pins[4], usb_c_host_sideb_pins[12 + 9]}, // A4 VBUS, B9 VBUS
{usb_c_host_sideb_pins[4], usb_c_host_sideb_pins[12 + 4]}, // A4 VBUS, B4 VBUS
{usb_c_host_sideb_pins[9], usb_c_host_sideb_pins[12 + 9]}, // A9 VBUS, B9 VBUS
{usb_c_host_sideb_pins[9], usb_c_host_sideb_pins[12 + 4]}, // A9 VBUS, B4 VBUS
{usb_c_host_sideb_pins[12 + 9], usb_c_host_sideb_pins[12 + 4]}, // B9 VBUS, B4 VBUS
{usb_c_host_sideb_pins[5], usb_c_host_sideb_pins[4]}, // CC1, A4 VBUS (56kO)
{usb_c_host_sideb_pins[5], usb_c_host_sideb_pins[9]}, // CC1, A9 VBUS (56kO)
{usb_c_host_sideb_pins[5], usb_c_host_sideb_pins[16]}, // CC1, B9 VBUS (56kO)
{usb_c_host_sideb_pins[5], usb_c_host_sideb_pins[21]}, // CC1, B4 VBUS (56kO)
// B-C connections
{usb_b_device_pins[1], usb_c_host_sideb_pins[4]}, // VBUS, A4 VBUS
{usb_b_device_pins[1], usb_c_host_sideb_pins[9]}, // VBUS, A9 VBUS
{usb_b_device_pins[1], usb_c_host_sideb_pins[12 + 9]}, // VBUS, B9 VBUS
{usb_b_device_pins[1], usb_c_host_sideb_pins[12 + 4]}, // VBUS, B4 VBUS
{usb_b_device_pins[0], usb_c_host_sideb_pins[0]}, // shield, shield
{usb_b_device_pins[0], usb_c_host_sideb_pins[1]}, // shield, A1 GND
{usb_b_device_pins[0], usb_c_host_sideb_pins[12]}, // shield, A12 GND
{usb_b_device_pins[0], usb_c_host_sideb_pins[12 + 12]}, // shield, B12 GND
{usb_b_device_pins[0], usb_c_host_sideb_pins[12 + 1]}, // shield, B1 GND
{usb_b_device_pins[4], usb_c_host_sideb_pins[0]}, // GND, shield
{usb_b_device_pins[4], usb_c_host_sideb_pins[1]}, // GND, A1 GND
{usb_b_device_pins[4], usb_c_host_sideb_pins[12]}, // GND, A12 GND
{usb_b_device_pins[4], usb_c_host_sideb_pins[12 + 12]}, // GND, B12 GND
{usb_b_device_pins[4], usb_c_host_sideb_pins[12 + 1]}, // GND, B1 GND
{usb_b_device_pins[2], usb_c_host_sideb_pins[7]}, // D-, A7 Dn1
{usb_b_device_pins[3], usb_c_host_sideb_pins[6]}, // D+, A6 Dp1
{usb_b_device_pins[1], usb_c_host_sideb_pins[5]}, // VBUS - A5 CC1 (56kO)
};
static const uint8_t usb__c_device_sidea__b_device__cb2_pins[][2] = {
// B internal connections
{usb_b_device_pins[0], usb_b_device_pins[4]}, // shield, GND
// C internal connections
{usb_c_device_sidea_pins[0], usb_c_device_sidea_pins[1]}, // shield, A1 GND
{usb_c_device_sidea_pins[0], usb_c_device_sidea_pins[12]}, // shield, A12 GND
{usb_c_device_sidea_pins[0], usb_c_device_sidea_pins[12 + 12]}, // shield, B12 GND
{usb_c_device_sidea_pins[0], usb_c_device_sidea_pins[12 + 1]}, // shield, B1 GND
{usb_c_device_sidea_pins[1], usb_c_device_sidea_pins[12]}, // A1 GND, A12 GND
{usb_c_device_sidea_pins[1], usb_c_device_sidea_pins[12 + 12]}, // A1 GND, B12 GND
{usb_c_device_sidea_pins[1], usb_c_device_sidea_pins[12 + 1]}, // A1 GND, B1 GND
{usb_c_device_sidea_pins[12], usb_c_device_sidea_pins[12 + 12]}, // A12 GND, B12 GND
{usb_c_device_sidea_pins[12], usb_c_device_sidea_pins[12 + 1]}, // A12 GND, B1 GND
{usb_c_device_sidea_pins[12 + 1], usb_c_device_sidea_pins[12 + 12]}, // B1 GND, B12 GND
{usb_c_device_sidea_pins[4], usb_c_device_sidea_pins[9]}, // A4 VBUS, A9 VBUS
{usb_c_device_sidea_pins[4], usb_c_device_sidea_pins[12 + 9]}, // A4 VBUS, B9 VBUS
{usb_c_device_sidea_pins[4], usb_c_device_sidea_pins[12 + 4]}, // A4 VBUS, B4 VBUS
{usb_c_device_sidea_pins[9], usb_c_device_sidea_pins[12 + 9]}, // A9 VBUS, B9 VBUS
{usb_c_device_sidea_pins[9], usb_c_device_sidea_pins[12 + 4]}, // A9 VBUS, B4 VBUS
{usb_c_device_sidea_pins[12 + 9], usb_c_device_sidea_pins[12 + 4]}, // B9 VBUS, B4 VBUS
{usb_c_device_sidea_pins[5], usb_c_device_sidea_pins[4]}, // CC1, A4 VBUS (56kO)
{usb_c_device_sidea_pins[5], usb_c_device_sidea_pins[9]}, // CC1, A9 VBUS (56kO)
{usb_c_device_sidea_pins[5], usb_c_device_sidea_pins[16]}, // CC1, B9 VBUS (56kO)
{usb_c_device_sidea_pins[5], usb_c_device_sidea_pins[21]}, // CC1, B4 VBUS (56kO)
// B-C connections
{usb_b_device_pins[1], usb_c_device_sidea_pins[4]}, // VBUS, A4 VBUS
{usb_b_device_pins[1], usb_c_device_sidea_pins[9]}, // VBUS, A9 VBUS
{usb_b_device_pins[1], usb_c_device_sidea_pins[12 + 9]}, // VBUS, B9 VBUS
{usb_b_device_pins[1], usb_c_device_sidea_pins[12 + 4]}, // VBUS, B4 VBUS
{usb_b_device_pins[0], usb_c_device_sidea_pins[0]}, // shield, shield
{usb_b_device_pins[0], usb_c_device_sidea_pins[1]}, // shield, A1 GND
{usb_b_device_pins[0], usb_c_device_sidea_pins[12]}, // shield, A12 GND
{usb_b_device_pins[0], usb_c_device_sidea_pins[12 + 12]}, // shield, B12 GND
{usb_b_device_pins[0], usb_c_device_sidea_pins[12 + 1]}, // shield, B1 GND
{usb_b_device_pins[4], usb_c_device_sidea_pins[0]}, // GND, shield
{usb_b_device_pins[4], usb_c_device_sidea_pins[1]}, // GND, A1 GND
{usb_b_device_pins[4], usb_c_device_sidea_pins[12]}, // GND, A12 GND
{usb_b_device_pins[4], usb_c_device_sidea_pins[12 + 12]}, // GND, B12 GND
{usb_b_device_pins[4], usb_c_device_sidea_pins[12 + 1]}, // GND, B1 GND
{usb_b_device_pins[2], usb_c_device_sidea_pins[7]}, // D-, A7 Dn1
{usb_b_device_pins[3], usb_c_device_sidea_pins[6]}, // D+, A6 Dp1
{usb_b_device_pins[1], usb_c_device_sidea_pins[5]}, // VBUS - A5 CC1 (56kO)
};
static const uint8_t usb__c_device_sideb__b_device__cb2_pins[][2] = {
// B internal connections
{usb_b_device_pins[0], usb_b_device_pins[4]}, // shield, GND
// C internal connections
{usb_c_device_sideb_pins[0], usb_c_device_sideb_pins[1]}, // shield, A1 GND
{usb_c_device_sideb_pins[0], usb_c_device_sideb_pins[12]}, // shield, A12 GND
{usb_c_device_sideb_pins[0], usb_c_device_sideb_pins[12 + 12]}, // shield, B12 GND
{usb_c_device_sideb_pins[0], usb_c_device_sideb_pins[12 + 1]}, // shield, B1 GND
{usb_c_device_sideb_pins[1], usb_c_device_sideb_pins[12]}, // A1 GND, A12 GND
{usb_c_device_sideb_pins[1], usb_c_device_sideb_pins[12 + 12]}, // A1 GND, B12 GND
{usb_c_device_sideb_pins[1], usb_c_device_sideb_pins[12 + 1]}, // A1 GND, B1 GND
{usb_c_device_sideb_pins[12], usb_c_device_sideb_pins[12 + 12]}, // A12 GND, B12 GND
{usb_c_device_sideb_pins[12], usb_c_device_sideb_pins[12 + 1]}, // A12 GND, B1 GND
{usb_c_device_sideb_pins[12 + 1], usb_c_device_sideb_pins[12 + 12]}, // B1 GND, B12 GND
{usb_c_device_sideb_pins[4], usb_c_device_sideb_pins[9]}, // A4 VBUS, A9 VBUS
{usb_c_device_sideb_pins[4], usb_c_device_sideb_pins[12 + 9]}, // A4 VBUS, B9 VBUS
{usb_c_device_sideb_pins[4], usb_c_device_sideb_pins[12 + 4]}, // A4 VBUS, B4 VBUS
{usb_c_device_sideb_pins[9], usb_c_device_sideb_pins[12 + 9]}, // A9 VBUS, B9 VBUS
{usb_c_device_sideb_pins[9], usb_c_device_sideb_pins[12 + 4]}, // A9 VBUS, B4 VBUS
{usb_c_device_sideb_pins[12 + 9], usb_c_device_sideb_pins[12 + 4]}, // B9 VBUS, B4 VBUS
{usb_c_device_sideb_pins[5], usb_c_device_sideb_pins[4]}, // CC1, A4 VBUS (56kO)
{usb_c_device_sideb_pins[5], usb_c_device_sideb_pins[9]}, // CC1, A9 VBUS (56kO)
{usb_c_device_sideb_pins[5], usb_c_device_sideb_pins[16]}, // CC1, B9 VBUS (56kO)
{usb_c_device_sideb_pins[5], usb_c_device_sideb_pins[21]}, // CC1, B4 VBUS (56kO)
// B-C connections
{usb_b_device_pins[1], usb_c_device_sideb_pins[4]}, // VBUS, A4 VBUS
{usb_b_device_pins[1], usb_c_device_sideb_pins[9]}, // VBUS, A9 VBUS
{usb_b_device_pins[1], usb_c_device_sideb_pins[12 + 9]}, // VBUS, B9 VBUS
{usb_b_device_pins[1], usb_c_device_sideb_pins[12 + 4]}, // VBUS, B4 VBUS
{usb_b_device_pins[0], usb_c_device_sideb_pins[0]}, // shield, shield
{usb_b_device_pins[0], usb_c_device_sideb_pins[1]}, // shield, A1 GND
{usb_b_device_pins[0], usb_c_device_sideb_pins[12]}, // shield, A12 GND
{usb_b_device_pins[0], usb_c_device_sideb_pins[12 + 12]}, // shield, B12 GND
{usb_b_device_pins[0], usb_c_device_sideb_pins[12 + 1]}, // shield, B1 GND
{usb_b_device_pins[4], usb_c_device_sideb_pins[0]}, // GND, shield
{usb_b_device_pins[4], usb_c_device_sideb_pins[1]}, // GND, A1 GND
{usb_b_device_pins[4], usb_c_device_sideb_pins[12]}, // GND, A12 GND
{usb_b_device_pins[4], usb_c_device_sideb_pins[12 + 12]}, // GND, B12 GND
{usb_b_device_pins[4], usb_c_device_sideb_pins[12 + 1]}, // GND, B1 GND
{usb_b_device_pins[2], usb_c_device_sideb_pins[7]}, // D-, A7 Dn1
{usb_b_device_pins[3], usb_c_device_sideb_pins[6]}, // D+, A6 Dp1
{usb_b_device_pins[1], usb_c_device_sideb_pins[5]}, // VBUS - A5 CC1 (56kO)
};
const struct usb_cable_t usb_cables[] = {
// A-A
{
@ -2480,6 +2667,35 @@ const struct usb_cable_t usb_cables[] = {
.pin_pairs_nb = LENGTH(usb__a_device__c_device_sidea__ac3g2_pins),
.pin_pairs = usb__a_device__c_device_sideb__ac3g2_pins,
},
// C - B USB 2.0
{
.name = "C-B USB 2.0",
.connectors_nb = LENGTH(usb_c_host_b_device_connectors),
.connectors = usb_c_host_b_device_connectors,
.pin_pairs_nb = LENGTH(usb__c_host_sidea__b_device__cb2_pins),
.pin_pairs = usb__c_host_sidea__b_device__cb2_pins,
},
{
.name = "C-B USB 2.0",
.connectors_nb = LENGTH(usb_c_host_b_device_connectors),
.connectors = usb_c_host_b_device_connectors,
.pin_pairs_nb = LENGTH(usb__c_host_sideb__b_device__cb2_pins),
.pin_pairs = usb__c_host_sideb__b_device__cb2_pins,
},
{
.name = "C-B USB 2.0",
.connectors_nb = LENGTH(usb_c_device_b_device_connectors),
.connectors = usb_c_device_b_device_connectors,
.pin_pairs_nb = LENGTH(usb__c_device_sidea__b_device__cb2_pins),
.pin_pairs = usb__c_device_sidea__b_device__cb2_pins,
},
{
.name = "C-B USB 2.0",
.connectors_nb = LENGTH(usb_c_device_b_device_connectors),
.connectors = usb_c_device_b_device_connectors,
.pin_pairs_nb = LENGTH(usb__c_device_sideb__b_device__cb2_pins),
.pin_pairs = usb__c_device_sideb__b_device__cb2_pins,
},
};
void usb_cables_pins_float(const struct usb_connector_t* connector)

View File

@ -69,7 +69,7 @@ extern const struct usb_pin_t usb_pins[105];
/** USB connectors definitions */
extern const struct usb_connector_t* usb_connectors[8];
/** USB cables definitions */
extern const struct usb_cable_t usb_cables[45];
extern const struct usb_cable_t usb_cables[49];
/** set every pin of connector to input floating
* @param[in] connector connector on which to set the pins floating