]> git.gag.com Git - hw/lipocharger/commitdiff
initial stab at parts placement
authorBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2022 15:11:57 +0000 (09:11 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2022 15:11:57 +0000 (09:11 -0600)
lipocharger.lht

index eb11d139acdd6242684efaaa7c93f7d25ca31043..803a91184c5ea419db5f500dfcca9ff19063aed2 100644 (file)
@@ -198,7 +198,7 @@ ha:pcb-rnd-board-v8 {
    ha:combining {
    }
 }
-     ha:bottom-sig      { lid=1; group=10; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>b}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>b} }
+     ha:bottom-sig      { lid=1; group=8; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>b}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>b} }
   li:objects {
   }
   color = {#3a5fcd}
@@ -212,47 +212,36 @@ ha:pcb-rnd-board-v8 {
    ha:combining {
    }
  }
-     ha:bottom-gnd      { lid=3; group=10;
+     ha:bottom-gnd      { lid=3; group=8;
    li:objects {
    }
   color = {#cd3700}
    ha:combining {
    }
  }
-     ha:int-sig2        { lid=4; group=7; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>i}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>i} }
-  li:objects {
-  }
-  color = {#548b54}
-  ha:combining {
-  }
-}
-     ha:int-sig1        { lid=5; group=5; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>o}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>o} }
-  li:objects {
-  }
-  color = {#8b7355}
-  ha:combining {
-  }
-}
-     ha:outline         { lid=6; group=9;
+     ha:outline         { lid=4; group=7;
    li:objects {
     ha:line.568 {
-     x1=0.0; y1=0.0; x2=0.0; y2=400.0mil; thickness=10.0mil; clearance=0.0;
-    }
-    ha:line.571 {
-     x1=0.0; y1=400.0mil; x2=1000.0mil; y2=400.0mil; thickness=10.0mil; clearance=0.0;
+     x1=0.0; y1=0.0; x2=0.0; y2=500.0mil; thickness=10.0mil; clearance=0.0;
     }
     ha:line.574 {
-     x1=1000.0mil; y1=400.0mil; x2=1000.0mil; y2=0.0; thickness=10.0mil; clearance=0.0;
+     x1=1000.0mil; y1=500.0mil; x2=1000.0mil; y2=0.0; thickness=10.0mil; clearance=0.0;
     }
     ha:line.577 {
      x1=1000.0mil; y1=0.0; x2=0.0; y2=0.0; thickness=10.0mil; clearance=0.0;
     }
+    ha:line.1281 {
+     x1=0.0; y1=500.0mil; x2=1000.0mil; y2=500.0mil; thickness=10.0mil; clearance=0.0;
+     ha:flags {
+      selected=1
+     }
+    }
    }
   color = {#00868b}
    ha:combining {
    }
  }
-     ha:bottom-silk     { lid=7; group=12; ha:combining { auto=1; }; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>x}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>x} } 
+     ha:bottom-silk     { lid=5; group=10; ha:combining { auto=1; }; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>x}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>x} } 
   li:objects {
    ha:text.585 {
     string=100      500; x=8.069326mm; y=10.109708mm; scale=200; fid=0;
@@ -302,65 +291,69 @@ ha:pcb-rnd-board-v8 {
   }
   color = {#000000}
 }
-     ha:top-silk        { lid=8; group=1; ha:combining { auto=1; }; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>s}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>s} } 
+     ha:top-silk        { lid=6; group=1; ha:combining { auto=1; }; ha:attributes { {pcb-rnd::key::select}={<Key>l; <Key>s}; {pcb-rnd::key::vis}={<Key>l; Shift<Key>s} } 
   li:objects {
   }
   color = {#000000}
 }
-     ha:top-paste       { lid=9; group=0; ha:combining { auto=1; } 
+     ha:top-paste       { lid=7; group=0; ha:combining { auto=1; } 
   li:objects {
   }
   color = {#cd00cd}
 }
-     ha:top-mask        { lid=10; group=2; ha:combining { sub=1; auto=1; } 
+     ha:top-mask        { lid=8; group=2; ha:combining { sub=1; auto=1; } 
   li:objects {
   }
   color = {#ff0000}
 }
-     ha:bottom-mask     { lid=11; group=11; ha:combining { sub=1; auto=1; } 
+     ha:bottom-mask     { lid=9; group=9; ha:combining { sub=1; auto=1; } 
   li:objects {
   }
   color = {#ff0000}
 }
-     ha:bottom-paste    { lid=12; group=13; ha:combining { auto=1; } 
+     ha:bottom-paste    { lid=10; group=11; ha:combining { auto=1; } 
   li:objects {
   }
   color = {#cd00cd}
 }
-     ha:slot-plated     { lid=13; group=14; ha:combining { auto=1; } 
+     ha:slot-plated     { lid=11; group=12; ha:combining { auto=1; } 
   li:objects {
   }
   color = {#8b7355}
 }
-     ha:slot-unplated   { lid=14; group=15; ha:combining { auto=1; } 
+     ha:slot-unplated   { lid=12; group=13; ha:combining { auto=1; } 
   li:objects {
   }
   color = {#00868b}
 }
-     ha:top-assy        { lid=15; group=16; color={#444444};
+     ha:top-assy        { lid=13; group=14; color={#444444};
    li:objects {
    }
    ha:combining {
    }
  }
-     ha:bot-assy        { lid=16; group=17; color={#444444};
+     ha:bot-assy        { lid=14; group=15; color={#444444};
    li:objects {
    }
    ha:combining {
    }
  }
-     ha:fab             { lid=17; group=18; ha:combining { auto=1; }; color={#222222};
+     ha:fab             { lid=15; group=16; ha:combining { auto=1; }; color={#222222};
    li:objects {
    }
  }
    }
 
     li:objects {
-      ha:subc.587 {
+      ha:subc.689 {
        ha:attributes {
-        value=4.7uF
-        footprint=0402
-        refdes=C1
+        copyright=2006 DJ Delorie
+        author=DJ Delorie
+        footprint=SOT23-5
+        dist-license=GPL
+        refdes=U1
+        value=MCP73831
+        use-license=Unlimited
        }
       ha:data {
             li:padstack_prototypes {
@@ -377,14 +370,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
+              -20.0mil  
+              -12.0mil  
+              -20.0mil  
+              12.0mil  
+              20.0mil  
+              12.0mil  
+              20.0mil  
+              -12.0mil  
              }
            }
 
@@ -396,14 +389,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              0.425958mm  
-              0.326136mm  
-              0.425958mm  
+              -23.0mil  
+              -15.0mil  
+              -23.0mil  
+              15.0mil  
+              23.0mil  
+              15.0mil  
+              23.0mil  
+              -15.0mil  
              }
            }
 
@@ -415,14 +408,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
+              -20.0mil  
+              -12.0mil  
+              -20.0mil  
+              12.0mil  
+              20.0mil  
+              12.0mil  
+              20.0mil  
+              -12.0mil  
              }
            }
          }
@@ -430,8 +423,36 @@ ha:pcb-rnd-board-v8 {
       }
 
        li:objects {
-        ha:padstack_ref.601 {
-         proto=0; x=14.161008mm; y=167.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.715 {
+         proto=0; x=593.0mil; y=139.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=4
+           name=VIN
+         }
+        }
+        ha:padstack_ref.716 {
+         proto=0; x=593.0mil; y=61.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=PROG
+         }
+        }
+        ha:padstack_ref.717 {
+         proto=0; x=511.0mil; y=61.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
          ha:flags {
           clearline=1
          }
@@ -441,11 +462,11 @@ ha:pcb-rnd-board-v8 {
 
          ha:attributes {
            term=1
-           name=1
+           name=STAT
          }
         }
-        ha:padstack_ref.602 {
-         proto=0; x=589.0mil; y=167.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.718 {
+         proto=0; x=511.0mil; y=100.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
          ha:flags {
           clearline=1
          }
@@ -455,7 +476,21 @@ ha:pcb-rnd-board-v8 {
 
          ha:attributes {
            term=2
-           name=2
+           name=VSS
+         }
+        }
+        ha:padstack_ref.719 {
+         proto=0; x=511.0mil; y=139.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=3
+           name=VBAT
          }
         }
        }
@@ -466,13 +501,17 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:text.588 {
-            string=%a.parent.refdes%; x=553.0mil; y=182.93mil; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
-            }
-            rot = 0.000000
+           ha:line.690 {
+            x1=483.0mil; y1=41.0mil; x2=483.0mil; y2=159.0mil; thickness=10.0mil; clearance=0.0;
+           }
+           ha:line.693 {
+            x1=483.0mil; y1=41.0mil; x2=622.0mil; y2=41.0mil; thickness=10.0mil; clearance=0.0;
+           }
+           ha:line.696 {
+            x1=622.0mil; y1=41.0mil; x2=622.0mil; y2=159.0mil; thickness=10.0mil; clearance=0.0;
+           }
+           ha:line.699 {
+            x1=483.0mil; y1=159.0mil; x2=622.0mil; y2=159.0mil; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -486,26 +525,26 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:line.589 {
-            x1=14.560804mm; y1=167.0mil; x2=14.560804mm; y2=167.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.703 {
+            x1=13.81252mm; y1=100.0mil; x2=13.81252mm; y2=100.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.592 {
-            x1=14.560804mm; y1=167.0mil; x2=14.560804mm; y2=167.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.706 {
+            x1=593.0mil; y1=139.0mil; x2=593.0mil; y2=139.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.595 {
-            x1=14.560804mm; y1=167.0mil; x2=15.560804mm; y2=167.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.709 {
+            x1=593.0mil; y1=139.0mil; x2=16.0622mm; y2=139.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.598 {
-            x1=14.560804mm; y1=167.0mil; x2=14.560804mm; y2=5.2418mm; thickness=0.1mm; clearance=0.0;
+           ha:line.712 {
+            x1=593.0mil; y1=139.0mil; x2=593.0mil; y2=4.5306mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -519,183 +558,74 @@ ha:pcb-rnd-board-v8 {
         }
        }
       }
-       uid = tWMbI3HAm7UIolEaNwMAAAAB
+       uid = tWMbI3HAm7UIolEaNwMAAAAH
       }
-      ha:subc.604 {
+      ha:subc.765 {
        ha:attributes {
-        value=4.7uF
-        footprint=0402
-        refdes=C2
+        value=SPDT
+        footprint=PCM12SMTR
+        refdes=S1
        }
       ha:data {
             li:padstack_prototypes {
 
        ha:ps_proto_v6.0 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
+         hdia=0.899922mm; hplated=1; htop=0; hbottom=0;
          li:shape {
 
            ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=1.255522mm;            }
             ha:combining {            }
             ha:layer_mask {
              copper = 1
              top = 1
             }
             clearance=0.0
-             li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
-             }
            }
 
            ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
+            ha:ps_circ { x=0.0; y=0.0; dia=1.255522mm;            }
+            ha:combining {            }
             ha:layer_mask {
-             top = 1
-             mask = 1
+             bottom = 1
+             copper = 1
             }
             clearance=0.0
-             li:ps_poly {
-              0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              0.425958mm  
-              0.326136mm  
-              0.425958mm  
-             }
            }
 
            ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
+            ha:ps_circ { x=0.0; y=0.0; dia=1.255522mm;            }
+            ha:combining {            }
             ha:layer_mask {
-             top = 1
-             paste = 1
+             copper = 1
+             intern = 1
             }
             clearance=0.0
-             li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
-             }
            }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.618 {
-         proto=0; x=466.74mil; y=167.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.619 {
-         proto=0; x=11.055604mm; y=167.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=2
-           name=2
-         }
-        }
-       }
-       li:layers {
-
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
 
-          li:objects {
-           ha:text.605 {
-            string=%a.parent.refdes%; x=422.0mil; y=95.0mil; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
+           ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=61.42mil;            }
+            ha:combining { sub=1; auto=1;            }
+            ha:layer_mask {
+             top = 1
+             mask = 1
             }
-            rot = 0.000000
+            clearance=0.0
            }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
-
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
 
-          li:objects {
-           ha:line.606 {
-            x1=451.0mil; y1=167.0mil; x2=451.0mil; y2=167.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.609 {
-            x1=451.0mil; y1=167.0mil; x2=451.0mil; y2=167.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.612 {
-            x1=451.0mil; y1=167.0mil; x2=10.4554mm; y2=167.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.615 {
-            x1=451.0mil; y1=167.0mil; x2=451.0mil; y2=3.2418mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
+           ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=61.42mil;            }
+            ha:combining { sub=1; auto=1;            }
+            ha:layer_mask {
+             bottom = 1
+             mask = 1
             }
+            clearance=0.0
            }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = tWMbI3HAm7UIolEaNwMAAAAC
-      }
-      ha:subc.621 {
-       ha:attributes {
-        value=1k
-        footprint=0402
-        refdes=R2
+         }
        }
-      ha:data {
-            li:padstack_prototypes {
 
-       ha:ps_proto_v6.0 {
+       ha:ps_proto_v6.1 {
          hdia=0.0; hplated=0; htop=0; hbottom=0;
          li:shape {
 
@@ -707,14 +637,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
+              -0.500128mm  
+              -15.75mil  
+              -0.500128mm  
+              15.75mil  
+              0.500128mm  
+              15.75mil  
+              0.500128mm  
+              -15.75mil  
              }
            }
 
@@ -726,14 +656,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              0.425958mm  
-              0.326136mm  
-              0.425958mm  
+              -0.676277mm  
+              -0.576199mm  
+              -0.676277mm  
+              0.576199mm  
+              0.676277mm  
+              0.576199mm  
+              0.676277mm  
+              -0.576199mm  
              }
            }
 
@@ -745,122 +675,83 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
+              -0.500128mm  
+              -15.75mil  
+              -0.500128mm  
+              15.75mil  
+              0.500128mm  
+              15.75mil  
+              0.500128mm  
+              -15.75mil  
              }
            }
          }
        }
-      }
 
-       li:objects {
-        ha:padstack_ref.635 {
-         proto=0; x=1.505204mm; y=49.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
+       ha:ps_proto_v6.2 {
+         hdia=0.0; hplated=0; htop=0; hbottom=0;
+         li:shape {
 
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.636 {
-         proto=0; x=2.304796mm; y=49.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=2
-           name=2
-         }
-        }
-       }
-       li:layers {
-
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
-
-          li:objects {
-           ha:text.622 {
-            string=%a.parent.refdes%; x=37.24mil; y=-1.5mil; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
+           ha:ps_shape_v4 {
+            ha:combining {            }
+            ha:layer_mask {
+             copper = 1
+             top = 1
             }
-            rot = 0.000000
+            clearance=0.0
+             li:ps_poly {
+              -0.500125mm  
+              -15.75mil  
+              -0.500125mm  
+              15.75mil  
+              0.500125mm  
+              15.75mil  
+              0.500125mm  
+              -15.75mil  
+             }
            }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
 
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
-
-          li:objects {
-           ha:line.623 {
-            x1=75.0mil; y1=49.0mil; x2=75.0mil; y2=49.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.626 {
-            x1=75.0mil; y1=49.0mil; x2=75.0mil; y2=49.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.629 {
-            x1=75.0mil; y1=49.0mil; x2=2.905mm; y2=49.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
+           ha:ps_shape_v4 {
+            ha:combining { sub=1; auto=1;            }
+            ha:layer_mask {
+             top = 1
+             mask = 1
             }
+            clearance=0.0
+             li:ps_poly {
+              -0.676274mm  
+              -0.576199mm  
+              -0.676274mm  
+              0.576199mm  
+              0.676274mm  
+              0.576199mm  
+              0.676274mm  
+              -0.576199mm  
+             }
            }
-           ha:line.632 {
-            x1=75.0mil; y1=49.0mil; x2=75.0mil; y2=2.2446mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
+
+           ha:ps_shape_v4 {
+            ha:combining { auto=1;            }
+            ha:layer_mask {
+             top = 1
+             paste = 1
             }
+            clearance=0.0
+             li:ps_poly {
+              -0.500125mm  
+              -15.75mil  
+              -0.500125mm  
+              15.75mil  
+              0.500125mm  
+              15.75mil  
+              0.500125mm  
+              -15.75mil  
+             }
            }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = tWMbI3HAm7UIolEaNwMAAAAD
-      }
-      ha:subc.638 {
-       ha:attributes {
-        value=1k
-        footprint=0402
-        refdes=R1
+         }
        }
-      ha:data {
-            li:padstack_prototypes {
 
-       ha:ps_proto_v6.0 {
+       ha:ps_proto_v6.3 {
          hdia=0.0; hplated=0; htop=0; hbottom=0;
          li:shape {
 
@@ -872,14 +763,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
+              0.350012mm  
+              -29.53mil  
+              -0.350012mm  
+              -29.53mil  
+              -0.350012mm  
+              29.53mil  
+              0.350012mm  
+              29.53mil  
              }
            }
 
@@ -891,14 +782,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              -0.425958mm  
-              -0.326136mm  
-              0.425958mm  
-              0.326136mm  
-              0.425958mm  
+              16.78mil  
+              -32.53mil  
+              -16.78mil  
+              -32.53mil  
+              -16.78mil  
+              32.53mil  
+              16.78mil  
+              32.53mil  
              }
            }
 
@@ -910,14 +801,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              -0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
+              0.350012mm  
+              -29.53mil  
+              -0.350012mm  
+              -29.53mil  
+              -0.350012mm  
+              29.53mil  
+              0.350012mm  
+              29.53mil  
              }
            }
          }
@@ -925,8 +816,92 @@ ha:pcb-rnd-board-v8 {
       }
 
        li:objects {
-        ha:padstack_ref.652 {
-         proto=0; x=7.677404mm; y=24.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.779 {
+         proto=0; x=540.95mil; y=384.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=0.15494mm;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=G
+           name=mnt
+         }
+        }
+        ha:padstack_ref.780 {
+         proto=0; x=16.740124mm; y=384.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=0.15494mm;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=G
+           name=mnt
+         }
+        }
+        ha:padstack_ref.781 {
+         proto=1; x=18.889978mm; y=8.65378mm; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=M
+           name=mnt
+         }
+        }
+        ha:padstack_ref.782 {
+         proto=1; x=18.889978mm; y=427.31mil; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=M
+           name=mnt
+         }
+        }
+        ha:padstack_ref.783 {
+         proto=2; x=11.590275mm; y=427.31mil; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=M
+           name=mnt
+         }
+        }
+        ha:padstack_ref.784 {
+         proto=2; x=11.590275mm; y=8.65378mm; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=M
+           name=mnt
+         }
+        }
+        ha:padstack_ref.785 {
+         proto=3; x=511.43mil; y=315.11mil; rot=0.000000; xmirror=0; smirror=0; clearance=3.0mil;
          ha:flags {
           clearline=1
          }
@@ -939,8 +914,8 @@ ha:pcb-rnd-board-v8 {
            name=1
          }
         }
-        ha:padstack_ref.653 {
-         proto=0; x=333.74mil; y=24.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.786 {
+         proto=3; x=15.990062mm; y=315.11mil; rot=0.000000; xmirror=0; smirror=0; clearance=3.0mil;
          ha:flags {
           clearline=1
          }
@@ -953,6 +928,20 @@ ha:pcb-rnd-board-v8 {
            name=2
          }
         }
+        ha:padstack_ref.787 {
+         proto=3; x=688.58mil; y=315.11mil; rot=0.000000; xmirror=0; smirror=0; clearance=3.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=3
+           name=3
+         }
+        }
        }
        li:layers {
 
@@ -961,14 +950,6 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:text.639 {
-            string=%a.parent.refdes%; x=291.74mil; y=0.938022mm; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
-            }
-            rot = 0.000000
-           }
           }
           ha:type {
            silk = 1
@@ -981,30 +962,34 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:line.640 {
-            x1=318.0mil; y1=24.0mil; x2=318.0mil; y2=24.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.767 {
+            x1=15.323452mm; y1=9.170387mm; x2=15.323452mm; y2=9.170387mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
-           }
-           ha:line.643 {
-            x1=318.0mil; y1=24.0mil; x2=318.0mil; y2=24.0mil; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ selected=1
+ };           }
+           ha:line.770 {
+            x1=600.0mil; y1=384.0mil; x2=600.0mil; y2=384.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
-           }
-           ha:line.646 {
-            x1=318.0mil; y1=24.0mil; x2=9.0772mm; y2=24.0mil; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ selected=1
+ };           }
+           ha:line.773 {
+            x1=600.0mil; y1=384.0mil; x2=16.24mm; y2=384.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
-           }
-           ha:line.649 {
-            x1=318.0mil; y1=24.0mil; x2=318.0mil; y2=1.6096mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ selected=1
+ };           }
+           ha:line.776 {
+            x1=600.0mil; y1=384.0mil; x2=600.0mil; y2=10.7536mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
-           }
+ ha:flags ={ selected=1
+ };           }
           }
           ha:type {
            top = 1
@@ -1014,13 +999,13 @@ ha:pcb-rnd-board-v8 {
         }
        }
       }
-       uid = tWMbI3HAm7UIolEaNwMAAAAE
+       uid = tWMbI3HAm7UIolEaNwMAAAAJ
       }
-      ha:subc.655 {
+      ha:subc.789 {
        ha:attributes {
-        value=2k
-        footprint=0402
-        refdes=R3
+        value=dualLED
+        footprint=0605
+        refdes=D1
        }
       ha:data {
             li:padstack_prototypes {
@@ -1037,14 +1022,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              -0.249936mm  
+              -16.73mil  
+              -12.795mil  
+              -16.73mil  
+              12.795mil  
+              16.73mil  
+              12.795mil  
+              16.73mil  
+              -12.795mil  
              }
            }
 
@@ -1056,14 +1041,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              -0.425958mm  
-              -0.326136mm  
-              -0.425958mm  
-              0.326136mm  
-              0.425958mm  
-              0.326136mm  
-              0.425958mm  
-              -0.326136mm  
+              -19.73mil  
+              -15.795mil  
+              -19.73mil  
+              15.795mil  
+              19.73mil  
+              15.795mil  
+              19.73mil  
+              -15.795mil  
              }
            }
 
@@ -1075,14 +1060,14 @@ ha:pcb-rnd-board-v8 {
             }
             clearance=0.0
              li:ps_poly {
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              -0.249936mm  
+              -16.73mil  
+              -12.795mil  
+              -16.73mil  
+              12.795mil  
+              16.73mil  
+              12.795mil  
+              16.73mil  
+              -12.795mil  
              }
            }
          }
@@ -1090,8 +1075,22 @@ ha:pcb-rnd-board-v8 {
       }
 
        li:objects {
-        ha:padstack_ref.669 {
-         proto=0; x=687.0mil; y=4.680204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.804 {
+         proto=0; x=5.931789mm; y=28.28mil; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=2
+           name=pin2
+         }
+        }
+        ha:padstack_ref.805 {
+         proto=0; x=5.931789mm; y=1.567942mm; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
          ha:flags {
           clearline=1
          }
@@ -1101,11 +1100,11 @@ ha:pcb-rnd-board-v8 {
 
          ha:attributes {
            term=1
-           name=1
+           name=pin1
          }
         }
-        ha:padstack_ref.670 {
-         proto=0; x=687.0mil; y=215.74mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.806 {
+         proto=0; x=176.455mil; y=28.28mil; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
          ha:flags {
           clearline=1
          }
@@ -1114,8 +1113,22 @@ ha:pcb-rnd-board-v8 {
          }
 
          ha:attributes {
-           term=2
-           name=2
+           term=4
+           name=pin4
+         }
+        }
+        ha:padstack_ref.807 {
+         proto=0; x=176.455mil; y=1.567942mm; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=3
+           name=pin3
          }
         }
        }
@@ -1126,13 +1139,8 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:text.656 {
-            string=%a.parent.refdes%; x=17.095724mm; y=165.74mil; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
-            }
-            rot = 270.000000
+           ha:arc.790 {
+            x=3.706876mm; y=45.0mil; width=5.0mil; height=5.0mil; astart=270.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -1146,26 +1154,26 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:line.657 {
-            x1=687.0mil; y1=200.0mil; x2=687.0mil; y2=200.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.792 {
+            x1=204.995mil; y1=45.005mil; x2=204.995mil; y2=45.005mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.660 {
-            x1=687.0mil; y1=200.0mil; x2=687.0mil; y2=200.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.795 {
+            x1=205.0mil; y1=45.0mil; x2=205.0mil; y2=45.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.663 {
-            x1=687.0mil; y1=200.0mil; x2=687.0mil; y2=4.08mm; thickness=0.1mm; clearance=0.0;
+           ha:line.798 {
+            x1=205.0mil; y1=45.0mil; x2=4.207mm; y2=45.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.666 {
-            x1=687.0mil; y1=200.0mil; x2=16.4498mm; y2=200.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.801 {
+            x1=205.0mil; y1=45.0mil; x2=205.0mil; y2=0.143mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -1179,13 +1187,13 @@ ha:pcb-rnd-board-v8 {
         }
        }
       }
-       uid = tWMbI3HAm7UIolEaNwMAAAAF
+       uid = tWMbI3HAm7UIolEaNwMAAAAK
       }
-      ha:subc.672 {
+      ha:subc.809 {
        ha:attributes {
-        value=10k
-        footprint=0402
-        refdes=R4
+        value=LiPo
+        footprint=S2B-PH-SM
+        refdes=J2
        }
       ha:data {
             li:padstack_prototypes {
@@ -1195,251 +1203,77 @@ ha:pcb-rnd-board-v8 {
          li:shape {
 
            ha:ps_shape_v4 {
+            ha:ps_line { x1=-49.215mil; y1=0.0; x2=49.215mil; y2=0.0; thickness=0.999998mm; square=0;            }
             ha:combining {            }
             ha:layer_mask {
              copper = 1
              top = 1
             }
             clearance=0.0
-             li:ps_poly {
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              -0.249936mm  
-             }
            }
 
            ha:ps_shape_v4 {
+            ha:ps_line { x1=-49.215mil; y1=0.0; x2=49.215mil; y2=0.0; thickness=47.24mil; square=0;            }
             ha:combining { sub=1; auto=1;            }
             ha:layer_mask {
              top = 1
              mask = 1
             }
             clearance=0.0
-             li:ps_poly {
-              -0.425958mm  
-              -0.326136mm  
-              -0.425958mm  
-              0.326136mm  
-              0.425958mm  
-              0.326136mm  
-              0.425958mm  
-              -0.326136mm  
-             }
            }
 
            ha:ps_shape_v4 {
+            ha:ps_line { x1=-49.215mil; y1=0.0; x2=49.215mil; y2=0.0; thickness=0.999998mm; square=0;            }
             ha:combining { auto=1;            }
             ha:layer_mask {
              top = 1
              paste = 1
             }
             clearance=0.0
-             li:ps_poly {
-              -0.349758mm  
-              -0.249936mm  
-              -0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              0.249936mm  
-              0.349758mm  
-              -0.249936mm  
-             }
            }
          }
        }
-      }
-
-       li:objects {
-        ha:padstack_ref.686 {
-         proto=0; x=510.0mil; y=4.661404mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.687 {
-         proto=0; x=510.0mil; y=5.460996mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=2
-           name=2
-         }
-        }
-       }
-       li:layers {
-
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
-
-          li:objects {
-           ha:text.673 {
-            string=%a.parent.refdes%; x=580.07mil; y=4.204204mm; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
-            }
-            rot = 270.000000
-           }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
-
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
-
-          li:objects {
-           ha:line.674 {
-            x1=510.0mil; y1=5.0612mm; x2=510.0mil; y2=5.0612mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.677 {
-            x1=510.0mil; y1=5.0612mm; x2=510.0mil; y2=5.0612mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.680 {
-            x1=510.0mil; y1=5.0612mm; x2=510.0mil; y2=4.0612mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.683 {
-            x1=510.0mil; y1=5.0612mm; x2=11.954mm; y2=5.0612mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = tWMbI3HAm7UIolEaNwMAAAAG
-      }
-      ha:subc.689 {
-       ha:attributes {
-        copyright=2006 DJ Delorie
-        author=DJ Delorie
-        footprint=SOT23-5
-        dist-license=GPL
-        refdes=U1
-        value=MCP73831
-        use-license=Unlimited
-       }
-      ha:data {
-            li:padstack_prototypes {
 
-       ha:ps_proto_v6.0 {
+       ha:ps_proto_v6.1 {
          hdia=0.0; hplated=0; htop=0; hbottom=0;
          li:shape {
 
            ha:ps_shape_v4 {
+            ha:ps_line { x1=-0.94996mm; y1=0.0; x2=0.94996mm; y2=0.0; thickness=59.06mil; square=0;            }
             ha:combining {            }
             ha:layer_mask {
              copper = 1
              top = 1
             }
             clearance=0.0
-             li:ps_poly {
-              -20.0mil  
-              -12.0mil  
-              -20.0mil  
-              12.0mil  
-              20.0mil  
-              12.0mil  
-              20.0mil  
-              -12.0mil  
-             }
            }
 
            ha:ps_shape_v4 {
+            ha:ps_line { x1=-0.94996mm; y1=0.0; x2=0.94996mm; y2=0.0; thickness=66.93mil; square=0;            }
             ha:combining { sub=1; auto=1;            }
             ha:layer_mask {
              top = 1
              mask = 1
             }
             clearance=0.0
-             li:ps_poly {
-              -23.0mil  
-              -15.0mil  
-              -23.0mil  
-              15.0mil  
-              23.0mil  
-              15.0mil  
-              23.0mil  
-              -15.0mil  
-             }
            }
 
            ha:ps_shape_v4 {
+            ha:ps_line { x1=-0.94996mm; y1=0.0; x2=0.94996mm; y2=0.0; thickness=59.06mil; square=0;            }
             ha:combining { auto=1;            }
             ha:layer_mask {
              top = 1
              paste = 1
             }
             clearance=0.0
-             li:ps_poly {
-              -20.0mil  
-              -12.0mil  
-              -20.0mil  
-              12.0mil  
-              20.0mil  
-              12.0mil  
-              20.0mil  
-              -12.0mil  
-             }
            }
          }
        }
       }
 
        li:objects {
-        ha:padstack_ref.715 {
-         proto=0; x=552.0mil; y=123.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=4
-           name=VIN
-         }
-        }
-        ha:padstack_ref.716 {
-         proto=0; x=552.0mil; y=45.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
+        ha:padstack_ref.823 {
+         proto=0; x=7.346061mm; y=290.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=0.499999mm;
          ha:flags {
           clearline=1
          }
@@ -1448,12 +1282,12 @@ ha:pcb-rnd-board-v8 {
          }
 
          ha:attributes {
-           term=5
-           name=PROG
+           term=2
+           name=pin2
          }
         }
-        ha:padstack_ref.717 {
-         proto=0; x=470.0mil; y=45.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
+        ha:padstack_ref.824 {
+         proto=0; x=7.346061mm; y=5.366004mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.499999mm;
          ha:flags {
           clearline=1
          }
@@ -1463,11 +1297,11 @@ ha:pcb-rnd-board-v8 {
 
          ha:attributes {
            term=1
-           name=STAT
+           name=pin1
          }
         }
-        ha:padstack_ref.718 {
-         proto=0; x=470.0mil; y=84.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
+        ha:padstack_ref.825 {
+         proto=1; x=1.796034mm; y=9.716008mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.0;
          ha:flags {
           clearline=1
          }
@@ -1476,12 +1310,12 @@ ha:pcb-rnd-board-v8 {
          }
 
          ha:attributes {
-           term=2
-           name=VSS
+           term=G
+           name=tab1
          }
         }
-        ha:padstack_ref.719 {
-         proto=0; x=470.0mil; y=123.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=15.0mil;
+        ha:padstack_ref.826 {
+         proto=1; x=1.796034mm; y=3.015996mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.0;
          ha:flags {
           clearline=1
          }
@@ -1490,8 +1324,8 @@ ha:pcb-rnd-board-v8 {
          }
 
          ha:attributes {
-           term=3
-           name=VBAT
+           term=G
+           name=tab2
          }
         }
        }
@@ -1502,26 +1336,6 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:line.690 {
-            x1=442.0mil; y1=25.0mil; x2=442.0mil; y2=143.0mil; thickness=10.0mil; clearance=0.0;
-           }
-           ha:line.693 {
-            x1=442.0mil; y1=25.0mil; x2=581.0mil; y2=25.0mil; thickness=10.0mil; clearance=0.0;
-           }
-           ha:line.696 {
-            x1=581.0mil; y1=25.0mil; x2=581.0mil; y2=143.0mil; thickness=10.0mil; clearance=0.0;
-           }
-           ha:line.699 {
-            x1=442.0mil; y1=143.0mil; x2=581.0mil; y2=143.0mil; thickness=10.0mil; clearance=0.0;
-           }
-           ha:text.702 {
-            string=%a.parent.refdes%; x=598.0mil; y=26.0mil; scale=89; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
-            }
-            rot = 0.000000
-           }
           }
           ha:type {
            silk = 1
@@ -1534,30 +1348,34 @@ ha:pcb-rnd-board-v8 {
          ha:combining {         }
 
           li:objects {
-           ha:line.703 {
-            x1=502.8mil; y1=84.0mil; x2=502.8mil; y2=84.0mil; thickness=0.1mm; clearance=0.0;
+           ha:line.811 {
+            x1=4.571047mm; y1=6.366002mm; x2=4.571047mm; y2=6.366002mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
-           }
-           ha:line.706 {
-            x1=552.0mil; y1=123.0mil; x2=552.0mil; y2=123.0mil; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ selected=1
+ };           }
+           ha:line.814 {
+            x1=0.096012mm; y1=412.05mil; x2=0.096012mm; y2=412.05mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
-           }
-           ha:line.709 {
-            x1=552.0mil; y1=123.0mil; x2=15.0208mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ selected=1
+ };           }
+           ha:line.817 {
+            x1=0.096012mm; y1=412.05mil; x2=0.096012mm; y2=9.46607mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
-           }
-           ha:line.712 {
-            x1=552.0mil; y1=123.0mil; x2=552.0mil; y2=4.1242mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ selected=1
+ };           }
+           ha:line.820 {
+            x1=0.096012mm; y1=412.05mil; x2=-0.903988mm; y2=412.05mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
-           }
+ ha:flags ={ selected=1
+ };           }
           }
           ha:type {
            top = 1
@@ -1567,1349 +1385,1627 @@ ha:pcb-rnd-board-v8 {
         }
        }
       }
-       uid = tWMbI3HAm7UIolEaNwMAAAAH
+       uid = tWMbI3HAm7UIolEaNwMAAAAL
       }
-      ha:subc.721 {
-       ha:attributes {
-        value=USBmicroB
-        footprint=ZX62-B-5PA
-        refdes=J1
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v6.0 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
+       ha:subc.960 {
+        ha:attributes {
+         refdes=C1
+         value=4.7uF
+         footprint=0603
+         openscad=0603
+        }
+       ha:data {
+              li:padstack_prototypes {
+
+        ha:ps_proto_v6.0 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
 
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               0.576072mm  
+               17.76mil  
+               0.576072mm  
+              }
             }
-            clearance=0.0
-             li:ps_poly {
-              -0.675132mm  
-              -7.875mil  
-              -0.675132mm  
-              7.875mil  
-              0.675132mm  
-              7.875mil  
-              0.675132mm  
-              -7.875mil  
+
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
              }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
+          }
+        }
+       }
+
+        li:objects {
+         ha:padstack_ref.974 {
+          proto=0; x=688.0mil; y=2.230628mm; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=1
+            name=1
+          }
+         }
+         ha:padstack_ref.975 {
+          proto=0; x=688.0mil; y=139.0mil; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=2
+            name=2
+          }
+         }
+        }
+        li:layers {
+
+         ha:top-silk {
+          lid=0
+          ha:combining {          }
+
+           li:objects {
            }
+           ha:type {
+            silk = 1
+            top = 1
+           }
+         }
 
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
+         ha:subc-aux {
+          lid=1
+          ha:combining {          }
+
+           li:objects {
+            ha:line.962 {
+             x1=688.0mil; y1=2.880614mm; x2=688.0mil; y2=2.880614mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=pnp-origin
+             }
             }
-            clearance=0.0
-             li:ps_poly {
-              -30.515mil  
-              -11.81mil  
-              -30.515mil  
-              11.81mil  
-              30.515mil  
-              11.81mil  
-              30.515mil  
-              -11.81mil  
+            ha:line.965 {
+             x1=688.0mil; y1=2.880614mm; x2=688.0mil; y2=2.880614mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
              }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
             }
-            clearance=0.0
-             li:ps_poly {
-              -0.675132mm  
-              -7.875mil  
-              -0.675132mm  
-              7.875mil  
-              0.675132mm  
-              7.875mil  
-              0.675132mm  
-              -7.875mil  
+            ha:line.968 {
+             x1=688.0mil; y1=2.880614mm; x2=688.0mil; y2=3.880614mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
+             }
+            }
+            ha:line.971 {
+             x1=688.0mil; y1=2.880614mm; x2=16.4752mm; y2=2.880614mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
              }
+            }
+           }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
            }
          }
+        }
        }
+        uid = 1f/t/PNB3NZF0ZSA5DwAAAAM
+       }
+       ha:subc.993 {
+        ha:attributes {
+         refdes=C2
+         value=4.7uF
+         footprint=0603
+         openscad=0603
+        }
+       ha:data {
+              li:padstack_prototypes {
+
+        ha:ps_proto_v6.0 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
 
-       ha:ps_proto_v6.1 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               0.576072mm  
+               17.76mil  
+               0.576072mm  
+              }
             }
-            clearance=0.0
-             li:ps_poly {
-              31.495mil  
-              -41.34mil  
-              -31.495mil  
-              -41.34mil  
-              -31.495mil  
-              41.34mil  
-              31.495mil  
-              41.34mil  
+
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
              }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
+          }
+        }
+       }
+
+        li:objects {
+         ha:padstack_ref.1007 {
+          proto=0; x=433.0mil; y=100.0mil; rot=-90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=1
+            name=1
+          }
+         }
+         ha:padstack_ref.1008 {
+          proto=0; x=433.0mil; y=151.18mil; rot=-90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=2
+            name=2
+          }
+         }
+        }
+        li:layers {
+
+         ha:top-silk {
+          lid=0
+          ha:combining {          }
+
+           li:objects {
            }
+           ha:type {
+            silk = 1
+            top = 1
+           }
+         }
 
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
+         ha:subc-aux {
+          lid=1
+          ha:combining {          }
+
+           li:objects {
+            ha:line.995 {
+             x1=433.0mil; y1=125.59mil; x2=433.0mil; y2=125.59mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=pnp-origin
+             }
             }
-            clearance=0.0
-             li:ps_poly {
-              35.435mil  
-              -45.28mil  
-              -35.435mil  
-              -45.28mil  
-              -35.435mil  
-              45.28mil  
-              35.435mil  
-              45.28mil  
+            ha:line.998 {
+             x1=433.0mil; y1=125.59mil; x2=433.0mil; y2=125.59mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
              }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
             }
-            clearance=0.0
-             li:ps_poly {
-              31.495mil  
-              -41.34mil  
-              -31.495mil  
-              -41.34mil  
-              -31.495mil  
-              41.34mil  
-              31.495mil  
-              41.34mil  
+            ha:line.1001 {
+             x1=433.0mil; y1=125.59mil; x2=433.0mil; y2=4.189986mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
              }
+            }
+            ha:line.1004 {
+             x1=433.0mil; y1=125.59mil; x2=9.9982mm; y2=125.59mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
+             }
+            }
+           }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
            }
          }
+        }
+       }
+        uid = 1f/t/PNB3NZF0ZSA5DwAAAAO
        }
+       ha:subc.1011 {
+        ha:attributes {
+         value=USBmicroB
+         footprint=11071
+         refdes=J1
+        }
+       ha:data {
+              li:padstack_prototypes {
+
+        ha:ps_proto_v6.0 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               7.875mil  
+               -0.675005mm  
+               -7.875mil  
+               -0.675005mm  
+               -7.875mil  
+               0.675005mm  
+               7.875mil  
+               0.675005mm  
+              }
+            }
 
-       ha:ps_proto_v6.2 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               10.875mil  
+               -0.751205mm  
+               -10.875mil  
+               -0.751205mm  
+               -10.875mil  
+               0.751205mm  
+               10.875mil  
+               0.751205mm  
+              }
+            }
 
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               7.875mil  
+               -0.675005mm  
+               -7.875mil  
+               -0.675005mm  
+               -7.875mil  
+               0.675005mm  
+               7.875mil  
+               0.675005mm  
+              }
             }
-            clearance=0.0
-             li:ps_poly {
-              -0.94996mm  
-              0.94996mm  
-              0.94996mm  
-              0.94996mm  
-              0.94996mm  
-              -0.94996mm  
-              -0.94996mm  
-              -0.94996mm  
+          }
+        }
+
+        ha:ps_proto_v6.1 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
              }
-           }
+             clearance=0.0
+              li:ps_poly {
+               -31.495mil  
+               -0.700024mm  
+               -31.495mil  
+               0.700024mm  
+               31.495mil  
+               0.700024mm  
+               31.495mil  
+               -0.700024mm  
+              }
+            }
 
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               -0.876173mm  
+               -0.776224mm  
+               -0.876173mm  
+               0.776224mm  
+               0.876173mm  
+               0.776224mm  
+               0.876173mm  
+               -0.776224mm  
+              }
             }
-            clearance=0.0
-             li:ps_poly {
-              -41.34mil  
-              41.34mil  
-              41.34mil  
-              41.34mil  
-              41.34mil  
-              -41.34mil  
-              -41.34mil  
-              -41.34mil  
+
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
              }
-           }
+             clearance=0.0
+              li:ps_poly {
+               -31.495mil  
+               -0.700024mm  
+               -31.495mil  
+               0.700024mm  
+               31.495mil  
+               0.700024mm  
+               31.495mil  
+               -0.700024mm  
+              }
+            }
+          }
+        }
 
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
+        ha:ps_proto_v6.2 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               -0.94996mm  
+               0.94996mm  
+               0.94996mm  
+               0.94996mm  
+               0.94996mm  
+               -0.94996mm  
+               -0.94996mm  
+               -0.94996mm  
+              }
             }
-            clearance=0.0
-             li:ps_poly {
-              -0.94996mm  
-              0.94996mm  
-              0.94996mm  
-              0.94996mm  
-              0.94996mm  
-              -0.94996mm  
-              -0.94996mm  
-              -0.94996mm  
+
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
              }
-           }
-         }
-       }
+             clearance=0.0
+              li:ps_poly {
+               -1.02616mm  
+               1.02616mm  
+               1.02616mm  
+               1.02616mm  
+               1.02616mm  
+               -1.02616mm  
+               -1.02616mm  
+               -1.02616mm  
+              }
+            }
 
