Import schematic changes from master to v1.

Use W25Q80 name
1k pyro series resistors
Switch to USB connector with tabs
Switch to '4screws' name
Make bulk cap footprint 1206
Set mfg_part_number for 4screws to seeed-compatible value

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/easymini.lht b/easymini.lht
index 9aba135c05a5c819a692baf58a57b03b542e15e1..fbd8b2753b604fc5815a5a6b911b659ee0258834 100644 (file)
--- a/easymini.lht
+++ b/easymini.lht
@@ -638,7 +638,7 @@ ha:pcb-rnd-board-v7 {
     }
      ha:subc.59 {
       ha:attributes {
-       value=Terminal-4
+       value=4screws
        footprint=282834-4
        refdes=J3
       }
@@ -934,11 +934,11 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAB
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAB
      }
      ha:subc.89 {
       ha:attributes {
-       value=unknown
+       value=
        footprint=hole-M3
        refdes=H4
       }
@@ -1086,11 +1086,11 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAC
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAC
      }
      ha:subc.105 {
       ha:attributes {
-       value=unknown
+       value=
        footprint=hole-M3
        refdes=H3
       }
@@ -1238,11 +1238,11 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAD
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAD
      }
      ha:subc.121 {
       ha:attributes {
-       value=unknown
+       value=
        footprint=hole-M3
        refdes=H1
       }
@@ -1390,11 +1390,11 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAE
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAE
      }
      ha:subc.137 {
       ha:attributes {
-       value=unknown
+       value=
        footprint=hole-M3
        refdes=H2
       }
@@ -1547,11 +1547,11 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAF
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAF
      }
      ha:subc.153 {
       ha:attributes {
-       value=Terminal-4
+       value=4screws
        footprint=282834-4
        refdes=J2
       }
@@ -1853,7 +1853,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAG
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAG
      }
      ha:subc.183 {
       ha:attributes {
@@ -3115,7 +3115,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAH
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAH
      }
      ha:subc.264 {
       ha:attributes {
@@ -3280,7 +3280,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAI
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAI
      }
      ha:subc.280 {
       ha:attributes {
@@ -3445,7 +3445,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAJ
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAJ
      }
      ha:subc.296 {
       ha:attributes {
@@ -3610,7 +3610,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAK
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAK
      }
      ha:subc.312 {
       ha:attributes {
@@ -3775,7 +3775,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAL
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAL
      }
      ha:subc.328 {
       ha:attributes {
@@ -3940,7 +3940,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAM
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAM
      }
      ha:subc.344 {
       ha:attributes {
@@ -4105,487 +4105,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAN
-     }
-     ha:subc.360 {
-      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:ps_shape_v4 {
-           ha:combining {           }
-           ha:layer_mask {
-            copper = 1
-            top = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             7.875mil  
-             -0.675132mm  
-             -7.875mil  
-             -0.675132mm  
-             -7.875mil  
-             0.675132mm  
-             7.875mil  
-             0.675132mm  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { sub=1; auto=1;           }
-           ha:layer_mask {
-            top = 1
-            mask = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             11.81mil  
-             -30.515mil  
-             -11.81mil  
-             -30.515mil  
-             -11.81mil  
-             30.515mil  
-             11.81mil  
-             30.515mil  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { auto=1;           }
-           ha:layer_mask {
-            top = 1
-            paste = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             7.875mil  
-             -0.675132mm  
-             -7.875mil  
-             -0.675132mm  
-             -7.875mil  
-             0.675132mm  
-             7.875mil  
-             0.675132mm  
-            }
-          }
-        }
-      }
-
-      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 {
-             -41.34mil  
-             -31.495mil  
-             -41.34mil  
-             31.495mil  
-             41.34mil  
-             31.495mil  
-             41.34mil  
-             -31.495mil  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { sub=1; auto=1;           }
-           ha:layer_mask {
-            top = 1
-            mask = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             -45.28mil  
-             -35.435mil  
-             -45.28mil  
-             35.435mil  
-             45.28mil  
-             35.435mil  
-             45.28mil  
-             -35.435mil  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { auto=1;           }
-           ha:layer_mask {
-            top = 1
-            paste = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             -41.34mil  
-             -31.495mil  
-             -41.34mil  
-             31.495mil  
-             41.34mil  
-             31.495mil  
-             41.34mil  
-             -31.495mil  
-            }
-          }
-        }
-      }
-
-      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  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { sub=1; auto=1;           }
-           ha:layer_mask {
-            top = 1
-            mask = 1
-           }
-           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 {
-             -0.94996mm  
-             0.94996mm  
-             0.94996mm  
-             0.94996mm  
-             0.94996mm  
-             -0.94996mm  
-             -0.94996mm  
-             -0.94996mm  
-            }
-          }
-        }
-      }
-
-      ha:ps_proto_v6.3 {
-        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 {
-             35.435mil  
-             -37.405mil  
-             -35.435mil  
-             -37.405mil  
-             -35.435mil  
-             37.405mil  
-             35.435mil  
-             37.405mil  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { sub=1; auto=1;           }
-           ha:layer_mask {
-            top = 1
-            mask = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             1.0mm  
-             -1.050038mm  
-             -1.0mm  
-             -1.050038mm  
-             -1.0mm  
-             1.050038mm  
-             1.0mm  
-             1.050038mm  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { auto=1;           }
-           ha:layer_mask {
-            top = 1
-            paste = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             35.435mil  
-             -37.405mil  
-             -35.435mil  
-             -37.405mil  
-             -35.435mil  
-             37.405mil  
-             35.435mil  
-             37.405mil  
-            }
-          }
-        }
-      }
-     }
-
-      li:objects {
-       ha:padstack_ref.362 {
-        proto=0; x=26.4403mm; y=621.075mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=3
-          name=DATA+
-        }
-       }
-       ha:padstack_ref.363 {
-        proto=0; x=25.790568mm; y=621.075mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=2
-          name=DATA-
-        }
-       }
-       ha:padstack_ref.364 {
-        proto=0; x=27.090286mm; y=621.075mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=4
-          name=ID
-        }
-       }
-       ha:padstack_ref.365 {
-        proto=0; x=25.140582mm; y=621.075mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=1
-          name=VBUS
-        }
-       }
-       ha:padstack_ref.366 {
-        proto=0; x=27.740272mm; y=621.075mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=5
-          name=GND
-        }
-       }
-       ha:padstack_ref.367 {
-        proto=1; x=29.540243mm; y=626.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=G
-          name=tab1
-        }
-       }
-       ha:padstack_ref.368 {
-        proto=1; x=23.340611mm; y=626.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=G
-          name=tab2
-        }
-       }
-       ha:padstack_ref.369 {
-        proto=2; x=27.640196mm; y=18.450306mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=G
-          name=tab3
-        }
-       }
-       ha:padstack_ref.370 {
-        proto=2; x=25.240658mm; y=18.450306mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=G
-          name=tab4
-        }
-       }
-       ha:padstack_ref.371 {
-        proto=3; x=30.440292mm; y=18.450306mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=G
-          name=tab5
-        }
-       }
-       ha:padstack_ref.372 {
-        proto=3; x=22.440562mm; y=18.450306mm; rot=0.000000; xmirror=0; smirror=0; clearance=4.92mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=G
-          name=tab6
-        }
-       }
-      }
-      li:layers {
-
-       ha:top-silk {
-        lid=0
-        ha:combining {        }
-
-         li:objects {
-          ha:text.361 {
-           string=%a.parent.refdes%; x=30.8864mm; y=559.0mil; scale=80; 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.373 {
-           x1=26.440415mm; y1=16.770777mm; x2=26.440415mm; y2=16.770777mm; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=pnp-origin
-           }
-          }
-          ha:line.376 {
-           x1=26.4403mm; y1=594.5mil; x2=26.4403mm; y2=594.5mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=origin
-           }
-          }
-          ha:line.379 {
-           x1=26.4403mm; y1=594.5mil; x2=27.4403mm; y2=594.5mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=x
-           }
-          }
-          ha:line.382 {
-           x1=26.4403mm; y1=594.5mil; x2=26.4403mm; y2=16.1003mm; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=y
-           }
-          }
-         }
-         ha:type {
-          top = 1
-          misc = 1
-          virtual = 1
-         }
-       }
-      }
-     }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAO
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAN
      }
      ha:subc.385 {
       ha:attributes {
@@ -4750,11 +4270,11 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAP
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAP
      }
      ha:subc.401 {
       ha:attributes {
-       value=100
+       value=1k
        footprint=0402
        refdes=R5
       }
@@ -4915,11 +4435,11 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAQ
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAQ
      }
      ha:subc.417 {
       ha:attributes {
-       value=100
+       value=1k
        footprint=0402
        refdes=R2
       }
@@ -5080,7 +4600,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAR
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAR
      }
      ha:subc.433 {
       ha:attributes {
@@ -5344,7 +4864,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAS
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAS
      }
      ha:subc.468 {
       ha:attributes {
@@ -5511,7 +5031,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAT
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAT
      }
      ha:subc.485 {
       ha:attributes {
@@ -5866,7 +5386,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAU
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAU
      }
      ha:subc.522 {
       ha:attributes {
@@ -5935,198 +5455,12 @@ ha:pcb-rnd-board-v7 {
              0.700024mm  
              43.31mil  
              -0.700024mm  
-            }
-          }
-        }
-      }
-
-      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.449961mm  
-             -0.699897mm  
-             -0.449961mm  
-             -0.699897mm  
-             -0.449961mm  
-             0.699897mm  
-             0.449961mm  
-             0.699897mm  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { sub=1; auto=1;           }
-           ha:layer_mask {
-            top = 1
-            mask = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             23.62mil  
-             -33.46mil  
-             -23.62mil  
-             -33.46mil  
-             -23.62mil  
-             33.46mil  
-             23.62mil  
-             33.46mil  
-            }
-          }
-
-          ha:ps_shape_v4 {
-           ha:combining { auto=1;           }
-           ha:layer_mask {
-            top = 1
-            paste = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             0.449961mm  
-             -0.699897mm  
-             -0.449961mm  
-             -0.699897mm  
-             -0.449961mm  
-             0.699897mm  
-             0.449961mm  
-             0.699897mm  
-            }
-          }
-        }
-      }
-     }
-
-      li:objects {
-       ha:padstack_ref.524 {
-        proto=0; x=5.597906mm; y=490.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=11.81mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=2
-          name=cathode
-        }
-       }
-       ha:padstack_ref.525 {
-        proto=1; x=120.0mil; y=490.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=11.81mil;
-        ha:flags {
-         clearline=1
-        }
-
-        li:thermal {
-        }
-
-        ha:attributes {
-          term=1
-          name=anode
-        }
-       }
-      }
-      li:layers {
-
-       ha:top-silk {
-        lid=0
-        ha:combining {        }
-
-         li:objects {
-          ha:line.526 {
-           x1=123.93mil; y1=11.481054mm; x2=242.05mil; y2=11.481054mm; thickness=10.0mil; clearance=0.0;
-          }
-          ha:line.529 {
-           x1=242.05mil; y1=11.481054mm; x2=242.05mil; y2=527.99mil; thickness=10.0mil; clearance=0.0;
-          }
-          ha:line.532 {
-           x1=123.93mil; y1=527.99mil; x2=242.05mil; y2=527.99mil; thickness=10.0mil; clearance=0.0;
-          }
-          ha:line.535 {
-           x1=123.93mil; y1=11.481054mm; x2=123.93mil; y2=527.99mil; thickness=10.0mil; clearance=0.0;
-          }
-          ha:line.538 {
-           x1=6.682232mm; y1=11.481054mm; x2=7.164578mm; y2=11.481054mm; thickness=10.0mil; clearance=0.0;
-          }
-          ha:line.541 {
-           x1=7.164578mm; y1=11.481054mm; x2=7.164578mm; y2=527.99mil; thickness=10.0mil; clearance=0.0;
-          }
-          ha:line.544 {
-           x1=6.682232mm; y1=527.99mil; x2=7.164578mm; y2=527.99mil; thickness=10.0mil; clearance=0.0;
-          }
-          ha:text.523 {
-           string=%a.parent.refdes%; x=48.0mil; y=467.0mil; scale=80; 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.547 {
-           x1=4.322953mm; y1=490.0mil; x2=4.322953mm; y2=490.0mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=pnp-origin
-           }
-          }
-          ha:line.550 {
-           x1=182.99mil; y1=490.0mil; x2=182.99mil; y2=490.0mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=origin
-           }
-          }
-          ha:line.553 {
-           x1=182.99mil; y1=490.0mil; x2=5.647946mm; y2=490.0mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=x
-           }
-          }
-          ha:line.556 {
-           x1=182.99mil; y1=490.0mil; x2=182.99mil; y2=13.446mm; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=y
-           }
+            }
           }
