move force bootloader soc pin assignment and connector

diff --git a/telefiretwo.lht b/telefiretwo.lht
index 158660d1e1b58e5195fb268b66c0dbc00b544213..028330887f1c53df7757d8fb5f53734d61c5aa37 100644 (file)
--- a/telefiretwo.lht
+++ b/telefiretwo.lht
@@ -1344,7 +1344,7 @@ ha:pcb-rnd-board-v6 {
 
           li:objects {
            ha:arc.136 {
-            x=687.0mil; y=2.667in; width=120.0mil; height=120.0mil; astart=0; adelta=360; thickness=10.0mil; clearance=0.0;
+            x=687.0mil; y=2.667in; width=120.0mil; height=120.0mil; astart=0.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -1498,7 +1498,7 @@ ha:pcb-rnd-board-v6 {
 
           li:objects {
            ha:arc.151 {
-            x=60.96mm; y=383.0mil; width=120.0mil; height=120.0mil; astart=0; adelta=360; thickness=10.0mil; clearance=0.0;
+            x=60.96mm; y=383.0mil; width=120.0mil; height=120.0mil; astart=0.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -1652,7 +1652,7 @@ ha:pcb-rnd-board-v6 {
 
           li:objects {
            ha:arc.166 {
-            x=60.96mm; y=2.667in; width=120.0mil; height=120.0mil; astart=0; adelta=360; thickness=10.0mil; clearance=0.0;
+            x=60.96mm; y=2.667in; width=120.0mil; height=120.0mil; astart=0.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -2797,7 +2797,7 @@ ha:pcb-rnd-board-v6 {
             x1=2.632in; y1=776.0mil; x2=2.518in; y2=776.0mil; thickness=10.0mil; clearance=0.0;
            }
            ha:arc.290 {
-            x=65.405mm; y=875.0mil; width=114.0mil; height=114.0mil; astart=300; adelta=300; thickness=10.0mil; clearance=0.0;
+            x=65.405mm; y=875.0mil; width=114.0mil; height=114.0mil; astart=300.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -3070,7 +3070,7 @@ ha:pcb-rnd-board-v6 {
             x1=2.257in; y1=776.0mil; x2=2.143in; y2=776.0mil; thickness=10.0mil; clearance=0.0;
            }
            ha:arc.309 {
-            x=2.2in; y=875.0mil; width=114.0mil; height=114.0mil; astart=300; adelta=300; thickness=10.0mil; clearance=0.0;
+            x=2.2in; y=875.0mil; width=114.0mil; height=114.0mil; astart=300.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -3343,7 +3343,7 @@ ha:pcb-rnd-board-v6 {
             x1=3.007in; y1=776.0mil; x2=2.893in; y2=776.0mil; thickness=10.0mil; clearance=0.0;
            }
            ha:arc.328 {
-            x=74.93mm; y=875.0mil; width=114.0mil; height=114.0mil; astart=300; adelta=300; thickness=10.0mil; clearance=0.0;
+            x=74.93mm; y=875.0mil; width=114.0mil; height=114.0mil; astart=300.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -3616,7 +3616,7 @@ ha:pcb-rnd-board-v6 {
             x1=2.744in; y1=72.8472mm; x2=2.744in; y2=2.982in; thickness=10.0mil; clearance=0.0;
            }
            ha:arc.574 {
-            x=67.183mm; y=74.295mm; width=114.0mil; height=114.0mil; astart=210; adelta=300; thickness=10.0mil; clearance=0.0;
+            x=67.183mm; y=74.295mm; width=114.0mil; height=114.0mil; astart=210.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -4219,7 +4219,7 @@ ha:pcb-rnd-board-v6 {
             x1=2.744in; y1=2.393in; x2=2.744in; y2=2.507in; thickness=10.0mil; clearance=0.0;
            }
            ha:arc.625 {
-            x=67.183mm; y=2.45in; width=114.0mil; height=114.0mil; astart=210; adelta=300; thickness=10.0mil; clearance=0.0;
+            x=67.183mm; y=2.45in; width=114.0mil; height=114.0mil; astart=210.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -8791,7 +8791,7 @@ ha:pcb-rnd-board-v6 {
 
            li:objects {
             ha:arc.1255 {
-             x=1.73736in; y=24.091882mm; width=5.0mil; height=5.0mil; astart=180; adelta=360; thickness=10.0mil; clearance=0.0;
+             x=1.73736in; y=24.091882mm; width=5.0mil; height=5.0mil; astart=180.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
             }
            }
            ha:type {
@@ -11424,7 +11424,7 @@ ha:pcb-rnd-board-v6 {
 
            li:objects {
             ha:arc.1432 {
-             x=1.85164in; y=1.1476185in; width=5.0mil; height=5.0mil; astart=270; adelta=360; thickness=10.0mil; clearance=0.0;
+             x=1.85164in; y=1.1476185in; width=5.0mil; height=5.0mil; astart=270.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
             }
            }
            ha:type {
@@ -17083,7 +17083,7 @@ ha:pcb-rnd-board-v6 {
 
             li:objects {
              ha:arc.2695 {
-              x=61.32703mm; y=2.176in; width=5.0mil; height=5.0mil; astart=0; adelta=360; thickness=10.0mil; clearance=0.0;
+              x=61.32703mm; y=2.176in; width=5.0mil; height=5.0mil; astart=0.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
              }
             }
             ha:type {
@@ -17352,7 +17352,7 @@ ha:pcb-rnd-board-v6 {
               x1=2.744in; y1=182.0mil; x2=2.744in; y2=68.0mil; thickness=10.0mil; clearance=0.0;
              }
              ha:arc.11550 {
-              x=67.183mm; y=125.0mil; width=114.0mil; height=114.0mil; astart=210; adelta=300; thickness=10.0mil; clearance=0.0;
+              x=67.183mm; y=125.0mil; width=114.0mil; height=114.0mil; astart=210.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
              }
              ha:text.11551 {
               string=%a.parent.refdes%; x=2.77in; y=95.0mil; scale=100; fid=0;
@@ -19306,7 +19306,7 @@ ha:pcb-rnd-board-v6 {
 
             li:objects {
              ha:arc.121 {
-              x=687.0mil; y=383.0mil; width=120.0mil; height=120.0mil; astart=0; adelta=360; thickness=10.0mil; clearance=0.0;
+              x=687.0mil; y=383.0mil; width=120.0mil; height=120.0mil; astart=0.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
               ha:flags {
                lock=1
               }
@@ -19377,7 +19377,7 @@ ha:pcb-rnd-board-v6 {
  };        }
         ha:subc.23543 {
          ha:attributes {
-          value=100
+          value=1k
           footprint=0402
           refdes=R8
          }
@@ -20602,7 +20602,7 @@ ha:pcb-rnd-board-v6 {
         }
         ha:subc.23424 {
          ha:attributes {
-          value=100
+          value=1k
           footprint=0402
           refdes=R22
          }
@@ -22503,7 +22503,7 @@ ha:pcb-rnd-board-v6 {
               x1=0.969264mm; y1=1.37421in; x2=116.9mil; y2=1.37421in; thickness=10.0mil; clearance=0.0;
              }
              ha:arc.23256 {
-              x=235.0mil; y=31.905194mm; width=3.999992mm; height=3.999992mm; astart=90; adelta=360; thickness=10.0mil; clearance=0.0;
+              x=235.0mil; y=31.905194mm; width=3.999992mm; height=3.999992mm; astart=90.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
              }
             }
             ha:type {
@@ -24558,7 +24558,7 @@ ha:pcb-rnd-board-v6 {
       }
       ha:subc.34207 {
        ha:attributes {
-        value=100
+        value=1k
         footprint=0402
         refdes=R7
        }
@@ -24888,7 +24888,7 @@ ha:pcb-rnd-board-v6 {
       }
       ha:subc.34241 {
        ha:attributes {
-        value=100
+        value=1k
         footprint=0402
         refdes=R16
        }
@@ -25353,7 +25353,7 @@ ha:pcb-rnd-board-v6 {
             x1=40.19704mm; y1=67.064654mm; x2=40.19704mm; y2=63.76494mm; thickness=10.0mil; clearance=0.0;
            }
            ha:arc.34271 {
-            x=44.162742mm; y=2.62656071in; width=5.0mil; height=5.0mil; astart=90; adelta=360; thickness=10.0mil; clearance=0.0;
+            x=44.162742mm; y=2.62656071in; width=5.0mil; height=5.0mil; astart=90.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -25575,7 +25575,7 @@ ha:pcb-rnd-board-v6 {
 
         li:objects {
          ha:padstack_ref.42951 {
-          proto=0; x=1.997in; y=2.782in; rot=180.000000; xmirror=0; smirror=0; clearance=7.5mil;
+          proto=0; x=3.012in; y=1.883in; rot=0.000000; xmirror=0; smirror=0; clearance=7.5mil;
           ha:flags {
            clearline=1
           }
@@ -25601,7 +25601,7 @@ ha:pcb-rnd-board-v6 {
           }
          }
          ha:padstack_ref.42952 {
-          proto=1; x=53.2638mm; y=2.782in; rot=180.000000; xmirror=0; smirror=0; clearance=7.5mil;
+          proto=1; x=73.9648mm; y=1.883in; rot=0.000000; xmirror=0; smirror=0; clearance=7.5mil;
           ha:flags {
            clearline=1
           }
@@ -25623,16 +25623,16 @@ ha:pcb-rnd-board-v6 {
 
            li:objects {
             ha:line.42927 {
-             x1=2.147in; y1=2.732in; x2=1.947in; y2=2.732in; thickness=15.0mil; clearance=0.0;
+             x1=2.862in; y1=1.933in; x2=3.062in; y2=1.933in; thickness=15.0mil; clearance=0.0;
             }
             ha:line.42930 {
-             x1=1.947in; y1=71.9328mm; x2=1.947in; y2=2.732in; thickness=15.0mil; clearance=0.0;
+             x1=3.062in; y1=1.833in; x2=3.062in; y2=1.933in; thickness=15.0mil; clearance=0.0;
             }
             ha:line.42933 {
-             x1=2.147in; y1=71.9328mm; x2=1.947in; y2=71.9328mm; thickness=15.0mil; clearance=0.0;
+             x1=2.862in; y1=1.833in; x2=3.062in; y2=1.833in; thickness=15.0mil; clearance=0.0;
             }
             ha:line.42936 {
-             x1=2.147in; y1=71.9328mm; x2=2.147in; y2=2.732in; thickness=15.0mil; clearance=0.0;
+             x1=2.862in; y1=1.833in; x2=2.862in; y2=1.933in; thickness=15.0mil; clearance=0.0;
             }
            }
            ha:type {
@@ -25647,25 +25647,25 @@ ha:pcb-rnd-board-v6 {
 
            li:objects {
             ha:line.42939 {
-             x1=2.047in; y1=2.782in; x2=2.047in; y2=2.782in; thickness=0.1mm; clearance=0.0;
+             x1=2.962in; y1=1.883in; x2=2.962in; y2=1.883in; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=pnp-origin
              }
             }
             ha:line.42942 {
-             x1=1.997in; y1=2.782in; x2=1.997in; y2=2.782in; thickness=0.1mm; clearance=0.0;
+             x1=3.012in; y1=1.883in; x2=3.012in; y2=1.883in; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=origin
              }
             }
             ha:line.42945 {
-             x1=1.997in; y1=2.782in; x2=51.7238mm; y2=2.782in; thickness=0.1mm; clearance=0.0;
+             x1=3.012in; y1=1.883in; x2=75.5048mm; y2=1.883in; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=x
              }
             }
             ha:line.42948 {
-             x1=1.997in; y1=2.782in; x2=1.997in; y2=71.6628mm; thickness=0.1mm; clearance=0.0;
+             x1=3.012in; y1=1.883in; x2=3.012in; y2=46.8282mm; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=y
              }
@@ -28780,32 +28780,38 @@ ha:pcb-rnd-board-v6 {
          clearline=1
         }
        }
-       ha:line.42921 {
-        x1=53.2077mm; y1=70.8099mm; x2=53.1622mm; y2=2.786in; thickness=10.0mil; clearance=20.0mil;
+       ha:line.42963 {
+        x1=2.13653in; y1=52.676425mm; x2=2.13653in; y2=54.952138mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.42953 {
-        x1=53.267864mm; y1=52.676425mm; x2=53.267864mm; y2=2.78184in; thickness=10.0mil; clearance=20.0mil;
+       ha:line.42966 {
+        x1=2.13653in; y1=54.952138mm; x2=54.102mm; y2=55.118mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.42956 {
-        x1=53.267864mm; y1=2.78184in; x2=53.2638mm; y2=2.782in; thickness=10.0mil; clearance=20.0mil;
+       ha:line.50445 {
+        x1=56.892825mm; y1=1.85242in; x2=58.587132mm; y2=1.85242in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.42963 {
-        x1=2.13653in; y1=52.676425mm; x2=2.13653in; y2=54.952138mm; thickness=10.0mil; clearance=20.0mil;
+       ha:line.50448 {
+        x1=58.587132mm; y1=1.85242in; x2=59.1058mm; y2=1.832in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.42966 {
-        x1=2.13653in; y1=54.952138mm; x2=54.102mm; y2=55.118mm; thickness=10.0mil; clearance=20.0mil;
+       ha:line.50451 {
+        x1=59.1058mm; y1=1.832in; x2=2.861in; y2=1.832in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.50454 {
+        x1=2.861in; y1=1.832in; x2=73.9648mm; y2=1.883in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -28814,7 +28820,7 @@ ha:pcb-rnd-board-v6 {
       color = {#8b2323}
     }
 
-    {ha:GND plane}                    {
+    {ha:GND plane}                      {
      lid=1
      group=5
      ha:combining {     }
@@ -28845,25 +28851,25 @@ ha:pcb-rnd-board-v6 {
         }
        }
        ha:arc.4829 {
-        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-180; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-180.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.4830 {
-        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.4831 {
-        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.4832 {
-        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=0; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=0.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -28887,7 +28893,7 @@ ha:pcb-rnd-board-v6 {
       color = {#3a5fcd}
     }
 
-    {ha:power plane}                    {
+    {ha:power plane}                      {
      lid=2
      group=7
      ha:combining {     }
@@ -29038,25 +29044,25 @@ ha:pcb-rnd-board-v6 {
         }
        }
        ha:arc.5093 {
-        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-180; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-180.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5094 {
-        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5095 {
-        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5096 {
-        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=0; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=0.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -29615,25 +29621,25 @@ ha:pcb-rnd-board-v6 {
         }
        }
        ha:arc.5444 {
-        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-180; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-180.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5445 {
-        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5446 {
-        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5447 {
-        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=0; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=0.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -29730,25 +29736,25 @@ ha:pcb-rnd-board-v6 {
         }
        }
        ha:arc.5486 {
-        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90; adelta=-90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90.000000; adelta=-90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5487 {
-        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=0.0; y=436.0mil; width=328.0mil; height=328.0mil; astart=90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5488 {
-        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=66.421mm; width=328.0mil; height=328.0mil; astart=-90.000000; adelta=90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:arc.5489 {
-        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=90; adelta=-90; thickness=10.0mil; clearance=20.0mil;
+        x=3.087in; y=435.0mil; width=328.0mil; height=328.0mil; astart=90.000000; adelta=-90.000000; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -29757,7 +29763,7 @@ ha:pcb-rnd-board-v6 {
       color = {#548b54}
     }
 
-    {ha:bottom silk}                    {
+    {ha:bottom silk}                      {
      lid=5
      group=12
      ha:combining { auto=1;     }
@@ -29767,7 +29773,7 @@ ha:pcb-rnd-board-v6 {
       color = {#000000}
     }
 
-    {ha:top silk}                    {
+    {ha:top silk}                      {
      lid=6
      group=1
      ha:combining { auto=1;     }
@@ -29785,9 +29791,6 @@ ha:pcb-rnd-board-v6 {
           }
         }
 
-        ha:flags {
-         auto=1
-        }
        }
        ha:polygon.27380 {
         li:geometry {
@@ -29809,9 +29812,6 @@ ha:pcb-rnd-board-v6 {
           }
         }
 
-        ha:flags {
-         auto=1
-        }
        }
        ha:polygon.27395 { clearance=12.0mil;
         li:geometry {
@@ -29884,7 +29884,7 @@ ha:pcb-rnd-board-v6 {
         rot = 0.000000
        }
        ha:text.5514 {
-        string=USB; x=2.877in; y=1.931in; scale=80; fid=0;
+        string=USB; x=2.986in; y=2.112in; scale=80; fid=0;
         ha:flags {
          clearline=1
         }
@@ -30003,7 +30003,7 @@ ha:pcb-rnd-board-v6 {
         rot = 0.000000
        }
        ha:text.42924 {
-        string=Force Bootloader; x=47.3686mm; y=2.8510748in; scale=80; fid=0;
+        string=Force; x=67.9934mm; y=46.4585mm; scale=80; fid=0;
         ha:flags {
          clearline=1
         }
@@ -30016,6 +30016,13 @@ ha:pcb-rnd-board-v6 {
         }
         rot = 0.000000
        }
+       ha:text.50458 {
+        string=Bootloader; x=66.4972mm; y=47.625mm; scale=80; fid=0;
+        ha:flags {
+         clearline=1
+        }
+        rot = 0.000000
+       }
       }
       color = {#000000}
     }
@@ -32081,219 +32088,219 @@ ha:pcb-rnd-board-v6 {
 
  ha:netlists {
    li:input {
+     ha:unnamed_net11 {
+     li:conn { J2-2; U7-11;     }
+     }
     ha:+3.3V {
     li:conn { C2-2; C3-2; C4-2; C36-2; C37-2; C43-2; C44-2; C45-2; C47-2; C171-2; C172-2; C173-1; C221-2; C251-1; C271-1; L600-1; R38-2; R171-1; U1-5; U3-1; U3-5; U3-12; U3-13; U3-15; U3-22; U3-25; U3-27; U3-28; U7-1; U7-24; U7-36; U7-48; U11-2; U13-8;    }
     }
-    ha:alarm_a {
-    li:conn { R13-2; R16-1; U7-40;    }
-    }
-    ha:alarm_b {
-    li:conn { R1-2; R7-1; U7-41;    }
-    }
-    ha:cmp_ldo_in {
-    li:conn { R36-1; R37-2; U13-3; U13-5;    }
-    }
-    ha:cmp_rail {
-    li:conn { R38-1; R39-2; U13-2; U13-6;    }
-    }
-    ha:cs_radio {
-    li:conn { U3-11; U7-13;    }
-    }
-    ha:fet_1 {
-    li:conn { J27-1; Q1-1; R14-1;    }
-    }
+     ha:fet_1 {
+     li:conn { J27-1; Q1-1; R14-1;     }
+     }
      ha:fet_2 {
      li:conn { J29-1; Q3-1; R23-1;     }
      }
-    ha:fet_a {
-    li:conn { J3-1; Q2-5; Q2-6;    }
-    }
-    ha:fet_b {
-    li:conn { J3-3; Q2-7; Q2-8;    }
-    }
-    ha:fire_1 {
-    li:conn { R2-2; R8-1; U7-38;    }
-    }
-     ha:fire_2 {
-     li:conn { R21-2; R22-1; U7-30;     }
+     ha:unnamed_net20 {
+     li:conn { C30-1; U3-31; X1-3;     }
      }
-    ha:GND {
-    li:conn { C2-1; C3-1; C4-1; C30-2; C31-2; C32-2; C33-2; C36-1; C37-1; C39-2; C42-1; C43-1; C44-1; C45-1; C47-1; C171-1; C172-1; C175-1; C210-2; C211-2; C221-1; C251-2; C261-2; C271-2; C291-2; C601-2; C602-2; C610-1; D1-2; D2-2; D4-2; D5-2; D6-2; D7-2; H1-1; H2-1; H3-1; H4-1; J2-1; J5-5; J6-1; J7-5; J8-2; J20-1; L192-2; Q1-2; Q2-1; Q2-3; Q3-2; R1-1; R2-1; R13-1; R15-1; R20-1; R21-1; R24-1; R26-1; R30-1; R37-1; R39-1; U1-2; U3-32; U3-33; U7-8; U7-20; U7-23; U7-35; U7-44; U7-47; U7-GND; U11-3; U13-4; X1-2; X1-4; X2-2; X2-4;    }
-    }
-    ha:led_armed {
-    li:conn { R3-1; U7-46;    }
-    }
+      ha:unnamed_net22 {
+      li:conn { C174-1; L171-2; U3-17;      }
+      }
+      ha:unnamed_net23 {
+      li:conn { C173-2; L171-1; R171-2;      }
+      }
+     ha:unnamed_net21 {
+     li:conn { C31-1; U3-30; X1-1;     }
+     }
+     ha:unnamed_net19 {
+     li:conn { J8-1; L174-2;     }
+     }
+      ha:unnamed_net26 {
+      li:conn { C181-2; L193-1; U3-18;      }
+      }
+      ha:fire_1 {
+      li:conn { R2-2; R8-1; U7-38;      }
+      }
+      ha:fire_2 {
+      li:conn { R21-2; R22-1; U7-30;      }
+      }
+      ha:GND {
+      li:conn { C2-1; C3-1; C4-1; C30-2; C31-2; C32-2; C33-2; C36-1; C37-1; C39-2; C42-1; C43-1; C44-1; C45-1; C47-1; C171-1; C172-1; C175-1; C210-2; C211-2; C221-1; C251-2; C261-2; C271-2; C291-2; C601-2; C602-2; C610-1; D1-2; D2-2; D4-2; D5-2; D6-2; D7-2; H1-1; H2-1; H3-1; H4-1; J2-1; J5-5; J6-1; J7-5; J8-2; J20-1; L192-2; Q1-2; Q2-1; Q2-3; Q3-2; R1-1; R2-1; R13-1; R15-1; R20-1; R21-1; R24-1; R26-1; R30-1; R37-1; R39-1; U1-2; U3-32; U3-33; U7-8; U7-20; U7-23; U7-35; U7-44; U7-47; U7-GND; U11-3; U13-4; X1-2; X1-4; X2-2; X2-4;      }
+      }
+     ha:unnamed_net24 {
+     li:conn { C174-2; C176-1; L172-1;     }
+     }
+      ha:cmp_rail {
+      li:conn { R38-1; R39-2; U13-2; U13-6;      }
+      }
+      ha:unnamed_net1 {
+      li:conn { Q1-3; R8-2; U13-7;      }
+      }
      ha:led_continuity1 {
      li:conn { R4-1; U7-45;     }
      }
-     ha:led_continuity2 {
-     li:conn { R5-1; U7-16;     }
+      ha:led_continuity2 {
+      li:conn { R5-1; U7-16;      }
+      }
+      ha:unnamed_net2 {
+      li:conn { C33-1; U7-6; X2-3;      }
+      }
+      ha:unnamed_net5 {
+      li:conn { J5-2; J7-2; R54-2;      }
+      }
+     ha:unnamed_net27 {
+     li:conn { C175-2; L173-2; L174-1;     }
      }
-    ha:led_rf_green {
-    li:conn { R6-1; U7-14;    }
-    }
-    ha:led_rf_red {
-    li:conn { R10-1; U7-17;    }
-    }
-    ha:led_rf_yellow {
-    li:conn { R9-1; U7-15;    }
-    }
-    ha:miso2 {
-    li:conn { U3-9; U7-27;    }
-    }
-    ha:mosi2 {
-    li:conn { U3-7; U7-28;    }
-    }
-    ha:radio_int {
-    li:conn { U3-4; U7-22;    }
-    }
-    ha:reset_n {
-    li:conn { C610-2; J6-2; U3-2; U7-7; U11-1;    }
-    }
-    ha:sck2 {
-    li:conn { U3-8; U7-26;    }
-    }
-    ha:sense_1 {
-    li:conn { R14-2; R20-2; U7-39;    }
+      ha:mosi2 {
+      li:conn { U3-7; U7-28;      }
+      }
+      ha:unnamed_net6 {
+      li:conn { J5-3; J7-3; R55-2;      }
+      }
+      ha:sense_2 {
+      li:conn { R23-2; R24-2; U7-29;      }
+      }
+      ha:sense_1 {
+      li:conn { R14-2; R20-2; U7-39;      }
+      }
+      ha:unnamed_net32 {
+      li:conn { C231-1; U3-24;      }
+      }
+     ha:unnamed_net3 {
+     li:conn { C32-1; U7-5; X2-1;     }
+     }
+      ha:unnamed_net29 {
+      li:conn { C191-1; L191-1; L192-1; U3-19;      }
+      }
+      ha:unnamed_net35 {
+      li:conn { C291-1; U3-29;      }
+      }
+      ha:unnamed_net25 {
+      li:conn { C176-2; C181-1; L172-2; L173-1;      }
+      }
+      ha:unnamed_net31 {
+      li:conn { C211-1; U3-21;      }
+      }
+      ha:reset_n {
+      li:conn { C610-2; J6-2; U3-2; U7-7; U11-1;      }
+      }
+     ha:unnamed_net28 {
+     li:conn { C210-1; L191-2; L201-1; U3-20;     }
+     }
+      ha:v_ldo_in {
+      li:conn { C39-1; D3-2; R36-2; U1-1;      }
+      }
+      ha:unnamed_net40 {
+      li:conn { D7-1; R10-2;      }
+      }
+      ha:cs_radio {
+      li:conn { U3-11; U7-13;      }
+      }
+      ha:alarm_a {
+      li:conn { R13-2; R16-1; U7-40;      }
+      }
+      ha:alarm_b {
+      li:conn { R1-2; R7-1; U7-41;      }
+      }
+      ha:led_rf_green {
+      li:conn { R6-1; U7-14;      }
+      }
+     ha:unnamed_net33 {
+     li:conn { C231-2; U3-23;     }
+     }
+     ha:unnamed_net34 {
+     li:conn { C261-1; U3-26;     }
+     }
+     ha:unnamed_net47 {
+     li:conn { Q2-2; R7-2;     }
+     }
+     ha:unnamed_net36 {
+     li:conn { R30-2; U3-14;     }
+     }
+     ha:unnamed_net37 {
+     li:conn { C42-2; U3-6;     }
+     }
+     ha:unnamed_net30 {
+     li:conn { C191-2; L193-2; L201-2;     }
+     }
+     ha:unnamed_net39 {
+     li:conn { D5-1; R6-2;     }
+     }
+     ha:usbdm {
+     li:conn { R54-1; U7-32;     }
+     }
+     ha:unnamed_net52 {
+     li:conn { J21-1; J22-1;     }
+     }
+     ha:unnamed_net48 {
+     li:conn { Q2-4; R16-2;     }
+     }
+     ha:fet_a {
+     li:conn { J3-1; Q2-5; Q2-6;     }
+     }
+     ha:fet_b {
+     li:conn { J3-3; Q2-7; Q2-8;     }
+     }
+     ha:unnamed_net43 {
+     li:conn { D1-1; R3-2;     }
+     }
+     ha:radio_int {
+     li:conn { U3-4; U7-22;     }
+     }
+     ha:unnamed_net53 {
+     li:conn { D4-1; R5-2;     }
+     }
+     ha:unnamed_net49 {
+     li:conn { Q3-3; R22-2; U13-1;     }
+     }
+     ha:unnamed_net41 {
+     li:conn { D6-1; R9-2;     }
+     }
+     ha:unnamed_net42 {
+     li:conn { D2-1; R4-2;     }
+     }
+     ha:led_rf_red {
+     li:conn { R10-1; U7-17;     }
+     }
+     ha:sck2 {
+     li:conn { U3-8; U7-26;     }
+     }
+     ha:usbdp {
+     li:conn { R55-1; U7-33;     }
+     }
+     ha:miso2 {
+     li:conn { U3-9; U7-27;     }
+     }
+    ha:cmp_ldo_in {
+    li:conn { R36-1; R37-2; U13-3; U13-5;    }
     }
-     ha:sense_2 {
-     li:conn { R23-2; R24-2; U7-29;     }
+     ha:v_pyro {
+     li:conn { J25-1; J26-1; J28-1; R11-1; R12-2;     }
+     }
+     ha:led_rf_yellow {
+     li:conn { R9-1; U7-15;     }
      }
+    ha:led_armed {
+    li:conn { R3-1; U7-46;    }
+    }
     ha:sense_batt {
     li:conn { R25-1; R26-2; U7-18;    }
     }
+     ha:swclk {
+     li:conn { J6-4; U7-37;     }
+     }
+     ha:vdda {
+     li:conn { C601-1; C602-1; L600-2; U7-9;     }
+     }
+     ha:swdio {
+     li:conn { J6-3; U7-34;     }
+     }
     ha:sense_pyro {
     li:conn { R12-1; R15-2; U7-12;    }
     }
-    ha:swclk {
-    li:conn { J6-4; U7-37;    }
-    }
-    ha:swdio {
-    li:conn { J6-3; U7-34;    }
-    }
-    ha:unnamed_net1 {
-    li:conn { Q1-3; R8-2; U13-7;    }
-    }
-    ha:unnamed_net2 {
-    li:conn { C33-1; U7-6; X2-3;    }
-    }
-    ha:unnamed_net3 {
-    li:conn { C32-1; U7-5; X2-1;    }
-    }
-    ha:unnamed_net5 {
-    li:conn { J5-2; J7-2; R54-2;    }
-    }
-    ha:unnamed_net6 {
-    li:conn { J5-3; J7-3; R55-2;    }
-    }
-    ha:unnamed_net11 {
-    li:conn { J2-2; U7-42;    }
-    }
-    ha:unnamed_net12 {
-    li:conn { J8-1; L174-2;    }
-    }
-    ha:unnamed_net13 {
-    li:conn { C30-1; U3-31; X1-3;    }
-    }
-    ha:unnamed_net14 {
-    li:conn { C31-1; U3-30; X1-1;    }
-    }
-    ha:unnamed_net15 {
-    li:conn { C174-1; L171-2; U3-17;    }
-    }
-    ha:unnamed_net16 {
-    li:conn { C173-2; L171-1; R171-2;    }
-    }
-    ha:unnamed_net17 {
-    li:conn { C174-2; C176-1; L172-1;    }
-    }
-    ha:unnamed_net18 {
-    li:conn { C176-2; C181-1; L172-2; L173-1;    }
-    }
-    ha:unnamed_net19 {
-    li:conn { C181-2; L193-1; U3-18;    }
-    }
-    ha:unnamed_net20 {
-    li:conn { C175-2; L173-2; L174-1;    }
-    }
-    ha:unnamed_net21 {
-    li:conn { C210-1; L191-2; L201-1; U3-20;    }
-    }
-    ha:unnamed_net22 {
-    li:conn { C191-1; L191-1; L192-1; U3-19;    }
-    }
-    ha:unnamed_net23 {
-    li:conn { C191-2; L193-2; L201-2;    }
-    }
-    ha:unnamed_net24 {
-    li:conn { C211-1; U3-21;    }
-    }
-    ha:unnamed_net25 {
-    li:conn { C231-1; U3-24;    }
-    }
-    ha:unnamed_net26 {
-    li:conn { C231-2; U3-23;    }
-    }
-    ha:unnamed_net27 {
-    li:conn { C261-1; U3-26;    }
-    }
-    ha:unnamed_net28 {
-    li:conn { C291-1; U3-29;    }
-    }
-    ha:unnamed_net29 {
-    li:conn { R30-2; U3-14;    }
-    }
-    ha:unnamed_net30 {
-    li:conn { C42-2; U3-6;    }
-    }
-    ha:unnamed_net32 {
-    li:conn { D5-1; R6-2;    }
-    }
-    ha:unnamed_net33 {
-    li:conn { D7-1; R10-2;    }
-    }
-    ha:unnamed_net34 {
-    li:conn { D6-1; R9-2;    }
-    }
-    ha:unnamed_net35 {
-    li:conn { D2-1; R4-2;    }
-    }
-    ha:unnamed_net36 {
-    li:conn { D1-1; R3-2;    }
-    }
-    ha:unnamed_net40 {
-    li:conn { Q2-2; R7-2;    }
-    }
-    ha:unnamed_net41 {
-    li:conn { Q2-4; R16-2;    }
-    }
-    ha:unnamed_net42 {
-    li:conn { Q3-3; R22-2; U13-1;    }
-    }
-    ha:unnamed_net45 {
-    li:conn { J21-1; J22-1;    }
-    }
-    ha:unnamed_net46 {
-    li:conn { D4-1; R5-2;    }
-    }
-    ha:usbdm {
-    li:conn { R54-1; U7-32;    }
-    }
-    ha:usbdp {
-    li:conn { R55-1; U7-33;    }
-    }
-    ha:v_ldo_in {
-    li:conn { C39-1; D3-2; R36-2; U1-1;    }
-    }
     ha:v_lipo {
     li:conn { D3-1; J3-2; J3-4; J23-1; J24-1; R11-2; R25-2;    }
     }
-    ha:v_pyro {
-    li:conn { J25-1; J26-1; J28-1; R11-1; R12-2;    }
-    }
-    ha:vdda {
-    li:conn { C601-1; C602-1; L600-2; U7-9;    }
-    }
    }
  }
  ha:layer_stack {
@@ -32387,6 +32394,7 @@ ha:pcb-rnd-board-v6 {
     min_wid = 0.1524 mm
     bloat = 0.1524 mm
     clearance = 10.00 mil
+     text_font_id = 0
    }
    ha:editor {
     live_routing = true

diff --git a/telefiretwo.sch b/telefiretwo.sch
index dcd13cc20b16816f3384d276f59ab60629daaa01..eec4ccd1a72addae71e118bb8bc8e9ba35e201cf 100644 (file)
--- a/telefiretwo.sch
+++ b/telefiretwo.sch
@@ -1,4 +1,4 @@
-v 20181211 2
+v 20200319 2
 C 40000 40000 0 0 0 title-E.sym
 N 56800 41600 65600 41600 4
 N 59300 41600 59300 43100 4
@@ -377,18 +377,18 @@ C 55300 72300 1 0 0 gnd.sym
 N 55400 73100 55400 72600 4
 N 55400 72600 55100 72600 4
 N 55400 73100 55100 73100 4
-C 46200 66000 1 90 0 capacitor.sym
+C 44900 66000 1 90 0 capacitor.sym
 {
-T 45500 66200 5 10 0 1 90 0 1
+T 44200 66200 5 10 0 1 90 0 1
 device=CAPACITOR
-T 45900 66700 5 10 1 1 180 0 1
+T 44600 66700 5 10 1 1 180 0 1
 refdes=C610
-T 45400 66200 5 10 1 1 0 0 1
+T 44100 66200 5 10 1 1 0 0 1
 value=0.1uF
-T 46200 66000 5 10 0 1 0 0 1
+T 44900 66000 5 10 0 1 0 0 1
 footprint=0402
 }
-C 45900 65700 1 0 0 gnd.sym
+C 44600 65700 1 0 0 gnd.sym
 N 48000 58100 46700 58100 4
 {
 T 46700 58200 5 10 1 1 0 0 1
@@ -1378,7 +1378,7 @@ T 73500 66600 5 10 1 1 0 0 1
 netname=v_pyro
 }
 N 46200 58500 48000 58500 4
-N 44100 56500 44100 55100 4
+N 44100 56100 44100 55100 4
 T 76800 43000 9 24 1 0 0 0 1
 PCB to fit Hammond 1554E2GYSL
 C 47500 55200 1 0 0 nc-left.sym
@@ -1485,18 +1485,18 @@ N 70600 44700 71700 44700 4
 T 70600 44800 5 10 1 1 0 0 1
 netname=v_lipo
 }
-C 43200 57000 1 180 0 conn-2.sym
+C 46400 65200 1 0 1 conn-2.sym
 {
-T 42795 57255 5 10 1 1 180 0 1
+T 45595 65645 5 10 1 1 0 6 1
 refdes=J2
-T 43200 57000 5 10 0 1 180 0 1
+T 46400 65200 5 10 0 1 0 6 1
 footprint=100mil2pin
-T 43200 57000 5 10 0 1 180 0 1
+T 46400 65200 5 10 0 1 0 6 1
 loadstatus=noload
-T 43200 57000 5 10 0 1 180 0 1
+T 46400 65200 5 10 0 1 0 6 1
 device=CONNECTOR
 }
-T 42000 56100 9 10 1 0 0 0 1
+T 45200 66100 9 10 1 0 180 6 1
 Force Bootloader
 C 69600 67100 1 270 0 n-fet.sym
 {
@@ -1829,9 +1829,7 @@ value=NoConnection
 T 47500 59600 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-N 43200 56500 44100 56500 4
 N 44700 55700 44100 55700 4
-N 48000 56900 43200 56900 4
 C 41900 60400 1 0 0 nc-right.sym
 {
 T 42000 60900 5 10 0 0 0 0 1
@@ -2058,11 +2056,11 @@ value=NoConnection
 T 47500 62400 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-C 47500 65200 1 0 0 nc-left.sym
+C 47500 56800 1 0 0 nc-left.sym
 {
-T 47500 65600 5 10 0 0 0 0 1
+T 47500 57200 5 10 0 0 0 0 1
 value=NoConnection
-T 47500 66000 5 10 0 0 0 0 1
+T 47500 57600 5 10 0 0 0 0 1
 device=DRC_Directive
 }
 C 47500 65600 1 0 0 nc-left.sym
@@ -2093,3 +2091,6 @@ value=NoConnection
 T 57600 65900 5 10 0 0 0 0 1
 device=DRC_Directive
 }
+C 47000 65400 1 0 1 gnd.sym
+N 46900 65700 46400 65700 4
+N 46400 65300 48000 65300 4