Update project files with latest KiCad 6 nightly

Signed-off-by: Stefan Agner <stefan@agner.ch>

Audio.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 85563a97-e861-4c7a-89d2-5e961d5501be)
 

CM4.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 116cf29d-aec3-4059-9c44-37f8f651d950)
 
@@ -2390,10 +2390,10 @@
     )
   )
 
-  (bus_alias "PCIe" (members "~RST" "~CLKREQ" "CLK+" "CLK-" "TX+" "TX-" "RX+" "RX-"))
-  (bus_alias "UART" (members "TXD" "RXD" "CTS" "RTS"))
   (bus_alias "HDMI" (members "D0+" "D0-" "D1+" "D1-" "D2+" "D2-" "CLK+" "CLK-" "CEC" "HPD" "SDA" "SCL"))
+  (bus_alias "UART" (members "TXD" "RXD" "CTS" "RTS"))
   (bus_alias "SD" (members "D[0..3]" "CMD" "CLK" "PWR" "DET"))
+  (bus_alias "PCIe" (members "~{RST}" "~{CLKREQ}" "CLK+" "CLK-" "TX+" "TX-" "RX+" "RX-"))
   (junction (at 59.055 173.99) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 121.92 171.45) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 127.508 157.48) (diameter 0.9144) (color 0 0 0 0))
@@ -3379,7 +3379,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1bb33fc0-3b29-41df-877b-3a8df7fb3d4a)
   )
-  (label "~RPI_BOOT" (at 24.765 127 0)
+  (label "~{RPI_BOOT}" (at 24.765 127 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 29667a27-e128-4590-91f2-a46114a5c7d2)
   )
@@ -3523,11 +3523,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1ac84774-43e1-4b09-a556-5cbfde39882b)
   )
-  (label "Radio.~BOOT" (at 88.9 134.62 0)
+  (label "Radio.~{BOOT}" (at 88.9 134.62 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid fee94b7f-3d61-4440-b7f3-2d4e622befd3)
   )
-  (label "Radio.~RESET" (at 88.9 137.16 0)
+  (label "Radio.~{RESET}" (at 88.9 137.16 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c64be186-4c86-43bf-878e-1f64e7e5f129)
   )
@@ -3563,7 +3563,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c8a71d37-7a3a-4143-8332-201a625beed9)
   )
-  (label "~RPI_BOOT" (at 115.57 157.48 0)
+  (label "~{RPI_BOOT}" (at 115.57 157.48 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4a6440ac-1756-499f-a5b2-caf391d35ad4)
   )
@@ -3583,11 +3583,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f76628c1-c806-4951-a6ce-389305b8a6c1)
   )
-  (label "PCIe.~RST" (at 146.05 55.88 0)
+  (label "PCIe.~{RST}" (at 146.05 55.88 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bf3a458e-645e-4987-89ad-aed45c457902)
   )
-  (label "PCIe.~CLKREQ" (at 146.05 58.42 0)
+  (label "PCIe.~{CLKREQ}" (at 146.05 58.42 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 68beab49-0fa4-4bdb-9eb1-fe67171efe14)
   )
@@ -3720,27 +3720,27 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ef2dfd08-4ee9-4343-8e5b-d132c42b0a10)
   )
