diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp index 5b64e37002..4139f180b3 100644 --- a/eeschema/connection_graph.cpp +++ b/eeschema/connection_graph.cpp @@ -1732,6 +1732,10 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph ) if( neighbor_name == member->Name() ) continue; + // Was this neighbor already updated from a different sheet? Don't rename it again + if( neighbor_conn->Sheet() != neighbor->m_sheet ) + continue; + // Safety check against infinite recursion wxASSERT( neighbor_conn->IsNet() ); diff --git a/qa/eeschema/data/netlists/test_hier_renaming/LED_matrix_x6.kicad_sch b/qa/eeschema/data/netlists/test_hier_renaming/LED_matrix_x6.kicad_sch new file mode 100644 index 0000000000..a0c0be36c3 --- /dev/null +++ b/qa/eeschema/data/netlists/test_hier_renaming/LED_matrix_x6.kicad_sch @@ -0,0 +1,438 @@ +(kicad_sch (version 20201015) (generator eeschema) + + (paper "A3") + + (lib_symbols + (symbol "Display_Graphic:788xHG" (in_bom yes) (on_board yes) + (property "Reference" "DS" (id 0) (at -13.97 16.51 0) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "788xHG" (id 1) (at -13.97 -19.05 0) + (effects (font (size 1.27 1.27))) + ) + (property "Footprint" "Display:788xHG" (id 2) (at 50.8 -10.16 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 50.8 -10.16 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_keywords" "led matrix bi-color red green" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_description" "Bi-color red and green 8x8 LED matrix 20x20 mm" (id 5) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "788xHG_0_1" + (circle (center -7.62 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -7.62 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (rectangle (start -15.24 15.24) (end 15.24 -17.78) + (stroke (width 0.254)) (fill (type background)) + ) + ) + (symbol "788xHG_1_1" + (circle (center -7.62 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -7.62 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -7.62 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -7.62 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -7.62 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -7.62 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -5.08 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center -2.54 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 0 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 2.54 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 5.08 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 7.62 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 -10.16) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 -7.62) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 -5.08) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 -2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 0) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (circle (center 10.16 2.54) (radius 0.635) (stroke (width 0)) (fill (type outline))) + (pin passive line (at -7.62 -20.32 90) (length 2.54) + (name "COL1G" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 -7.62 0) (length 2.54) + (name "ROW7" (effects (font (size 1.27 1.27)))) + (number "10" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 -5.08 0) (length 2.54) + (name "ROW6" (effects (font (size 1.27 1.27)))) + (number "11" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 -2.54 0) (length 2.54) + (name "ROW5" (effects (font (size 1.27 1.27)))) + (number "12" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 0 0) (length 2.54) + (name "ROW4" (effects (font (size 1.27 1.27)))) + (number "13" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 2.54 0) (length 2.54) + (name "ROW3" (effects (font (size 1.27 1.27)))) + (number "14" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 5.08 0) (length 2.54) + (name "ROW2" (effects (font (size 1.27 1.27)))) + (number "15" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 7.62 0) (length 2.54) + (name "ROW1" (effects (font (size 1.27 1.27)))) + (number "16" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -7.62 17.78 270) (length 2.54) + (name "COL1R" (effects (font (size 1.27 1.27)))) + (number "17" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -5.08 17.78 270) (length 2.54) + (name "COL2R" (effects (font (size 1.27 1.27)))) + (number "18" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -2.54 17.78 270) (length 2.54) + (name "COL3R" (effects (font (size 1.27 1.27)))) + (number "19" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -5.08 -20.32 90) (length 2.54) + (name "COL2G" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 0 17.78 270) (length 2.54) + (name "COL4R" (effects (font (size 1.27 1.27)))) + (number "20" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 2.54 17.78 270) (length 2.54) + (name "COL5R" (effects (font (size 1.27 1.27)))) + (number "21" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 5.08 17.78 270) (length 2.54) + (name "COL6R" (effects (font (size 1.27 1.27)))) + (number "22" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 7.62 17.78 270) (length 2.54) + (name "COL7R" (effects (font (size 1.27 1.27)))) + (number "23" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 10.16 17.78 270) (length 2.54) + (name "COL8R" (effects (font (size 1.27 1.27)))) + (number "24" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -2.54 -20.32 90) (length 2.54) + (name "COL3G" (effects (font (size 1.27 1.27)))) + (number "3" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 0 -20.32 90) (length 2.54) + (name "COL4G" (effects (font (size 1.27 1.27)))) + (number "4" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 2.54 -20.32 90) (length 2.54) + (name "COL5G" (effects (font (size 1.27 1.27)))) + (number "5" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 5.08 -20.32 90) (length 2.54) + (name "COL6G" (effects (font (size 1.27 1.27)))) + (number "6" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 7.62 -20.32 90) (length 2.54) + (name "COL7G" (effects (font (size 1.27 1.27)))) + (number "7" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 10.16 -20.32 90) (length 2.54) + (name "COL8G" (effects (font (size 1.27 1.27)))) + (number "8" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at -17.78 -10.16 0) (length 2.54) + (name "ROW8" (effects (font (size 1.27 1.27)))) + (number "9" (effects (font (size 1.27 1.27)))) + ) + ) + ) + ) + + + (bus_entry (at 175.26 55.88) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 175.26 58.42) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 175.26 60.96) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 175.26 63.5) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 175.26 66.04) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 175.26 68.58) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 175.26 71.12) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 175.26 73.66) (size 2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 146.05) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 148.59) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 151.13) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 153.67) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 156.21) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 158.75) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 161.29) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 370.84 163.83) (size -2.54 -2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + + (wire (pts (xy 185.42 53.34) (xy 177.8 53.34)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 185.42 55.88) (xy 177.8 55.88)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 185.42 58.42) (xy 177.8 58.42)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 185.42 60.96) (xy 177.8 60.96)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 185.42 63.5) (xy 177.8 63.5)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 185.42 66.04) (xy 177.8 66.04)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 185.42 68.58) (xy 177.8 68.58)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 185.42 71.12) (xy 177.8 71.12)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 146.05) (xy 382.27 146.05)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 148.59) (xy 382.27 148.59)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 151.13) (xy 382.27 151.13)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 153.67) (xy 382.27 153.67)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 156.21) (xy 382.27 156.21)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 158.75) (xy 382.27 158.75)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 161.29) (xy 382.27 161.29)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 370.84 163.83) (xy 382.27 163.83)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 55.88) (xy 175.26 58.42)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 58.42) (xy 175.26 60.96)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 60.96) (xy 175.26 63.5)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 63.5) (xy 175.26 66.04)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 66.04) (xy 175.26 68.58)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 68.58) (xy 175.26 71.12)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 71.12) (xy 175.26 73.66)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 73.66) (xy 175.26 142.24)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 175.26 142.24) (xy 368.3 142.24)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 142.24) (xy 368.3 143.51)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 143.51) (xy 368.3 146.05)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 146.05) (xy 368.3 148.59)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 148.59) (xy 368.3 151.13)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 151.13) (xy 368.3 153.67)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 153.67) (xy 368.3 156.21)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 156.21) (xy 368.3 158.75)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 368.3 158.75) (xy 368.3 161.29)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + + (label "ROW0" (at 179.07 53.34 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW1" (at 179.07 55.88 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW2" (at 179.07 58.42 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW3" (at 179.07 60.96 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW4" (at 179.07 63.5 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW5" (at 179.07 66.04 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW6" (at 179.07 68.58 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW7" (at 179.07 71.12 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW[7..0]" (at 193.04 142.24 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW0" (at 381 146.05 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + (label "ROW1" (at 381 148.59 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + (label "ROW2" (at 381 151.13 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + (label "ROW3" (at 381 153.67 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + (label "ROW4" (at 381 156.21 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + (label "ROW5" (at 381 158.75 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + (label "ROW6" (at 381 161.29 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + (label "ROW7" (at 381 163.83 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + ) + + (hierarchical_label "ROW0" (shape passive) (at 382.27 146.05 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (hierarchical_label "ROW1" (shape passive) (at 382.27 148.59 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (hierarchical_label "ROW2" (shape passive) (at 382.27 151.13 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (hierarchical_label "ROW3" (shape passive) (at 382.27 153.67 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (hierarchical_label "ROW4" (shape passive) (at 382.27 156.21 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (hierarchical_label "ROW5" (shape passive) (at 382.27 158.75 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (hierarchical_label "ROW6" (shape passive) (at 382.27 161.29 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (hierarchical_label "ROW7" (shape passive) (at 382.27 163.83 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + + (symbol (lib_id "Display_Graphic:788xHG") (at 203.2 60.96 0) + (in_bom yes) (on_board yes) + (uuid "e63356eb-7345-434d-8464-3fa9dc47789a") + (property "Reference" "DS2" (id 0) (at 187.96 44.45 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "788xHG" (id 1) (at 185.42 80.01 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Display:788xHG" (id 2) (at 254 71.12 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 254 71.12 0) + (effects (font (size 1.27 1.27)) hide) + ) + ) +) diff --git a/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_prl b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_prl new file mode 100644 index 0000000000..6fe23342ac --- /dev/null +++ b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_prl @@ -0,0 +1,72 @@ +{ + "board": { + "active_layer": 0, + "active_layer_preset": "", + "hidden_nets": [], + "high_contrast_mode": 0, + "net_color_mode": 1, + "opacity": { + "pads": 1.0, + "tracks": 1.0, + "vias": 1.0, + "zones": 0.6 + }, + "ratsnest_display_mode": 0, + "selection_filter": { + "dimensions": true, + "footprints": true, + "graphics": true, + "keepouts": true, + "lockedItems": true, + "otherItems": true, + "pads": true, + "text": true, + "tracks": true, + "vias": true, + "zones": true + }, + "visible_items": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 37, + 38 + ], + "visible_layers": "fffffff_ffffffff" + }, + "meta": { + "filename": "test_hier_renaming.kicad_prl", + "version": 2 + }, + "project": { + "files": [] + } +} diff --git a/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_pro b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_pro new file mode 100644 index 0000000000..96587091c6 --- /dev/null +++ b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_pro @@ -0,0 +1,415 @@ +{ + "board": { + "design_settings": { + "defaults": { + "board_outline_line_width": 0.09999999999999999, + "copper_line_width": 0.19999999999999998, + "copper_text_italic": false, + "copper_text_size_h": 1.5, + "copper_text_size_v": 1.5, + "copper_text_thickness": 0.3, + "copper_text_upright": true, + "courtyard_line_width": 0.049999999999999996, + "dimension_precision": 1, + "dimension_units": 0, + "dimensions": { + "arrow_length": 1270000, + "extension_offset": 500000, + "keep_text_aligned": true, + "suppress_zeroes": false, + "text_position": 0, + "units_format": 1 + }, + "fab_line_width": 0.09999999999999999, + "fab_text_italic": false, + "fab_text_size_h": 1.0, + "fab_text_size_v": 1.0, + "fab_text_thickness": 0.15, + "fab_text_upright": true, + "other_line_width": 0.09999999999999999, + "other_text_italic": false, + "other_text_size_h": 1.0, + "other_text_size_v": 1.0, + "other_text_thickness": 0.15, + "other_text_upright": true, + "pads": { + "drill": 0.762, + "height": 1.524, + "width": 1.524 + }, + "silk_line_width": 0.15, + "silk_text_italic": false, + "silk_text_size_h": 1.0, + "silk_text_size_v": 1.0, + "silk_text_thickness": 0.15, + "silk_text_upright": true, + "zones": { + "45_degree_only": false, + "min_clearance": 0.19999999999999998 + } + }, + "diff_pair_dimensions": [ + { + "gap": 0.0, + "via_gap": 0.0, + "width": 0.0 + } + ], + "drc_exclusions": [], + "meta": { + "version": 1 + }, + "rule_severities": { + "annular_width": "error", + "clearance": "error", + "copper_edge_clearance": "error", + "courtyards_overlap": "error", + "diff_pair_gap_out_of_range": "error", + "diff_pair_uncoupled_length_too_long": "error", + "drill_too_small": "error", + "duplicate_footprints": "warning", + "extra_footprint": "warning", + "hole_clearance": "error", + "hole_near_hole": "error", + "invalid_outline": "error", + "item_on_disabled_layer": "error", + "items_not_allowed": "error", + "length_out_of_range": "error", + "malformed_courtyard": "error", + "microvia_drill_too_small": "error", + "missing_courtyard": "ignore", + "missing_footprint": "warning", + "net_conflict": "warning", + "npth_inside_courtyard": "ignore", + "padstack": "error", + "pth_inside_courtyard": "ignore", + "shorting_items": "error", + "silk_over_copper": "error", + "silk_overlap": "error", + "skew_out_of_range": "error", + "too_many_vias": "error", + "track_dangling": "warning", + "track_width": "error", + "tracks_crossing": "error", + "unconnected_items": "error", + "unresolved_variable": "error", + "via_dangling": "warning", + "zone_has_empty_net": "error", + "zones_intersect": "error" + }, + "rules": { + "allow_blind_buried_vias": false, + "allow_microvias": false, + "max_error": 0.005, + "min_clearance": 0.15, + "min_copper_edge_clearance": 0.3, + "min_hole_clearance": 0.0, + "min_hole_to_hole": 0.25, + "min_microvia_diameter": 0.19999999999999998, + "min_microvia_drill": 0.09999999999999999, + "min_silk_clearance": 0.0, + "min_through_hole_diameter": 0.3, + "min_track_width": 0.15, + "min_via_annular_width": 0.049999999999999996, + "min_via_annulus": 0.15, + "min_via_diameter": 0.3, + "solder_mask_clearance": 0.0, + "solder_mask_min_width": 0.0, + "solder_paste_clearance": 0.0, + "solder_paste_margin_ratio": -0.0 + }, + "track_widths": [ + 0.0, + 0.2, + 0.4 + ], + "via_dimensions": [ + { + "diameter": 0.0, + "drill": 0.0 + }, + { + "diameter": 0.6, + "drill": 0.3 + }, + { + "diameter": 0.8, + "drill": 0.4 + } + ], + "zones_allow_external_fillets": false, + "zones_use_no_outline": false + }, + "layer_presets": [] + }, + "boards": [], + "cvpcb": { + "equivalence_files": [] + }, + "erc": { + "erc_exclusions": [], + "meta": { + "version": 0 + }, + "pin_map": [ + [ + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 2 + ], + [ + 0, + 2, + 0, + 1, + 0, + 1, + 0, + 2, + 2, + 2, + 2 + ], + [ + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 2 + ], + [ + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 2, + 1, + 1, + 2 + ], + [ + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 2 + ], + [ + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 2 + ], + [ + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 2 + ], + [ + 0, + 2, + 1, + 2, + 0, + 1, + 0, + 2, + 2, + 2, + 2 + ], + [ + 0, + 2, + 0, + 1, + 0, + 1, + 0, + 2, + 0, + 0, + 2 + ], + [ + 0, + 2, + 1, + 1, + 0, + 1, + 0, + 2, + 0, + 0, + 2 + ], + [ + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2 + ] + ], + "rule_severities": { + "bus_definition_conflict": "error", + "bus_label_syntax": "error", + "bus_to_bus_conflict": "error", + "bus_to_net_conflict": "error", + "different_unit_footprint": "error", + "different_unit_net": "error", + "duplicate_sheet_names": "error", + "global_label_dangling": "error", + "hier_label_mismatch": "error", + "label_dangling": "error", + "lib_symbol_issues": "warning", + "multiple_net_names": "error", + "net_not_bus_member": "error", + "no_connect_connected": "error", + "no_connect_dangling": "error", + "pin_not_connected": "error", + "pin_not_driven": "error", + "pin_to_pin": "warning", + "power_pin_not_driven": "error", + "similar_labels": "error", + "unresolved_variable": "error", + "wire_dangling": "error" + } + }, + "libraries": { + "pinned_footprint_libs": [], + "pinned_symbol_libs": [] + }, + "meta": { + "filename": "test_hier_renaming.kicad_pro", + "version": 1 + }, + "net_settings": { + "classes": [ + { + "bus_width": 6.0, + "clearance": 0.2, + "diff_pair_gap": 0.25, + "diff_pair_via_gap": 0.25, + "diff_pair_width": 0.2, + "line_style": 0, + "microvia_diameter": 0.3, + "microvia_drill": 0.1, + "name": "Default", + "pcb_color": "rgba(0, 0, 0, 0.000)", + "schematic_color": "rgba(0, 0, 0, 0.000)", + "track_width": 0.25, + "via_diameter": 0.8, + "via_drill": 0.4, + "wire_width": 6.0 + } + ], + "meta": { + "version": 0 + }, + "net_colors": { + "Net-(DS1-Pad1)": "rgb(255, 255, 0)" + } + }, + "pcbnew": { + "last_paths": { + "gencad": "", + "idf": "", + "netlist": "", + "specctra_dsn": "", + "step": "", + "vmrl": "", + "vrml": "" + }, + "page_layout_descr_file": "" + }, + "schematic": { + "drawing": { + "default_bus_thickness": 12.0, + "default_junction_size": 40.0, + "default_line_thickness": 6.0, + "default_text_size": 50.0, + "default_wire_thickness": 6.0, + "field_names": [], + "intersheets_ref_prefix": "", + "intersheets_ref_short": false, + "intersheets_ref_show": false, + "intersheets_ref_suffix": "", + "junction_size_choice": 3, + "pin_symbol_size": 25.0, + "text_offset_ratio": 0.3 + }, + "legacy_lib_dir": "", + "legacy_lib_list": [], + "meta": { + "version": 0 + }, + "net_format_name": "Pcbnew", + "page_layout_descr_file": "", + "plot_directory": "", + "spice_adjust_passive_values": false, + "spice_external_command": "spice \"%I\"", + "subpart_first_id": 65, + "subpart_id_separator": 0 + }, + "sheets": [ + [ + "0c777b0f-2f12-4510-99ee-a28b103b057a", + "" + ], + [ + "0c777b0f-2f12-4510-99ee-a28b103b057a", + "matrixes1" + ], + [ + "8fe7e2b2-e224-440a-ae87-ac0912bb533a", + "matrixes2" + ] + ], + "text_variables": {} +} diff --git a/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_sch b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_sch new file mode 100644 index 0000000000..f1f59cf2cf --- /dev/null +++ b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_sch @@ -0,0 +1,298 @@ +(kicad_sch (version 20201015) (generator eeschema) + + (paper "A4") + + (lib_symbols + ) + + (bus_alias "SPI" (members "MISO" "MOSI" "SCLK" "~CS")) + (bus_alias "JTAG" (members "TCK" "TMS" "TDI" "TDO")) + + (bus_entry (at 139.7 86.36) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 139.7 88.9) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 139.7 91.44) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 139.7 93.98) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 139.7 96.52) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 139.7 99.06) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 139.7 101.6) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 139.7 104.14) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 86.36) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 88.9) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 91.44) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 93.98) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 96.52) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 99.06) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 101.6) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + (bus_entry (at 236.22 104.14) (size 2.54 2.54) + (stroke (width 0.1524) (type solid) (color 0 0 0 0)) + ) + + (wire (pts (xy 129.54 86.36) (xy 139.7 86.36)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 129.54 88.9) (xy 139.7 88.9)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 129.54 91.44) (xy 139.7 91.44)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 129.54 93.98) (xy 139.7 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 129.54 96.52) (xy 139.7 96.52)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 129.54 99.06) (xy 139.7 99.06)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 129.54 101.6) (xy 139.7 101.6)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 129.54 104.14) (xy 139.7 104.14)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 86.36) (xy 236.22 86.36)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 88.9) (xy 236.22 88.9)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 91.44) (xy 236.22 91.44)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 93.98) (xy 236.22 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 96.52) (xy 236.22 96.52)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 99.06) (xy 236.22 99.06)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 101.6) (xy 236.22 101.6)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (wire (pts (xy 226.06 104.14) (xy 236.22 104.14)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 88.9) (xy 142.24 91.44)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 91.44) (xy 142.24 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 93.98) (xy 142.24 96.52)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 96.52) (xy 142.24 99.06)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 99.06) (xy 142.24 101.6)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 101.6) (xy 142.24 104.14)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 104.14) (xy 142.24 106.68)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 106.68) (xy 142.24 138.43)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 142.24 138.43) (xy 238.76 138.43)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 88.9) (xy 238.76 91.44)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 91.44) (xy 238.76 93.98)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 93.98) (xy 238.76 96.52)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 96.52) (xy 238.76 99.06)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 99.06) (xy 238.76 101.6)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 101.6) (xy 238.76 104.14)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 104.14) (xy 238.76 106.68)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + (bus (pts (xy 238.76 106.68) (xy 238.76 138.43)) + (stroke (width 0) (type solid) (color 0 0 0 0)) + ) + + (label "ROW0" (at 130.81 86.36 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW1" (at 130.81 88.9 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW2" (at 130.81 91.44 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW3" (at 130.81 93.98 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW4" (at 130.81 96.52 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW5" (at 130.81 99.06 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW6" (at 130.81 101.6 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW7" (at 130.81 104.14 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW[7..0]" (at 177.8 138.43 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW0" (at 227.33 86.36 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW1" (at 227.33 88.9 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW2" (at 227.33 91.44 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW3" (at 227.33 93.98 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW4" (at 227.33 96.52 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW5" (at 227.33 99.06 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW6" (at 227.33 101.6 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (label "ROW7" (at 227.33 104.14 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + + (sheet (at 111.76 73.66) (size 17.78 53.34) + (stroke (width 0.1524) (type solid) (color 132 0 132 1)) + (fill (color 255 255 255 0.0000)) + (uuid 0c777b0f-2f12-4510-99ee-a28b103b057a) + (property "Sheet name" "matrixes1" (id 0) (at 111.76 73.0245 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (property "Sheet file" "LED_matrix_x6.kicad_sch" (id 1) (at 111.76 127.5085 0) + (effects (font (size 1.27 1.27)) (justify left top)) + ) + (pin "ROW0" passive (at 129.54 86.36 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW1" passive (at 129.54 88.9 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW2" passive (at 129.54 91.44 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW3" passive (at 129.54 93.98 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW4" passive (at 129.54 96.52 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW5" passive (at 129.54 99.06 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW6" passive (at 129.54 101.6 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW7" passive (at 129.54 104.14 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + ) + + (sheet (at 208.28 73.66) (size 17.78 53.34) + (stroke (width 0.1524) (type solid) (color 132 0 132 1)) + (fill (color 255 255 255 0.0000)) + (uuid 8fe7e2b2-e224-440a-ae87-ac0912bb533a) + (property "Sheet name" "matrixes2" (id 0) (at 208.28 73.0245 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + ) + (property "Sheet file" "LED_matrix_x6.kicad_sch" (id 1) (at 208.28 127.5085 0) + (effects (font (size 1.27 1.27)) (justify left top)) + ) + (pin "ROW0" passive (at 226.06 86.36 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW1" passive (at 226.06 88.9 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW2" passive (at 226.06 91.44 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW3" passive (at 226.06 93.98 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW4" passive (at 226.06 96.52 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW5" passive (at 226.06 99.06 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW6" passive (at 226.06 101.6 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (pin "ROW7" passive (at 226.06 104.14 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + ) + + (sheet_instances + (path "/" (page "1")) + (path "/0c777b0f-2f12-4510-99ee-a28b103b057a/" (page "")) + (path "/8fe7e2b2-e224-440a-ae87-ac0912bb533a/" (page "")) + ) + + (symbol_instances + (path "/0c777b0f-2f12-4510-99ee-a28b103b057a/e63356eb-7345-434d-8464-3fa9dc47789a" + (reference "DS1") (unit 1) (value "788xHG") (footprint "Display:788xHG") + ) + (path "/8fe7e2b2-e224-440a-ae87-ac0912bb533a/e63356eb-7345-434d-8464-3fa9dc47789a" + (reference "DS2") (unit 1) (value "788xHG") (footprint "Display:788xHG") + ) + ) +) diff --git a/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.net b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.net new file mode 100644 index 0000000000..ca2aa8c4e0 --- /dev/null +++ b/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.net @@ -0,0 +1,194 @@ +(export (version "D") + (design + (source "/home/jon/work/kicad/qa/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_sch") + (date "Tue 29 Dec 2020 16:36:06 EST") + (tool "Eeschema (5.99.0-7925-g950ccad220-dirty)") + (sheet (number "1") (name "/") (tstamps "/") + (title_block + (title) + (company) + (rev) + (date) + (source "test_hier_renaming.kicad_sch") + (comment (number "1") (value "")) + (comment (number "2") (value "")) + (comment (number "3") (value "")) + (comment (number "4") (value "")) + (comment (number "5") (value "")) + (comment (number "6") (value "")) + (comment (number "7") (value "")) + (comment (number "8") (value "")) + (comment (number "9") (value "")))) + (sheet (number "2") (name "/matrixes1/") (tstamps "/0c777b0f-2f12-4510-99ee-a28b103b057a/") + (title_block + (title) + (company) + (rev) + (date) + (source "LED_matrix_x6.kicad_sch") + (comment (number "1") (value "")) + (comment (number "2") (value "")) + (comment (number "3") (value "")) + (comment (number "4") (value "")) + (comment (number "5") (value "")) + (comment (number "6") (value "")) + (comment (number "7") (value "")) + (comment (number "8") (value "")) + (comment (number "9") (value "")))) + (sheet (number "3") (name "/matrixes2/") (tstamps "/8fe7e2b2-e224-440a-ae87-ac0912bb533a/") + (title_block + (title) + (company) + (rev) + (date) + (source "LED_matrix_x6.kicad_sch") + (comment (number "1") (value "")) + (comment (number "2") (value "")) + (comment (number "3") (value "")) + (comment (number "4") (value "")) + (comment (number "5") (value "")) + (comment (number "6") (value "")) + (comment (number "7") (value "")) + (comment (number "8") (value "")) + (comment (number "9") (value ""))))) + (components + (comp (ref "DS1") + (value "788xHG") + (footprint "Display:788xHG") + (libsource (lib "Display_Graphic") (part "788xHG") (description "Bi-color red and green 8x8 LED matrix 20x20 mm")) + (property (name "Sheet name") (value "matrixes1")) + (property (name "Sheet file") (value "LED_matrix_x6.kicad_sch")) + (sheetpath (names "/matrixes1/") (tstamps "/0c777b0f-2f12-4510-99ee-a28b103b057a/")) + (tstamp "e63356eb-7345-434d-8464-3fa9dc47789a")) + (comp (ref "DS2") + (value "788xHG") + (footprint "Display:788xHG") + (libsource (lib "Display_Graphic") (part "788xHG") (description "Bi-color red and green 8x8 LED matrix 20x20 mm")) + (property (name "Sheet name") (value "matrixes2")) + (property (name "Sheet file") (value "LED_matrix_x6.kicad_sch")) + (sheetpath (names "/matrixes2/") (tstamps "/8fe7e2b2-e224-440a-ae87-ac0912bb533a/")) + (tstamp "e63356eb-7345-434d-8464-3fa9dc47789a"))) + (libparts + (libpart (lib "Display_Graphic") (part "788xHG") + (description "Bi-color red and green 8x8 LED matrix 20x20 mm") + (fields + (field (name "Reference") "DS") + (field (name "Value") "788xHG") + (field (name "Footprint") "Display:788xHG")) + (pins + (pin (num "1") (name "COL1G") (type "passive")) + (pin (num "2") (name "COL2G") (type "passive")) + (pin (num "3") (name "COL3G") (type "passive")) + (pin (num "4") (name "COL4G") (type "passive")) + (pin (num "5") (name "COL5G") (type "passive")) + (pin (num "6") (name "COL6G") (type "passive")) + (pin (num "7") (name "COL7G") (type "passive")) + (pin (num "8") (name "COL8G") (type "passive")) + (pin (num "9") (name "ROW8") (type "passive")) + (pin (num "10") (name "ROW7") (type "passive")) + (pin (num "11") (name "ROW6") (type "passive")) + (pin (num "12") (name "ROW5") (type "passive")) + (pin (num "13") (name "ROW4") (type "passive")) + (pin (num "14") (name "ROW3") (type "passive")) + (pin (num "15") (name "ROW2") (type "passive")) + (pin (num "16") (name "ROW1") (type "passive")) + (pin (num "17") (name "COL1R") (type "passive")) + (pin (num "18") (name "COL2R") (type "passive")) + (pin (num "19") (name "COL3R") (type "passive")) + (pin (num "20") (name "COL4R") (type "passive")) + (pin (num "21") (name "COL5R") (type "passive")) + (pin (num "22") (name "COL6R") (type "passive")) + (pin (num "23") (name "COL7R") (type "passive")) + (pin (num "24") (name "COL8R") (type "passive"))))) + (libraries + (library (logical "Display_Graphic") + (uri "/home/jon/kicad-library/kicad-symbols//Display_Graphic.kicad_sym"))) + (nets + (net (code "1") (name "/ROW0") + (node (ref "DS1") (pin "16") (pinfunction "ROW1")) + (node (ref "DS2") (pin "16") (pinfunction "ROW1"))) + (net (code "2") (name "/ROW1") + (node (ref "DS1") (pin "15") (pinfunction "ROW2")) + (node (ref "DS2") (pin "15") (pinfunction "ROW2"))) + (net (code "3") (name "/ROW2") + (node (ref "DS1") (pin "14") (pinfunction "ROW3")) + (node (ref "DS2") (pin "14") (pinfunction "ROW3"))) + (net (code "4") (name "/ROW3") + (node (ref "DS1") (pin "13") (pinfunction "ROW4")) + (node (ref "DS2") (pin "13") (pinfunction "ROW4"))) + (net (code "5") (name "/ROW4") + (node (ref "DS1") (pin "12") (pinfunction "ROW5")) + (node (ref "DS2") (pin "12") (pinfunction "ROW5"))) + (net (code "6") (name "/ROW5") + (node (ref "DS1") (pin "11") (pinfunction "ROW6")) + (node (ref "DS2") (pin "11") (pinfunction "ROW6"))) + (net (code "7") (name "/ROW6") + (node (ref "DS1") (pin "10") (pinfunction "ROW7")) + (node (ref "DS2") (pin "10") (pinfunction "ROW7"))) + (net (code "8") (name "/ROW7") + (node (ref "DS1") (pin "9") (pinfunction "ROW8")) + (node (ref "DS2") (pin "9") (pinfunction "ROW8"))) + (net (code "9") (name "Net-(DS1-Pad1)") + (node (ref "DS1") (pin "1") (pinfunction "COL1G"))) + (net (code "10") (name "Net-(DS1-Pad2)") + (node (ref "DS1") (pin "2") (pinfunction "COL2G"))) + (net (code "11") (name "Net-(DS1-Pad3)") + (node (ref "DS1") (pin "3") (pinfunction "COL3G"))) + (net (code "12") (name "Net-(DS1-Pad4)") + (node (ref "DS1") (pin "4") (pinfunction "COL4G"))) + (net (code "13") (name "Net-(DS1-Pad5)") + (node (ref "DS1") (pin "5") (pinfunction "COL5G"))) + (net (code "14") (name "Net-(DS1-Pad6)") + (node (ref "DS1") (pin "6") (pinfunction "COL6G"))) + (net (code "15") (name "Net-(DS1-Pad7)") + (node (ref "DS1") (pin "7") (pinfunction "COL7G"))) + (net (code "16") (name "Net-(DS1-Pad8)") + (node (ref "DS1") (pin "8") (pinfunction "COL8G"))) + (net (code "17") (name "Net-(DS1-Pad17)") + (node (ref "DS1") (pin "17") (pinfunction "COL1R"))) + (net (code "18") (name "Net-(DS1-Pad18)") + (node (ref "DS1") (pin "18") (pinfunction "COL2R"))) + (net (code "19") (name "Net-(DS1-Pad19)") + (node (ref "DS1") (pin "19") (pinfunction "COL3R"))) + (net (code "20") (name "Net-(DS1-Pad20)") + (node (ref "DS1") (pin "20") (pinfunction "COL4R"))) + (net (code "21") (name "Net-(DS1-Pad21)") + (node (ref "DS1") (pin "21") (pinfunction "COL5R"))) + (net (code "22") (name "Net-(DS1-Pad22)") + (node (ref "DS1") (pin "22") (pinfunction "COL6R"))) + (net (code "23") (name "Net-(DS1-Pad23)") + (node (ref "DS1") (pin "23") (pinfunction "COL7R"))) + (net (code "24") (name "Net-(DS1-Pad24)") + (node (ref "DS1") (pin "24") (pinfunction "COL8R"))) + (net (code "25") (name "Net-(DS2-Pad1)") + (node (ref "DS2") (pin "1") (pinfunction "COL1G"))) + (net (code "26") (name "Net-(DS2-Pad2)") + (node (ref "DS2") (pin "2") (pinfunction "COL2G"))) + (net (code "27") (name "Net-(DS2-Pad3)") + (node (ref "DS2") (pin "3") (pinfunction "COL3G"))) + (net (code "28") (name "Net-(DS2-Pad4)") + (node (ref "DS2") (pin "4") (pinfunction "COL4G"))) + (net (code "29") (name "Net-(DS2-Pad5)") + (node (ref "DS2") (pin "5") (pinfunction "COL5G"))) + (net (code "30") (name "Net-(DS2-Pad6)") + (node (ref "DS2") (pin "6") (pinfunction "COL6G"))) + (net (code "31") (name "Net-(DS2-Pad7)") + (node (ref "DS2") (pin "7") (pinfunction "COL7G"))) + (net (code "32") (name "Net-(DS2-Pad8)") + (node (ref "DS2") (pin "8") (pinfunction "COL8G"))) + (net (code "33") (name "Net-(DS2-Pad17)") + (node (ref "DS2") (pin "17") (pinfunction "COL1R"))) + (net (code "34") (name "Net-(DS2-Pad18)") + (node (ref "DS2") (pin "18") (pinfunction "COL2R"))) + (net (code "35") (name "Net-(DS2-Pad19)") + (node (ref "DS2") (pin "19") (pinfunction "COL3R"))) + (net (code "36") (name "Net-(DS2-Pad20)") + (node (ref "DS2") (pin "20") (pinfunction "COL4R"))) + (net (code "37") (name "Net-(DS2-Pad21)") + (node (ref "DS2") (pin "21") (pinfunction "COL5R"))) + (net (code "38") (name "Net-(DS2-Pad22)") + (node (ref "DS2") (pin "22") (pinfunction "COL6R"))) + (net (code "39") (name "Net-(DS2-Pad23)") + (node (ref "DS2") (pin "23") (pinfunction "COL7R"))) + (net (code "40") (name "Net-(DS2-Pad24)") + (node (ref "DS2") (pin "24") (pinfunction "COL8R"))))) \ No newline at end of file diff --git a/qa/eeschema/test_netlists.cpp b/qa/eeschema/test_netlists.cpp index 4e20a940b1..8d66fe076a 100644 --- a/qa/eeschema/test_netlists.cpp +++ b/qa/eeschema/test_netlists.cpp @@ -253,5 +253,10 @@ BOOST_AUTO_TEST_CASE( BusJunctions ) } +BOOST_AUTO_TEST_CASE( HierRenaming ) +{ + doNetlistTest( "test_hier_renaming" ); +} + BOOST_AUTO_TEST_SUITE_END()