diff --git a/usb_cables.c b/usb_cables.c
index dcb4901..94ad11f 100644
--- a/usb_cables.c
+++ b/usb_cables.c
@@ -671,48 +671,48 @@ static const struct usb_connector_t* usb_a_a_connectors[] = {
 };
 
 static const struct usb_pin_t* usb_a_a_power_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_a_pins[1]},
-	{&usb_host_a_pins[4], &usb_device_a_pins[4]},
+	{&usb_host_a_pins[1], &usb_device_a_pins[1]}, // VBUS
+	{&usb_host_a_pins[4], &usb_device_a_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_a_usb2_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_a_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_a_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_a_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_a_pins[4]},
+	{&usb_host_a_pins[1], &usb_device_a_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_a_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_a_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_a_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_a_usb2_shielded_pins[][2] = {
-	{&usb_host_a_pins[0], &usb_device_a_pins[0]},
-	{&usb_host_a_pins[1], &usb_device_a_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_a_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_a_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_a_pins[4]},
+	{&usb_host_a_pins[0], &usb_device_a_pins[0]}, // shield
+	{&usb_host_a_pins[1], &usb_device_a_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_a_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_a_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_a_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_a_usb3_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_a_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_a_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_a_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_a_pins[4]},
-	{&usb_host_a_pins[5], &usb_device_a_pins[5]},
-	{&usb_host_a_pins[6], &usb_device_a_pins[6]},
-	{&usb_host_a_pins[7], &usb_device_a_pins[7]},
-	{&usb_host_a_pins[8], &usb_device_a_pins[8]},
-	{&usb_host_a_pins[9], &usb_device_a_pins[9]},
+	{&usb_host_a_pins[1], &usb_device_a_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_a_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_a_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_a_pins[4]}, // GND
+	{&usb_host_a_pins[5], &usb_device_a_pins[5]}, // SSRX-, SSTX-
+	{&usb_host_a_pins[6], &usb_device_a_pins[6]}, // SSRX+, SSTX+
+	{&usb_host_a_pins[7], &usb_device_a_pins[7]}, // GND_DRAIN
+	{&usb_host_a_pins[8], &usb_device_a_pins[8]}, // SSTX-, SSRX-
+	{&usb_host_a_pins[9], &usb_device_a_pins[9]}, // SSTX+, SSRX+
 };
 
 static const struct usb_pin_t* usb_a_a_usb3_shielded_pins[][2] = {
-	{&usb_host_a_pins[0], &usb_device_a_pins[0]},
-	{&usb_host_a_pins[1], &usb_device_a_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_a_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_a_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_a_pins[4]},
-	{&usb_host_a_pins[5], &usb_device_a_pins[5]},
-	{&usb_host_a_pins[6], &usb_device_a_pins[6]},
-	{&usb_host_a_pins[7], &usb_device_a_pins[7]},
-	{&usb_host_a_pins[8], &usb_device_a_pins[8]},
-	{&usb_host_a_pins[9], &usb_device_a_pins[9]},
+	{&usb_host_a_pins[0], &usb_device_a_pins[0]}, // shield
+	{&usb_host_a_pins[1], &usb_device_a_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_a_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_a_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_a_pins[4]}, // GND
+	{&usb_host_a_pins[5], &usb_device_a_pins[5]}, // SSRX-, SSTX-
+	{&usb_host_a_pins[6], &usb_device_a_pins[6]}, // SSRX+, SSTX+
+	{&usb_host_a_pins[7], &usb_device_a_pins[7]}, // GND_DRAIN
+	{&usb_host_a_pins[8], &usb_device_a_pins[8]}, // SSTX-, SSRX-
+	{&usb_host_a_pins[9], &usb_device_a_pins[9]}, // SSTX+, SSRX+
 };
 
 static const struct usb_connector_t* usb_a_host_b_connectors[] = {
@@ -721,48 +721,48 @@ static const struct usb_connector_t* usb_a_host_b_connectors[] = {
 };
 
 static const struct usb_pin_t* usb_a_host_b_power_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_host_a_pins[4], &usb_device_b_pins[4]},
+	{&usb_host_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_host_a_pins[4], &usb_device_b_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_b_usb2_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_b_pins[4]},
+	{&usb_host_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_b_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_b_usb2_shielded_pins[][2] = {
-	{&usb_host_a_pins[0], &usb_device_b_pins[0]},
-	{&usb_host_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_b_pins[4]},
+	{&usb_host_a_pins[0], &usb_device_b_pins[0]}, // shield
+	{&usb_host_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_b_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_b_usb3_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_b_pins[4]},
-	{&usb_host_a_pins[5], &usb_device_b_pins[5]},
-	{&usb_host_a_pins[6], &usb_device_b_pins[6]},
-	{&usb_host_a_pins[7], &usb_device_b_pins[7]},
-	{&usb_host_a_pins[8], &usb_device_b_pins[8]},
-	{&usb_host_a_pins[9], &usb_device_b_pins[9]},
+	{&usb_host_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_b_pins[4]}, // GND
+	{&usb_host_a_pins[5], &usb_device_b_pins[5]}, // SSRX-, SSTX-
+	{&usb_host_a_pins[6], &usb_device_b_pins[6]}, // SSRX+, SSTX+
+	{&usb_host_a_pins[7], &usb_device_b_pins[7]}, // GND_DRAIN
+	{&usb_host_a_pins[8], &usb_device_b_pins[8]}, // SSTX-, SSRX-
+	{&usb_host_a_pins[9], &usb_device_b_pins[9]}, // SSTX+, SSRX+
 };
 
 static const struct usb_pin_t* usb_a_host_b_usb3_shielded_pins[][2] = {
-	{&usb_host_a_pins[0], &usb_device_b_pins[0]},
-	{&usb_host_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_b_pins[4]},
-	{&usb_host_a_pins[5], &usb_device_b_pins[5]},
-	{&usb_host_a_pins[6], &usb_device_b_pins[6]},
-	{&usb_host_a_pins[7], &usb_device_b_pins[7]},
-	{&usb_host_a_pins[8], &usb_device_b_pins[8]},
-	{&usb_host_a_pins[9], &usb_device_b_pins[9]},
+	{&usb_host_a_pins[0], &usb_device_b_pins[0]}, // shield
+	{&usb_host_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_b_pins[4]}, // GND
+	{&usb_host_a_pins[5], &usb_device_b_pins[5]}, // SSRX-, SSTX-
+	{&usb_host_a_pins[6], &usb_device_b_pins[6]}, // SSRX+, SSTX+
+	{&usb_host_a_pins[7], &usb_device_b_pins[7]}, // GND_DRAIN
+	{&usb_host_a_pins[8], &usb_device_b_pins[8]}, // SSTX-, SSRX-
+	{&usb_host_a_pins[9], &usb_device_b_pins[9]}, // SSTX+, SSRX+
 };
 
 static const struct usb_connector_t* usb_a_device_b_connectors[] = {
@@ -771,48 +771,48 @@ static const struct usb_connector_t* usb_a_device_b_connectors[] = {
 };
 
 static const struct usb_pin_t* usb_a_device_b_power_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_device_a_pins[4], &usb_device_b_pins[4]},
+	{&usb_device_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_device_a_pins[4], &usb_device_b_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_b_usb2_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_b_pins[4]},
+	{&usb_device_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_b_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_b_usb2_shielded_pins[][2] = {
-	{&usb_device_a_pins[0], &usb_device_b_pins[0]},
-	{&usb_device_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_b_pins[4]},
+	{&usb_device_a_pins[0], &usb_device_b_pins[0]}, // shield
+	{&usb_device_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_b_pins[4]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_b_usb3_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_b_pins[4]},
-	{&usb_device_a_pins[5], &usb_device_b_pins[5]},
-	{&usb_device_a_pins[6], &usb_device_b_pins[6]},
-	{&usb_device_a_pins[7], &usb_device_b_pins[7]},
-	{&usb_device_a_pins[8], &usb_device_b_pins[8]},
-	{&usb_device_a_pins[9], &usb_device_b_pins[9]},
+	{&usb_device_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_b_pins[4]}, // GND
+	{&usb_device_a_pins[5], &usb_device_b_pins[5]}, // SSRX-, SSTX-
+	{&usb_device_a_pins[6], &usb_device_b_pins[6]}, // SSRX+, SSTX+
+	{&usb_device_a_pins[7], &usb_device_b_pins[7]}, // GND_DRAIN
+	{&usb_device_a_pins[8], &usb_device_b_pins[8]}, // SSTX-, SSRX-
+	{&usb_device_a_pins[9], &usb_device_b_pins[9]}, // SSTX+, SSRX+
 };
 
 static const struct usb_pin_t* usb_a_device_b_usb3_shielded_pins[][2] = {
-	{&usb_device_a_pins[0], &usb_device_b_pins[0]},
-	{&usb_device_a_pins[1], &usb_device_b_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_b_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_b_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_b_pins[4]},
-	{&usb_device_a_pins[5], &usb_device_b_pins[5]},
-	{&usb_device_a_pins[6], &usb_device_b_pins[6]},
-	{&usb_device_a_pins[7], &usb_device_b_pins[7]},
-	{&usb_device_a_pins[8], &usb_device_b_pins[8]},
-	{&usb_device_a_pins[9], &usb_device_b_pins[9]},
+	{&usb_device_a_pins[0], &usb_device_b_pins[0]}, // shield
+	{&usb_device_a_pins[1], &usb_device_b_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_b_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_b_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_b_pins[4]}, // GND
+	{&usb_device_a_pins[5], &usb_device_b_pins[5]}, // SSRX-, SSTX-
+	{&usb_device_a_pins[6], &usb_device_b_pins[6]}, // SSRX+, SSTX+
+	{&usb_device_a_pins[7], &usb_device_b_pins[7]}, // GND_DRAIN
+	{&usb_device_a_pins[8], &usb_device_b_pins[8]}, // SSTX-, SSRX-
+	{&usb_device_a_pins[9], &usb_device_b_pins[9]}, // SSTX+, SSRX+
 };
 
 static const struct usb_connector_t* usb_a_host_minib_connectors[] = {
@@ -821,23 +821,23 @@ static const struct usb_connector_t* usb_a_host_minib_connectors[] = {
 };
 
 static const struct usb_pin_t* usb_a_host_minib_power_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_minib_pins[1]},
-	{&usb_host_a_pins[4], &usb_device_minib_pins[5]},
+	{&usb_host_a_pins[1], &usb_device_minib_pins[1]}, // VBUS
+	{&usb_host_a_pins[4], &usb_device_minib_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_minib_usb2_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_minib_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_minib_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_minib_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_minib_pins[5]},
+	{&usb_host_a_pins[1], &usb_device_minib_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_minib_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_minib_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_minib_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_minib_usb2_shielded_pins[][2] = {
-	{&usb_host_a_pins[0], &usb_device_minib_pins[0]},
-	{&usb_host_a_pins[1], &usb_device_minib_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_minib_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_minib_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_minib_pins[5]},
+	{&usb_host_a_pins[0], &usb_device_minib_pins[0]}, // shield
+	{&usb_host_a_pins[1], &usb_device_minib_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_minib_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_minib_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_minib_pins[5]}, // GND
 };
 
 static const struct usb_connector_t* usb_a_device_minib_connectors[] = {
@@ -846,23 +846,23 @@ static const struct usb_connector_t* usb_a_device_minib_connectors[] = {
 };
 
 static const struct usb_pin_t* usb_a_device_minib_power_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_minib_pins[1]},
-	{&usb_device_a_pins[4], &usb_device_minib_pins[5]},
+	{&usb_device_a_pins[1], &usb_device_minib_pins[1]}, // VBUS
+	{&usb_device_a_pins[4], &usb_device_minib_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_minib_usb2_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_minib_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_minib_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_minib_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_minib_pins[5]},
+	{&usb_device_a_pins[1], &usb_device_minib_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_minib_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_minib_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_minib_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_minib_usb2_shielded_pins[][2] = {
-	{&usb_device_a_pins[0], &usb_device_minib_pins[0]},
-	{&usb_device_a_pins[1], &usb_device_minib_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_minib_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_minib_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_minib_pins[5]},
+	{&usb_device_a_pins[0], &usb_device_minib_pins[0]}, // shield
+	{&usb_device_a_pins[1], &usb_device_minib_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_minib_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_minib_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_minib_pins[5]}, // GND
 };
 
 static const struct usb_connector_t* usb_a_host_microb_connectors[] = {
@@ -871,48 +871,48 @@ static const struct usb_connector_t* usb_a_host_microb_connectors[] = {
 };
 
 static const struct usb_pin_t* usb_a_host_microb_power_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_host_a_pins[4], &usb_device_microb_pins[5]},
+	{&usb_host_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_host_a_pins[4], &usb_device_microb_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_microb_usb2_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_microb_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_microb_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_microb_pins[5]},
+	{&usb_host_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_microb_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_microb_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_microb_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_microb_usb2_shielded_pins[][2] = {
-	{&usb_host_a_pins[0], &usb_device_microb_pins[0]},
-	{&usb_host_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_microb_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_microb_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_microb_pins[5]},
+	{&usb_host_a_pins[0], &usb_device_microb_pins[0]}, // shield
+	{&usb_host_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_microb_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_microb_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_microb_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_host_microb_usb3_unshielded_pins[][2] = {
-	{&usb_host_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_microb_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_microb_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_microb_pins[5]},
-	{&usb_host_a_pins[5], &usb_device_microb_pins[6]},
-	{&usb_host_a_pins[6], &usb_device_microb_pins[7]},
-	{&usb_host_a_pins[7], &usb_device_microb_pins[8]},
-	{&usb_host_a_pins[8], &usb_device_microb_pins[9]},
-	{&usb_host_a_pins[9], &usb_device_microb_pins[10]},
+	{&usb_host_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_microb_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_microb_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_microb_pins[5]}, // GND
+	{&usb_host_a_pins[5], &usb_device_microb_pins[6]}, // SSRX-, SSTX-
+	{&usb_host_a_pins[6], &usb_device_microb_pins[7]}, // SSRX+, SSTX+
+	{&usb_host_a_pins[7], &usb_device_microb_pins[8]}, // GND_DRAIN
+	{&usb_host_a_pins[8], &usb_device_microb_pins[9]}, // SSTX-, SSRX-
+	{&usb_host_a_pins[9], &usb_device_microb_pins[10]}, // SSTX+, SSRX+
 };
 
 static const struct usb_pin_t* usb_a_host_microb_usb3_shielded_pins[][2] = {
-	{&usb_host_a_pins[0], &usb_device_microb_pins[0]},
-	{&usb_host_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_host_a_pins[2], &usb_device_microb_pins[2]},
-	{&usb_host_a_pins[3], &usb_device_microb_pins[3]},
-	{&usb_host_a_pins[4], &usb_device_microb_pins[5]},
-	{&usb_host_a_pins[5], &usb_device_microb_pins[6]},
-	{&usb_host_a_pins[6], &usb_device_microb_pins[7]},
-	{&usb_host_a_pins[7], &usb_device_microb_pins[8]},
-	{&usb_host_a_pins[8], &usb_device_microb_pins[9]},
-	{&usb_host_a_pins[9], &usb_device_microb_pins[10]},
+	{&usb_host_a_pins[0], &usb_device_microb_pins[0]}, // shield
+	{&usb_host_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_host_a_pins[2], &usb_device_microb_pins[2]}, // D-
+	{&usb_host_a_pins[3], &usb_device_microb_pins[3]}, // D+
+	{&usb_host_a_pins[4], &usb_device_microb_pins[5]}, // GND
+	{&usb_host_a_pins[5], &usb_device_microb_pins[6]}, // SSRX-, SSTX-
+	{&usb_host_a_pins[6], &usb_device_microb_pins[7]}, // SSRX+, SSTX+
+	{&usb_host_a_pins[7], &usb_device_microb_pins[8]}, // GND_DRAIN
+	{&usb_host_a_pins[8], &usb_device_microb_pins[9]}, // SSTX-, SSRX-
+	{&usb_host_a_pins[9], &usb_device_microb_pins[10]}, // SSTX+, SSRX+
 };
 
 static const struct usb_connector_t* usb_a_device_microb_connectors[] = {
@@ -921,35 +921,35 @@ static const struct usb_connector_t* usb_a_device_microb_connectors[] = {
 };
 
 static const struct usb_pin_t* usb_a_device_microb_power_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_device_a_pins[4], &usb_device_microb_pins[5]},
+	{&usb_device_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_device_a_pins[4], &usb_device_microb_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_microb_usb2_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_microb_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_microb_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_microb_pins[5]},
+	{&usb_device_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_microb_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_microb_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_microb_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_microb_usb2_shielded_pins[][2] = {
-	{&usb_device_a_pins[0], &usb_device_microb_pins[0]},
-	{&usb_device_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_microb_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_microb_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_microb_pins[5]},
+	{&usb_device_a_pins[0], &usb_device_microb_pins[0]}, // shield
+	{&usb_device_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_microb_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_microb_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_microb_pins[5]}, // GND
 };
 
 static const struct usb_pin_t* usb_a_device_microb_usb3_unshielded_pins[][2] = {
-	{&usb_device_a_pins[1], &usb_device_microb_pins[1]},
-	{&usb_device_a_pins[2], &usb_device_microb_pins[2]},
-	{&usb_device_a_pins[3], &usb_device_microb_pins[3]},
-	{&usb_device_a_pins[4], &usb_device_microb_pins[5]},
-	{&usb_device_a_pins[5], &usb_device_microb_pins[6]},
-	{&usb_device_a_pins[6], &usb_device_microb_pins[7]},
-	{&usb_device_a_pins[7], &usb_device_microb_pins[8]},
-	{&usb_device_a_pins[8], &usb_device_microb_pins[9]},
-	{&usb_device_a_pins[9], &usb_device_microb_pins[10]},
+	{&usb_device_a_pins[1], &usb_device_microb_pins[1]}, // VBUS
+	{&usb_device_a_pins[2], &usb_device_microb_pins[2]}, // D-
+	{&usb_device_a_pins[3], &usb_device_microb_pins[3]}, // D+
+	{&usb_device_a_pins[4], &usb_device_microb_pins[5]}, // GND
+	{&usb_device_a_pins[5], &usb_device_microb_pins[6]}, // SSRX-, SSTX-
+	{&usb_device_a_pins[6], &usb_device_microb_pins[7]}, // SSRX+, SSTX+
+	{&usb_device_a_pins[7], &usb_device_microb_pins[8]}, // GND_DRAIN
+	{&usb_device_a_pins[8], &usb_device_microb_pins[9]}, // SSTX-, SSRX-
+	{&usb_device_a_pins[9], &usb_device_microb_pins[10]}, // SSTX+, SSRX+
 };
 
 static const struct usb_pin_t* usb_a_device_microb_usb3_shielded_pins[][2] = {