Fix some test errors and update gold files for better netnames.

eeschema/sch_field.cpp

@@ -79,6 +79,8 @@ EDA_ITEM* SCH_FIELD::Clone() const
 
 void SCH_FIELD::SetId( int aId )
 {
+    KICAD_T labelTypes[] = { SCH_LABEL_LOCATE_ANY_T, EOT };
+
     m_id = aId;
 
     if( m_parent && m_parent->Type() == SCH_SHEET_T )
@@ -99,7 +101,7 @@ void SCH_FIELD::SetId( int aId )
         default:              SetLayer( LAYER_FIELDS );        break;
         }
     }
-    else
+    else if( m_parent && m_parent->IsType( labelTypes ) )
     {
         // We can't use defined IDs for labels because there can be multiple net class
         // assignments.

qa/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.net

@@ -807,133 +807,133 @@
       (node (ref "C3") (pin "2") (pintype "passive"))
       (node (ref "R6") (pin "1") (pintype "passive"))
       (node (ref "R7") (pin "2") (pintype "passive")))
-    (net (code "15") (name "Net-(C4-Pad1)")
+    (net (code "15") (name "Net-(C5-Pad1)")
-      (node (ref "C4") (pin "1") (pintype "passive"))
-      (node (ref "R7") (pin "1") (pintype "passive"))
-      (node (ref "U3") (pin "5") (pinfunction "+") (pintype "input")))
-    (net (code "16") (name "Net-(C5-Pad1)")
       (node (ref "C5") (pin "1") (pintype "passive"))
       (node (ref "R10") (pin "2") (pintype "passive")))
-    (net (code "17") (name "Net-(C6-Pad2)")
+    (net (code "16") (name "Net-(C6-Pad2)")
       (node (ref "C6") (pin "2") (pintype "passive"))
       (node (ref "R16") (pin "1") (pintype "passive"))
       (node (ref "R17") (pin "2") (pintype "passive")))
-    (net (code "18") (name "Net-(C7-Pad1)")
+    (net (code "17") (name "Net-(C8-Pad1)")
-      (node (ref "C7") (pin "1") (pintype "passive"))
-      (node (ref "R17") (pin "1") (pintype "passive"))
-      (node (ref "U4") (pin "5") (pinfunction "+") (pintype "input")))
-    (net (code "19") (name "Net-(C8-Pad1)")
       (node (ref "C8") (pin "1") (pintype "passive"))
       (node (ref "R20") (pin "2") (pintype "passive")))
-    (net (code "20") (name "Net-(C10-Pad1)")
+    (net (code "18") (name "Net-(C12-Pad1)")
-      (node (ref "C10") (pin "1") (pintype "passive"))
-      (node (ref "U1") (pin "2") (pinfunction "CAP+") (pintype "input")))
-    (net (code "21") (name "Net-(C10-Pad2)")
-      (node (ref "C10") (pin "2") (pintype "passive"))
-      (node (ref "U1") (pin "4") (pinfunction "CAP-") (pintype "input")))
-    (net (code "22") (name "Net-(C12-Pad1)")
       (node (ref "C12") (pin "1") (pintype "passive"))
       (node (ref "R23") (pin "1") (pintype "passive"))
       (node (ref "R6") (pin "2") (pintype "passive")))
-    (net (code "23") (name "Net-(C14-Pad1)")
+    (net (code "19") (name "Net-(C14-Pad1)")
       (node (ref "C14") (pin "1") (pintype "passive"))
       (node (ref "R16") (pin "2") (pintype "passive"))
       (node (ref "R24") (pin "1") (pintype "passive")))
-    (net (code "24") (name "Net-(D2-Pad1)")
+    (net (code "20") (name "Net-(D2-K)")
       (node (ref "D2") (pin "1") (pinfunction "K") (pintype "passive"))
       (node (ref "D3") (pin "2") (pinfunction "A") (pintype "passive")))
-    (net (code "25") (name "Net-(D3-Pad1)")
+    (net (code "21") (name "Net-(D3-K)")
       (node (ref "D3") (pin "1") (pinfunction "K") (pintype "passive"))
       (node (ref "Q1") (pin "2") (pinfunction "B") (pintype "input"))
       (node (ref "R4") (pin "1") (pintype "passive")))
-    (net (code "26") (name "Net-(D4-Pad1)")
+    (net (code "22") (name "Net-(D4-A)")
+      (node (ref "D4") (pin "2") (pinfunction "A") (pintype "passive"))
+      (node (ref "D8") (pin "1") (pinfunction "K") (pintype "passive")))
+    (net (code "23") (name "Net-(D4-K)")
       (node (ref "D4") (pin "1") (pinfunction "K") (pintype "passive"))
       (node (ref "Q3") (pin "2") (pinfunction "B") (pintype "input"))
       (node (ref "Q4") (pin "3") (pinfunction "C") (pintype "passive"))
       (node (ref "R10") (pin "1") (pintype "passive")))
-    (net (code "27") (name "Net-(D4-Pad2)")
+    (net (code "24") (name "Net-(D5-K)")
-      (node (ref "D4") (pin "2") (pinfunction "A") (pintype "passive"))
-      (node (ref "D8") (pin "1") (pinfunction "K") (pintype "passive")))
-    (net (code "28") (name "Net-(D5-Pad1)")
       (node (ref "D5") (pin "1") (pinfunction "K") (pintype "passive"))
       (node (ref "D6") (pin "2") (pinfunction "A") (pintype "passive")))
-    (net (code "29") (name "Net-(D6-Pad1)")
+    (net (code "25") (name "Net-(D6-K)")
       (node (ref "D6") (pin "1") (pinfunction "K") (pintype "passive"))
       (node (ref "Q5") (pin "2") (pinfunction "B") (pintype "input"))
       (node (ref "R14") (pin "1") (pintype "passive")))
-    (net (code "30") (name "Net-(D7-Pad1)")
+    (net (code "26") (name "Net-(D7-A)")
+      (node (ref "D7") (pin "2") (pinfunction "A") (pintype "passive"))
+      (node (ref "D9") (pin "1") (pinfunction "K") (pintype "passive")))
+    (net (code "27") (name "Net-(D7-K)")
       (node (ref "D7") (pin "1") (pinfunction "K") (pintype "passive"))
       (node (ref "Q7") (pin "2") (pinfunction "B") (pintype "input"))
       (node (ref "Q8") (pin "3") (pinfunction "C") (pintype "passive"))
       (node (ref "R20") (pin "1") (pintype "passive")))
-    (net (code "31") (name "Net-(D7-Pad2)")
+    (net (code "28") (name "Net-(D8-A)")
-      (node (ref "D7") (pin "2") (pinfunction "A") (pintype "passive"))
-      (node (ref "D9") (pin "1") (pinfunction "K") (pintype "passive")))
-    (net (code "32") (name "Net-(D8-Pad2)")
       (node (ref "D8") (pin "2") (pinfunction "A") (pintype "passive"))
       (node (ref "Q1") (pin "3") (pinfunction "C") (pintype "passive"))
       (node (ref "Q2") (pin "2") (pinfunction "B") (pintype "input")))
-    (net (code "33") (name "Net-(D9-Pad2)")
+    (net (code "29") (name "Net-(D9-A)")
       (node (ref "D9") (pin "2") (pinfunction "A") (pintype "passive"))
       (node (ref "Q5") (pin "3") (pinfunction "C") (pintype "passive"))
       (node (ref "Q6") (pin "2") (pinfunction "B") (pintype "input")))
-    (net (code "34") (name "Net-(Q1-Pad1)")
+    (net (code "30") (name "Net-(Q1-E)")
       (node (ref "Q1") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R3") (pin "2") (pintype "passive")))
-    (net (code "35") (name "Net-(Q2-Pad1)")
+    (net (code "31") (name "Net-(Q2-E)")
       (node (ref "Q2") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R26") (pin "2") (pintype "passive"))
       (node (ref "R5") (pin "2") (pintype "passive")))
-    (net (code "36") (name "Net-(Q3-Pad1)")
+    (net (code "32") (name "Net-(Q3-E)")
       (node (ref "Q3") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R12") (pin "2") (pintype "passive"))
       (node (ref "R25") (pin "2") (pintype "passive")))
-    (net (code "37") (name "Net-(Q4-Pad1)")
+    (net (code "33") (name "Net-(Q4-B)")
-      (node (ref "Q4") (pin "1") (pinfunction "E") (pintype "passive"))
-      (node (ref "R9") (pin "1") (pintype "passive")))
-    (net (code "38") (name "Net-(Q4-Pad2)")
       (node (ref "Q4") (pin "2") (pinfunction "B") (pintype "input"))
       (node (ref "R8") (pin "1") (pintype "passive")))
-    (net (code "39") (name "Net-(Q5-Pad1)")
+    (net (code "34") (name "Net-(Q4-E)")
+      (node (ref "Q4") (pin "1") (pinfunction "E") (pintype "passive"))
+      (node (ref "R9") (pin "1") (pintype "passive")))
+    (net (code "35") (name "Net-(Q5-E)")
       (node (ref "Q5") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R13") (pin "2") (pintype "passive")))
-    (net (code "40") (name "Net-(Q6-Pad1)")
+    (net (code "36") (name "Net-(Q6-E)")
       (node (ref "Q6") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R15") (pin "2") (pintype "passive"))
       (node (ref "R28") (pin "2") (pintype "passive")))
-    (net (code "41") (name "Net-(Q7-Pad1)")
+    (net (code "37") (name "Net-(Q7-E)")
       (node (ref "Q7") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R22") (pin "2") (pintype "passive"))
       (node (ref "R27") (pin "2") (pintype "passive")))
-    (net (code "42") (name "Net-(Q8-Pad1)")
+    (net (code "38") (name "Net-(Q8-B)")
-      (node (ref "Q8") (pin "1") (pinfunction "E") (pintype "passive"))
-      (node (ref "R19") (pin "1") (pintype "passive")))
-    (net (code "43") (name "Net-(Q8-Pad2)")
       (node (ref "Q8") (pin "2") (pinfunction "B") (pintype "input"))
       (node (ref "R18") (pin "1") (pintype "passive")))
-    (net (code "44") (name "Net-(R9-Pad2)")
+    (net (code "39") (name "Net-(Q8-E)")
+      (node (ref "Q8") (pin "1") (pinfunction "E") (pintype "passive"))
+      (node (ref "R19") (pin "1") (pintype "passive")))
+    (net (code "40") (name "Net-(R9-Pad2)")
       (node (ref "R9") (pin "2") (pintype "passive"))
       (node (ref "U3") (pin "1") (pintype "output")))
-    (net (code "45") (name "Net-(R11-Pad1)")
+    (net (code "41") (name "Net-(R11-Pad1)")
       (node (ref "R11") (pin "1") (pintype "passive"))
       (node (ref "RV1") (pin "1") (pinfunction "1") (pintype "passive")))
-    (net (code "46") (name "Net-(R19-Pad2)")
+    (net (code "42") (name "Net-(R19-Pad2)")
       (node (ref "R19") (pin "2") (pintype "passive"))
       (node (ref "U4") (pin "1") (pintype "output")))
-    (net (code "47") (name "Net-(R21-Pad1)")
+    (net (code "43") (name "Net-(R21-Pad1)")
       (node (ref "R21") (pin "1") (pintype "passive"))
       (node (ref "RV2") (pin "1") (pinfunction "1") (pintype "passive")))
-    (net (code "48") (name "Net-(RV1-Pad2)")
+    (net (code "44") (name "Net-(U1-CAP+)")
+      (node (ref "C10") (pin "1") (pintype "passive"))
+      (node (ref "U1") (pin "2") (pinfunction "CAP+") (pintype "input")))
+    (net (code "45") (name "Net-(U1-CAP-)")
+      (node (ref "C10") (pin "2") (pintype "passive"))
+      (node (ref "U1") (pin "4") (pinfunction "CAP-") (pintype "input")))
+    (net (code "46") (name "Net-(U3A--)")
       (node (ref "RV1") (pin "2") (pinfunction "2") (pintype "passive"))
       (node (ref "U3") (pin "2") (pinfunction "-") (pintype "input")))
-    (net (code "49") (name "Net-(RV2-Pad2)")
+    (net (code "47") (name "Net-(U3B-+)")
+      (node (ref "C4") (pin "1") (pintype "passive"))
+      (node (ref "R7") (pin "1") (pintype "passive"))
+      (node (ref "U3") (pin "5") (pinfunction "+") (pintype "input")))
+    (net (code "48") (name "Net-(U4A--)")
       (node (ref "RV2") (pin "2") (pinfunction "2") (pintype "passive"))
       (node (ref "U4") (pin "2") (pinfunction "-") (pintype "input")))
+    (net (code "49") (name "Net-(U4B-+)")
+      (node (ref "C7") (pin "1") (pintype "passive"))
+      (node (ref "R17") (pin "1") (pintype "passive"))
+      (node (ref "U4") (pin "5") (pinfunction "+") (pintype "input")))
     (net (code "50") (name "VCC")
       (node (ref "C1") (pin "1") (pintype "passive"))
       (node (ref "U1") (pin "8") (pinfunction "V+") (pintype "power_in"))
       (node (ref "U2") (pin "1") (pinfunction "VO") (pintype "power_out")))
-    (net (code "51") (name "unconnected-(U1-Pad6)")
+    (net (code "51") (name "unconnected-(U1-LV)")
       (node (ref "U1") (pin "6") (pinfunction "LV") (pintype "input+no_connect")))
-    (net (code "52") (name "unconnected-(U1-Pad7)")
+    (net (code "52") (name "unconnected-(U1-OSC)")
-      (node (ref "U1") (pin "7") (pinfunction "OSC") (pintype "input+no_connect")))))
+      (node (ref "U1") (pin "7") (pinfunction "OSC") (pintype "input+no_connect")))))

qa/eeschema/data/netlists/noconnects/noconnects.net

@@ -61,32 +61,32 @@
   (nets
     (net (code "1") (name "/VS")
       (node (ref "U1") (pin "11") (pinfunction "VS") (pintype "output+no_connect")))
-    (net (code "2") (name "Net-(U1-Pad7)")
+    (net (code "2") (name "Net-(U1-COM)")
       (node (ref "U1") (pin "7") (pinfunction "VSS") (pintype "power_in"))
       (node (ref "U1") (pin "9") (pinfunction "COM") (pintype "power_in")))
-    (net (code "3") (name "unconnected-(U1-Pad1)")
+    (net (code "3") (name "unconnected-(U1-COM)")
-      (node (ref "U1") (pin "1") (pinfunction "VAA") (pintype "power_in")))
-    (net (code "4") (name "unconnected-(U1-Pad2)")
-      (node (ref "U1") (pin "2") (pinfunction "GND") (pintype "power_in")))
-    (net (code "5") (name "unconnected-(U1-Pad3)")
-      (node (ref "U1") (pin "3") (pinfunction "IN+") (pintype "input")))
-    (net (code "6") (name "unconnected-(U1-Pad4)")
-      (node (ref "U1") (pin "4") (pinfunction "IN-") (pintype "input")))
-    (net (code "7") (name "unconnected-(U1-Pad5)")
-      (node (ref "U1") (pin "5") (pinfunction "COMP") (pintype "output")))
-    (net (code "8") (name "unconnected-(U1-Pad6)")
-      (node (ref "U1") (pin "6") (pinfunction "CSD") (pintype "passive+no_connect")))
-    (net (code "9") (name "unconnected-(U1-Pad8)")
-      (node (ref "U1") (pin "8") (pinfunction "VCC") (pintype "power_in")))
-    (net (code "10") (name "unconnected-(U1-Pad10)")
-      (node (ref "U1") (pin "10") (pinfunction "VN") (pintype "power_in")))
-    (net (code "11") (name "unconnected-(U1-Pad12)")
-      (node (ref "U1") (pin "12") (pinfunction "VP") (pintype "power_in")))
-    (net (code "12") (name "unconnected-(U1-Pad13)")
-      (node (ref "U1") (pin "13") (pinfunction "VB") (pintype "power_in")))
-    (net (code "13") (name "unconnected-(U1-Pad14)")
-      (node (ref "U1") (pin "14") (pinfunction "CSH") (pintype "passive")))
-    (net (code "14") (name "unconnected-(U1-Pad15)")
       (node (ref "U1") (pin "15") (pinfunction "COM") (pintype "no_connect")))
-    (net (code "15") (name "unconnected-(U1-Pad16)")
+    (net (code "4") (name "unconnected-(U1-COMP)")
-      (node (ref "U1") (pin "16") (pinfunction "PTNC") (pintype "no_connect")))))
+      (node (ref "U1") (pin "5") (pinfunction "COMP") (pintype "output")))
+    (net (code "5") (name "unconnected-(U1-CSD)")
+      (node (ref "U1") (pin "6") (pinfunction "CSD") (pintype "passive+no_connect")))
+    (net (code "6") (name "unconnected-(U1-CSH)")
+      (node (ref "U1") (pin "14") (pinfunction "CSH") (pintype "passive")))
+    (net (code "7") (name "unconnected-(U1-GND)")
+      (node (ref "U1") (pin "2") (pinfunction "GND") (pintype "power_in")))
+    (net (code "8") (name "unconnected-(U1-IN+)")
+      (node (ref "U1") (pin "3") (pinfunction "IN+") (pintype "input")))
+    (net (code "9") (name "unconnected-(U1-IN-)")
+      (node (ref "U1") (pin "4") (pinfunction "IN-") (pintype "input")))
+    (net (code "10") (name "unconnected-(U1-PTNC)")
+      (node (ref "U1") (pin "16") (pinfunction "PTNC") (pintype "no_connect")))
+    (net (code "11") (name "unconnected-(U1-VAA)")
+      (node (ref "U1") (pin "1") (pinfunction "VAA") (pintype "power_in")))
+    (net (code "12") (name "unconnected-(U1-VB)")
+      (node (ref "U1") (pin "13") (pinfunction "VB") (pintype "power_in")))
+    (net (code "13") (name "unconnected-(U1-VCC)")
+      (node (ref "U1") (pin "8") (pinfunction "VCC") (pintype "power_in")))
+    (net (code "14") (name "unconnected-(U1-VN)")
+      (node (ref "U1") (pin "10") (pinfunction "VN") (pintype "power_in")))
+    (net (code "15") (name "unconnected-(U1-VP)")
+      (node (ref "U1") (pin "12") (pinfunction "VP") (pintype "power_in")))))

qa/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.net

@@ -148,5 +148,5 @@
     (net (code "5") (name "LIVE")
       (node (ref "J1") (pin "1") (pinfunction "Pin_1") (pintype "passive"))
       (node (ref "R2") (pin "2") (pintype "passive")))
-    (net (code "6") (name "unconnected-(J1-Pad3)")
+    (net (code "6") (name "unconnected-(J1-Pin_3)")
       (node (ref "J1") (pin "3") (pinfunction "Pin_3") (pintype "passive")))))

qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.net

@@ -126,67 +126,67 @@
     (net (code "8") (name "/ROW7")
       (node (ref "DS1") (pin "9") (pinfunction "ROW8") (pintype "passive"))
       (node (ref "DS2") (pin "9") (pinfunction "ROW8") (pintype "passive")))
-    (net (code "12") (name "unconnected-(DS1-Pad1)")
+    (net (code "12") (name "unconnected-(DS1-COL1G)")
       (node (ref "DS1") (pin "1") (pinfunction "COL1G") (pintype "passive")))
-    (net (code "13") (name "unconnected-(DS1-Pad2)")
+    (net (code "13") (name "unconnected-(DS1-COL1R)")
-      (node (ref "DS1") (pin "2") (pinfunction "COL2G") (pintype "passive")))
-    (net (code "14") (name "unconnected-(DS1-Pad3)")
-      (node (ref "DS1") (pin "3") (pinfunction "COL3G") (pintype "passive")))
-    (net (code "15") (name "unconnected-(DS1-Pad4)")
-      (node (ref "DS1") (pin "4") (pinfunction "COL4G") (pintype "passive")))
-    (net (code "16") (name "unconnected-(DS1-Pad5)")
-      (node (ref "DS1") (pin "5") (pinfunction "COL5G") (pintype "passive")))
-    (net (code "17") (name "unconnected-(DS1-Pad6)")
-      (node (ref "DS1") (pin "6") (pinfunction "COL6G") (pintype "passive")))
-    (net (code "18") (name "unconnected-(DS1-Pad7)")
-      (node (ref "DS1") (pin "7") (pinfunction "COL7G") (pintype "passive")))
-    (net (code "19") (name "unconnected-(DS1-Pad8)")
-      (node (ref "DS1") (pin "8") (pinfunction "COL8G") (pintype "passive")))
-    (net (code "20") (name "unconnected-(DS1-Pad17)")
       (node (ref "DS1") (pin "17") (pinfunction "COL1R") (pintype "passive")))
-    (net (code "21") (name "unconnected-(DS1-Pad18)")
+    (net (code "14") (name "unconnected-(DS1-COL2G)")
+      (node (ref "DS1") (pin "2") (pinfunction "COL2G") (pintype "passive")))
+    (net (code "15") (name "unconnected-(DS1-COL2R)")
       (node (ref "DS1") (pin "18") (pinfunction "COL2R") (pintype "passive")))
-    (net (code "22") (name "unconnected-(DS1-Pad19)")
+    (net (code "16") (name "unconnected-(DS1-COL3G)")
+      (node (ref "DS1") (pin "3") (pinfunction "COL3G") (pintype "passive")))
+    (net (code "17") (name "unconnected-(DS1-COL3R)")
       (node (ref "DS1") (pin "19") (pinfunction "COL3R") (pintype "passive")))
-    (net (code "23") (name "unconnected-(DS1-Pad20)")
+    (net (code "18") (name "unconnected-(DS1-COL4G)")
+      (node (ref "DS1") (pin "4") (pinfunction "COL4G") (pintype "passive")))
+    (net (code "19") (name "unconnected-(DS1-COL4R)")
       (node (ref "DS1") (pin "20") (pinfunction "COL4R") (pintype "passive")))
-    (net (code "24") (name "unconnected-(DS1-Pad21)")
+    (net (code "20") (name "unconnected-(DS1-COL5G)")
+      (node (ref "DS1") (pin "5") (pinfunction "COL5G") (pintype "passive")))
+    (net (code "21") (name "unconnected-(DS1-COL5R)")
       (node (ref "DS1") (pin "21") (pinfunction "COL5R") (pintype "passive")))
-    (net (code "25") (name "unconnected-(DS1-Pad22)")
+    (net (code "22") (name "unconnected-(DS1-COL6G)")
+      (node (ref "DS1") (pin "6") (pinfunction "COL6G") (pintype "passive")))
+    (net (code "23") (name "unconnected-(DS1-COL6R)")
       (node (ref "DS1") (pin "22") (pinfunction "COL6R") (pintype "passive")))
-    (net (code "26") (name "unconnected-(DS1-Pad23)")
+    (net (code "24") (name "unconnected-(DS1-COL7G)")
+      (node (ref "DS1") (pin "7") (pinfunction "COL7G") (pintype "passive")))
+    (net (code "25") (name "unconnected-(DS1-COL7R)")
       (node (ref "DS1") (pin "23") (pinfunction "COL7R") (pintype "passive")))
-    (net (code "27") (name "unconnected-(DS1-Pad24)")
+    (net (code "26") (name "unconnected-(DS1-COL8G)")
+      (node (ref "DS1") (pin "8") (pinfunction "COL8G") (pintype "passive")))
+    (net (code "27") (name "unconnected-(DS1-COL8R)")
       (node (ref "DS1") (pin "24") (pinfunction "COL8R") (pintype "passive")))
-    (net (code "28") (name "unconnected-(DS2-Pad1)")
+    (net (code "28") (name "unconnected-(DS2-COL1G)")
       (node (ref "DS2") (pin "1") (pinfunction "COL1G") (pintype "passive")))
-    (net (code "29") (name "unconnected-(DS2-Pad2)")
+    (net (code "29") (name "unconnected-(DS2-COL1R)")
-      (node (ref "DS2") (pin "2") (pinfunction "COL2G") (pintype "passive")))
-    (net (code "30") (name "unconnected-(DS2-Pad3)")
-      (node (ref "DS2") (pin "3") (pinfunction "COL3G") (pintype "passive")))
-    (net (code "31") (name "unconnected-(DS2-Pad4)")
-      (node (ref "DS2") (pin "4") (pinfunction "COL4G") (pintype "passive")))
-    (net (code "32") (name "unconnected-(DS2-Pad5)")
-      (node (ref "DS2") (pin "5") (pinfunction "COL5G") (pintype "passive")))
-    (net (code "33") (name "unconnected-(DS2-Pad6)")
-      (node (ref "DS2") (pin "6") (pinfunction "COL6G") (pintype "passive")))
-    (net (code "34") (name "unconnected-(DS2-Pad7)")
-      (node (ref "DS2") (pin "7") (pinfunction "COL7G") (pintype "passive")))
-    (net (code "35") (name "unconnected-(DS2-Pad8)")
-      (node (ref "DS2") (pin "8") (pinfunction "COL8G") (pintype "passive")))
-    (net (code "36") (name "unconnected-(DS2-Pad17)")
       (node (ref "DS2") (pin "17") (pinfunction "COL1R") (pintype "passive")))
-    (net (code "37") (name "unconnected-(DS2-Pad18)")
+    (net (code "30") (name "unconnected-(DS2-COL2G)")
+      (node (ref "DS2") (pin "2") (pinfunction "COL2G") (pintype "passive")))
+    (net (code "31") (name "unconnected-(DS2-COL2R)")
       (node (ref "DS2") (pin "18") (pinfunction "COL2R") (pintype "passive")))
-    (net (code "38") (name "unconnected-(DS2-Pad19)")
+    (net (code "32") (name "unconnected-(DS2-COL3G)")
+      (node (ref "DS2") (pin "3") (pinfunction "COL3G") (pintype "passive")))
+    (net (code "33") (name "unconnected-(DS2-COL3R)")
       (node (ref "DS2") (pin "19") (pinfunction "COL3R") (pintype "passive")))
-    (net (code "39") (name "unconnected-(DS2-Pad20)")
+    (net (code "34") (name "unconnected-(DS2-COL4G)")
+      (node (ref "DS2") (pin "4") (pinfunction "COL4G") (pintype "passive")))
+    (net (code "35") (name "unconnected-(DS2-COL4R)")
       (node (ref "DS2") (pin "20") (pinfunction "COL4R") (pintype "passive")))
-    (net (code "40") (name "unconnected-(DS2-Pad21)")
+    (net (code "36") (name "unconnected-(DS2-COL5G)")
+      (node (ref "DS2") (pin "5") (pinfunction "COL5G") (pintype "passive")))
+    (net (code "37") (name "unconnected-(DS2-COL5R)")
       (node (ref "DS2") (pin "21") (pinfunction "COL5R") (pintype "passive")))
-    (net (code "41") (name "unconnected-(DS2-Pad22)")
+    (net (code "38") (name "unconnected-(DS2-COL6G)")
+      (node (ref "DS2") (pin "6") (pinfunction "COL6G") (pintype "passive")))
+    (net (code "39") (name "unconnected-(DS2-COL6R)")
       (node (ref "DS2") (pin "22") (pinfunction "COL6R") (pintype "passive")))
-    (net (code "42") (name "unconnected-(DS2-Pad23)")
+    (net (code "40") (name "unconnected-(DS2-COL7G)")
+      (node (ref "DS2") (pin "7") (pinfunction "COL7G") (pintype "passive")))
+    (net (code "41") (name "unconnected-(DS2-COL7R)")
       (node (ref "DS2") (pin "23") (pinfunction "COL7R") (pintype "passive")))
-    (net (code "43") (name "unconnected-(DS2-Pad24)")
+    (net (code "42") (name "unconnected-(DS2-COL8G)")
-      (node (ref "DS2") (pin "24") (pinfunction "COL8R") (pintype "passive")))))
+      (node (ref "DS2") (pin "8") (pinfunction "COL8G") (pintype "passive")))
+    (net (code "43") (name "unconnected-(DS2-COL8R)")
+      (node (ref "DS2") (pin "24") (pinfunction "COL8R") (pintype "passive")))))

qa/eeschema/data/netlists/video/video.net

@@ -4899,479 +4899,479 @@
       (node (ref "W3") (pin "1") (pinfunction "1") (pintype "passive"))
       (node (ref "W4") (pin "1") (pinfunction "1") (pintype "passive"))
       (node (ref "W5") (pin "1") (pinfunction "1") (pintype "passive")))
-    (net (code "316") (name "Net-(BUS1-PadA4)")
+    (net (code "316") (name "Net-(BUS1-PRSNT1#)")
-      (node (ref "BUS1") (pin "A4") (pinfunction "TDI") (pintype "output"))
-      (node (ref "BUS1") (pin "B4") (pinfunction "TDO") (pintype "input")))
-    (net (code "317") (name "Net-(BUS1-PadB9)")
       (node (ref "BUS1") (pin "B9") (pinfunction "PRSNT1#") (pintype "input"))
       (node (ref "W5") (pin "2") (pinfunction "2") (pintype "passive")))
-    (net (code "318") (name "Net-(BUS1-PadB11)")
+    (net (code "317") (name "Net-(BUS1-PRSNT2#)")
       (node (ref "BUS1") (pin "B11") (pinfunction "PRSNT2#") (pintype "input"))
       (node (ref "W4") (pin "2") (pinfunction "2") (pintype "passive")))
+    (net (code "318") (name "Net-(BUS1-TDI)")
+      (node (ref "BUS1") (pin "A4") (pinfunction "TDI") (pintype "output"))
+      (node (ref "BUS1") (pin "B4") (pinfunction "TDO") (pintype "input")))
     (net (code "319") (name "Net-(C1-Pad1)")
       (node (ref "C1") (pin "1") (pintype "passive"))
       (node (ref "C47") (pin "1") (pintype "passive"))
       (node (ref "R35") (pin "1") (pintype "passive")))
-    (net (code "320") (name "Net-(C1-Pad2)")
+    (net (code "320") (name "Net-(C3-Pad1)")
-      (node (ref "C1") (pin "2") (pintype "passive"))
-      (node (ref "R14") (pin "1") (pintype "passive"))
-      (node (ref "U10") (pin "140") (pinfunction "SYNC_DET") (pintype "input")))
-    (net (code "321") (name "Net-(C3-Pad1)")
       (node (ref "C3") (pin "1") (pintype "passive"))
       (node (ref "R3") (pin "2") (pintype "passive")))
-    (net (code "322") (name "Net-(C4-Pad1)")
+    (net (code "321") (name "Net-(C4-Pad1)")
       (node (ref "C4") (pin "1") (pintype "passive"))
       (node (ref "R2") (pin "2") (pintype "passive")))
-    (net (code "323") (name "Net-(C5-Pad1)")
+    (net (code "322") (name "Net-(C5-Pad2)")
-      (node (ref "C5") (pin "1") (pintype "passive"))
-      (node (ref "U10") (pin "117") (pinfunction "VIN_C") (pintype "input")))
-    (net (code "324") (name "Net-(C5-Pad2)")
       (node (ref "C5") (pin "2") (pintype "passive"))
       (node (ref "R19") (pin "1") (pintype "passive")))
-    (net (code "325") (name "Net-(C6-Pad1)")
+    (net (code "323") (name "Net-(C8-Pad2)")
-      (node (ref "C6") (pin "1") (pintype "passive"))
-      (node (ref "R12") (pin "1") (pintype "passive"))
-      (node (ref "U10") (pin "113") (pinfunction "REFOUT") (pintype "output"))
-      (node (ref "U10") (pin "137") (pinfunction "CREF+") (pintype "input"))
-      (node (ref "U10") (pin "144") (pinfunction "YREF+") (pintype "input")))
-    (net (code "326") (name "Net-(C7-Pad1)")
-      (node (ref "C7") (pin "1") (pintype "passive"))
-      (node (ref "R27") (pin "2") (pintype "passive"))
-      (node (ref "U10") (pin "114") (pinfunction "CLEVEL") (pintype "input")))
-    (net (code "327") (name "Net-(C8-Pad1)")
-      (node (ref "C8") (pin "1") (pintype "passive"))
-      (node (ref "U10") (pin "4") (pinfunction "VIN_Y/COMP.") (pintype "input")))
-    (net (code "328") (name "Net-(C8-Pad2)")
       (node (ref "C8") (pin "2") (pintype "passive"))
       (node (ref "R20") (pin "1") (pintype "passive")))
-    (net (code "329") (name "Net-(C16-Pad1)")
+    (net (code "324") (name "Net-(C36-Pad2)")
-      (node (ref "C16") (pin "1") (pintype "passive"))
-      (node (ref "U10") (pin "110") (pinfunction "N/C") (pintype "input")))
-    (net (code "330") (name "Net-(C32-Pad2)")
-      (node (ref "C32") (pin "2") (pintype "passive"))
-      (node (ref "U9") (pin "43") (pinfunction "VREF") (pintype "input"))
-      (node (ref "U9") (pin "44") (pinfunction "VREFOUT") (pintype "output")))
-    (net (code "331") (name "Net-(C34-Pad2)")
-      (node (ref "C34") (pin "2") (pintype "passive"))
-      (node (ref "C42") (pin "2") (pintype "passive"))
-      (node (ref "R8") (pin "1") (pintype "passive"))
-      (node (ref "U9") (pin "40") (pinfunction "IREF") (pintype "input")))
-    (net (code "332") (name "Net-(C35-Pad2)")
-      (node (ref "C35") (pin "2") (pintype "passive"))
-      (node (ref "U9") (pin "41") (pinfunction "COMP") (pintype "input"))
-      (node (ref "U9") (pin "42") (pinfunction "OPA") (pintype "output")))
-    (net (code "333") (name "Net-(C36-Pad1)")
-      (node (ref "C36") (pin "1") (pintype "passive"))
-      (node (ref "R15") (pin "2") (pintype "passive"))
-      (node (ref "U8") (pin "7") (pinfunction "CEXT2") (pintype "input")))
-    (net (code "334") (name "Net-(C36-Pad2)")
       (node (ref "C36") (pin "2") (pintype "passive"))
       (node (ref "C37") (pin "2") (pintype "passive"))
       (node (ref "R36") (pin "1") (pintype "passive")))
-    (net (code "335") (name "Net-(C39-Pad1)")
+    (net (code "325") (name "Net-(C39-Pad2)")
-      (node (ref "C39") (pin "1") (pintype "passive"))
-      (node (ref "U8") (pin "83") (pinfunction "RVID0") (pintype "input")))
-    (net (code "336") (name "Net-(C39-Pad2)")
       (node (ref "C39") (pin "2") (pintype "passive"))
       (node (ref "R24") (pin "2") (pintype "passive")))
-    (net (code "337") (name "Net-(C40-Pad1)")
+    (net (code "326") (name "Net-(C40-Pad2)")
-      (node (ref "C40") (pin "1") (pintype "passive"))
-      (node (ref "U8") (pin "79") (pinfunction "GVID0") (pintype "input")))
-    (net (code "338") (name "Net-(C40-Pad2)")
       (node (ref "C40") (pin "2") (pintype "passive"))
       (node (ref "R23") (pin "2") (pintype "passive")))
-    (net (code "339") (name "Net-(C41-Pad1)")
+    (net (code "327") (name "Net-(C41-Pad2)")
-      (node (ref "C41") (pin "1") (pintype "passive"))
-      (node (ref "U8") (pin "75") (pinfunction "BVID0") (pintype "input")))
-    (net (code "340") (name "Net-(C41-Pad2)")
       (node (ref "C41") (pin "2") (pintype "passive"))
       (node (ref "R22") (pin "2") (pintype "passive")))
-    (net (code "341") (name "Net-(C43-Pad1)")
+    (net (code "328") (name "Net-(C46-Pad1)")
-      (node (ref "C43") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "12") (pinfunction "VOFF") (pintype "output")))
-    (net (code "342") (name "Net-(C44-Pad1)")
-      (node (ref "C44") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "6") (pinfunction "UOFF") (pintype "output")))
-    (net (code "343") (name "Net-(C45-Pad1)")
-      (node (ref "C45") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "15") (pinfunction "FLT") (pintype "passive")))
-    (net (code "344") (name "Net-(C46-Pad1)")
       (node (ref "C46") (pin "1") (pintype "passive"))
       (node (ref "C53") (pin "1") (pintype "passive"))
       (node (ref "L1") (pin "2") (pinfunction "2") (pintype "passive")))
-    (net (code "345") (name "Net-(C48-Pad2)")
+    (net (code "329") (name "Net-(C49-Pad1)")
-      (node (ref "C48") (pin "2") (pintype "passive"))
-      (node (ref "C64") (pin "1") (pintype "passive"))
-      (node (ref "R11") (pin "2") (pintype "passive"))
-      (node (ref "U20") (pin "13") (pinfunction "VREF") (pintype "output")))
-    (net (code "346") (name "Net-(C49-Pad1)")
       (node (ref "C49") (pin "1") (pintype "passive"))
       (node (ref "R21") (pin "1") (pintype "passive"))
       (node (ref "R26") (pin "2") (pintype "passive"))
       (node (ref "X1") (pin "1") (pinfunction "1") (pintype "passive")))
-    (net (code "347") (name "Net-(C54-Pad1)")
+    (net (code "330") (name "Net-(C61-Pad1)")
-      (node (ref "C54") (pin "1") (pintype "passive"))
-      (node (ref "L2") (pin "2") (pinfunction "2") (pintype "passive"))
-      (node (ref "U20") (pin "8") (pinfunction "VCC") (pintype "input")))
-    (net (code "348") (name "Net-(C58-Pad1)")
-      (node (ref "C58") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "11") (pinfunction "B") (pintype "input")))
-    (net (code "349") (name "Net-(C59-Pad1)")
-      (node (ref "C59") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "9") (pinfunction "G") (pintype "input")))
-    (net (code "350") (name "Net-(C60-Pad1)")
-      (node (ref "C60") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "7") (pinfunction "R") (pintype "input")))
-    (net (code "351") (name "Net-(C61-Pad1)")
       (node (ref "C61") (pin "1") (pintype "passive"))
       (node (ref "R30") (pin "1") (pintype "passive"))
       (node (ref "R31") (pin "2") (pintype "passive")))
-    (net (code "352") (name "Net-(C61-Pad2)")
+    (net (code "331") (name "Net-(CV1-Pad1)")
-      (node (ref "C61") (pin "2") (pintype "passive"))
-      (node (ref "U20") (pin "24") (pinfunction "CS") (pintype "input")))
-    (net (code "353") (name "Net-(C65-Pad2)")
-      (node (ref "C65") (pin "2") (pintype "passive"))
-      (node (ref "R25") (pin "2") (pintype "passive"))
-      (node (ref "U10") (pin "109") (pinfunction "XTAL1_OUT") (pintype "output"))
-      (node (ref "X2") (pin "1") (pinfunction "1") (pintype "passive")))
-    (net (code "354") (name "Net-(C66-Pad2)")
-      (node (ref "C66") (pin "2") (pintype "passive"))
-      (node (ref "R25") (pin "1") (pintype "passive"))
-      (node (ref "U10") (pin "108") (pinfunction "XTAL1_IN") (pintype "input"))
-      (node (ref "X2") (pin "2") (pinfunction "2") (pintype "passive")))
-    (net (code "355") (name "Net-(CV1-Pad1)")
       (node (ref "CV1") (pin "1") (pintype "passive"))
       (node (ref "X3") (pin "1") (pinfunction "1") (pintype "passive")))
-    (net (code "356") (name "Net-(D6-Pad1)")
+    (net (code "332") (name "Net-(D6-A)")
       (node (ref "D6") (pin "1") (pinfunction "A") (pintype "passive"))
       (node (ref "R13") (pin "2") (pintype "passive")))
-    (net (code "357") (name "Net-(L1-Pad1)")
+    (net (code "333") (name "Net-(L6-Pad1)")
-      (node (ref "L1") (pin "1") (pinfunction "1") (pintype "passive"))
-      (node (ref "U20") (pin "18") (pinfunction "NOTCH") (pintype "input")))
-    (net (code "358") (name "Net-(L6-Pad1)")
       (node (ref "L6") (pin "1") (pinfunction "1") (pintype "passive"))
       (node (ref "R10") (pin "1") (pintype "passive")))
-    (net (code "359") (name "Net-(L6-Pad2)")
+    (net (code "334") (name "Net-(P4-P1)")
-      (node (ref "L6") (pin "2") (pinfunction "2") (pintype "passive"))
-      (node (ref "R11") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "20") (pinfunction "Y+SIN") (pintype "input")))
-    (net (code "360") (name "Net-(P4-Pad1)")
       (node (ref "P4") (pin "1") (pinfunction "P1") (pintype "passive"))
       (node (ref "R48") (pin "2") (pintype "passive"))
       (node (ref "U23") (pin "25") (pinfunction "M1") (pintype "passive"))
       (node (ref "U23") (pin "27") (pinfunction "M0") (pintype "input"))
       (node (ref "U23") (pin "29") (pinfunction "M2") (pintype "input")))
-    (net (code "361") (name "Net-(P9-Pad1)")
+    (net (code "335") (name "Net-(POT1-Pad1)")
-      (node (ref "P9") (pin "1") (pinfunction "1") (pintype "passive"))
-      (node (ref "U23") (pin "51") (pinfunction "SGCK3") (pintype "passive")))
-    (net (code "362") (name "Net-(P10-Pad1)")
-      (node (ref "P10") (pin "1") (pinfunction "1") (pintype "passive"))
-      (node (ref "U23") (pin "87") (pinfunction "P87") (pintype "passive")))
-    (net (code "363") (name "Net-(P11-Pad1)")
-      (node (ref "P11") (pin "1") (pinfunction "1") (pintype "passive"))
-      (node (ref "U23") (pin "82") (pinfunction "PGCK4") (pintype "passive")))
-    (net (code "364") (name "Net-(POT1-Pad1)")
       (node (ref "POT1") (pin "1") (pinfunction "1") (pintype "passive"))
       (node (ref "R9") (pin "1") (pintype "passive")))
-    (net (code "365") (name "Net-(Q1-Pad1)")
+    (net (code "336") (name "Net-(Q1-B)")
+      (node (ref "Q1") (pin "2") (pinfunction "B") (pintype "input"))
+      (node (ref "R16") (pin "1") (pintype "passive")))
+    (net (code "337") (name "Net-(Q1-E)")
       (node (ref "Q1") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R32") (pin "1") (pintype "passive"))
       (node (ref "R39") (pin "2") (pintype "passive")))
-    (net (code "366") (name "Net-(Q1-Pad2)")
+    (net (code "338") (name "Net-(Q2-B)")
-      (node (ref "Q1") (pin "2") (pinfunction "B") (pintype "input"))
+      (node (ref "Q2") (pin "2") (pinfunction "B") (pintype "input"))
-      (node (ref "R16") (pin "1") (pintype "passive")))
+      (node (ref "R17") (pin "1") (pintype "passive")))
-    (net (code "367") (name "Net-(Q2-Pad1)")
+    (net (code "339") (name "Net-(Q2-E)")
       (node (ref "Q2") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R33") (pin "1") (pintype "passive"))
       (node (ref "R40") (pin "1") (pintype "passive")))
-    (net (code "368") (name "Net-(Q2-Pad2)")
+    (net (code "340") (name "Net-(Q3-B)")
-      (node (ref "Q2") (pin "2") (pinfunction "B") (pintype "input"))
+      (node (ref "Q3") (pin "2") (pinfunction "B") (pintype "input"))
-      (node (ref "R17") (pin "1") (pintype "passive")))
+      (node (ref "R18") (pin "1") (pintype "passive")))
-    (net (code "369") (name "Net-(Q3-Pad1)")
+    (net (code "341") (name "Net-(Q3-E)")
       (node (ref "Q3") (pin "1") (pinfunction "E") (pintype "passive"))
       (node (ref "R34") (pin "1") (pintype "passive"))
       (node (ref "R41") (pin "2") (pintype "passive")))
-    (net (code "370") (name "Net-(Q3-Pad2)")
+    (net (code "342") (name "Net-(U1-SCL)")
-      (node (ref "Q3") (pin "2") (pinfunction "B") (pintype "input"))
-      (node (ref "R18") (pin "1") (pintype "passive")))
-    (net (code "371") (name "Net-(R4-Pad1)")
-      (node (ref "R4") (pin "1") (pintype "passive"))
-      (node (ref "U20") (pin "2") (pinfunction "MCTR") (pintype "input")))
-    (net (code "372") (name "Net-(R5-Pad1)")
-      (node (ref "R5") (pin "1") (pintype "passive"))
-      (node (ref "U11") (pin "59") (pinfunction "MODE_16/32") (pintype "input"))
-      (node (ref "W1") (pin "2") (pinfunction "2") (pintype "passive")))
-    (net (code "373") (name "Net-(R6-Pad1)")
-      (node (ref "R6") (pin "1") (pintype "passive"))
-      (node (ref "U11") (pin "138") (pinfunction "FLT#") (pintype "input"))
-      (node (ref "W2") (pin "2") (pinfunction "2") (pintype "passive")))
-    (net (code "374") (name "Net-(R7-Pad1)")
-      (node (ref "R7") (pin "1") (pintype "passive"))
-      (node (ref "U11") (pin "135") (pinfunction "SNV") (pintype "input"))
-      (node (ref "W3") (pin "2") (pinfunction "2") (pintype "passive")))
-    (net (code "375") (name "Net-(R9-Pad2)")
-      (node (ref "R9") (pin "2") (pintype "passive"))
-      (node (ref "U20") (pin "21") (pinfunction "B/ADJ") (pintype "passive")))
-    (net (code "376") (name "Net-(R10-Pad2)")
-      (node (ref "R10") (pin "2") (pintype "passive"))
-      (node (ref "U20") (pin "22") (pinfunction "Y+SOUT") (pintype "output")))
-    (net (code "377") (name "Net-(R19-Pad2)")
-      (node (ref "R19") (pin "2") (pintype "passive"))
-      (node (ref "U10") (pin "115") (pinfunction "OUT_C") (pintype "output")))
-    (net (code "378") (name "Net-(R27-Pad1)")
-      (node (ref "R27") (pin "1") (pintype "passive"))
-      (node (ref "U10") (pin "135") (pinfunction "R/2") (pintype "input")))
-    (net (code "379") (name "Net-(R28-Pad2)")
       (node (ref "R28") (pin "2") (pintype "passive"))
       (node (ref "U1") (pin "6") (pinfunction "SCL") (pintype "input"))
       (node (ref "U11") (pin "128") (pinfunction "ERD#/SCL") (pintype "output")))
-    (net (code "380") (name "Net-(R29-Pad2)")
+    (net (code "343") (name "Net-(U1-SDA)")
       (node (ref "R29") (pin "2") (pintype "passive"))
       (node (ref "U1") (pin "5") (pinfunction "SDA") (pintype "bidirectional"))
       (node (ref "U11") (pin "127") (pinfunction "EWR#/SDA") (pintype "bidirectional")))
-    (net (code "381") (name "Net-(R36-Pad2)")
+    (net (code "344") (name "Net-(U8-BIN)")
-      (node (ref "R36") (pin "2") (pintype "passive"))
-      (node (ref "U8") (pin "6") (pinfunction "CEXT1") (pintype "output")))
-    (net (code "382") (name "Net-(R38-Pad1)")
-      (node (ref "R38") (pin "1") (pintype "passive"))
-      (node (ref "U8") (pin "69") (pinfunction "RSET") (pintype "input")))
-    (net (code "383") (name "Net-(U8-Pad58)")
       (node (ref "U8") (pin "58") (pinfunction "BIN") (pintype "input"))
       (node (ref "U8") (pin "68") (pinfunction "BOUT") (pintype "output")))
-    (net (code "384") (name "Net-(U8-Pad60)")
+    (net (code "345") (name "Net-(U8-BVID0)")
+      (node (ref "C41") (pin "1") (pintype "passive"))
+      (node (ref "U8") (pin "75") (pinfunction "BVID0") (pintype "input")))
+    (net (code "346") (name "Net-(U8-CEXT1)")
+      (node (ref "R36") (pin "2") (pintype "passive"))
+      (node (ref "U8") (pin "6") (pinfunction "CEXT1") (pintype "output")))
+    (net (code "347") (name "Net-(U8-CEXT2)")
+      (node (ref "C36") (pin "1") (pintype "passive"))
+      (node (ref "R15") (pin "2") (pintype "passive"))
+      (node (ref "U8") (pin "7") (pinfunction "CEXT2") (pintype "input")))
+    (net (code "348") (name "Net-(U8-GIN)")
       (node (ref "U8") (pin "60") (pinfunction "GIN") (pintype "input"))
       (node (ref "U8") (pin "70") (pinfunction "GOUT") (pintype "output")))
-    (net (code "385") (name "Net-(U8-Pad62)")
+    (net (code "349") (name "Net-(U8-GVID0)")
+      (node (ref "C40") (pin "1") (pintype "passive"))
+      (node (ref "U8") (pin "79") (pinfunction "GVID0") (pintype "input")))
+    (net (code "350") (name "Net-(U8-RIN)")
       (node (ref "U8") (pin "62") (pinfunction "RIN") (pintype "input"))
       (node (ref "U8") (pin "72") (pinfunction "ROUT") (pintype "output")))
-    (net (code "386") (name "Net-(U20-Pad23)")
+    (net (code "351") (name "Net-(U8-RSET)")
+      (node (ref "R38") (pin "1") (pintype "passive"))
+      (node (ref "U8") (pin "69") (pinfunction "RSET") (pintype "input")))
+    (net (code "352") (name "Net-(U8-RVID0)")
+      (node (ref "C39") (pin "1") (pintype "passive"))
+      (node (ref "U8") (pin "83") (pinfunction "RVID0") (pintype "input")))
+    (net (code "353") (name "Net-(U9-COMP)")
+      (node (ref "C35") (pin "2") (pintype "passive"))
+      (node (ref "U9") (pin "41") (pinfunction "COMP") (pintype "input"))
+      (node (ref "U9") (pin "42") (pinfunction "OPA") (pintype "output")))
+    (net (code "354") (name "Net-(U9-IREF)")
+      (node (ref "C34") (pin "2") (pintype "passive"))
+      (node (ref "C42") (pin "2") (pintype "passive"))
+      (node (ref "R8") (pin "1") (pintype "passive"))
+      (node (ref "U9") (pin "40") (pinfunction "IREF") (pintype "input")))
+    (net (code "355") (name "Net-(U9-VREF)")
+      (node (ref "C32") (pin "2") (pintype "passive"))
+      (node (ref "U9") (pin "43") (pinfunction "VREF") (pintype "input"))
+      (node (ref "U9") (pin "44") (pinfunction "VREFOUT") (pintype "output")))
+    (net (code "356") (name "Net-(U10-CLEVEL)")
+      (node (ref "C7") (pin "1") (pintype "passive"))
+      (node (ref "R27") (pin "2") (pintype "passive"))
+      (node (ref "U10") (pin "114") (pinfunction "CLEVEL") (pintype "input")))
+    (net (code "357") (name "Net-(U10-CREF+)")
+      (node (ref "C6") (pin "1") (pintype "passive"))
+      (node (ref "R12") (pin "1") (pintype "passive"))
+      (node (ref "U10") (pin "113") (pinfunction "REFOUT") (pintype "output"))
+      (node (ref "U10") (pin "137") (pinfunction "CREF+") (pintype "input"))
+      (node (ref "U10") (pin "144") (pinfunction "YREF+") (pintype "input")))
+    (net (code "358") (name "Net-(U10-N/C)")
+      (node (ref "C16") (pin "1") (pintype "passive"))
+      (node (ref "U10") (pin "110") (pinfunction "N/C") (pintype "input")))
+    (net (code "359") (name "Net-(U10-OUT_C)")
+      (node (ref "R19") (pin "2") (pintype "passive"))
+      (node (ref "U10") (pin "115") (pinfunction "OUT_C") (pintype "output")))
+    (net (code "360") (name "Net-(U10-R/2)")
+      (node (ref "R27") (pin "1") (pintype "passive"))
+      (node (ref "U10") (pin "135") (pinfunction "R/2") (pintype "input")))
+    (net (code "361") (name "Net-(U10-SYNC_DET)")
+      (node (ref "C1") (pin "2") (pintype "passive"))
+      (node (ref "R14") (pin "1") (pintype "passive"))
+      (node (ref "U10") (pin "140") (pinfunction "SYNC_DET") (pintype "input")))
+    (net (code "362") (name "Net-(U10-VIN_C)")
+      (node (ref "C5") (pin "1") (pintype "passive"))
+      (node (ref "U10") (pin "117") (pinfunction "VIN_C") (pintype "input")))
+    (net (code "363") (name "Net-(U10-VIN_Y/COMP.)")
+      (node (ref "C8") (pin "1") (pintype "passive"))
+      (node (ref "U10") (pin "4") (pinfunction "VIN_Y/COMP.") (pintype "input")))
+    (net (code "364") (name "Net-(U10-XTAL1_IN)")
+      (node (ref "C66") (pin "2") (pintype "passive"))
+      (node (ref "R25") (pin "1") (pintype "passive"))
+      (node (ref "U10") (pin "108") (pinfunction "XTAL1_IN") (pintype "input"))
+      (node (ref "X2") (pin "2") (pinfunction "2") (pintype "passive")))
+    (net (code "365") (name "Net-(U10-XTAL1_OUT)")
+      (node (ref "C65") (pin "2") (pintype "passive"))
+      (node (ref "R25") (pin "2") (pintype "passive"))
+      (node (ref "U10") (pin "109") (pinfunction "XTAL1_OUT") (pintype "output"))
+      (node (ref "X2") (pin "1") (pinfunction "1") (pintype "passive")))
+    (net (code "366") (name "Net-(U11-FLT#)")
+      (node (ref "R6") (pin "1") (pintype "passive"))
+      (node (ref "U11") (pin "138") (pinfunction "FLT#") (pintype "input"))
+      (node (ref "W2") (pin "2") (pinfunction "2") (pintype "passive")))
+    (net (code "367") (name "Net-(U11-MODE_16/32)")
+      (node (ref "R5") (pin "1") (pintype "passive"))
+      (node (ref "U11") (pin "59") (pinfunction "MODE_16/32") (pintype "input"))
+      (node (ref "W1") (pin "2") (pinfunction "2") (pintype "passive")))
+    (net (code "368") (name "Net-(U11-SNV)")
+      (node (ref "R7") (pin "1") (pintype "passive"))
+      (node (ref "U11") (pin "135") (pinfunction "SNV") (pintype "input"))
+      (node (ref "W3") (pin "2") (pinfunction "2") (pintype "passive")))
+    (net (code "369") (name "Net-(U20-B)")
+      (node (ref "C58") (pin "1") (pintype "passive"))
+      (node (ref "U20") (pin "11") (pinfunction "B") (pintype "input")))
+    (net (code "370") (name "Net-(U20-B/ADJ)")
+      (node (ref "R9") (pin "2") (pintype "passive"))
+      (node (ref "U20") (pin "21") (pinfunction "B/ADJ") (pintype "passive")))
+    (net (code "371") (name "Net-(U20-CS)")
+      (node (ref "C61") (pin "2") (pintype "passive"))
+      (node (ref "U20") (pin "24") (pinfunction "CS") (pintype "input")))
+    (net (code "372") (name "Net-(U20-FLT)")
+      (node (ref "C45") (pin "1") (pintype "passive"))
+      (node (ref "U20") (pin "15") (pinfunction "FLT") (pintype "passive")))
+    (net (code "373") (name "Net-(U20-G)")
+      (node (ref "C59") (pin "1") (pintype "passive"))
+      (node (ref "U20") (pin "9") (pinfunction "G") (pintype "input")))
+    (net (code "374") (name "Net-(U20-MCTR)")
+      (node (ref "R4") (pin "1") (pintype "passive"))
+      (node (ref "U20") (pin "2") (pinfunction "MCTR") (pintype "input")))
+    (net (code "375") (name "Net-(U20-NOTCH)")
+      (node (ref "L1") (pin "1") (pinfunction "1") (pintype "passive"))
+      (node (ref "U20") (pin "18") (pinfunction "NOTCH") (pintype "input")))
+    (net (code "376") (name "Net-(U20-OSC)")
       (node (ref "U20") (pin "23") (pinfunction "OSC") (pintype "output"))
       (node (ref "X3") (pin "2") (pinfunction "2") (pintype "passive")))
-    (net (code "387") (name "unconnected-(BUS1-PadA1)")
+    (net (code "377") (name "Net-(U20-R)")
-      (node (ref "BUS1") (pin "A1") (pinfunction "TRST#") (pintype "output+no_connect")))
+      (node (ref "C60") (pin "1") (pintype "passive"))
-    (net (code "388") (name "unconnected-(BUS1-PadA3)")
+      (node (ref "U20") (pin "7") (pinfunction "R") (pintype "input")))
-      (node (ref "BUS1") (pin "A3") (pinfunction "TMS") (pintype "output+no_connect")))
+    (net (code "378") (name "Net-(U20-UOFF)")
-    (net (code "389") (name "unconnected-(BUS1-PadA7)")
+      (node (ref "C44") (pin "1") (pintype "passive"))
-      (node (ref "BUS1") (pin "A7") (pinfunction "INTC#") (pintype "input+no_connect")))
+      (node (ref "U20") (pin "6") (pinfunction "UOFF") (pintype "output")))
-    (net (code "390") (name "unconnected-(BUS1-PadA9)")
+    (net (code "379") (name "Net-(U20-VCC)")
-      (node (ref "BUS1") (pin "A9") (pinfunction "RESERVED") (pintype "passive+no_connect")))
+      (node (ref "C54") (pin "1") (pintype "passive"))
-    (net (code "391") (name "unconnected-(BUS1-PadA11)")
+      (node (ref "L2") (pin "2") (pinfunction "2") (pintype "passive"))
-      (node (ref "BUS1") (pin "A11") (pinfunction "RESERVED") (pintype "passive+no_connect")))
+      (node (ref "U20") (pin "8") (pinfunction "VCC") (pintype "input")))
-    (net (code "392") (name "unconnected-(BUS1-PadA14)")
+    (net (code "380") (name "Net-(U20-VOFF)")
-      (node (ref "BUS1") (pin "A14") (pinfunction "3.3VAUX") (pintype "passive+no_connect")))
+      (node (ref "C43") (pin "1") (pintype "passive"))
-    (net (code "393") (name "unconnected-(BUS1-PadA19)")
+      (node (ref "U20") (pin "12") (pinfunction "VOFF") (pintype "output")))
-      (node (ref "BUS1") (pin "A19") (pinfunction "PME#") (pintype "passive+no_connect")))
+    (net (code "381") (name "Net-(U20-VREF)")
-    (net (code "394") (name "unconnected-(BUS1-PadA40)")
+      (node (ref "C48") (pin "2") (pintype "passive"))
-      (node (ref "BUS1") (pin "A40") (pinfunction "RESERVED") (pintype "bidirectional+no_connect")))
+      (node (ref "C64") (pin "1") (pintype "passive"))
-    (net (code "395") (name "unconnected-(BUS1-PadA41)")
+      (node (ref "R11") (pin "2") (pintype "passive"))
-      (node (ref "BUS1") (pin "A41") (pinfunction "RESERVED") (pintype "bidirectional+no_connect")))
+      (node (ref "U20") (pin "13") (pinfunction "VREF") (pintype "output")))
-    (net (code "396") (name "unconnected-(BUS1-PadA60)")
+    (net (code "382") (name "Net-(U20-Y+SIN)")
-      (node (ref "BUS1") (pin "A60") (pinfunction "REQ64#") (pintype "bidirectional+no_connect")))
+      (node (ref "L6") (pin "2") (pinfunction "2") (pintype "passive"))
-    (net (code "397") (name "unconnected-(BUS1-PadB1)")
+      (node (ref "R11") (pin "1") (pintype "passive"))
+      (node (ref "U20") (pin "20") (pinfunction "Y+SIN") (pintype "input")))
+    (net (code "383") (name "Net-(U20-Y+SOUT)")
+      (node (ref "R10") (pin "2") (pintype "passive"))
+      (node (ref "U20") (pin "22") (pinfunction "Y+SOUT") (pintype "output")))
+    (net (code "384") (name "Net-(U23-P87)")
+      (node (ref "P10") (pin "1") (pinfunction "1") (pintype "passive"))
+      (node (ref "U23") (pin "87") (pinfunction "P87") (pintype "passive")))
+    (net (code "385") (name "Net-(U23-PGCK4)")
+      (node (ref "P11") (pin "1") (pinfunction "1") (pintype "passive"))
+      (node (ref "U23") (pin "82") (pinfunction "PGCK4") (pintype "passive")))
+    (net (code "386") (name "Net-(U23-SGCK3)")
+      (node (ref "P9") (pin "1") (pinfunction "1") (pintype "passive"))
+      (node (ref "U23") (pin "51") (pinfunction "SGCK3") (pintype "passive")))
+    (net (code "387") (name "unconnected-(BUS1--12V)")
       (node (ref "BUS1") (pin "B1") (pinfunction "-12V") (pintype "power_in+no_connect")))
-    (net (code "398") (name "unconnected-(BUS1-PadB2)")
+    (net (code "388") (name "unconnected-(BUS1-3.3VAUX)")
-      (node (ref "BUS1") (pin "B2") (pinfunction "TCK") (pintype "output+no_connect")))
+      (node (ref "BUS1") (pin "A14") (pinfunction "3.3VAUX") (pintype "passive+no_connect")))
-    (net (code "399") (name "unconnected-(BUS1-PadB7)")
+    (net (code "389") (name "unconnected-(BUS1-ACK64#)")
-      (node (ref "BUS1") (pin "B7") (pinfunction "INTB#") (pintype "input+no_connect")))
-    (net (code "400") (name "unconnected-(BUS1-PadB8)")
-      (node (ref "BUS1") (pin "B8") (pinfunction "INTD#") (pintype "input+no_connect")))
-    (net (code "401") (name "unconnected-(BUS1-PadB10)")
-      (node (ref "BUS1") (pin "B10") (pinfunction "RESERVED") (pintype "passive+no_connect")))
-    (net (code "402") (name "unconnected-(BUS1-PadB14)")
-      (node (ref "BUS1") (pin "B14") (pinfunction "RESERVED") (pintype "passive+no_connect")))
-    (net (code "403") (name "unconnected-(BUS1-PadB60)")
       (node (ref "BUS1") (pin "B60") (pinfunction "ACK64#") (pintype "bidirectional+no_connect")))
-    (net (code "404") (name "unconnected-(U7-Pad8)")
+    (net (code "390") (name "unconnected-(BUS1-INTB#)")
+      (node (ref "BUS1") (pin "B7") (pinfunction "INTB#") (pintype "input+no_connect")))
+    (net (code "391") (name "unconnected-(BUS1-INTC#)")
+      (node (ref "BUS1") (pin "A7") (pinfunction "INTC#") (pintype "input+no_connect")))
+    (net (code "392") (name "unconnected-(BUS1-INTD#)")
+      (node (ref "BUS1") (pin "B8") (pinfunction "INTD#") (pintype "input+no_connect")))
+    (net (code "393") (name "unconnected-(BUS1-PME#)")
+      (node (ref "BUS1") (pin "A19") (pinfunction "PME#") (pintype "passive+no_connect")))
+    (net (code "394") (name "unconnected-(BUS1-REQ64#)")
+      (node (ref "BUS1") (pin "A60") (pinfunction "REQ64#") (pintype "bidirectional+no_connect")))
+    (net (code "395") (name "unconnected-(BUS1-RESERVED)")
+      (node (ref "BUS1") (pin "B10") (pinfunction "RESERVED") (pintype "passive+no_connect")))
+    (net (code "396") (name "unconnected-(BUS1-RESERVED)_1")
+      (node (ref "BUS1") (pin "B14") (pinfunction "RESERVED") (pintype "passive+no_connect")))
+    (net (code "397") (name "unconnected-(BUS1-RESERVED)_2")
+      (node (ref "BUS1") (pin "A41") (pinfunction "RESERVED") (pintype "bidirectional+no_connect")))
+    (net (code "398") (name "unconnected-(BUS1-RESERVED)_3")
+      (node (ref "BUS1") (pin "A40") (pinfunction "RESERVED") (pintype "bidirectional+no_connect")))
+    (net (code "399") (name "unconnected-(BUS1-RESERVED)_4")
+      (node (ref "BUS1") (pin "A11") (pinfunction "RESERVED") (pintype "passive+no_connect")))
+    (net (code "400") (name "unconnected-(BUS1-RESERVED)_5")
+      (node (ref "BUS1") (pin "A9") (pinfunction "RESERVED") (pintype "passive+no_connect")))
+    (net (code "401") (name "unconnected-(BUS1-TCK)")
+      (node (ref "BUS1") (pin "B2") (pinfunction "TCK") (pintype "output+no_connect")))
+    (net (code "402") (name "unconnected-(BUS1-TMS)")
+      (node (ref "BUS1") (pin "A3") (pinfunction "TMS") (pintype "output+no_connect")))
+    (net (code "403") (name "unconnected-(BUS1-TRST#)")
+      (node (ref "BUS1") (pin "A1") (pinfunction "TRST#") (pintype "output+no_connect")))
+    (net (code "404") (name "unconnected-(U7-CLK/2)")
       (node (ref "U7") (pin "8") (pinfunction "CLK/2") (pintype "tri_state+no_connect")))
-    (net (code "405") (name "unconnected-(U8-Pad4)")
+    (net (code "405") (name "unconnected-(U8-BVID1)")
-      (node (ref "U8") (pin "4") (pinfunction "SYNC0") (pintype "input+no_connect")))
-    (net (code "406") (name "unconnected-(U8-Pad5)")
-      (node (ref "U8") (pin "5") (pinfunction "SYNC1") (pintype "input+no_connect")))
-    (net (code "407") (name "unconnected-(U8-Pad74)")
       (node (ref "U8") (pin "74") (pinfunction "BVID1") (pintype "input+no_connect")))
-    (net (code "408") (name "unconnected-(U8-Pad77)")
+    (net (code "406") (name "unconnected-(U8-GVID1)")
       (node (ref "U8") (pin "77") (pinfunction "GVID1") (pintype "input+no_connect")))
-    (net (code "409") (name "unconnected-(U8-Pad81)")
+    (net (code "407") (name "unconnected-(U8-RVID1)")
       (node (ref "U8") (pin "81") (pinfunction "RVID1") (pintype "input+no_connect")))
-    (net (code "410") (name "unconnected-(U9-Pad5)")
+    (net (code "408") (name "unconnected-(U8-SYNC0)")
-      (node (ref "U9") (pin "5") (pinfunction "S0") (pintype "input+no_connect")))
+      (node (ref "U8") (pin "4") (pinfunction "SYNC0") (pintype "input+no_connect")))
-    (net (code "411") (name "unconnected-(U9-Pad6)")
+    (net (code "409") (name "unconnected-(U8-SYNC1)")
-      (node (ref "U9") (pin "6") (pinfunction "S1") (pintype "input+no_connect")))
+      (node (ref "U8") (pin "5") (pinfunction "SYNC1") (pintype "input+no_connect")))
-    (net (code "412") (name "unconnected-(U9-Pad27)")
+    (net (code "410") (name "unconnected-(U9-CR0)")
       (node (ref "U9") (pin "27") (pinfunction "CR0") (pintype "output+no_connect")))
-    (net (code "413") (name "unconnected-(U9-Pad30)")
+    (net (code "411") (name "unconnected-(U9-CR3)")
       (node (ref "U9") (pin "30") (pinfunction "CR3") (pintype "output+no_connect")))
-    (net (code "414") (name "unconnected-(U10-Pad25)")
+    (net (code "412") (name "unconnected-(U9-S0)")
-      (node (ref "U10") (pin "25") (pinfunction "FIELD_1") (pintype "bidirectional+no_connect")))
+      (node (ref "U9") (pin "5") (pinfunction "S0") (pintype "input+no_connect")))
-    (net (code "415") (name "unconnected-(U10-Pad26)")
+    (net (code "413") (name "unconnected-(U9-S1)")
-      (node (ref "U10") (pin "26") (pinfunction "FIELD_0") (pintype "bidirectional+no_connect")))
+      (node (ref "U9") (pin "6") (pinfunction "S1") (pintype "input+no_connect")))
-    (net (code "416") (name "unconnected-(U10-Pad27)")
+    (net (code "414") (name "unconnected-(U10-ACTIVE)")
-      (node (ref "U10") (pin "27") (pinfunction "FIELD_2") (pintype "output+no_connect")))
-    (net (code "417") (name "unconnected-(U10-Pad28)")
-      (node (ref "U10") (pin "28") (pinfunction "CBFLAG") (pintype "output+no_connect")))
-    (net (code "418") (name "unconnected-(U10-Pad29)")
-      (node (ref "U10") (pin "29") (pinfunction "VALID") (pintype "output+no_connect")))
-    (net (code "419") (name "unconnected-(U10-Pad32)")
       (node (ref "U10") (pin "32") (pinfunction "ACTIVE") (pintype "output+no_connect")))
-    (net (code "420") (name "unconnected-(U10-Pad33)")
+    (net (code "415") (name "unconnected-(U10-CAPTURE)")
-      (node (ref "U10") (pin "33") (pinfunction "VACTIVE") (pintype "output+no_connect")))
-    (net (code "421") (name "unconnected-(U10-Pad35)")
-      (node (ref "U10") (pin "35") (pinfunction "HACTIVE") (pintype "output+no_connect")))
-    (net (code "422") (name "unconnected-(U10-Pad37)")
-      (node (ref "U10") (pin "37") (pinfunction "SERROR") (pintype "output+no_connect")))
-    (net (code "423") (name "unconnected-(U10-Pad38)")
       (node (ref "U10") (pin "38") (pinfunction "CAPTURE") (pintype "output+no_connect")))
-    (net (code "424") (name "unconnected-(U10-Pad101)")
+    (net (code "416") (name "unconnected-(U10-CBFLAG)")
-      (node (ref "U10") (pin "101") (pinfunction "TDO") (pintype "output+no_connect")))
+      (node (ref "U10") (pin "28") (pinfunction "CBFLAG") (pintype "output+no_connect")))
-    (net (code "425") (name "unconnected-(U10-Pad105)")
+    (net (code "417") (name "unconnected-(U10-CLKX2)")
       (node (ref "U10") (pin "105") (pinfunction "CLKX2") (pintype "output+no_connect")))
-    (net (code "426") (name "unconnected-(U10-Pad106)")
+    (net (code "418") (name "unconnected-(U10-FIELD_0)")
-      (node (ref "U10") (pin "106") (pinfunction "XTAL2_IN") (pintype "input+no_connect")))
+      (node (ref "U10") (pin "26") (pinfunction "FIELD_0") (pintype "bidirectional+no_connect")))
-    (net (code "427") (name "unconnected-(U10-Pad107)")
+    (net (code "419") (name "unconnected-(U10-FIELD_1)")
-      (node (ref "U10") (pin "107") (pinfunction "XTAL2_OUT") (pintype "output+no_connect")))
+      (node (ref "U10") (pin "25") (pinfunction "FIELD_1") (pintype "bidirectional+no_connect")))
-    (net (code "428") (name "unconnected-(U10-Pad127)")
+    (net (code "420") (name "unconnected-(U10-FIELD_2)")
+      (node (ref "U10") (pin "27") (pinfunction "FIELD_2") (pintype "output+no_connect")))
+    (net (code "421") (name "unconnected-(U10-HACTIVE)")
+      (node (ref "U10") (pin "35") (pinfunction "HACTIVE") (pintype "output+no_connect")))
+    (net (code "422") (name "unconnected-(U10-SERROR)")
+      (node (ref "U10") (pin "37") (pinfunction "SERROR") (pintype "output+no_connect")))
+    (net (code "423") (name "unconnected-(U10-TDO)")
+      (node (ref "U10") (pin "101") (pinfunction "TDO") (pintype "output+no_connect")))
+    (net (code "424") (name "unconnected-(U10-VACTIVE)")
+      (node (ref "U10") (pin "33") (pinfunction "VACTIVE") (pintype "output+no_connect")))
+    (net (code "425") (name "unconnected-(U10-VALID)")
+      (node (ref "U10") (pin "29") (pinfunction "VALID") (pintype "output+no_connect")))
+    (net (code "426") (name "unconnected-(U10-VID1_C)")
       (node (ref "U10") (pin "127") (pinfunction "VID1_C") (pintype "input+no_connect")))
-    (net (code "429") (name "unconnected-(U10-Pad129)")
+    (net (code "427") (name "unconnected-(U10-VID1_Y)")
-      (node (ref "U10") (pin "129") (pinfunction "VID2_C") (pintype "input+no_connect")))
-    (net (code "430") (name "unconnected-(U10-Pad131)")
-      (node (ref "U10") (pin "131") (pinfunction "VID3_C") (pintype "input+no_connect")))
-    (net (code "431") (name "unconnected-(U10-Pad150)")
-      (node (ref "U10") (pin "150") (pinfunction "VID3_Y") (pintype "input+no_connect")))
-    (net (code "432") (name "unconnected-(U10-Pad152)")
-      (node (ref "U10") (pin "152") (pinfunction "VID2_Y") (pintype "input+no_connect")))
-    (net (code "433") (name "unconnected-(U10-Pad154)")
       (node (ref "U10") (pin "154") (pinfunction "VID1_Y") (pintype "input+no_connect")))
-    (net (code "434") (name "unconnected-(U12-Pad67)")
+    (net (code "428") (name "unconnected-(U10-VID2_C)")
+      (node (ref "U10") (pin "129") (pinfunction "VID2_C") (pintype "input+no_connect")))
+    (net (code "429") (name "unconnected-(U10-VID2_Y)")
+      (node (ref "U10") (pin "152") (pinfunction "VID2_Y") (pintype "input+no_connect")))
+    (net (code "430") (name "unconnected-(U10-VID3_C)")
+      (node (ref "U10") (pin "131") (pinfunction "VID3_C") (pintype "input+no_connect")))
+    (net (code "431") (name "unconnected-(U10-VID3_Y)")
+      (node (ref "U10") (pin "150") (pinfunction "VID3_Y") (pintype "input+no_connect")))
+    (net (code "432") (name "unconnected-(U10-XTAL2_IN)")
+      (node (ref "U10") (pin "106") (pinfunction "XTAL2_IN") (pintype "input+no_connect")))
+    (net (code "433") (name "unconnected-(U10-XTAL2_OUT)")
+      (node (ref "U10") (pin "107") (pinfunction "XTAL2_OUT") (pintype "output+no_connect")))
+    (net (code "434") (name "unconnected-(U12-PRD0)")
       (node (ref "U12") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "435") (name "unconnected-(U12-Pad68)")
+    (net (code "435") (name "unconnected-(U12-PRD1)")
       (node (ref "U12") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "436") (name "unconnected-(U12-Pad69)")
+    (net (code "436") (name "unconnected-(U12-PRD2)")
       (node (ref "U12") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "437") (name "unconnected-(U12-Pad70)")
+    (net (code "437") (name "unconnected-(U12-PRD3)")
       (node (ref "U12") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "438") (name "unconnected-(U13-Pad67)")
+    (net (code "438") (name "unconnected-(U13-PRD0)")
       (node (ref "U13") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "439") (name "unconnected-(U13-Pad68)")
+    (net (code "439") (name "unconnected-(U13-PRD1)")
       (node (ref "U13") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "440") (name "unconnected-(U13-Pad69)")
+    (net (code "440") (name "unconnected-(U13-PRD2)")
       (node (ref "U13") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "441") (name "unconnected-(U13-Pad70)")
+    (net (code "441") (name "unconnected-(U13-PRD3)")
       (node (ref "U13") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "442") (name "unconnected-(U14-Pad67)")
+    (net (code "442") (name "unconnected-(U14-PRD0)")
       (node (ref "U14") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "443") (name "unconnected-(U14-Pad68)")
+    (net (code "443") (name "unconnected-(U14-PRD1)")
       (node (ref "U14") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "444") (name "unconnected-(U14-Pad69)")
+    (net (code "444") (name "unconnected-(U14-PRD2)")
       (node (ref "U14") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "445") (name "unconnected-(U14-Pad70)")
+    (net (code "445") (name "unconnected-(U14-PRD3)")
       (node (ref "U14") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "446") (name "unconnected-(U15-Pad67)")
+    (net (code "446") (name "unconnected-(U15-PRD0)")
       (node (ref "U15") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "447") (name "unconnected-(U15-Pad68)")
+    (net (code "447") (name "unconnected-(U15-PRD1)")
       (node (ref "U15") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "448") (name "unconnected-(U15-Pad69)")
+    (net (code "448") (name "unconnected-(U15-PRD2)")
       (node (ref "U15") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "449") (name "unconnected-(U15-Pad70)")
+    (net (code "449") (name "unconnected-(U15-PRD3)")
       (node (ref "U15") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "450") (name "unconnected-(U16-Pad67)")
+    (net (code "450") (name "unconnected-(U16-PRD0)")
       (node (ref "U16") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "451") (name "unconnected-(U16-Pad68)")
+    (net (code "451") (name "unconnected-(U16-PRD1)")
       (node (ref "U16") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "452") (name "unconnected-(U16-Pad69)")
+    (net (code "452") (name "unconnected-(U16-PRD2)")
       (node (ref "U16") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "453") (name "unconnected-(U16-Pad70)")
+    (net (code "453") (name "unconnected-(U16-PRD3)")
       (node (ref "U16") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "454") (name "unconnected-(U17-Pad67)")
+    (net (code "454") (name "unconnected-(U17-PRD0)")
       (node (ref "U17") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "455") (name "unconnected-(U17-Pad68)")
+    (net (code "455") (name "unconnected-(U17-PRD1)")
       (node (ref "U17") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "456") (name "unconnected-(U17-Pad69)")
+    (net (code "456") (name "unconnected-(U17-PRD2)")
       (node (ref "U17") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "457") (name "unconnected-(U17-Pad70)")
+    (net (code "457") (name "unconnected-(U17-PRD3)")
       (node (ref "U17") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "458") (name "unconnected-(U18-Pad67)")
+    (net (code "458") (name "unconnected-(U18-PRD0)")
       (node (ref "U18") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "459") (name "unconnected-(U18-Pad68)")
+    (net (code "459") (name "unconnected-(U18-PRD1)")
       (node (ref "U18") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "460") (name "unconnected-(U18-Pad69)")
+    (net (code "460") (name "unconnected-(U18-PRD2)")
       (node (ref "U18") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "461") (name "unconnected-(U18-Pad70)")
+    (net (code "461") (name "unconnected-(U18-PRD3)")
       (node (ref "U18") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "462") (name "unconnected-(U19-Pad67)")
+    (net (code "462") (name "unconnected-(U19-PRD0)")
       (node (ref "U19") (pin "67") (pinfunction "PRD0") (pintype "input+no_connect")))
-    (net (code "463") (name "unconnected-(U19-Pad68)")
+    (net (code "463") (name "unconnected-(U19-PRD1)")
       (node (ref "U19") (pin "68") (pinfunction "PRD1") (pintype "input+no_connect")))
-    (net (code "464") (name "unconnected-(U19-Pad69)")
+    (net (code "464") (name "unconnected-(U19-PRD2)")
       (node (ref "U19") (pin "69") (pinfunction "PRD2") (pintype "input+no_connect")))
-    (net (code "465") (name "unconnected-(U19-Pad70)")
+    (net (code "465") (name "unconnected-(U19-PRD3)")
       (node (ref "U19") (pin "70") (pinfunction "PRD3") (pintype "input+no_connect")))
-    (net (code "466") (name "unconnected-(U20-Pad1)")
+    (net (code "466") (name "unconnected-(U20--B.Y)")
-      (node (ref "U20") (pin "1") (pinfunction "-R.Y") (pintype "input+no_connect")))
-    (net (code "467") (name "unconnected-(U20-Pad3)")
       (node (ref "U20") (pin "3") (pinfunction "-B.Y") (pintype "input+no_connect")))
-    (net (code "468") (name "unconnected-(U20-Pad4)")
+    (net (code "467") (name "unconnected-(U20--R.Y)")
+      (node (ref "U20") (pin "1") (pinfunction "-R.Y") (pintype "input+no_connect")))
+    (net (code "468") (name "unconnected-(U20-H/2)")
       (node (ref "U20") (pin "4") (pinfunction "H/2") (pintype "bidirectional+no_connect")))
-    (net (code "469") (name "unconnected-(U20-Pad5)")
+    (net (code "469") (name "unconnected-(U20-Y)")
       (node (ref "U20") (pin "5") (pinfunction "Y") (pintype "input+no_connect")))
-    (net (code "470") (name "unconnected-(U21-Pad6)")
+    (net (code "470") (name "unconnected-(U21-CEO)")
       (node (ref "U21") (pin "6") (pinfunction "CEO") (pintype "output+no_connect")))
-    (net (code "471") (name "unconnected-(U22-Pad3)")
+    (net (code "471") (name "unconnected-(U22-DOUT/SGCK4)")
-      (node (ref "U22") (pin "3") (pinfunction "P/A17") (pintype "passive+no_connect")))
-    (net (code "472") (name "unconnected-(U22-Pad4)")
-      (node (ref "U22") (pin "4") (pinfunction "P/TDI") (pintype "passive+no_connect")))
-    (net (code "473") (name "unconnected-(U22-Pad5)")
-      (node (ref "U22") (pin "5") (pinfunction "P/TCK") (pintype "passive+no_connect")))
-    (net (code "474") (name "unconnected-(U22-Pad6)")
-      (node (ref "U22") (pin "6") (pinfunction "P/A3") (pintype "passive+no_connect")))
-    (net (code "475") (name "unconnected-(U22-Pad10)")
-      (node (ref "U22") (pin "10") (pinfunction "P/A4") (pintype "passive+no_connect")))
-    (net (code "476") (name "unconnected-(U22-Pad14)")
-      (node (ref "U22") (pin "14") (pinfunction "P14") (pintype "passive+no_connect")))
-    (net (code "477") (name "unconnected-(U22-Pad15)")
-      (node (ref "U22") (pin "15") (pinfunction "P15") (pintype "passive+no_connect")))
-    (net (code "478") (name "unconnected-(U22-Pad16)")
-      (node (ref "U22") (pin "16") (pinfunction "P16") (pintype "passive+no_connect")))
-    (net (code "479") (name "unconnected-(U22-Pad27)")
-      (node (ref "U22") (pin "27") (pinfunction "PGCK2") (pintype "passive+no_connect")))
-    (net (code "480") (name "unconnected-(U22-Pad30)")
-      (node (ref "U22") (pin "30") (pinfunction "P/LDC") (pintype "passive+no_connect")))
-    (net (code "481") (name "unconnected-(U22-Pad65)")
-      (node (ref "U22") (pin "65") (pinfunction "P65") (pintype "passive+no_connect")))
-    (net (code "482") (name "unconnected-(U22-Pad66)")
-      (node (ref "U22") (pin "66") (pinfunction "P66") (pintype "passive+no_connect")))
-    (net (code "483") (name "unconnected-(U22-Pad73)")
       (node (ref "U22") (pin "73") (pinfunction "DOUT/SGCK4") (pintype "passive+no_connect")))
-    (net (code "484") (name "unconnected-(U22-Pad76)")
+    (net (code "472") (name "unconnected-(U22-P/A3)")
+      (node (ref "U22") (pin "6") (pinfunction "P/A3") (pintype "passive+no_connect")))
+    (net (code "473") (name "unconnected-(U22-P/A4)")
+      (node (ref "U22") (pin "10") (pinfunction "P/A4") (pintype "passive+no_connect")))
+    (net (code "474") (name "unconnected-(U22-P/A17)")
+      (node (ref "U22") (pin "3") (pinfunction "P/A17") (pintype "passive+no_connect")))
+    (net (code "475") (name "unconnected-(U22-P/LDC)")
+      (node (ref "U22") (pin "30") (pinfunction "P/LDC") (pintype "passive+no_connect")))
+    (net (code "476") (name "unconnected-(U22-P/TCK)")
+      (node (ref "U22") (pin "5") (pinfunction "P/TCK") (pintype "passive+no_connect")))
+    (net (code "477") (name "unconnected-(U22-P/TDI)")
+      (node (ref "U22") (pin "4") (pinfunction "P/TDI") (pintype "passive+no_connect")))
+    (net (code "478") (name "unconnected-(U22-P14)")
+      (node (ref "U22") (pin "14") (pinfunction "P14") (pintype "passive+no_connect")))
+    (net (code "479") (name "unconnected-(U22-P15)")
+      (node (ref "U22") (pin "15") (pinfunction "P15") (pintype "passive+no_connect")))
+    (net (code "480") (name "unconnected-(U22-P16)")
+      (node (ref "U22") (pin "16") (pinfunction "P16") (pintype "passive+no_connect")))
+    (net (code "481") (name "unconnected-(U22-P65)")
+      (node (ref "U22") (pin "65") (pinfunction "P65") (pintype "passive+no_connect")))
+    (net (code "482") (name "unconnected-(U22-P66)")
+      (node (ref "U22") (pin "66") (pinfunction "P66") (pintype "passive+no_connect")))
+    (net (code "483") (name "unconnected-(U22-PGCK2)")
+      (node (ref "U22") (pin "27") (pinfunction "PGCK2") (pintype "passive+no_connect")))
+    (net (code "484") (name "unconnected-(U22-TDO)")
       (node (ref "U22") (pin "76") (pinfunction "TDO") (pintype "output+no_connect")))
-    (net (code "485") (name "unconnected-(U23-Pad2)")
+    (net (code "485") (name "unconnected-(U23-DOUT/SGCK4)")
-      (node (ref "U23") (pin "2") (pinfunction "SGCK1") (pintype "passive+no_connect")))
-    (net (code "486") (name "unconnected-(U23-Pad31)")
-      (node (ref "U23") (pin "31") (pinfunction "P31/HDC") (pintype "passive+no_connect")))
-    (net (code "487") (name "unconnected-(U23-Pad33)")
-      (node (ref "U23") (pin "33") (pinfunction "P33/LDC") (pintype "passive+no_connect")))
-    (net (code "488") (name "unconnected-(U23-Pad49)")
-      (node (ref "U23") (pin "49") (pinfunction "P49") (pintype "passive+no_connect")))
-    (net (code "489") (name "unconnected-(U23-Pad50)")
-      (node (ref "U23") (pin "50") (pinfunction "P50") (pintype "passive+no_connect")))
-    (net (code "490") (name "unconnected-(U23-Pad58)")
-      (node (ref "U23") (pin "58") (pinfunction "P58") (pintype "passive+no_connect")))
-    (net (code "491") (name "unconnected-(U23-Pad60)")
-      (node (ref "U23") (pin "60") (pinfunction "P60") (pintype "passive+no_connect")))
-    (net (code "492") (name "unconnected-(U23-Pad62)")
-      (node (ref "U23") (pin "62") (pinfunction "P62") (pintype "passive+no_connect")))
-    (net (code "493") (name "unconnected-(U23-Pad68)")
-      (node (ref "U23") (pin "68") (pinfunction "P68") (pintype "passive+no_connect")))
-    (net (code "494") (name "unconnected-(U23-Pad76)")
       (node (ref "U23") (pin "76") (pinfunction "DOUT/SGCK4") (pintype "passive+no_connect")))
-    (net (code "495") (name "unconnected-(U23-Pad79)")
+    (net (code "486") (name "unconnected-(U23-P31/HDC)")
-      (node (ref "U23") (pin "79") (pinfunction "TDO") (pintype "output+no_connect")))
+      (node (ref "U23") (pin "31") (pinfunction "P31/HDC") (pintype "passive+no_connect")))
-    (net (code "496") (name "unconnected-(U23-Pad98)")
+    (net (code "487") (name "unconnected-(U23-P33/LDC)")
+      (node (ref "U23") (pin "33") (pinfunction "P33/LDC") (pintype "passive+no_connect")))
+    (net (code "488") (name "unconnected-(U23-P49)")
+      (node (ref "U23") (pin "49") (pinfunction "P49") (pintype "passive+no_connect")))
+    (net (code "489") (name "unconnected-(U23-P50)")
+      (node (ref "U23") (pin "50") (pinfunction "P50") (pintype "passive+no_connect")))
+    (net (code "490") (name "unconnected-(U23-P58)")
+      (node (ref "U23") (pin "58") (pinfunction "P58") (pintype "passive+no_connect")))
+    (net (code "491") (name "unconnected-(U23-P60)")
+      (node (ref "U23") (pin "60") (pinfunction "P60") (pintype "passive+no_connect")))
+    (net (code "492") (name "unconnected-(U23-P62)")
+      (node (ref "U23") (pin "62") (pinfunction "P62") (pintype "passive+no_connect")))
+    (net (code "493") (name "unconnected-(U23-P68)")
+      (node (ref "U23") (pin "68") (pinfunction "P68") (pintype "passive+no_connect")))
+    (net (code "494") (name "unconnected-(U23-P98)")
       (node (ref "U23") (pin "98") (pinfunction "P98") (pintype "passive+no_connect")))
-    (net (code "497") (name "unconnected-(U23-Pad99)")
+    (net (code "495") (name "unconnected-(U23-P99)")
       (node (ref "U23") (pin "99") (pinfunction "P99") (pintype "passive+no_connect")))
-    (net (code "498") (name "unconnected-(U23-Pad100)")
+    (net (code "496") (name "unconnected-(U23-P100)")
       (node (ref "U23") (pin "100") (pinfunction "P100") (pintype "passive+no_connect")))
-    (net (code "499") (name "unconnected-(U24-Pad84)")
+    (net (code "497") (name "unconnected-(U23-SGCK1)")
+      (node (ref "U23") (pin "2") (pinfunction "SGCK1") (pintype "passive+no_connect")))
+    (net (code "498") (name "unconnected-(U23-TDO)")
+      (node (ref "U23") (pin "79") (pinfunction "TDO") (pintype "output+no_connect")))
+    (net (code "499") (name "unconnected-(U24-PGCK3)")
       (node (ref "U24") (pin "84") (pinfunction "PGCK3") (pintype "passive+no_connect")))
-    (net (code "500") (name "unconnected-(U24-Pad121)")
+    (net (code "500") (name "unconnected-(U24-TDO)")
-      (node (ref "U24") (pin "121") (pinfunction "TDO") (pintype "output+no_connect")))))
+      (node (ref "U24") (pin "121") (pinfunction "TDO") (pintype "output+no_connect")))))

qa/eeschema/test_ee_item.cpp

@@ -87,6 +87,7 @@ public:
         case SCH_BITMAP_T:         return new SCH_BITMAP();
         case SCH_TEXT_T:           return new SCH_TEXT( wxPoint( 0, 0 ), "test text" );
         case SCH_LABEL_T:          return new SCH_LABEL( wxPoint( 0, 0 ), "test label" );
+        case SCH_NETCLASS_FLAG_T:  return new SCH_NETCLASS_FLAG( wxPoint( 0, 0 ) );
         case SCH_GLOBAL_LABEL_T:   return new SCH_GLOBALLABEL();
         case SCH_HIER_LABEL_T:     return new SCH_HIERLABEL();
         case SCH_FIELD_T:          return new SCH_FIELD( wxPoint( 0, 0 ), 0, nullptr );

qa/eeschema/test_netlists.cpp

@@ -198,8 +198,8 @@ void TEST_NETLISTS_FIXTURE::compareNetlists()
             const COMPONENT_NET& testNet   = refComp->GetNet( net );
 
             // The two nets at the same index should be identical
-            BOOST_REQUIRE_EQUAL( goldenNet.GetPinName(), testNet.GetPinName() );
             BOOST_REQUIRE_EQUAL( goldenNet.GetNetName(), testNet.GetNetName() );
+            BOOST_REQUIRE_EQUAL( goldenNet.GetPinName(), testNet.GetPinName() );
         }
     }
 }

qa/eeschema/test_sch_pin.cpp

@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE( PinNumbering )
     SCH_SHEET_PATH path;
 
     const wxString name = m_sch_pin->GetDefaultNetName( path );
-    BOOST_CHECK_EQUAL( name, "Net-(U2-Pad42)" );
+    BOOST_CHECK_EQUAL( name, "Net-(U2-pinname)" );
 
     // do it again: this should now (transparently) go though the net name map
     // can't really check directly, but coverage tools should see this