shuffle screw terminal order to ease wiring of arm/fire switches

diff --git a/Notebook b/Notebook
index a83143555991d982404efe84794e02eb74dfa8c6..0cc11283591154a580a4a2be10a5dead1c858039 100644 (file)
--- a/Notebook
+++ b/Notebook
@@ -11,7 +11,8 @@ connect all of them to pin 4, the gpio driving the circuit.
 
 The net effect is that we're making 12V from the gpio, which means all the LED
 current and switcher inefficiency is coming as current through that gpio.  The
-measured LED current is around 7mA, so this is "safe" for the SOC, but really
-not a great plan... 
+measured LED current is around 7mA, so this is "safe" for the SOC, but leaves
+less engineering margin than we usually like.
 
-Need to redesign this in the future to use a transistor/FET switch.
+Changing the circuit to be powered from v_lipo with the gpio hooked to shdn*
+and controlling a FET switch on the output might be smarter someday?

diff --git a/telelco.lht b/telelco.lht
index 4987d8b00d6b3415e1436f3ce9c637f6db541270..97c67accf30ba6678af16250177b3449803c24c2 100644 (file)
--- a/telelco.lht
+++ b/telelco.lht
@@ -1247,6 +1247,15 @@ ha:pcb-rnd-board-v5 {
       li:thermal {
       }
      }