-       ha:ps_proto_v6.3 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               -0.94996mm  
+               0.94996mm  
+               0.94996mm  
+               0.94996mm  
+               0.94996mm  
+               -0.94996mm  
+               -0.94996mm  
+               -0.94996mm  
+              }
+            }
+          }
+        }
 
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
+        ha:ps_proto_v6.3 {
+          hdia=0.0; hplated=1; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:ps_line { x1=0.0; y1=0.55mm; x2=0.0; y2=-0.55mm; thickness=1.05mm; square=0;             }
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=10.0mil
             }
-            clearance=0.0
-             li:ps_poly {
-              -37.405mil  
-              -35.435mil  
-              -37.405mil  
-              35.435mil  
-              37.405mil  
-              35.435mil  
-              37.405mil  
-              -35.435mil  
+
+            ha:ps_shape_v4 {
+             ha:ps_line { x1=0.0; y1=0.55mm; x2=0.0; y2=-0.55mm; thickness=0.45mm; square=0;             }
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              mech = 1
              }
-           }
+             clearance=10.0mil
+            }
 
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
+            ha:ps_shape_v4 {
+             ha:ps_line { x1=0.0; y1=0.55mm; x2=0.0; y2=-0.55mm; thickness=84.0mil; square=0;             }
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=10.0mil
             }