-         }
-         ha:type {
-          top = 1
-          misc = 1
-          virtual = 1
-         }
-       }
-      }
-     }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAV
-     }
-     ha:subc.559 {
-      ha:attributes {
-       value=22uF
-       footprint=1210
-       refdes=C8
+        }
       }
-     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 {
 
@@ -6138,14 +5472,14 @@ ha:pcb-rnd-board-v7 {
            }
            clearance=0.0
             li:ps_poly {
-             -53.14mil  
-             -0.649986mm  
-             -53.14mil  
-             0.649986mm  
-             53.14mil  
-             0.649986mm  
-             53.14mil  
-             -0.649986mm  
+             0.449961mm  
+             -0.699897mm  
+             -0.449961mm  
+             -0.699897mm  
+             -0.449961mm  
+             0.699897mm  
+             0.449961mm  
+             0.699897mm  
             }
           }
 
@@ -6157,14 +5491,14 @@ ha:pcb-rnd-board-v7 {
            }
            clearance=0.0
             li:ps_poly {
-             -56.14mil  
-             -0.726186mm  
-             -56.14mil  
-             0.726186mm  
-             56.14mil  
-             0.726186mm  
-             56.14mil  
-             -0.726186mm  
+             23.62mil  
+             -33.46mil  
+             -23.62mil  
+             -33.46mil  
+             -23.62mil  
+             33.46mil  
+             23.62mil  
+             33.46mil  
             }
           }
 