+     ha:padstack_ref.26478 {
+      proto=0; x=67.183mm; y=2.734in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
      ha:subc.97 {
       ha:attributes {
        {io_pcb::hidename_y}=55.9994 mm
@@ -12724,13 +12733,15 @@ ha:pcb-rnd-board-v5 {
         }
 
         li:thermal {
+           li:0 {
+            diag  
+            round  
+           }
           li:1 {
-           on  
            diag  
            round  
           }
           li:3 {
-           on  
            diag  
            round  
           }
@@ -12748,6 +12759,16 @@ ha:pcb-rnd-board-v5 {
         }
 
         li:thermal {
+          li:1 {
+           on  
+           diag  
+           round  
+          }
+          li:3 {
+           on  
+           diag  
+           round  
+          }
         }
 
         ha:attributes {
@@ -12820,25 +12841,29 @@ ha:pcb-rnd-board-v5 {
            ha:attributes {
              subc-role=pnp-origin
            }
-          }
+ ha:flags ={ selected=1
+ };          }
           ha:line.1113 {
            x1=61.9999mm; y1=72.6961mm; x2=61.9999mm; y2=72.6961mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
-          }
+ ha:flags ={ selected=1
+ };          }
           ha:line.1116 {
            x1=61.9999mm; y1=72.6961mm; x2=61.9999mm; y2=71.6961mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
-          }
+ ha:flags ={ selected=1
+ };          }
           ha:line.1119 {
            x1=61.9999mm; y1=72.6961mm; x2=60.9999mm; y2=72.6961mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
-          }
+ ha:flags ={ selected=1
+ };          }
          }
          ha:type {
           top = 1
@@ -32588,6 +32613,12 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
+       ha:line.26491 {
+        x1=73.660024mm; y1=75.94603mm; x2=67.157594mm; y2=2.734in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
       }
       color = {#8b2323}
     }
@@ -33204,13 +33235,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.4703 {
-        x1=2.951in; y1=1.939in; x2=2.951in; y2=2.939in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.4706 {
-        x1=2.951in; y1=2.939in; x2=73.66mm; y2=2.99in; thickness=10.0mil; clearance=20.0mil;
+        x1=2.951in; y1=1.939in; x2=2.951in; y2=2.738in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33299,12 +33324,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.4751 {
-        x1=76.835mm; y1=2.915in; x2=3.1in; y2=2.99in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.4754 {
         x1=69.7738mm; y1=1.411in; x2=69.7738mm; y2=2.508in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -33317,18 +33336,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.4760 {
-        x1=2.644in; y1=1.64in; x2=2.644in; y2=2.934in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.4763 {
-        x1=2.644in; y1=2.934in; x2=2.7in; y2=2.99in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.4766 {
         x1=2.447in; y1=1.423in; x2=2.447in; y2=2.483in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -33701,6 +33708,48 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
+       ha:line.26442 {
+        x1=76.835mm; y1=2.883in; x2=76.835mm; y2=75.311054mm; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26445 {
+        x1=76.835mm; y1=75.311054mm; x2=76.200024mm; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26463 {
+        x1=68.580024mm; y1=75.94603mm; x2=68.580024mm; y2=75.920576mm; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26466 {
+        x1=68.580024mm; y1=75.920576mm; x2=2.951in; y2=2.738in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26469 {
+        x1=2.951in; y1=2.738in; x2=2.944in; y2=2.745in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.4760 {
+        x1=2.644in; y1=1.64in; x2=2.644in; y2=2.733in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26494 {
+        x1=2.644in; y1=2.733in; x2=67.183mm; y2=2.734in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
        ha:polygon.4919 {
         li:geometry {
           ta:contour {
@@ -33765,7 +33814,7 @@ ha:pcb-rnd-board-v5 {
       color = {#548b54}
     }
 
-    {ha:bottom silk}          {
+    {ha:bottom silk}              {
      lid=5
      group=12
      ha:combining { auto=1;     }
@@ -33986,7 +34035,7 @@ ha:pcb-rnd-board-v5 {
       color = {#000000}
     }
 
-    {ha:top silk}          {
+    {ha:top silk}              {
      lid=6
      group=1
      ha:combining { auto=1;     }
@@ -34072,7 +34121,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4974 {
-        string=Arm; x=76.1238mm; y=2.803in; scale=100; fid=0; direction=0;
+        string=Arm; x=76.2254mm; y=2.801in; scale=100; fid=0; direction=0;
         ha:flags {
          clearline=1
         }
@@ -34096,7 +34145,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4978 {
-        string=Fire LED; x=2.745in; y=2.803in; scale=100; fid=0; direction=0;
+        string=Fire LED; x=2.629in; y=2.798in; scale=100; fid=0; direction=0;
         ha:flags {
          clearline=1
         }
@@ -34113,12 +34162,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:text.4981 {
-        string=Fire; x=65.9892mm; y=2.803in; scale=100; fid=0; direction=0;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:text.4982 {
         string=Mode; x=1.119in; y=2.797in; scale=100; fid=0; direction=0;
         ha:flags {
@@ -34161,6 +34204,12 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
+       ha:text.4981 {
+        string=Fire; x=73.0504mm; y=2.796in; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
       }
       color = {#000000}
     }
@@ -36234,7 +36283,7 @@ ha:pcb-rnd-board-v5 {
     li:conn { C37-2; C43-2; C44-2; C45-2; C47-2; C171-2; C172-2; C173-1; C221-2; C251-1; C271-1; C604-2; C605-2; C606-2; C607-2; J9-7; J100-6; L600-1; R1-2; R2-2; R171-1; U1-5; U6-1; U6-5; U6-12; U6-13; U6-15; U6-22; U6-25; U6-27; U6-28; U7-11; U7-28; U7-50; U7-75; U7-100;    }
     }
     ha:arm {
-    li:conn { J2-3; R21-2;    }
+    li:conn { J2-4; R21-2;    }
     }
     ha:armed {
     li:conn { R54-2; U7-42;    }
@@ -36294,16 +36343,16 @@ ha:pcb-rnd-board-v5 {
     li:conn { J100-3; U7-44;    }
     }
     ha:fire {
-    li:conn { J2-7; R20-1;    }
+    li:conn { J2-5; R20-1;    }
     }
     ha:fire12V {
-    li:conn { C2-1; D8-2; J2-5; R32-1;    }
+    li:conn { C2-1; D8-2; J2-7; R32-1;    }
     }
     ha:fire_led {
     li:conn { C1-1; L1-1; R31-1; U3-4; U3-5; U7-30;    }
     }
      ha:GND {
-     li:conn { B1-2; C1-2; C2-2; C5-1; C6-1; C7-1; C30-2; C31-2; C32-2; C33-2; C37-1; C38-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; C603-1; C604-1; C605-1; C606-1; C607-1; C610-1; D3-2; D4-2; D5-2; D6-2; D7-2; D9-2; D10-2; D11-2; D12-2; D13-2; D14-2; D15-2; D16-2; D17-2; D18-2; H1-1; H2-1; H3-1; H4-1; H5-1; H6-1; J1-4; J1-5; J2-4; J2-6; J2-8; J3-1; J4-2; J4-4; J4-6; J4-8; J8-2; J9-1; J100-1; J100-2; L192-2; R4-1; R14-1; R15-1; R30-1; R31-2; R33-2; U1-2; U2-2; U3-2; U6-32; U6-33; U7-10; U7-19; U7-20; U7-27; U7-37; U7-49; U7-74; U7-94; U7-99; U8-1; X1-2; X1-4; X2-2; X2-4;     }
+     li:conn { B1-2; C1-2; C2-2; C5-1; C6-1; C7-1; C30-2; C31-2; C32-2; C33-2; C37-1; C38-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; C603-1; C604-1; C605-1; C606-1; C607-1; C610-1; D3-2; D4-2; D5-2; D6-2; D7-2; D9-2; D10-2; D11-2; D12-2; D13-2; D14-2; D15-2; D16-2; D17-2; D18-2; H1-1; H2-1; H3-1; H4-1; H5-1; H6-1; J1-4; J1-5; J2-3; J2-6; J2-8; J3-1; J4-2; J4-4; J4-6; J4-8; J8-2; J9-1; J100-1; J100-2; L192-2; R4-1; R14-1; R15-1; R30-1; R31-2; R33-2; U1-2; U2-2; U3-2; U6-32; U6-33; U7-10; U7-19; U7-20; U7-27; U7-37; U7-49; U7-74; U7-94; U7-99; U8-1; X1-2; X1-4; X2-2; X2-4;     }
      }
     ha:miso2 {
     li:conn { J9-4; U6-9; U7-84;    }

diff --git a/telelco.sch b/telelco.sch
index e0db99b2133cbfd23afb520a2ecb1282f6b4c977..df86640c3e3540bddeacf5ae141a782e72567671 100644 (file)
--- a/telelco.sch
+++ b/telelco.sch
@@ -1188,19 +1188,19 @@ N 42400 53000 41200 53000 4
 T 41200 53100 5 10 1 1 0 0 1
 netname=v_lipo
 }
-N 42400 52600 41200 52600 4
+N 42400 52200 41200 52200 4
 {
-T 41200 52700 5 10 1 1 0 0 1
+T 41200 52300 5 10 1 1 0 0 1
 netname=arm
 }
-N 42400 51000 41200 51000 4
+N 42400 51800 41200 51800 4
 {
-T 41200 51100 5 10 1 1 0 0 1
+T 41200 51900 5 10 1 1 0 0 1
 netname=fire
 }
 N 42400 51400 41800 51400 4
-N 41800 50000 41800 52200 4
-N 41800 52200 42400 52200 4
+N 41800 50000 41800 52600 4
+N 41800 52600 42400 52600 4
 C 41900 49700 1 0 1 gnd.sym
 N 50600 48100 53000 48100 4
 N 53000 48100 53000 48800 4
@@ -2268,20 +2268,20 @@ N 61600 61100 62100 61100 4
 N 61600 61500 62100 61500 4
 N 44200 60300 44200 59900 4
 N 62100 60400 62100 61500 4
-T 43400 50700 9 10 1 0 0 0 13
-On / Off
+T 43300 50900 9 10 1 0 0 0 13
+--On / Off
+/
 
 
 
-Safe / Arm
 
+Arm
 
-
-Fire LED (in button)
+Fire
 
 
 
-Fire
+Fire LED (in button)
 C 47200 47200 1 180 1 led.sym
 {
 T 47100 46600 5 10 0 0 180 6 1
@@ -2646,9 +2646,9 @@ T 42400 50100 5 10 0 1 0 0 1
 device=CONNECTOR
 }
 N 41800 50600 42400 50600 4
-N 42400 51800 41200 51800 4
+N 42400 51000 41200 51000 4
 {
-T 41200 51900 5 10 1 1 0 0 1
+T 41200 51100 5 10 1 1 0 0 1
 netname=fire12V
 }
 C 61200 60600 1 0 0 led.sym