-            clearance=0.0
-             li:ps_poly {
-              -1.050038mm  
-              -1.0mm  
-              -1.050038mm  
-              1.0mm  
-              1.050038mm  
-              1.0mm  
-              1.050038mm  
-              -1.0mm  
+
+            ha:ps_shape_v4 {
+             ha:ps_line { x1=0.0; y1=0.55mm; x2=0.0; y2=-0.55mm; thickness=1.05mm; square=0;             }
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              intern = 1
              }
-           }
+             clearance=10.0mil
+            }
 
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
+            ha:ps_shape_v4 {
+             ha:ps_line { x1=0.0; y1=0.55mm; x2=0.0; y2=-0.55mm; thickness=1.05mm; square=0;             }
+             ha:combining {             }
+             ha:layer_mask {
+              bottom = 1
+              copper = 1
+             }
+             clearance=10.0mil
             }
-            clearance=0.0
-             li:ps_poly {
-              -37.405mil  
-              -35.435mil  
-              -37.405mil  
-              35.435mil  
-              37.405mil  
-              35.435mil  
-              37.405mil  
-              -35.435mil  
+
+            ha:ps_shape_v4 {
+             ha:ps_line { x1=0.0; y1=0.55mm; x2=0.0; y2=-0.55mm; thickness=84.0mil; square=0;             }
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              bottom = 1
+              mask = 1
              }
-           }
-         }
+             clearance=10.0mil
+            }
+
+            ha:ps_shape_v4 {
+             ha:ps_line { x1=0.0; y1=0.55mm; x2=0.0; y2=-0.55mm; thickness=1.05mm; square=0;             }
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
+             }
+             clearance=10.0mil
+            }
+          }
+        }
        }