-  (hierarchical_label "~FAN_PWM" (shape output) (at 35.56 101.6 180)
+  (hierarchical_label "~{FAN_PWM}" (shape output) (at 35.56 101.6 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid f41b2584-f3dc-414d-a4d0-8d1bc367e3d4)
   )
-  (hierarchical_label "~LED_PWR" (shape output) (at 35.56 129.54 180)
+  (hierarchical_label "~{LED_PWR}" (shape output) (at 35.56 129.54 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid e5d26a03-5f54-423e-aa34-f8eb7503220a)
   )
-  (hierarchical_label "~LED_ACT" (shape output) (at 35.56 132.08 180)
+  (hierarchical_label "~{LED_ACT}" (shape output) (at 35.56 132.08 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid c0fe8b38-e580-4639-9051-fb024c92f616)
   )
-  (hierarchical_label "~EXTRST" (shape output) (at 35.56 134.62 180)
+  (hierarchical_label "~{EXTRST}" (shape output) (at 35.56 134.62 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 665beb10-77df-4226-adaa-f43588b2bdc0)
   )
-  (hierarchical_label "~SW_USER" (shape input) (at 92.71 139.7 0)
+  (hierarchical_label "~{SW_USER}" (shape input) (at 92.71 139.7 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 6e0c72e4-8eda-4d06-96bf-e50aefc7c183)
   )
-  (hierarchical_label "~SW_WIPE" (shape input) (at 92.71 142.24 0)
+  (hierarchical_label "~{SW_WIPE}" (shape input) (at 92.71 142.24 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid f717bef9-2184-4a93-8397-0aee7362d28b)
   )
@@ -3752,7 +3752,7 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid f1d64b4a-fc35-4d1b-8e80-7b63863ed7c1)
   )
-  (hierarchical_label "Radio{UART SWD ~RESET ~BOOT}" (shape bidirectional) (at 107.95 82.55 0)
+  (hierarchical_label "Radio{UART SWD ~{RESET} ~{BOOT}}" (shape bidirectional) (at 107.95 82.55 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 09ed0e5e-82b0-428a-85cf-818870b24039)
   )
@@ -3764,7 +3764,7 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 63e942c6-0a41-4f1f-9239-0ffcedf9a9fa)
   )
-  (hierarchical_label "Radio{UART SWD ~RESET ~BOOT}" (shape bidirectional) (at 110.49 129.54 0)
+  (hierarchical_label "Radio{UART SWD ~{RESET} ~{BOOT}}" (shape bidirectional) (at 110.49 129.54 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 1ff11dbf-88d8-4e1d-a7e6-71d00d371973)
   )

ControlRTC.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 4af23fdd-6809-4cd6-9aeb-ed1230261a12)
 
@@ -1148,7 +1148,7 @@
           (number "2" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at 10.16 -5.08 180) (length 2.54)
-          (name "~INT~" (effects (font (size 1.27 1.27))))
+          (name "~{INT}" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
         (pin power_in line (at 0 -10.16 90) (length 2.54)

Ethernet.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 7e5ed504-339d-4299-b167-faac5bf1f64d)
 
@@ -2507,8 +2507,8 @@
     )
   )
 
-  (bus_alias "ETH" (members "TD1+" "TD1-" "TD2+" "TD2-" "TD3+" "TD3-" "TD4+" "TD4-" "LED_YELLOW" "LED_GREEN"))
   (bus_alias "PoE" (members "VC1" "VC2" "VC3" "VC4"))
+  (bus_alias "ETH" (members "TD1+" "TD1-" "TD2+" "TD2-" "TD3+" "TD3-" "TD4+" "TD4-" "LED_YELLOW" "LED_GREEN"))
   (junction (at 153.67 80.01) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 177.8 130.81) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 179.07 139.7) (diameter 0.9144) (color 0 0 0 0))

LightBlue.kicad_pro

@@ -375,6 +375,7 @@
     ],
     "rule_severities": {
       "bus_definition_conflict": "error",
+      "bus_entry_needed": "error",
       "bus_label_syntax": "error",
       "bus_to_bus_conflict": "error",
       "bus_to_net_conflict": "error",
@@ -569,7 +570,7 @@
       }
     ],
     "meta": {
-      "version": 0
+      "version": 1
     },
     "net_colors": null
   },