@@ -6176,14 +5510,14 @@ ha:pcb-rnd-board-v7 {
            }
            clearance=0.0
             li:ps_poly {
-             -53.14mil  
-             -0.649986mm  
-             -53.14mil  
-             0.649986mm  
-             53.14mil  
-             0.649986mm  
-             53.14mil  
-             -0.649986mm  
+             0.449961mm  
+             -0.699897mm  
+             -0.449961mm  
+             -0.699897mm  
+             -0.449961mm  
+             0.699897mm  
+             0.449961mm  
+             0.699897mm  
             }
           }
         }
@@ -6191,8 +5525,8 @@ ha:pcb-rnd-board-v7 {
      }
 
       li:objects {
-       ha:padstack_ref.561 {
-        proto=0; x=167.0mil; y=7.64286mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.524 {
+        proto=0; x=5.597906mm; y=490.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=11.81mil;
         ha:flags {
          clearline=1
         }
@@ -6201,12 +5535,12 @@ ha:pcb-rnd-board-v7 {
         }
 
         ha:attributes {
-          term=1
-          name=1
+          term=2
+          name=cathode
         }
        }
-       ha:padstack_ref.562 {
-        proto=0; x=167.0mil; y=419.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.525 {
+        proto=1; x=120.0mil; y=490.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=11.81mil;
         ha:flags {
          clearline=1
         }
@@ -6215,8 +5549,8 @@ ha:pcb-rnd-board-v7 {
         }
 
         ha:attributes {
-          term=2
-          name=2
+          term=1
+          name=anode
         }
        }
       }
@@ -6227,19 +5561,34 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:line.563 {
-           x1=5.591556mm; y1=8.642858mm; x2=5.591556mm; y2=9.642602mm; thickness=8.0mil; clearance=0.0;
+          ha:line.526 {
+           x1=123.93mil; y1=11.481054mm; x2=242.05mil; y2=11.481054mm; thickness=10.0mil; clearance=0.0;
+          }
+          ha:line.529 {
+           x1=242.05mil; y1=11.481054mm; x2=242.05mil; y2=527.99mil; thickness=10.0mil; clearance=0.0;
+          }
+          ha:line.532 {
+           x1=123.93mil; y1=527.99mil; x2=242.05mil; y2=527.99mil; thickness=10.0mil; clearance=0.0;
+          }
+          ha:line.535 {
+           x1=123.93mil; y1=11.481054mm; x2=123.93mil; y2=527.99mil; thickness=10.0mil; clearance=0.0;
           }
-          ha:line.566 {
-           x1=2.892044mm; y1=8.642858mm; x2=2.892044mm; y2=9.642602mm; thickness=8.0mil; clearance=0.0;
+          ha:line.538 {
+           x1=6.682232mm; y1=11.481054mm; x2=7.164578mm; y2=11.481054mm; thickness=10.0mil; clearance=0.0;
+          }
+          ha:line.541 {
+           x1=7.164578mm; y1=11.481054mm; x2=7.164578mm; y2=527.99mil; thickness=10.0mil; clearance=0.0;
+          }
+          ha:line.544 {
+           x1=6.682232mm; y1=527.99mil; x2=7.164578mm; y2=527.99mil; thickness=10.0mil; clearance=0.0;
           }
-          ha:text.560 {
-           string=%a.parent.refdes%; x=275.0mil; y=340.0mil; scale=80; fid=0;
+          ha:text.523 {
+           string=%a.parent.refdes%; x=48.0mil; y=467.0mil; scale=80; fid=0;
            ha:flags {
             dyntext=1
             floater=1
            }
-           rot = 270.000000
+           rot = 0.000000
           }
          }
          ha:type {
@@ -6253,26 +5602,26 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:line.569 {
-           x1=167.0mil; y1=9.14273mm; x2=167.0mil; y2=9.14273mm; thickness=0.1mm; clearance=0.0;
+          ha:line.547 {
+           x1=4.322953mm; y1=490.0mil; x2=4.322953mm; y2=490.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=pnp-origin
            }
           }
-          ha:line.572 {
-           x1=167.0mil; y1=9.14273mm; x2=167.0mil; y2=9.14273mm; thickness=0.1mm; clearance=0.0;
+          ha:line.550 {
+           x1=182.99mil; y1=490.0mil; x2=182.99mil; y2=490.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
           }
-          ha:line.575 {
-           x1=167.0mil; y1=9.14273mm; x2=167.0mil; y2=8.14273mm; thickness=0.1mm; clearance=0.0;
+          ha:line.553 {
+           x1=182.99mil; y1=490.0mil; x2=5.647946mm; y2=490.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
-          ha:line.578 {
-           x1=167.0mil; y1=9.14273mm; x2=3.2418mm; y2=9.14273mm; thickness=0.1mm; clearance=0.0;
+          ha:line.556 {
+           x1=182.99mil; y1=490.0mil; x2=182.99mil; y2=13.446mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
@@ -6286,7 +5635,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAW
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAV
      }
      ha:subc.581 {
       ha:attributes {
@@ -6451,7 +5800,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAX
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAX
      }
      ha:subc.597 {
       ha:attributes {
@@ -6616,7 +5965,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAY
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAY
      }
      ha:subc.613 {
       ha:attributes {
@@ -6781,7 +6130,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAZ
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAZ
      }
      ha:subc.629 {
       ha:attributes {
@@ -6946,7 +6295,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAa
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAa
      }
      ha:subc.645 {
       ha:attributes {
@@ -7111,7 +6460,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAb
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAb
      }
      ha:subc.661 {
       ha:attributes {
@@ -7276,7 +6625,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAc
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAc
      }
      ha:subc.677 {
       ha:attributes {
@@ -7441,7 +6790,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAd
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAd
      }
      ha:subc.693 {
       ha:attributes {
@@ -7768,7 +7117,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAe
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAe
      }
      ha:subc.728 {
       ha:attributes {
@@ -8096,7 +7445,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAf
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAf
      }
      ha:subc.748 {
       ha:attributes {
@@ -8292,7 +7641,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAg
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAg
      }
      ha:subc.767 {
       ha:attributes {
@@ -8457,7 +7806,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAh
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAh
      }
      ha:subc.783 {
       ha:attributes {
@@ -8622,7 +7971,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAi
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAi
      }
      ha:subc.799 {
       ha:attributes {
@@ -8845,7 +8194,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAj
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAj
      }
      ha:subc.830 {
       ha:attributes {
@@ -9186,7 +8535,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAk
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAk
      }
      ha:subc.868 {
       ha:attributes {
@@ -9464,7 +8813,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAl
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAl
      }
      ha:subc.896 {
       ha:attributes {
@@ -9629,7 +8978,7 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAm
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAm
      }
      ha:subc.912 {
       ha:attributes {
@@ -9773,14 +9122,179 @@ ha:pcb-rnd-board-v7 {
              subc-role=origin
            }
           }
-          ha:line.922 {
-           x1=11.697208mm; y1=123.0mil; x2=10.697208mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.922 {
+           x1=11.697208mm; y1=123.0mil; x2=10.697208mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
+           ha:attributes {
+             subc-role=x
+           }
+          }
+          ha:line.925 {
+           x1=11.697208mm; y1=123.0mil; x2=11.697208mm; y2=2.1242mm; thickness=0.1mm; clearance=0.0;
+           ha:attributes {
+             subc-role=y
+           }
+          }
+         }
+         ha:type {
+          top = 1
+          misc = 1
+          virtual = 1
+         }
+       }
+      }
+     }
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAn
+     }
+     ha:subc.928 {
+      ha:attributes {
+       value=100k
+       footprint=0402
+       refdes=R12
+      }
+     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.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:layer_mask {
+            top = 1
+            mask = 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:layer_mask {
+            top = 1
+            paste = 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.930 {
+        proto=0; x=476.48mil; y=162.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.931 {
+        proto=0; x=445.0mil; y=162.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.929 {
+           string=%a.parent.refdes%; x=423.0mil; y=178.0mil; scale=80; 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.932 {
+           x1=460.74mil; y1=162.0mil; x2=460.74mil; y2=162.0mil; thickness=0.1mm; clearance=0.0;
+           ha:attributes {
+             subc-role=pnp-origin
+           }
+          }
+          ha:line.935 {
+           x1=460.74mil; y1=162.0mil; x2=460.74mil; y2=162.0mil; thickness=0.1mm; clearance=0.0;
+           ha:attributes {
+             subc-role=origin
+           }
+          }
+          ha:line.938 {
+           x1=460.74mil; y1=162.0mil; x2=10.702796mm; y2=162.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
-          ha:line.925 {
-           x1=11.697208mm; y1=123.0mil; x2=11.697208mm; y2=2.1242mm; thickness=0.1mm; clearance=0.0;
+          ha:line.941 {
+           x1=460.74mil; y1=162.0mil; x2=460.74mil; y2=3.1148mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
@@ -9794,13 +9308,13 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAn
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAo
      }
-     ha:subc.928 {
+     ha:subc.944 {
       ha:attributes {
-       value=100k
+       value=27k
        footprint=0402
-       refdes=R12
+       refdes=R13
       }
      ha:data {
           li:padstack_prototypes {
@@ -9870,8 +9384,8 @@ ha:pcb-rnd-board-v7 {
      }
 
       li:objects {
-       ha:padstack_ref.930 {
-        proto=0; x=476.48mil; y=162.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.946 {
+        proto=0; x=14.274796mm; y=161.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
         ha:flags {
          clearline=1
         }
@@ -9884,8 +9398,8 @@ ha:pcb-rnd-board-v7 {
           name=1
         }
        }
-       ha:padstack_ref.931 {
-        proto=0; x=445.0mil; y=162.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.947 {
+        proto=0; x=13.475204mm; y=161.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
         ha:flags {
          clearline=1
         }
@@ -9906,8 +9420,8 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:text.929 {
-           string=%a.parent.refdes%; x=423.0mil; y=178.0mil; scale=80; fid=0;
+          ha:text.945 {
+           string=%a.parent.refdes%; x=514.0mil; y=178.0mil; scale=80; fid=0;
            ha:flags {
             dyntext=1
             floater=1
@@ -9926,26 +9440,26 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:line.932 {
-           x1=460.74mil; y1=162.0mil; x2=460.74mil; y2=162.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.948 {
+           x1=13.875mm; y1=161.0mil; x2=13.875mm; y2=161.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=pnp-origin
            }
           }
-          ha:line.935 {
-           x1=460.74mil; y1=162.0mil; x2=460.74mil; y2=162.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.951 {
+           x1=13.875mm; y1=161.0mil; x2=13.875mm; y2=161.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
           }
-          ha:line.938 {
-           x1=460.74mil; y1=162.0mil; x2=10.702796mm; y2=162.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.954 {
+           x1=13.875mm; y1=161.0mil; x2=12.875mm; y2=161.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
-          ha:line.941 {
-           x1=460.74mil; y1=162.0mil; x2=460.74mil; y2=3.1148mm; thickness=0.1mm; clearance=0.0;
+          ha:line.957 {
+           x1=13.875mm; y1=161.0mil; x2=13.875mm; y2=3.0894mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
@@ -9959,13 +9473,13 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAo
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAp
      }
-     ha:subc.944 {
+     ha:subc.960 {
       ha:attributes {
        value=27k
        footprint=0402
-       refdes=R13
+       refdes=R6
       }
      ha:data {
           li:padstack_prototypes {
@@ -10035,8 +9549,8 @@ ha:pcb-rnd-board-v7 {
      }
 
       li:objects {
-       ha:padstack_ref.946 {
-        proto=0; x=14.274796mm; y=161.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.962 {
+        proto=0; x=14.274796mm; y=85.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
         ha:flags {
          clearline=1
         }
@@ -10049,8 +9563,8 @@ ha:pcb-rnd-board-v7 {
           name=1
         }
        }
-       ha:padstack_ref.947 {
-        proto=0; x=13.475204mm; y=161.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.963 {
+        proto=0; x=13.475204mm; y=85.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
         ha:flags {
          clearline=1
         }
@@ -10071,8 +9585,8 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:text.945 {
-           string=%a.parent.refdes%; x=514.0mil; y=178.0mil; scale=80; fid=0;
+          ha:text.961 {
+           string=%a.parent.refdes%; x=524.0mil; y=18.0mil; scale=80; fid=0;
            ha:flags {
             dyntext=1
             floater=1
@@ -10091,26 +9605,26 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:line.948 {
-           x1=13.875mm; y1=161.0mil; x2=13.875mm; y2=161.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.964 {
+           x1=13.875mm; y1=85.0mil; x2=13.875mm; y2=85.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=pnp-origin
            }
           }
-          ha:line.951 {
-           x1=13.875mm; y1=161.0mil; x2=13.875mm; y2=161.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.967 {
+           x1=13.875mm; y1=85.0mil; x2=13.875mm; y2=85.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
           }
-          ha:line.954 {
-           x1=13.875mm; y1=161.0mil; x2=12.875mm; y2=161.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.970 {
+           x1=13.875mm; y1=85.0mil; x2=12.875mm; y2=85.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
-          ha:line.957 {
-           x1=13.875mm; y1=161.0mil; x2=13.875mm; y2=3.0894mm; thickness=0.1mm; clearance=0.0;
+          ha:line.973 {
+           x1=13.875mm; y1=85.0mil; x2=13.875mm; y2=1.159mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
@@ -10124,13 +9638,13 @@ ha:pcb-rnd-board-v7 {
        }
       }
      }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAp
+      uid = 7L+Lzye7e3ztiS8kg6gAAAAq
      }
-     ha:subc.960 {
+     ha:subc.976 {
       ha:attributes {
        value=27k
        footprint=0402
-       refdes=R6
+       refdes=R8
       }
      ha:data {
           li:padstack_prototypes {
@@ -10200,8 +9714,8 @@ ha:pcb-rnd-board-v7 {
      }
 
       li:objects {
-       ha:padstack_ref.962 {
-        proto=0; x=14.274796mm; y=85.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.978 {
+        proto=0; x=14.274796mm; y=123.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
         ha:flags {
          clearline=1
         }
@@ -10214,8 +9728,8 @@ ha:pcb-rnd-board-v7 {
           name=1
         }
        }
-       ha:padstack_ref.963 {
-        proto=0; x=13.475204mm; y=85.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+       ha:padstack_ref.979 {
+        proto=0; x=13.475204mm; y=123.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
         ha:flags {
          clearline=1
         }
@@ -10236,8 +9750,8 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:text.961 {
-           string=%a.parent.refdes%; x=524.0mil; y=18.0mil; scale=80; fid=0;
+          ha:text.977 {
+           string=%a.parent.refdes%; x=581.0mil; y=76.0mil; scale=80; fid=0;
            ha:flags {
             dyntext=1
             floater=1
@@ -10256,206 +9770,842 @@ ha:pcb-rnd-board-v7 {
         ha:combining {        }
 
          li:objects {
-          ha:line.964 {
-           x1=13.875mm; y1=85.0mil; x2=13.875mm; y2=85.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.980 {
+           x1=13.875mm; y1=123.0mil; x2=13.875mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=pnp-origin
            }
           }
-          ha:line.967 {
-           x1=13.875mm; y1=85.0mil; x2=13.875mm; y2=85.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.983 {
+           x1=13.875mm; y1=123.0mil; x2=13.875mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
           }
-          ha:line.970 {
-           x1=13.875mm; y1=85.0mil; x2=12.875mm; y2=85.0mil; thickness=0.1mm; clearance=0.0;
+          ha:line.986 {
+           x1=13.875mm; y1=123.0mil; x2=12.875mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
-          ha:line.973 {
-           x1=13.875mm; y1=85.0mil; x2=13.875mm; y2=1.159mm; thickness=0.1mm; clearance=0.0;
+          ha:line.989 {
+           x1=13.875mm; y1=123.0mil; x2=13.875mm; y2=2.1242mm; 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 = 7L+Lzye7e3ztiS8kg6gAAAAr
+     }
+      ha:subc.3783 {
+       ha:attributes {
+        refdes=C8
+        value=22uF
+        footprint=1206
+        openscad=1206
+       }
+      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.649986mm  
+              -0.94996mm  
+              -0.649986mm  
+              -0.94996mm  
+              -0.649986mm  
+              0.94996mm  
+              0.649986mm  
+              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 {
+              0.726186mm  
+              -1.02616mm  
+              -0.726186mm  
+              -1.02616mm  
+              -0.726186mm  
+              1.02616mm  
+              0.726186mm  
+              1.02616mm  
+             }
+           }
+
+           ha:ps_shape_v4 {
+            ha:combining { auto=1;            }
+            ha:layer_mask {
+             top = 1
+             paste = 1
+            }
+            clearance=0.0
+             li:ps_poly {
+              0.649986mm  
+              -0.94996mm  
+              -0.649986mm  
+              -0.94996mm  
+              -0.649986mm  
+              0.94996mm  
+              0.649986mm  
+              0.94996mm  
+             }
+           }
+         }
+       }
+      }
+
+       li:objects {
+        ha:padstack_ref.3803 {
+         proto=0; x=167.0mil; y=419.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.3804 {
+         proto=0; x=167.0mil; y=7.64286mm; 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:line.3784 {
+            x1=3.29184mm; y1=9.742678mm; x2=3.29184mm; y2=8.542782mm; thickness=8.0mil; clearance=0.0;
+           }
+           ha:line.3787 {
+            x1=204.4mil; y1=9.742678mm; x2=204.4mil; y2=8.542782mm; thickness=8.0mil; clearance=0.0;
+           }
+           ha:text.3790 {
+            string=%a.parent.refdes%; x=135.5mil; y=9.94283mm; scale=100; fid=0;
+            ha:flags {
+             dyntext=1
+             floater=1
+            }
+            rot = 90.000000
+           }
+          }
+          ha:type {
+           silk = 1
+           top = 1
+          }
+        }
+
+        ha:subc-aux {
+         lid=1
+         ha:combining {         }
+
+          li:objects {
+           ha:line.3791 {
+            x1=167.0mil; y1=9.14273mm; x2=167.0mil; y2=9.14273mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=pnp-origin
+            }
+           }
+           ha:line.3794 {
+            x1=167.0mil; y1=9.14273mm; x2=167.0mil; y2=9.14273mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=origin
+            }
+           }
+           ha:line.3797 {
+            x1=167.0mil; y1=9.14273mm; x2=167.0mil; y2=8.14273mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=x
+            }
+           }
+           ha:line.3800 {
+            x1=167.0mil; y1=9.14273mm; x2=5.2418mm; y2=9.14273mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=y
+            }
+           }
+          }
+          ha:type {
+           top = 1
+           misc = 1
+           virtual = 1
+          }
+        }
+       }
+      }
+       uid = 0T0gM6TcfoZ0eol+DecAAAAs
+      }
+      ha:subc.3837 {
+       ha:attributes {
+        value=USBmicroB
+        footprint=2013499-1
+        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_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 { 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  
+             }
+           }
+         }
+       }
+
+       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
+            }
+            clearance=0.0
+             li:ps_poly {
+              -0.876173mm  
+              -0.776224mm  
+              -0.876173mm  
+              0.776224mm  
+              0.876173mm  
+              0.776224mm  
+              0.876173mm  
+              -0.776224mm  
+             }
+           }
+
+           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_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  
+             }
+           }
+
+           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_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_proto_v6.3 {
+         hdia=28.35mil; hplated=1; htop=0; hbottom=0;
+         li:shape {
+
+           ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=45.67mil;            }
+            ha:combining {            }
+            ha:layer_mask {
+             copper = 1
+             top = 1
+            }
+            clearance=0.0
+           }
+
+           ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=45.67mil;            }
+            ha:combining {            }
+            ha:layer_mask {
+             bottom = 1
+             copper = 1
+            }
+            clearance=0.0
+           }
+
+           ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=45.67mil;            }
+            ha:combining {            }
+            ha:layer_mask {
+             copper = 1
+             intern = 1
+            }
+            clearance=0.0
+           }
+
+           ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=51.67mil;            }
+            ha:combining { sub=1; auto=1;            }
+            ha:layer_mask {
+             top = 1
+             mask = 1
+            }
+            clearance=0.0
+           }
+
+           ha:ps_shape_v4 {
+            ha:ps_circ { x=0.0; y=0.0; dia=51.67mil;            }
+            ha:combining { sub=1; auto=1;            }
+            ha:layer_mask {
+             bottom = 1
+             mask = 1
+            }
+            clearance=0.0
+           }
+         }
+       }
+
+       ha:ps_proto_v6.4 {
+         hdia=0.0; hplated=0; htop=0; hbottom=0;
+         li:shape {
+
+           ha:ps_shape_v4 {
+            ha:ps_line { x1=0.0; y1=-23.625mil; x2=0.0; y2=23.625mil; thickness=45.67mil; square=0;            }
+            ha:combining {            }
+            ha:layer_mask {
+             copper = 1
+             top = 1
+            }
+            clearance=0.0
+           }
+
+           ha:ps_shape_v4 {
+            ha:ps_line { x1=0.0; y1=-23.625mil; x2=0.0; y2=23.625mil; thickness=51.67mil; 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=0.0; y1=-23.625mil; x2=0.0; y2=23.625mil; thickness=45.67mil; square=0;            }
+            ha:combining { auto=1;            }
+            ha:layer_mask {
+             top = 1
+             paste = 1
+            }
+            clearance=0.0
+           }
+         }
+       }
+
+       ha:ps_proto_v6.5 {
+         hdia=0.0; hplated=0; htop=0; hbottom=0;
+         li:shape {
+
+           ha:ps_shape_v4 {
+            ha:ps_line { x1=0.0; y1=-23.625mil; x2=0.0; y2=23.625mil; thickness=45.67mil; square=0;            }
+            ha:combining {            }
+            ha:layer_mask {
+             bottom = 1
+             copper = 1
+            }
+            clearance=0.0
+           }
+
+           ha:ps_shape_v4 {
+            ha:ps_line { x1=0.0; y1=-23.625mil; x2=0.0; y2=23.625mil; thickness=51.67mil; square=0;            }
+            ha:combining { sub=1; auto=1;            }
+            ha:layer_mask {
+             bottom = 1
+             mask = 1
+            }
+            clearance=0.0
+           }
+
+           ha:ps_shape_v4 {
+            ha:ps_line { x1=0.0; y1=-23.625mil; x2=0.0; y2=23.625mil; thickness=45.67mil; square=0;            }
+            ha:combining { auto=1;            }
+            ha:layer_mask {
+             bottom = 1
+             paste = 1
+            }
+            clearance=0.0
+           }
+         }
+       }
+      }
+
+       li:objects {
+        ha:padstack_ref.3851 {
+         proto=0; x=990.73mil; y=624.69mil; rot=180.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=1
+           name=VBUS
+         }
+        }
+        ha:padstack_ref.3852 {
+         proto=0; x=1.01632in; y=624.69mil; rot=180.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=2
+           name=D-
+         }
+        }
+        ha:padstack_ref.3853 {
+         proto=0; x=1.04191in; y=624.69mil; rot=180.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=3
+           name=D+
+         }
+        }
+        ha:padstack_ref.3854 {
+         proto=0; x=1.0675in; y=624.69mil; rot=180.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=4
+           name=HS
+         }
+        }
+        ha:padstack_ref.3855 {
+         proto=0; x=27.764486mm; y=624.69mil; rot=180.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
+        }
+        ha:padstack_ref.3856 {
+         proto=1; x=29.664533mm; y=16.09217mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
+        }
+        ha:padstack_ref.3857 {
+         proto=1; x=23.264495mm; y=16.09217mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
          }
-       }
-      }
-     }
-      uid = lo/6GmR6TDdi7TdfNSQAAAAq
-     }
-     ha:subc.976 {
-      ha:attributes {
-       value=27k
-       footprint=0402
-       refdes=R8
-      }
-     ha:data {
-          li:padstack_prototypes {
 
-      ha:ps_proto_v6.0 {
-        hdia=0.0; hplated=0; htop=0; hbottom=0;
-        li:shape {
+         ha:attributes {
+           term=5
+           name=GND
+         }
+        }
+        ha:padstack_ref.3858 {
+         proto=2; x=27.9146mm; y=730.0mil; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-          ha:ps_shape_v4 {
-           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  
-            }
-          }
+         li:thermal {
+         }
 
-          ha:ps_shape_v4 {
-           ha:combining { sub=1; auto=1;           }
-           ha:layer_mask {
-            top = 1
-            mask = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             0.326136mm  
-             -0.425958mm  
-             -0.326136mm  
-             -0.425958mm  
-             -0.326136mm  
-             0.425958mm  
-             0.326136mm  
-             0.425958mm  
-            }
-          }
+         ha:attributes {
+           term=5
+           name=GND
+         }
+        }
+        ha:padstack_ref.3859 {
+         proto=2; x=984.82mil; y=730.0mil; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-          ha:ps_shape_v4 {
-           ha:combining { auto=1;           }
-           ha:layer_mask {
-            top = 1
-            paste = 1
-           }
-           clearance=0.0
-            li:ps_poly {
-             0.249936mm  
-             -0.349758mm  
-             -0.249936mm  
-             -0.349758mm  
-             -0.249936mm  
-             0.349758mm  
-             0.249936mm  
-             0.349758mm  
-            }
-          }
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
         }
-      }
-     }
+        ha:padstack_ref.3860 {
+         proto=3; x=1.17026in; y=19.142202mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-      li:objects {
-       ha:padstack_ref.978 {
-        proto=0; x=14.274796mm; y=123.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-        ha:flags {
-         clearline=1
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
         }
+        ha:padstack_ref.3861 {
+         proto=3; x=1.17026in; y=17.942052mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-        li:thermal {
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
         }
+        ha:padstack_ref.3862 {
+         proto=3; x=23.204424mm; y=19.142202mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-        ha:attributes {
-          term=1
-          name=1
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
         }
-       }
-       ha:padstack_ref.979 {
-        proto=0; x=13.475204mm; y=123.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-        ha:flags {
-         clearline=1
+        ha:padstack_ref.3863 {
+         proto=3; x=23.204424mm; y=17.942052mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
         }
+        ha:padstack_ref.3864 {
+         proto=4; x=1.17026in; y=18.542127mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-        li:thermal {
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
         }
+        ha:padstack_ref.3865 {
+         proto=5; x=1.17026in; y=18.542127mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-        ha:attributes {
-          term=2
-          name=2
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
+         }
         }
-       }
-      }
-      li:layers {
+        ha:padstack_ref.3866 {
+         proto=4; x=23.204424mm; y=18.542127mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
 
-       ha:top-silk {
-        lid=0
-        ha:combining {        }
+         li:thermal {
+         }
 
-         li:objects {
-          ha:text.977 {
-           string=%a.parent.refdes%; x=581.0mil; y=76.0mil; scale=80; fid=0;
-           ha:flags {
-            dyntext=1
-            floater=1
-           }
-           rot = 0.000000
-          }
+         ha:attributes {
+           term=5
+           name=GND
          }
-         ha:type {
-          silk = 1
-          top = 1
+        }
+        ha:padstack_ref.3867 {
+         proto=5; x=23.204424mm; y=18.542127mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.0;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=5
+           name=GND
          }
+        }
        }
+       li:layers {
 
-       ha:subc-aux {
-        lid=1
-        ha:combining {        }
+        ha:top-silk {
+         lid=0
+         ha:combining {         }
 
-         li:objects {
-          ha:line.980 {
-           x1=13.875mm; y1=123.0mil; x2=13.875mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=pnp-origin
+          li:objects {
+           ha:text.3838 {
+            string=%a.parent.refdes%; x=1.04191in; y=787.09mil; scale=100; fid=0;
+            ha:flags {
+             dyntext=1
+             floater=1
+            }
+            rot = 180.000000
            }
           }
-          ha:line.983 {
-           x1=13.875mm; y1=123.0mil; x2=13.875mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=origin
-           }
+          ha:type {
+           silk = 1
+           top = 1
           }
-          ha:line.986 {
-           x1=13.875mm; y1=123.0mil; x2=12.875mm; y2=123.0mil; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=x
+        }
+
+        ha:subc-aux {
+         lid=1
+         ha:combining {         }
+
+          li:objects {
+           ha:line.3839 {
+            x1=1.04191in; y1=17.467117mm; x2=1.04191in; y2=17.467117mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=pnp-origin
+            }
            }
-          }
-          ha:line.989 {
-           x1=13.875mm; y1=123.0mil; x2=13.875mm; y2=2.1242mm; thickness=0.1mm; clearance=0.0;
-           ha:attributes {
-             subc-role=y
+           ha:line.3842 {
+            x1=1.04191in; y1=787.09mil; x2=1.04191in; y2=787.09mil; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=origin
+            }
+           }
+           ha:line.3845 {
+            x1=1.04191in; y1=787.09mil; x2=27.464514mm; y2=787.09mil; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=x
+            }
+           }
+           ha:line.3848 {
+            x1=1.04191in; y1=787.09mil; x2=1.04191in; y2=20.992086mm; 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 = lo/6GmR6TDdi7TdfNSQAAAAr
-     }
+       uid = 0T0gM6TcfoZ0eol+DecAAAAu
+      }
    }
    li:layers {
 
@@ -15289,326 +15439,115 @@ ha:pcb-rnd-board-v7 {
  ha:netlists {
    li:input {
     ha:unnamed_net10 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R10-2; U1-13;    }
-     style = (unknown)
-    }
-    ha:unnamed_net11 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { U1-26;    }
-     style = (unknown)
     }
     ha:+3.3V {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { C4-2; C6-2; C7-2; C9-2; C10-2; R16-2; U1-6; U1-29; U2-5; U3-1; U4-3; U4-7; U4-8; U5-8;    }
-     style = (unknown)
     }
     ha:unnamed_net12 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { Q1-2; R2-2; U5-1;    }
-     style = (unknown)
     }
     ha:unnamed_net13 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { Q1-4; R5-2; U5-7;    }
-     style = (unknown)
-    }
-    ha:unnamed_net14 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { J1-1;    }
-     style = (unknown)
     }
     ha:unnamed_net15 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J1-2; R10-1;    }
-     style = (unknown)
     }
     ha:unnamed_net16 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J1-3; R9-1; R11-1;    }
-     style = (unknown)
-    }
-    ha:unnamed_net17 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { J1-4;    }
-     style = (unknown)
-    }
-    ha:unnamed_net18 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { U2-4;    }
-     style = (unknown)
     }
     ha:unnamed_net19 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { B1-1; J2-3; J3-1;    }
-     style = (unknown)
     }
     ha:GND {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { B1-2; C2-2; C3-2; C4-1; C6-1; C7-1; C8-1; C9-1; C10-1; H1-1; H2-1; H3-1; H4-1; J1-5; J2-4; J4-1; Q1-1; Q1-3; R1-1; R4-1; R6-1; R8-1; R13-1; R15-1; R17-1; U1-33; U2-2; U3-2; U3-3; U4-4; U5-4; U8-1; X1-2; X1-4;    }
-     style = (unknown)
+    li:conn { B1-2; C2-2; C3-2; C4-1; C6-1; C7-1; C8-1; C9-1; C10-1; H1-1; H2-1; H3-1; H4-1; J1-5; J1-G; J2-4; J4-1; Q1-1; Q1-3; R1-1; R4-1; R6-1; R8-1; R13-1; R15-1; R17-1; U1-33; U2-2; U3-2; U3-3; U4-4; U5-4; U8-1; X1-2; X1-4;    }
     }
     ha:cmp_rail {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R16-1; R17-2; U5-2; U5-6;    }
-     style = (unknown)
-    }
-    ha:unnamed_net1 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { U1-3;    }
-     style = (unknown)
-    }
-    ha:unnamed_net2 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { U1-10;    }
-     style = (unknown)
-    }
-    ha:unnamed_net3 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { U1-11;    }
-     style = (unknown)
     }
     ha:unnamed_net4 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-24; U8-2;    }
-     style = (unknown)
     }
-    ha:mosi0 {
-     ha:attributes {
-      style=(unknown)
+     ha:usb_pullup {
+     li:conn { R9-2; U1-7;     }
      }
+    ha:mosi0 {
     li:conn { U1-18; U3-7;    }
-     style = (unknown)
     }
     ha:mosi1 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-12; U4-5;    }
-     style = (unknown)
     }
-    ha:unnamed_net5 {
-     ha:attributes {
-      style=(unknown)
+     ha:unnamed_net7 {
+     li:conn { C3-1; U1-5; X1-3;     }
      }
-    li:conn { U1-30;    }
-     style = (unknown)
-    }
     ha:cs_flash {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-27; U4-1;    }
-     style = (unknown)
     }
-    ha:unnamed_net7 {
-     ha:attributes {
-      style=(unknown)
+     ha:unnamed_net9 {
+     li:conn { R11-2; U1-14;     }
      }
-    li:conn { C3-1; U1-5; X1-3;    }
-     style = (unknown)
-    }
     ha:unnamed_net8 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { C2-1; U1-4; X1-1;    }
-     style = (unknown)
-    }
-    ha:unnamed_net6 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { U1-1;    }
-     style = (unknown)
-    }
-    ha:unnamed_net9 {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { R11-2; U1-14;    }
-     style = (unknown)
     }
     ha:reset_n {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J4-2; U1-2;    }
-     style = (unknown)
-    }
-    ha:usb_pullup {
-     ha:attributes {
-      style=(unknown)
-     }
-    li:conn { R9-2; U1-7;    }
-     style = (unknown)
     }
     ha:v_ldo_in {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { C8-2; D1-2; R14-2; U2-1; U2-3;    }
-     style = (unknown)
     }
     ha:v_bat {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { D1-1; J2-2; J3-2; J3-3; R12-2;    }
-     style = (unknown)
     }
     ha:rxd {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J4-5; U1-31;    }
-     style = (unknown)
     }
     ha:fet_a {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J3-4; Q1-5; Q1-6; R7-2;    }
-     style = (unknown)
     }
     ha:fet_b {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J2-1; Q1-7; Q1-8; R3-1;    }
-     style = (unknown)
     }
     ha:cs_baro {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-16; U3-4; U3-5;    }
-     style = (unknown)
     }
     ha:fire_a {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R4-2; R5-1; U1-8;    }
-     style = (unknown)
     }
     ha:fire_b {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R1-2; R2-1; U1-9;    }
-     style = (unknown)
     }
     ha:sclk0 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-15; U3-8;    }
-     style = (unknown)
     }
     ha:sclk1 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-28; U4-6;    }
-     style = (unknown)
     }
     ha:miso0 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-17; U3-6;    }
-     style = (unknown)
     }
     ha:miso1 {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { U1-20; U4-2;    }
-     style = (unknown)
     }
     ha:sense_a {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R7-1; R8-2; U1-21;    }
-     style = (unknown)
     }
     ha:sense_b {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R3-2; R6-2; U1-22;    }
-     style = (unknown)
     }
     ha:cmp_ldo_in {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R14-1; R15-2; U5-3; U5-5;    }
-     style = (unknown)
     }
     ha:swclk {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J4-4; U1-19;    }
-     style = (unknown)
     }
     ha:sense_bat {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { R12-1; R13-2; U1-23;    }
-     style = (unknown)
     }
     ha:txd {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J4-6; U1-32;    }
-     style = (unknown)
     }
     ha:swdio {
-     ha:attributes {
-      style=(unknown)
-     }
     li:conn { J4-3; U1-25;    }
-     style = (unknown)
     }
    }
  }

diff --git a/easymini.sch b/easymini.sch
index 3f411f4efecc6a1d1e957f900d41dae695ba06a9..49dfd66316dab7f076c5cd66ad1e476564d0f921 100644 (file)
--- a/easymini.sch
+++ b/easymini.sch
@@ -1,4 +1,4 @@
-v 20130925 2
+v 20201211 2
 C 10100 10100 0 0 0 title-C-both.sym
 C 14500 16300 1 0 0 lpc11u1x.sym
 {
@@ -77,7 +77,7 @@ footprint=0402
 T 27800 23600 5 10 1 1 180 0 1
 refdes=R2
 T 28200 23600 5 10 1 1 180 0 1
-value=100
+value=1k
 }
 C 27400 19500 1 0 0 resistor.sym
 {
@@ -88,7 +88,7 @@ footprint=0402
 T 27800 19900 5 10 1 1 180 0 1
 refdes=R5
 T 28200 19900 5 10 1 1 180 0 1
-value=100
+value=1k
 }
 N 28300 23300 28900 23300 4
 N 28300 19600 28900 19600 4
@@ -187,7 +187,7 @@ C 11800 18900 1 0 1 USBmicroB.sym
 T 10805 21300 5 10 1 1 0 6 1
 refdes=J1
 T 11445 19295 5 10 0 1 0 6 1
-footprint=ZX62-B-5PA
+footprint=2013499-1
 T 11800 18900 5 10 0 0 0 0 1
 device=CONNECTOR
 T 11800 18900 5 10 0 0 0 0 1
@@ -250,7 +250,7 @@ footprint=SOIJ8
 T 20095 14595 5 10 1 1 0 0 1
 refdes=U4
 T 20400 13000 5 10 1 1 0 0 1
-value=W25Q80DVSSIG
+value=W25Q80
 }
 C 20800 14800 1 0 0 3.3V-plus.sym
 N 22200 13700 22200 14800 4
@@ -411,7 +411,7 @@ device=CAPACITOR
 T 12500 11600 5 10 0 0 90 0 1
 symversion=0.1
 T 13400 11400 5 10 0 0 90 0 1
-footprint=1210
+footprint=1206
 T 13550 12150 5 10 1 1 180 0 1
 refdes=C8
 T 13800 11700 5 10 1 1 180 0 1
@@ -517,7 +517,9 @@ footprint=282834-4
 T 15400 15200 5 10 0 1 0 0 1
 device=CONNECTOR
 T 15400 15200 5 10 0 1 0 0 1
-value=Terminal-4
+value=4screws
+T 15400 15200 5 10 0 0 0 0 1
+mfg_part_number=282834-4
 }
 C 13500 13800 1 0 1 conn-4.sym
 {
@@ -528,7 +530,9 @@ footprint=282834-4
 T 13500 13800 5 10 0 1 0 0 1
 device=CONNECTOR
 T 13500 13800 5 10 0 1 0 0 1
-value=Terminal-4
+value=4screws
+T 13500 13800 5 10 0 0 0 0 1
+mfg_part_number=282834-4
 }
 T 12650 14700 9 10 1 0 0 6 1
 Switch Out
@@ -968,3 +972,4 @@ N 21500 17700 20500 17700 4
 T 21500 17750 5 10 1 1 0 6 1
 netname=usb_pullup
 }
+C 10800 18500 1 0 0 gnd.sym