-      }
 
-       li:objects {
-        ha:padstack_ref.753 {
-         proto=0; x=836.575mil; y=250.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
-         }
+        li:objects {
+         ha:padstack_ref.1025 {
+          proto=0; x=837.6mil; y=301.18mil; rot=-90.000000; xmirror=0; smirror=0; clearance=6.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
-         }
+          li:thermal {
+          }
 
-         ha:attributes {
-           term=3
-           name=DATA+
-         }
-        }
-        ha:padstack_ref.754 {
-         proto=0; x=836.575mil; y=6.999732mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+          ha:attributes {
+            term=1
+            name=VBUS
+          }
          }
+         ha:padstack_ref.1026 {
+          proto=0; x=837.6mil; y=6.999986mm; rot=-90.000000; xmirror=0; smirror=0; clearance=6.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
-         }
+          li:thermal {
+          }
 
-         ha:attributes {
-           term=2
-           name=DATA-
-         }
-        }
-        ha:padstack_ref.755 {
-         proto=0; x=836.575mil; y=5.700014mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+          ha:attributes {
+            term=2
+            name=D-
+          }
          }
+         ha:padstack_ref.1027 {
+          proto=0; x=837.6mil; y=250.0mil; rot=-90.000000; xmirror=0; smirror=0; clearance=6.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
-         }
+          li:thermal {
+          }
 