@@ -585,6 +586,7 @@
     "page_layout_descr_file": ""
   },
   "schematic": {
+    "annotate_start_num": 0,
     "drawing": {
       "default_bus_thickness": 12.0,
       "default_junction_size": 36.0,
@@ -598,16 +600,19 @@
       "intersheets_ref_show": false,
       "intersheets_ref_suffix": "",
       "junction_size_choice": 3,
+      "label_size_ratio": 0.3,
       "pin_symbol_size": 25.0,
       "text_offset_ratio": 0.3
     },
     "legacy_lib_dir": "",
     "legacy_lib_list": [],
     "meta": {
-      "version": 0
+      "version": 1
     },
     "net_format_name": "",
     "ngspice": {
+      "fix_include_paths": true,
+      "fix_passive_vals": false,
       "meta": {
         "version": 0
       },

LightBlue.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid abc482bd-3f17-4d35-80db-1da3dcdb5c27)
 
@@ -640,11 +640,11 @@
     (property "Sheet file" "Radio.kicad_sch" (id 1) (at 175.26 86.8689 0)
       (effects (font (size 1.27 1.27)) (justify left top))
     )
-    (pin "~LED_RADIO" output (at 215.9 53.34 0)
+    (pin "~{LED_RADIO}" output (at 215.9 53.34 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid d755ead0-5518-4bd2-ae4a-ac3a4462d0d4)
     )
-    (pin "Radio{UART SWD ~RESET ~BOOT}" bidirectional (at 175.26 80.01 180)
+    (pin "Radio{UART SWD ~{RESET} ~{BOOT}}" bidirectional (at 175.26 80.01 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 411ed783-a9dc-4822-9f29-8f6dfad67edd)
     )
@@ -704,7 +704,7 @@
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid d676a940-f810-4bd4-87ae-ca7d5bf4f704)
     )
-    (pin "~EXTRST" output (at 110.49 92.71 180)
+    (pin "~{EXTRST}" output (at 110.49 92.71 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 4858358d-b7e4-48a9-b2a8-12d4f17b691b)
     )
@@ -712,27 +712,27 @@
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 54e675ac-4be0-4c7a-bac9-c760d208b4a2)
     )