-         ha:attributes {
-           term=4
-           name=ID
-         }
-        }
-        ha:padstack_ref.756 {
-         proto=0; x=836.575mil; y=301.17mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+          ha:attributes {
+            term=3
+            name=D+
+          }
          }
+         ha:padstack_ref.1028 {
+          proto=0; x=837.6mil; y=5.700014mm; rot=-90.000000; xmirror=0; smirror=0; clearance=6.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
-         }
+          li:thermal {
+          }
 
-         ha:attributes {
-           term=1
-           name=VBUS
-         }
-        }
-        ha:padstack_ref.757 {
-         proto=0; x=836.575mil; y=5.050028mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+          ha:attributes {
+            term=4
+            name=HS
+          }
          }
+         ha:padstack_ref.1029 {
+          proto=0; x=837.6mil; y=5.050028mm; rot=-90.000000; xmirror=0; smirror=0; clearance=6.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
-         }
+          li:thermal {
+          }
 
-         ha:attributes {
-           term=5
-           name=GND
+          ha:attributes {
+            term=5
+            name=GND
+          }
          }
-        }
-        ha:padstack_ref.758 {
-         proto=1; x=841.5mil; y=3.250057mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+         ha:padstack_ref.1030 {
+          proto=1; x=854.33mil; y=124.015mil; rot=-90.000000; xmirror=0; smirror=0; clearance=0.0;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=G
+          }
          }
+         ha:padstack_ref.1031 {
+          proto=1; x=854.33mil; y=375.985mil; rot=-90.000000; xmirror=0; smirror=0; clearance=0.0;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=G
+          }
          }
+         ha:padstack_ref.1032 {
+          proto=2; x=23.949914mm; y=5.199888mm; rot=-90.000000; xmirror=0; smirror=0; clearance=0.0;
+          ha:flags {
+           clearline=1
+          }
 
-         ha:attributes {
-           term=G
-           name=tab1
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=G
+          }
          }
-        }
-        ha:padstack_ref.759 {
-         proto=1; x=841.5mil; y=372.035mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+         ha:padstack_ref.1033 {
+          proto=2; x=23.949914mm; y=7.500112mm; rot=-90.000000; xmirror=0; smirror=0; clearance=0.0;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=G
+          }
          }
+         ha:padstack_ref.1034 {
+          proto=3; x=23.950078mm; y=3.150108mm; rot=-90.000000; xmirror=0; smirror=0; clearance=0.259969mm;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=G
+          }
          }
+         ha:padstack_ref.1035 {
+          proto=3; x=23.950078mm; y=375.98mil; rot=-90.000000; xmirror=0; smirror=0; clearance=0.259969mm;
+          ha:flags {
+           clearline=1
+          }
 
-         ha:attributes {
-           term=G
-           name=tab2
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=G
+          }
          }
         }
-        ha:padstack_ref.760 {
-         proto=2; x=23.924006mm; y=5.150104mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
-         }
+        li:layers {
 
-         li:thermal {
-         }
+         ha:top-silk {
+          lid=0
+          ha:combining {          }
 
-         ha:attributes {
-           term=G
-           name=tab3
+           li:objects {
+           }
+           ha:type {
+            silk = 1
+            top = 1
+           }
          }
-        }
-        ha:padstack_ref.761 {
-         proto=2; x=23.924006mm; y=297.23mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+
+         ha:subc-aux {
+          lid=1
+          ha:combining {          }
+
+           li:objects {
+            ha:line.1013 {
+             x1=22.898549mm; y1=250.0mil; x2=22.898549mm; y2=250.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=pnp-origin
+             }
+            }
+            ha:line.1016 {
+             x1=1000.0mil; y1=250.0mil; x2=1000.0mil; y2=250.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
+             }
+            }
+            ha:line.1019 {
+             x1=1000.0mil; y1=250.0mil; x2=1000.0mil; y2=5.35mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
+             }
+            }
+            ha:line.1022 {
+             x1=1000.0mil; y1=250.0mil; x2=26.4mm; y2=250.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
+             }
+            }
+           }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
+           }
          }
 
-         li:thermal {
+         {ha:top copper}   {
+          lid=2
+          ha:combining {          }
+
+           li:objects {
+           }
+           ha:type {
+            copper = 1
+            top = 1
+           }
          }
 
-         ha:attributes {
-           term=G
-           name=tab4
+         ha:top_paste {
+          lid=3
+          ha:combining { auto=1;          }
+
+           li:objects {
+           }
+           ha:type {
+            top = 1
+            paste = 1
+           }
          }
-        }
-        ha:padstack_ref.762 {
-         proto=3; x=23.924006mm; y=2.350008mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+
+         ha:top_mask {
+          lid=4
+          ha:combining { sub=1; auto=1;          }
+
+           li:objects {
+           }
+           ha:type {
+            top = 1
+            mask = 1
+           }
          }
 
-         li:thermal {
+         ha:any_internal_copper {
+          lid=5
+          ha:combining {          }
+
+           li:objects {
+           }
+           ha:type {
+            copper = 1
+            intern = 1
+           }
+           stack_offs = 1
          }
 
-         ha:attributes {
-           term=G
-           name=tab5
+         ha:bottom_copper {
+          lid=6
+          ha:combining {          }
+
+           li:objects {
+           }
+           ha:type {
+            bottom = 1
+            copper = 1
+           }
          }
-        }
-        ha:padstack_ref.763 {
-         proto=3; x=23.924006mm; y=407.47mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-         ha:flags {
-          clearline=1
+
+         ha:bottom_mask {
+          lid=7
+          ha:combining { sub=1; auto=1;          }
+
+           li:objects {
+           }
+           ha:type {
+            bottom = 1
+            mask = 1
+           }
          }
 
-         li:thermal {
+         ha:bottom_silk {
+          lid=8
+          ha:combining { auto=1;          }
+
+           li:objects {
+           }
+           ha:type {
+            silk = 1
+            bottom = 1
+           }
          }
 
-         ha:attributes {
-           term=G
-           name=tab6
+         ha:bottom_paste {
+          lid=9
+          ha:combining { auto=1;          }
+
+           li:objects {
+           }
+           ha:type {
+            bottom = 1
+            paste = 1
+           }
          }
-        }
-       }
-       li:layers {
 
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
+         ha:outline {
+          lid=10
+          ha:combining {          }
 
-          li:objects {
-           ha:line.722 {
-            x1=810.0mil; y1=405.5mil; x2=998.98mil; y2=405.5mil; thickness=10.0mil; clearance=0.0;
+           li:objects {
            }
-           ha:line.725 {
-            x1=810.0mil; y1=2.400046mm; x2=998.98mil; y2=2.400046mm; thickness=10.0mil; clearance=0.0;
+           ha:type {
+            boundary = 1
            }
-           ha:line.728 {
-            x1=810.0mil; y1=2.400046mm; x2=810.0mil; y2=405.5mil; thickness=10.0mil; clearance=0.0;
+           purpose = uroute
+         }
+
+         ha:pmech {
+          lid=11
+          ha:combining { auto=1;          }
+
+           li:objects {
            }
-           ha:line.731 {
-            x1=998.98mil; y1=2.400046mm; x2=998.98mil; y2=405.5mil; thickness=10.0mil; clearance=0.0;
+           ha:type {
+            mech = 1
            }
-           ha:line.734 {
-            x1=998.98mil; y1=405.5mil; x2=998.98mil; y2=11.24966mm; thickness=10.0mil; clearance=0.0;
+           purpose = proute
+         }
+
+         ha:umech {
+          lid=12
+          ha:combining { auto=1;          }
+
+           li:objects {
            }
-           ha:line.737 {
-            x1=998.98mil; y1=57.09mil; x2=998.98mil; y2=2.400046mm; thickness=10.0mil; clearance=0.0;
+           ha:type {
+            mech = 1
            }
-           ha:text.740 {
-            string=%a.parent.refdes%; x=18.901918mm; y=2.448814mm; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
+           purpose = uroute
+         }
+        }
+       }
+        uid = t+CANjtdPMoBlE0Q3VMAAAAB
+       }
+       ha:subc.1053 {
+        ha:attributes {
+         refdes=R1
+         value=1k
+         footprint=0603
+         openscad=0603
+        }
+       ha:data {
+              li:padstack_prototypes {
+
+        ha:ps_proto_v6.0 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
+
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               0.576072mm  
+               17.76mil  
+               0.576072mm  
+              }
+            }
+
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
             }
-            rot = 0.000000
-           }
           }
-          ha:type {
-           silk = 1
-           top = 1
+        }
+       }
+
+        li:objects {
+         ha:padstack_ref.1067 {
+          proto=0; x=304.41mil; y=45.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=1
+            name=1
+          }
+         }
+         ha:padstack_ref.1068 {
+          proto=0; x=9.031986mm; y=45.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=2
+            name=2
           }
+         }
         }
+        li:layers {
 
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
+         ha:top-silk {
+          lid=0
+          ha:combining {          }
 
-          li:objects {
-           ha:line.741 {
-            x1=22.244477mm; y1=6.349884mm; x2=22.244477mm; y2=6.349884mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
+           li:objects {
            }
-           ha:line.744 {
-            x1=810.0mil; y1=250.0mil; x2=810.0mil; y2=250.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
+           ha:type {
+            silk = 1
+            top = 1
            }
-           ha:line.747 {
-            x1=810.0mil; y1=250.0mil; x2=810.0mil; y2=7.35mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
+         }
+
+         ha:subc-aux {
+          lid=1
+          ha:combining {          }
+
+           li:objects {
+            ha:line.1055 {
+             x1=330.0mil; y1=45.0mil; x2=330.0mil; y2=45.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=pnp-origin
+             }
             }
-           }
-           ha:line.750 {
-            x1=810.0mil; y1=250.0mil; x2=21.574mm; y2=250.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
+            ha:line.1058 {
+             x1=330.0mil; y1=45.0mil; x2=330.0mil; y2=45.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
+             }
+            }
+            ha:line.1061 {
+             x1=330.0mil; y1=45.0mil; x2=9.382mm; y2=45.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
+             }
+            }
+            ha:line.1064 {
+             x1=330.0mil; y1=45.0mil; x2=330.0mil; y2=2.143mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
+             }
             }
            }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
+           }
+         }
         }
        }
-      }
-       uid = tWMbI3HAm7UIolEaNwMAAAAI
-      }
-      ha:subc.765 {
-       ha:attributes {
-        value=SPDT
-        footprint=PCM12SMTR
-        refdes=S1
+        uid = 1f/t/PNB3NZF0ZSA5DwAAAAS
        }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v6.0 {
-         hdia=0.899922mm; hplated=1; htop=0; hbottom=0;
-         li:shape {
+       ha:subc.1086 {
+        ha:attributes {
+         refdes=R2
+         value=1k
+         footprint=0603
+         openscad=0603
+        }
+       ha:data {
+              li:padstack_prototypes {
+
+        ha:ps_proto_v6.0 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
 
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=1.255522mm;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               0.576072mm  
+               17.76mil  
+               0.576072mm  
+              }
             }
-            clearance=0.0
-           }
 
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=1.255522mm;            }
-            ha:combining {            }
-            ha:layer_mask {
-             bottom = 1
-             copper = 1
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
             }
-            clearance=0.0
-           }
+          }
+        }
+       }
 
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=1.255522mm;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             intern = 1
-            }
-            clearance=0.0
-           }
+        li:objects {
+         ha:padstack_ref.1100 {
+          proto=0; x=1.382014mm; y=45.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=61.42mil;            }
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-           }
+          li:thermal {
+          }
 
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=61.42mil;            }
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             bottom = 1
-             mask = 1
-            }
-            clearance=0.0
-           }
+          ha:attributes {
+            term=1
+            name=1
+          }
          }
-       }
-
-       ha:ps_proto_v6.1 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -0.500128mm  
-              -15.75mil  
-              -0.500128mm  
-              15.75mil  
-              0.500128mm  
-              15.75mil  
-              0.500128mm  
-              -15.75mil  
-             }
-           }
+         ha:padstack_ref.1101 {
+          proto=0; x=105.59mil; y=45.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -0.676277mm  
-              -0.576199mm  
-              -0.676277mm  
-              0.576199mm  
-              0.676277mm  
-              0.576199mm  
-              0.676277mm  
-              -0.576199mm  
-             }
-           }
+          li:thermal {
+          }
 
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -0.500128mm  
-              -15.75mil  
-              -0.500128mm  
-              15.75mil  
-              0.500128mm  
-              15.75mil  
-              0.500128mm  
-              -15.75mil  
-             }
-           }
+          ha:attributes {
+            term=2
+            name=2
+          }
          }
-       }
-
-       ha:ps_proto_v6.2 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
+        }
+        li:layers {
 
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -0.500125mm  
-              -15.75mil  
-              -0.500125mm  
-              15.75mil  
-              0.500125mm  
-              15.75mil  
-              0.500125mm  
-              -15.75mil  
-             }
-           }
+         ha:top-silk {
+          lid=0
+          ha:combining {          }
 
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -0.676274mm  
-              -0.576199mm  
-              -0.676274mm  
-              0.576199mm  
-              0.676274mm  
-              0.576199mm  
-              0.676274mm  
-              -0.576199mm  
-             }
+           li:objects {
            }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -0.500125mm  
-              -15.75mil  
-              -0.500125mm  
-              15.75mil  
-              0.500125mm  
-              15.75mil  
-              0.500125mm  
-              -15.75mil  
-             }
+           ha:type {
+            silk = 1
+            top = 1
            }
          }
-       }
 