-    (pin "~LED_PWR" output (at 110.49 81.28 180)
+    (pin "~{LED_PWR}" output (at 110.49 81.28 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid e68109dc-ed5b-4115-b10c-86e3e1cd8f5e)
     )
-    (pin "~LED_ACT" output (at 110.49 78.74 180)
+    (pin "~{LED_ACT}" output (at 110.49 78.74 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 08a4315f-d715-4c5d-bb7b-db9b1e5d6917)
     )
-    (pin "~FAN_PWM" output (at 158.115 71.12 0)
+    (pin "~{FAN_PWM}" output (at 158.115 71.12 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 9fdef8b1-1ed1-4a09-9c65-439d27d4943e)
     )
-    (pin "Radio{UART SWD ~RESET ~BOOT}" bidirectional (at 158.115 80.01 0)
+    (pin "Radio{UART SWD ~{RESET} ~{BOOT}}" bidirectional (at 158.115 80.01 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 2f0b0fda-42bd-4c5a-ba78-88beb8cf9b7e)
     )
-    (pin "~SW_WIPE" input (at 110.49 71.755 180)
+    (pin "~{SW_WIPE}" input (at 110.49 71.755 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 20559413-fe04-4a76-97f3-35d2fcf52f1e)
     )
-    (pin "~SW_USER" input (at 110.49 74.295 180)
+    (pin "~{SW_USER}" input (at 110.49 74.295 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid bea8a61b-f9e6-4821-9682-22a61dfa11ae)
     )
@@ -756,27 +756,27 @@
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid c6696ad6-d534-4a98-a4af-bc9b0419b3e8)
     )
-    (pin "~LED_PWR" input (at 110.49 40.64 180)
+    (pin "~{LED_PWR}" input (at 110.49 40.64 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 74831538-ffef-4216-9ad7-2dc4c58401e4)
     )
-    (pin "~FAN_PWM" input (at 158.115 53.975 0)
+    (pin "~{FAN_PWM}" input (at 158.115 53.975 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 00439a74-41c1-44a1-ae78-9ce765150eda)
     )
-    (pin "~LED_RADIO" input (at 158.115 46.99 0)
+    (pin "~{LED_RADIO}" input (at 158.115 46.99 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 766cde48-55d7-4ed5-9d53-70de087b96b9)
     )
-    (pin "~LED_ACT" input (at 110.49 43.18 180)
+    (pin "~{LED_ACT}" input (at 110.49 43.18 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 762deb47-85e1-4401-9630-82df3e91f0a5)
     )
-    (pin "~SW_WIPE" output (at 110.49 53.34 180)
+    (pin "~{SW_WIPE}" output (at 110.49 53.34 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 5a6e91f3-cd4f-406f-ba6d-280ef81b9d42)
     )
-    (pin "~SW_USER" output (at 110.49 50.8 180)
+    (pin "~{SW_USER}" output (at 110.49 50.8 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid adb89242-12da-4d08-adf3-6de3a7e84841)
     )
@@ -888,11 +888,11 @@
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 62d82a8e-c6fa-4a55-a936-f194411aea28)
     )
-    (pin "~EXTRST" input (at 59.69 41.91 0)
+    (pin "~{EXTRST}" input (at 59.69 41.91 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 3373ee3a-7996-41d0-8eff-fdec065bae90)
     )
-    (pin "~RESET_CM4" output (at 59.69 44.45 0)
+    (pin "~{RESET_CM4}" output (at 59.69 44.45 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid e7dcadaa-d591-471f-871f-ba24464ec0a8)
     )

PCIe.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid fb9177d9-5a2c-47b4-80e8-740c8259d0b6)
 
@@ -46,7 +46,7 @@
           (number "1" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at 25.4 -10.16 180) (length 2.54)
-          (name "DAS/~DSS~/~LED1" (effects (font (size 1.27 1.27))))
+          (name "DAS/~{DSS}/~{LED1}" (effects (font (size 1.27 1.27))))
           (number "10" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at -25.4 0 0) (length 2.54)
@@ -222,7 +222,7 @@
           (number "5" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at -25.4 43.18 0) (length 2.54)
-          (name "~PERST" (effects (font (size 1.27 1.27))))
+          (name "~{PERST}" (effects (font (size 1.27 1.27))))
           (number "50" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 0 -48.26 90) (length 2.54) hide
@@ -230,7 +230,7 @@
           (number "51" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at -25.4 40.64 0) (length 2.54)
-          (name "~CLKREQ" (effects (font (size 1.27 1.27))))
+          (name "~{CLKREQ}" (effects (font (size 1.27 1.27))))
           (number "52" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at -25.4 -38.1 0) (length 2.54)
@@ -238,7 +238,7 @@
           (number "53" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at -25.4 38.1 0) (length 2.54)
-          (name "~PEWAKE" (effects (font (size 1.27 1.27))))
+          (name "~{PEWAKE}" (effects (font (size 1.27 1.27))))
           (number "54" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at -25.4 -35.56 0) (length 2.54)
@@ -742,11 +742,11 @@
     (uuid e4009c61-5ce0-40c1-8698-cf21c00fe274)
   )
 
-  (label "PCIe.~RST" (at 74.93 48.26 0)
+  (label "PCIe.~{RST}" (at 74.93 48.26 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a1ff7461-f7ed-4c9c-baba-8e3448925b66)
   )
-  (label "PCIe.~CLKREQ" (at 74.93 50.8 0)
+  (label "PCIe.~{CLKREQ}" (at 74.93 50.8 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 79fe2150-61eb-403b-8c6e-6c6d5701499a)
   )

PoE.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 6a7216c3-78af-4a47-8c2e-9a92812932fb)
 

Power.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 7563390d-2b26-4f42-babb-ee1d9f58d701)
 
@@ -812,7 +812,6 @@
     )
   )
 
-
   (junction (at 35.56 77.47) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 35.56 85.09) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 35.56 125.73) (diameter 0.9144) (color 0 0 0 0))

Radio.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid edcdf4aa-f209-403c-9c79-2c346aebc738)
 
@@ -822,19 +822,19 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 734f303e-4ee4-4fdb-8ff8-7cec4b4c94df)
   )
-  (label "Radio.~RESET" (at 66.675 80.01 180)
+  (label "Radio.~{RESET}" (at 66.675 80.01 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0ff6addb-e8b7-476d-b4a0-8cf354ece6ea)
   )
-  (label "Radio.~BOOT" (at 66.675 82.55 180)
+  (label "Radio.~{BOOT}" (at 66.675 82.55 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5b9a6137-a237-4581-b916-75181e2f0f70)
   )
-  (label "Radio.~BOOT" (at 70.485 90.17 0)
+  (label "Radio.~{BOOT}" (at 70.485 90.17 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c531f404-ad92-4f8b-a132-a8dcc22de2dc)
   )
-  (label "Radio.~RESET" (at 101.6 142.24 0)
+  (label "Radio.~{RESET}" (at 101.6 142.24 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 5d930b3f-91fe-4f99-a01c-22901b13e239)
   )
@@ -906,7 +906,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid b26c8137-d13e-4823-9e08-83b7859fa257)
   )
-  (label "Radio.~RESET" (at 167.64 97.79 180)
+  (label "Radio.~{RESET}" (at 167.64 97.79 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid f453b90b-63d1-411a-8404-fa02e3ea0553)
   )
@@ -954,16 +954,16 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c2ad731c-6059-484e-bd8d-f0cc94de691c)
   )
-  (label "Radio.~RESET" (at 226.568 97.79 180)
+  (label "Radio.~{RESET}" (at 226.568 97.79 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid a272e554-6309-484a-91be-f745b63afb08)
   )
 
-  (hierarchical_label "Radio{UART SWD ~RESET ~BOOT}" (shape bidirectional) (at 47.625 57.15 180)
+  (hierarchical_label "Radio{UART SWD ~{RESET} ~{BOOT}}" (shape bidirectional) (at 47.625 57.15 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 70d0f3f0-467b-44db-9a71-99babdca904a)
   )
-  (hierarchical_label "~LED_RADIO" (shape output) (at 116.84 92.71 180)
+  (hierarchical_label "~{LED_RADIO}" (shape output) (at 116.84 92.71 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid fc43ef5e-8408-4e30-b8bc-82c0e9a6885e)
   )

SDCard.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 9f52fa22-0e20-42b5-9ee4-277d84cde590)
 

USB.kicad_sch

@@ -1,4 +1,4 @@
-(kicad_sch (version 20210406) (generator eeschema)
+(kicad_sch (version 20210621) (generator eeschema)
 
   (uuid 3a632b82-acbf-4d0a-9053-97d1eb64aab2)
 
@@ -478,7 +478,7 @@
           (number "10" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at 12.7 -2.54 180) (length 2.54)
-          (name "~SUSPEND" (effects (font (size 1.27 1.27))))
+          (name "~{SUSPEND}" (effects (font (size 1.27 1.27))))
           (number "11" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 0 -27.94 90) (length 2.54) hide
@@ -486,7 +486,7 @@
           (number "12" (effects (font (size 1.27 1.27))))
         )
         (pin input line (at 12.7 7.62 180) (length 2.54)
-          (name "~WAKEUP" (effects (font (size 1.27 1.27))))
+          (name "~{WAKEUP}" (effects (font (size 1.27 1.27))))
           (number "13" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at 12.7 0 180) (length 2.54)
@@ -494,11 +494,11 @@
           (number "14" (effects (font (size 1.27 1.27))))
         )
         (pin input line (at 12.7 15.24 180) (length 2.54)
-          (name "~CTS" (effects (font (size 1.27 1.27))))
+          (name "~{CTS}" (effects (font (size 1.27 1.27))))
           (number "15" (effects (font (size 1.27 1.27))))
         )
         (pin output line (at 12.7 17.78 180) (length 2.54)
-          (name "~RTS" (effects (font (size 1.27 1.27))))
+          (name "~{RTS}" (effects (font (size 1.27 1.27))))
           (number "16" (effects (font (size 1.27 1.27))))
         )
         (pin input line (at 12.7 20.32 180) (length 2.54)
@@ -510,7 +510,7 @@
           (number "18" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at 12.7 -15.24 180) (length 2.54)
-          (name "~RXT~/GPIO.3" (effects (font (size 1.27 1.27))))
+          (name "~{RXT}/GPIO.3" (effects (font (size 1.27 1.27))))
           (number "19" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at 12.7 -7.62 180) (length 2.54)
@@ -518,7 +518,7 @@
           (number "2" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at 12.7 -12.7 180) (length 2.54)
-          (name "~TXT~/GPIO.2" (effects (font (size 1.27 1.27))))
+          (name "~{TXT}/GPIO.2" (effects (font (size 1.27 1.27))))
           (number "20" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 0 -27.94 90) (length 2.54) hide
@@ -550,7 +550,7 @@
           (number "8" (effects (font (size 1.27 1.27))))
         )
         (pin input line (at -12.7 22.86 0) (length 2.54)
-          (name "~RST" (effects (font (size 1.27 1.27))))
+          (name "~{RST}" (effects (font (size 1.27 1.27))))
           (number "9" (effects (font (size 1.27 1.27))))
         )
       )
@@ -588,7 +588,7 @@
           (number "1" (effects (font (size 1.27 1.27))))
         )
         (pin input line (at -10.16 -2.54 0) (length 2.54)
-          (name "~OE" (effects (font (size 1.27 1.27))))
+          (name "~{OE}" (effects (font (size 1.27 1.27))))
           (number "10" (effects (font (size 1.27 1.27))))
         )
         (pin input line (at -10.16 -5.08 0) (length 2.54)
@@ -1712,7 +1712,7 @@
           (number "2" (effects (font (size 1.27 1.27))))
         )
         (pin open_collector line (at 10.16 -2.54 180) (length 2.54)
-          (name "~FLG" (effects (font (size 1.27 1.27))))
+          (name "~{FLG}" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
         (pin input line (at -10.16 -2.54 0) (length 2.54)
@@ -1969,9 +1969,9 @@
     )
   )
 
-  (bus_alias "I2C" (members "SDA" "SCL"))
-  (bus_alias "CM4_USB" (members "CM4_USB_D+" "CM4_USB_D-" "CM4_USB_OTG_ID"))
   (bus_alias "USB" (members "D+" "D-"))
+  (bus_alias "CM4_USB" (members "CM4_USB_D+" "CM4_USB_D-" "CM4_USB_OTG_ID"))
+  (bus_alias "I2C" (members "SDA" "SCL"))
   (junction (at 22.86 80.01) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 22.86 88.9) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 24.892 187.452) (diameter 0.9144) (color 0 0 0 0))
@@ -3534,7 +3534,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid da797f91-92eb-4f69-947f-3b6a7f5150ee)
   )