-       ha:ps_proto_v6.3 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
+         ha:subc-aux {
+          lid=1
+          ha:combining {          }
 
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              0.350012mm  
-              -29.53mil  
-              -0.350012mm  
-              -29.53mil  
-              -0.350012mm  
-              29.53mil  
-              0.350012mm  
-              29.53mil  
+           li:objects {
+            ha:line.1088 {
+             x1=80.0mil; y1=45.0mil; x2=80.0mil; y2=45.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=pnp-origin
              }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
             }
-            clearance=0.0
-             li:ps_poly {
-              16.78mil  
-              -32.53mil  
-              -16.78mil  
-              -32.53mil  
-              -16.78mil  
-              32.53mil  
-              16.78mil  
-              32.53mil  
+            ha:line.1091 {
+             x1=80.0mil; y1=45.0mil; x2=80.0mil; y2=45.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
              }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
             }
-            clearance=0.0
-             li:ps_poly {
-              0.350012mm  
-              -29.53mil  
-              -0.350012mm  
-              -29.53mil  
-              -0.350012mm  
-              29.53mil  
-              0.350012mm  
-              29.53mil  
+            ha:line.1094 {
+             x1=80.0mil; y1=45.0mil; x2=3.032mm; y2=45.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
              }
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.779 {
-         proto=0; x=540.95mil; y=384.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=0.15494mm;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=G
-           name=mnt
-         }
-        }
-        ha:padstack_ref.780 {
-         proto=0; x=16.740124mm; y=384.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=0.15494mm;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=G
-           name=mnt
-         }
-        }
-        ha:padstack_ref.781 {
-         proto=1; x=18.889978mm; y=8.65378mm; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=M
-           name=mnt
-         }
-        }
-        ha:padstack_ref.782 {
-         proto=1; x=18.889978mm; y=427.31mil; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=M
-           name=mnt
-         }
-        }
-        ha:padstack_ref.783 {
-         proto=2; x=11.590275mm; y=427.31mil; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=M
-           name=mnt
-         }
-        }
-        ha:padstack_ref.784 {
-         proto=2; x=11.590275mm; y=8.65378mm; rot=0.000000; xmirror=0; smirror=0; clearance=2.649982mm;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=M
-           name=mnt
-         }
-        }
-        ha:padstack_ref.785 {
-         proto=3; x=511.43mil; y=315.11mil; rot=0.000000; xmirror=0; smirror=0; clearance=3.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.786 {
-         proto=3; x=15.990062mm; y=315.11mil; rot=0.000000; xmirror=0; smirror=0; clearance=3.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=2
-           name=2
-         }
-        }
-        ha:padstack_ref.787 {
-         proto=3; x=688.58mil; y=315.11mil; rot=0.000000; xmirror=0; smirror=0; clearance=3.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=3
-           name=3
-         }
-        }
-       }
-       li:layers {
-
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
-
-          li:objects {
-           ha:text.766 {
-            string=%a.parent.refdes%; x=360.0mil; y=378.0mil; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
-            }
-            rot = 0.000000
-           }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
-
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
-
-          li:objects {
-           ha:line.767 {
-            x1=15.323452mm; y1=9.170387mm; x2=15.323452mm; y2=9.170387mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.770 {
-            x1=600.0mil; y1=384.0mil; x2=600.0mil; y2=384.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.773 {
-            x1=600.0mil; y1=384.0mil; x2=16.24mm; y2=384.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.776 {
-            x1=600.0mil; y1=384.0mil; x2=600.0mil; y2=10.7536mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = tWMbI3HAm7UIolEaNwMAAAAJ
-      }
-      ha:subc.789 {
-       ha:attributes {
-        value=dualLED
-        footprint=0605
-        refdes=D1
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v6.0 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -16.73mil  
-              -12.795mil  
-              -16.73mil  
-              12.795mil  
-              16.73mil  
-              12.795mil  
-              16.73mil  
-              -12.795mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -19.73mil  
-              -15.795mil  
-              -19.73mil  
-              15.795mil  
-              19.73mil  
-              15.795mil  
-              19.73mil  
-              -15.795mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -16.73mil  
-              -12.795mil  
-              -16.73mil  
-              12.795mil  
-              16.73mil  
-              12.795mil  
-              16.73mil  
-              -12.795mil  
-             }
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.804 {
-         proto=0; x=5.601589mm; y=22.28mil; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=2
-           name=pin2
-         }
-        }
-        ha:padstack_ref.805 {
-         proto=0; x=5.601589mm; y=1.415542mm; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=pin1
-         }
-        }
-        ha:padstack_ref.806 {
-         proto=0; x=163.455mil; y=22.28mil; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=4
-           name=pin4
-         }
-        }
-        ha:padstack_ref.807 {
-         proto=0; x=163.455mil; y=1.415542mm; rot=0.000000; xmirror=0; smirror=0; clearance=-8.855mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=3
-           name=pin3
-         }
-        }
-       }
-       li:layers {
-
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
-
-          li:objects {
-           ha:arc.790 {
-            x=3.376676mm; y=39.0mil; width=5.0mil; height=5.0mil; astart=270.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
-           }
-           ha:text.791 {
-            string=%a.parent.refdes%; x=192.0mil; y=39.0mil; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
-            }
-            rot = 270.000000
-           }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
-
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
-
-          li:objects {
-           ha:line.792 {
-            x1=191.995mil; y1=39.005mil; x2=191.995mil; y2=39.005mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.795 {
-            x1=192.0mil; y1=39.0mil; x2=192.0mil; y2=39.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.798 {
-            x1=192.0mil; y1=39.0mil; x2=3.8768mm; y2=39.0mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.801 {
-            x1=192.0mil; y1=39.0mil; x2=192.0mil; y2=-0.0094mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = tWMbI3HAm7UIolEaNwMAAAAK
-      }
-      ha:subc.809 {
-       ha:attributes {
-        value=LiPo
-        footprint=S2B-PH-SM
-        refdes=J2
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v6.0 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:ps_line { x1=-49.215mil; y1=0.0; x2=49.215mil; y2=0.0; thickness=0.999998mm; square=0;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_line { x1=-49.215mil; y1=0.0; x2=49.215mil; y2=0.0; thickness=47.24mil; square=0;            }
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_line { x1=-49.215mil; y1=0.0; x2=49.215mil; y2=0.0; thickness=0.999998mm; square=0;            }
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-           }
-         }
-       }
-
-       ha:ps_proto_v6.1 {
-         hdia=0.0; hplated=0; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:ps_line { x1=-0.94996mm; y1=0.0; x2=0.94996mm; y2=0.0; thickness=59.06mil; square=0;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
             }
-            clearance=0.0
+            ha:line.1097 {
+             x1=80.0mil; y1=45.0mil; x2=80.0mil; y2=2.143mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
+             }
+            }
+           }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
            }
+         }
+        }
+       }
+        uid = 1f/t/PNB3NZF0ZSA5DwAAAAU
+       }
+       ha:subc.1119 {
+        ha:attributes {
+         refdes=R3
+         value=2k
+         footprint=0603
+         openscad=0603
+        }
+       ha:data {
+              li:padstack_prototypes {
+
+        ha:ps_proto_v6.0 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
 
-           ha:ps_shape_v4 {
-            ha:ps_line { x1=-0.94996mm; y1=0.0; x2=0.94996mm; y2=0.0; thickness=66.93mil; square=0;            }
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               0.576072mm  
+               17.76mil  
+               0.576072mm  
+              }
             }
-            clearance=0.0
-           }
 
-           ha:ps_shape_v4 {
-            ha:ps_line { x1=-0.94996mm; y1=0.0; x2=0.94996mm; y2=0.0; thickness=59.06mil; square=0;            }
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
             }
-            clearance=0.0
-           }
-         }
+          }
+        }
        }
-      }
 
-       li:objects {
-        ha:padstack_ref.823 {
-         proto=0; x=7.346061mm; y=290.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=0.499999mm;
-         ha:flags {
-          clearline=1
-         }
+        li:objects {
+         ha:padstack_ref.1133 {
+          proto=0; x=688.0mil; y=245.59mil; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
-         }
+          li:thermal {
+          }
 
-         ha:attributes {
-           term=2
-           name=pin2
-         }
-        }
-        ha:padstack_ref.824 {
-         proto=0; x=7.346061mm; y=5.366004mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.499999mm;
-         ha:flags {
-          clearline=1
+          ha:attributes {
+            term=1
+            name=1
+          }
          }
+         ha:padstack_ref.1134 {
+          proto=0; x=688.0mil; y=4.938014mm; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
 
-         li:thermal {
-         }
+          li:thermal {
+          }
 
-         ha:attributes {
-           term=1
-           name=pin1
+          ha:attributes {
+            term=2
+            name=2
+          }
          }
         }
-        ha:padstack_ref.825 {
-         proto=1; x=1.796034mm; y=9.716008mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.0;
-         ha:flags {
-          clearline=1
-         }
+        li:layers {
 
-         li:thermal {
-         }
+         ha:top-silk {
+          lid=0
+          ha:combining {          }
 
-         ha:attributes {
-           term=G
-           name=tab1
-         }
-        }
-        ha:padstack_ref.826 {
-         proto=1; x=1.796034mm; y=3.015996mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.0;
-         ha:flags {
-          clearline=1
+           li:objects {
+           }
+           ha:type {
+            silk = 1
+            top = 1
+           }
          }
 
-         li:thermal {
-         }
+         ha:subc-aux {
+          lid=1
+          ha:combining {          }
 
-         ha:attributes {
-           term=G
-           name=tab2
+           li:objects {
+            ha:line.1121 {
+             x1=688.0mil; y1=220.0mil; x2=688.0mil; y2=220.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=pnp-origin
+             }
+            }
+            ha:line.1124 {
+             x1=688.0mil; y1=220.0mil; x2=688.0mil; y2=220.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
+             }
+            }
+            ha:line.1127 {
+             x1=688.0mil; y1=220.0mil; x2=688.0mil; y2=4.588mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
+             }
+            }
+            ha:line.1130 {
+             x1=688.0mil; y1=220.0mil; x2=18.4752mm; y2=220.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
+             }
+            }
+           }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
+           }
          }
         }
        }
-       li:layers {
+        uid = 1f/t/PNB3NZF0ZSA5DwAAAAW
+       }
+       ha:subc.1152 {
+        ha:attributes {
+         refdes=R4
+         value=10k
+         footprint=0603
+         openscad=0603
+        }
+       ha:data {
+              li:padstack_prototypes {
+
+        ha:ps_proto_v6.0 {
+          hdia=0.0; hplated=0; htop=0; hbottom=0;
+          li:shape {
+
+            ha:ps_shape_v4 {
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
+            }
 
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
+            ha:ps_shape_v4 {
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               -0.576072mm  
+               -17.76mil  
+               0.576072mm  
+               17.76mil  
+               0.576072mm  
+              }
+            }
 
-          li:objects {
-           ha:text.810 {
-            string=%a.parent.refdes%; x=0.096012mm; y=412.05mil; scale=100; fid=0;
-            ha:flags {
-             dyntext=1
-             floater=1
+            ha:ps_shape_v4 {
+             ha:combining { auto=1;             }
+             ha:layer_mask {
+              top = 1
+              paste = 1
+             }
+             clearance=0.0
+              li:ps_poly {
+               0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               -0.499872mm  
+               -0.374904mm  
+               0.499872mm  
+               0.374904mm  
+               0.499872mm  
+              }
             }
-            rot = 90.000000
-           }
           }
-          ha:type {
-           silk = 1
-           top = 1
+        }
+       }
+
+        li:objects {
+         ha:padstack_ref.1166 {
+          proto=0; x=511.0mil; y=245.59mil; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=1
+            name=1
+          }
+         }
+         ha:padstack_ref.1167 {
+          proto=0; x=511.0mil; y=4.938014mm; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=2
+            name=2
           }
+         }
         }
+        li:layers {
 
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
+         ha:top-silk {
+          lid=0
+          ha:combining {          }
 
-          li:objects {
-           ha:line.811 {
-            x1=4.571047mm; y1=6.366002mm; x2=4.571047mm; y2=6.366002mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
+           li:objects {
            }
-           ha:line.814 {
-            x1=0.096012mm; y1=412.05mil; x2=0.096012mm; y2=412.05mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
+           ha:type {
+            silk = 1
+            top = 1
            }
-           ha:line.817 {
-            x1=0.096012mm; y1=412.05mil; x2=0.096012mm; y2=9.46607mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
+         }
+
+         ha:subc-aux {
+          lid=1
+          ha:combining {          }
+
+           li:objects {
+            ha:line.1154 {
+             x1=511.0mil; y1=220.0mil; x2=511.0mil; y2=220.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=pnp-origin
+             }
             }
-           }
-           ha:line.820 {
-            x1=0.096012mm; y1=412.05mil; x2=-0.903988mm; y2=412.05mil; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
+            ha:line.1157 {
+             x1=511.0mil; y1=220.0mil; x2=511.0mil; y2=220.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
+             }
+            }
+            ha:line.1160 {
+             x1=511.0mil; y1=220.0mil; x2=511.0mil; y2=4.588mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
+             }
+            }
+            ha:line.1163 {
+             x1=511.0mil; y1=220.0mil; x2=13.9794mm; y2=220.0mil; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
+             }
             }
            }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
+           }
+         }
         }
        }
-      }
-       uid = tWMbI3HAm7UIolEaNwMAAAAL
-      }
+        uid = 1f/t/PNB3NZF0ZSA5DwAAAAY
+       }
+       ha:rat.1404 {
+        x1=688.0mil; y1=2.230628mm; lgrp1=3; anchor1=pcb/960/974; x2=688.0mil; y2=245.59mil; lgrp2=3; anchor2=pcb/1119/1133;
+       }
+       ha:rat.1407 {
+        x1=837.6mil; y1=5.050028mm; lgrp1=3; anchor1=pcb/1011/1029; x2=688.0mil; y2=245.59mil; lgrp2=3; anchor2=pcb/1119/1133;
+       }
+       ha:rat.1410 {
+        x1=837.6mil; y1=5.050028mm; lgrp1=3; anchor1=pcb/1011/1029; x2=854.33mil; y2=124.015mil; lgrp2=3; anchor2=pcb/1011/1030;
+       }
+       ha:rat.1413 {
+        x1=688.0mil; y1=245.59mil; lgrp1=3; anchor1=pcb/1119/1133; x2=511.0mil; y2=245.59mil; lgrp2=3; anchor2=pcb/1152/1166;
+       }
+       ha:rat.1416 {
+        x1=511.0mil; y1=245.59mil; lgrp1=3; anchor1=pcb/1152/1166; x2=511.0mil; y2=100.0mil; lgrp2=3; anchor2=pcb/689/718;
+       }
+       ha:rat.1419 {
+        x1=433.0mil; y1=100.0mil; lgrp1=3; anchor1=pcb/993/1007; x2=511.0mil; y2=100.0mil; lgrp2=3; anchor2=pcb/689/718;
+       }
+       ha:rat.1422 {
+        x1=7.346061mm; y1=290.0mil; lgrp1=3; anchor1=pcb/809/823; x2=511.0mil; y2=245.59mil; lgrp2=3; anchor2=pcb/1152/1166;
+       }
+       ha:rat.1425 {
+        x1=7.346061mm; y1=290.0mil; lgrp1=3; anchor1=pcb/809/823; x2=1.382014mm; y2=45.0mil; lgrp2=3; anchor2=pcb/1086/1100;
+       }
+       ha:rat.1428 {
+        x1=688.0mil; y1=139.0mil; lgrp1=3; anchor1=pcb/960/975; x2=593.0mil; y2=139.0mil; lgrp2=3; anchor2=pcb/689/715;
+       }
+       ha:rat.1431 {
+        x1=688.0mil; y1=139.0mil; lgrp1=3; anchor1=pcb/960/975; x2=837.6mil; y2=301.18mil; lgrp2=3; anchor2=pcb/1011/1025;
+       }
+       ha:rat.1434 {
+        x1=9.031986mm; y1=45.0mil; lgrp1=3; anchor1=pcb/1053/1068; x2=593.0mil; y2=139.0mil; lgrp2=3; anchor2=pcb/689/715;
+       }
+       ha:rat.1437 {
+        x1=433.0mil; y1=151.18mil; lgrp1=3; anchor1=pcb/993/1008; x2=511.0mil; y2=139.0mil; lgrp2=3; anchor2=pcb/689/719;
+       }
+       ha:rat.1440 {
+        x1=433.0mil; y1=151.18mil; lgrp1=3; anchor1=pcb/993/1008; x2=7.346061mm; y2=5.366004mm; lgrp2=3; anchor2=pcb/809/824;
+       }
+       ha:rat.1443 {
+        x1=5.931789mm; y1=28.28mil; lgrp1=3; anchor1=pcb/789/804; x2=304.41mil; y2=45.0mil; lgrp2=3; anchor2=pcb/1053/1067;
+       }
+       ha:rat.1446 {
+        x1=5.931789mm; y1=1.567942mm; lgrp1=3; anchor1=pcb/789/805; x2=176.455mil; y2=28.28mil; lgrp2=3; anchor2=pcb/789/806;
+       }
+       ha:rat.1449 {
+        x1=5.931789mm; y1=1.567942mm; lgrp1=3; anchor1=pcb/789/805; x2=511.0mil; y2=61.0mil; lgrp2=3; anchor2=pcb/689/717;
+       }
+       ha:rat.1452 {
+        x1=176.455mil; y1=1.567942mm; lgrp1=3; anchor1=pcb/789/807; x2=105.59mil; y2=45.0mil; lgrp2=3; anchor2=pcb/1086/1101;
+       }
+       ha:rat.1455 {
+        x1=688.0mil; y1=4.938014mm; lgrp1=3; anchor1=pcb/1119/1134; x2=688.58mil; y2=315.11mil; lgrp2=3; anchor2=pcb/765/787;
+       }
+       ha:rat.1458 {
+        x1=511.0mil; y1=4.938014mm; lgrp1=3; anchor1=pcb/1152/1167; x2=511.43mil; y2=315.11mil; lgrp2=3; anchor2=pcb/765/785;
+       }
+       ha:rat.1461 {
+        x1=15.990062mm; y1=315.11mil; lgrp1=3; anchor1=pcb/765/786; x2=593.0mil; y2=61.0mil; lgrp2=3; anchor2=pcb/689/716;
+       }
     }
  }
 
@@ -2918,17 +3014,17 @@ ha:pcb-rnd-board-v8 {
    ha:0 {
     name = top_paste
     ha:type { top=1; paste=1; }
-    li:layers { 9; }
+    li:layers { 7; }
    }
    ha:1 {
     name = top_silk
     ha:type { silk=1; top=1; }
-    li:layers { 8; }
+    li:layers { 6; }
    }
    ha:2 {
     name = top_mask
     ha:type { top=1; mask=1; }
-    li:layers { 10; }
+    li:layers { 8; }
    }
    ha:3 {
     name = top_copper
@@ -2942,85 +3038,81 @@ ha:pcb-rnd-board-v8 {
     name = grp_4
    }
    ha:5 {
-    name = Intern
-    ha:type { copper=1; intern=1; }
-    li:layers { 5; }
-   }
-   ha:6 {
-    ha:type { substrate=1; intern=1; }
-    ha:attributes { thickness={0.125mm } }
-    li:layers { }
     name = grp_6
+    ha:type {  intern=1; substrate=1; }
+    li:layers {  }
+     ha:attributes {
+      thickness={0.125mm }
+     }
    }
-   ha:7 {
-    name = Intern
-    ha:type { copper=1; intern=1; }
-    li:layers { 4; }
-   }
-   ha:8 {
+   ha:6 {
     ha:type { substrate=1; intern=1; }
     ha:attributes { thickness={0.7375mm } }
     li:layers { }
     name = grp_8
    }
-   ha:9 {
+   ha:7 {
     name = global_outline
-    ha:type { boundary=1; }
-    purpose = uroute
-    li:layers { 6; }
+    ha:type {  boundary=1; }
+    li:layers { 4; }
+     purpose = uroute
    }
-   ha:10 {
+   ha:8 {
+    ha:type {  bottom=1; copper=1; }
+    li:layers {  1; 3;}
     name = bottom_copper
-    ha:type { bottom=1; copper=1; }
-    li:layers { 1; 3; }
    }
-   ha:11 {
+   ha:9 {
     name = bottom_mask
-    ha:type { bottom=1; mask=1; }
-    li:layers { 11; }
+    ha:type {  bottom=1; mask=1; }
+    li:layers { 9; }
    }
-   ha:12 {
+   ha:10 {
     name = bottom_silk
-    ha:type { silk=1; bottom=1; }
-    li:layers { 7; }
+    ha:type { bottom=1; silk=1; }
+    li:layers { 5; }
    }
-   ha:13 {
+   ha:11 {
     name = bottom_paste
     ha:type { bottom=1; paste=1; }
-    li:layers { 12; }
+    li:layers { 10; }
    }
-   ha:14 {
+   ha:12 {
     name = pmech
-    ha:type { mech=1; }
-    purpose = proute
-    li:layers { 13; }
+    ha:type {  mech=1; }
+    li:layers { 11; }
+     purpose = proute
    }
-   ha:15 {
+   ha:13 {
     name = umech
-    ha:type { mech=1; }
-    purpose = uroute
-    li:layers { 14; }
+    ha:type {  mech=1; }
+    li:layers { 12; }
+     purpose = uroute
    }
-   ha:16 {
+   ha:14 {
     name = top_assy
-    ha:type { top=1; doc=1; }
+    ha:type {  top=1; doc=1; }
     purpose = assy
-    ha:attributes { init-invis=1; }
-    li:layers { 15; }
+    li:layers { 13; }
+     ha:attributes {
+      init-invis=1
+     }
    }
-   ha:17 {
+   ha:15 {
     name = bot_assy
-    ha:type { bottom=1; doc=1; }
+    ha:type {  bottom=1; doc=1; }
     purpose = assy
-    ha:attributes { init-invis=1; }
-    li:layers { 16; }
+    li:layers { 14; }
+     ha:attributes {
+      init-invis=1
+     }
    }
-   ha:18 {
+   ha:16 {
     name = fab
     ha:type { top=1; doc=1; }
     purpose = fab
     ha:attributes { init-invis=1; }
-    li:layers { 17; }
+    li:layers { 15; }
    }
   }
  }
@@ -4991,9 +5083,42 @@ ha:pcb-rnd-board-v8 {
      show_solder_side = 0
      grids_idx = 1
      grid = 1.00 mil
+      buffer_number = 0
     }
    }
   }
   ha:pixmaps {
   }
+  ha:netlists {
+
+   li:input {
+     ha:GND {
+     li:conn { C1-1; C2-1; J1-5; J1-G; J2-2; R2-1; R3-1; R4-1; S1-frame; S1-holes; U1-2;     }
+     }
+     ha:unnamed_net1 {
+     li:conn { C1-2; J1-1; R1-2; U1-4;     }
+     }
+     ha:unnamed_net2 {
+     li:conn { C2-2; J2-1; U1-3;     }
+     }
+     ha:unnamed_net3 {
+     li:conn { D1-2; R1-1;     }
+     }
+     ha:unnamed_net4 {
+     li:conn { D1-1; D1-4; U1-1;     }
+     }
+     ha:unnamed_net5 {
+     li:conn { D1-3; R2-2;     }
+     }
+     ha:unnamed_net6 {
+     li:conn { R3-2; S1-3;     }
+     }
+     ha:unnamed_net7 {
+     li:conn { R4-2; S1-1;     }
+     }
+     ha:unnamed_net8 {
+     li:conn { S1-2; U1-5;     }
+     }
+   }
+  }
 }