-  (label "~USB_OC" (at 184.912 47.752 180)
+  (label "~{USB_OC}" (at 184.912 47.752 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 295e2769-e80c-43f9-9fb0-61d683988857)
   )
@@ -3546,7 +3546,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid a15670b6-50ab-4980-b1ca-bb86e2445034)
   )
-  (label "~USB_OC" (at 184.912 60.452 180)
+  (label "~{USB_OC}" (at 184.912 60.452 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 390fa407-dcb9-418d-bcce-fcc9cf5e1228)
   )
@@ -3614,7 +3614,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c887a1e8-4be4-426e-b01c-4021c6140977)
   )
-  (label "~USB_OC" (at 249.682 39.37 180)
+  (label "~{USB_OC}" (at 249.682 39.37 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0a80c7af-43fc-4509-a603-18f628c7a0ed)
   )
@@ -3635,7 +3635,7 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid b61a7f78-9c40-43fe-b1e6-6bca586c1f51)
   )
-  (hierarchical_label "~RESET_CM4" (shape output) (at 64.262 141.732 0)
+  (hierarchical_label "~{RESET_CM4}" (shape output) (at 64.262 141.732 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid bfe01d95-0c8d-47a5-b17e-1de0739cc018)
   )
@@ -3643,7 +3643,7 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid c57f0846-d4a2-40ba-bcdd-bdc58a2fc526)
   )
-  (hierarchical_label "~EXTRST" (shape input) (at 109.982 52.832 180)
+  (hierarchical_label "~{EXTRST}" (shape input) (at 109.982 52.832 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 37544627-64d0-410f-9447-4a22f0546c3c)
   )