fix #59 #71

RobertGawron · Jul 14, 2019 · af38e97 · af38e97
1 parent 06ca2f4
commit af38e97
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 38 deletions.
diff --git a/hardware/Sensor/DataAcquisition.sch b/hardware/Sensor/DataAcquisition.sch
@@ -619,8 +619,8 @@ SWIM
 Text Label 10100 5350 0    50   ~ 0
 RST
 Wire Wire Line
-	7600 3700 7350 3700
-Text Label 7350 3700 0    50   ~ 0
+	7600 3700 6950 3700
+Text Label 6550 3700 0    50   ~ 0
 RST
 $Comp
 L power:GND #PWR074
@@ -1175,4 +1175,33 @@ F 3 "~" H 4300 4050 50  0001 C CNN
 	1    4300 4050
 	0    1    1    0   
 $EndComp
+$Comp
+L Device:C C3
+U 1 1 5D2F6D24
+P 6950 4000
+F 0 "C3" V 6698 4000 50  0000 C CNN
+F 1 "10n" V 6789 4000 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6988 3850 50  0001 C CNN
+F 3 "~" H 6950 4000 50  0001 C CNN
+	1    6950 4000
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR05
+U 1 1 5D2F704C
+P 6950 4200
+F 0 "#PWR05" H 6950 3950 50  0001 C CNN
+F 1 "GND" V 6955 4072 50  0000 R CNN
+F 2 "" H 6950 4200 50  0001 C CNN
+F 3 "" H 6950 4200 50  0001 C CNN
+	1    6950 4200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6950 3850 6950 3700
+Connection ~ 6950 3700
+Wire Wire Line
+	6950 3700 6550 3700
+Wire Wire Line
+	6950 4200 6950 4150
 $EndSCHEMATC
diff --git a/hardware/Sensor/chamber.kicad_pcb b/hardware/Sensor/chamber.kicad_pcb
@@ -3,9 +3,9 @@
   (general
     (thickness 1.6)
     (drawings 19)
-    (tracks 661)
+    (tracks 665)
     (zones 0)
-    (modules 99)
+    (modules 100)
     (nets 66)
   )
 
@@ -253,6 +253,42 @@
     (add_net "Net-(R37-Pad1)")
   )
 
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5D2B1C5C)
+    (at 195.58 134.62 270)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5CF2BB44/5D2F6D24)
+    (attr smd)
+    (fp_text reference C3 (at 0 -1.65 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 10n (at 0 1.65 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 45 /DataAcquisition/RST))
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module IonizationChamber:SwitchButtonGeneric (layer F.Cu) (tedit 5CEA7FBF) (tstamp 5CE8AE0C)
     (at 163.195 101.6)
     (path /5D1FFE32)
@@ -3576,7 +3612,7 @@
     (fp_text reference C32 (at 0 -1.65) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 3n2 (at 0 1.65) (layer F.Fab)
+    (fp_text value 3n3 (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0) (layer F.Fab)
@@ -4847,15 +4883,19 @@
   (segment (start 182.978 131.181) (end 184.0078 131.181) (width 0.3048) (layer F.Cu) (net 44))
   (segment (start 184.767598 136.071074) (end 185.856524 137.16) (width 0.3048) (layer F.Cu) (net 44))
   (segment (start 185.856524 137.16) (end 198.898 137.16) (width 0.3048) (layer F.Cu) (net 44))
-  (segment (start 189.016401 135.184401) (end 189.992 136.16) (width 0.3048) (layer F.Cu) (net 45))
-  (segment (start 189.016401 134.087599) (end 189.016401 135.184401) (width 0.3048) (layer F.Cu) (net 45))
-  (segment (start 190.5 132.604) (end 189.016401 134.087599) (width 0.3048) (layer F.Cu) (net 45))
-  (segment (start 190.5 131.121478) (end 190.5 132.604) (width 0.3048) (layer F.Cu) (net 45))
-  (segment (start 188.878 130.531) (end 189.909522 130.531) (width 0.3048) (layer F.Cu) (net 45) (status 10))
-  (segment (start 189.909522 130.531) (end 190.5 131.121478) (width 0.3048) (layer F.Cu) (net 45))
-  (segment (start 189.992 136.16) (end 196.2032 136.16) (width 0.3048) (layer F.Cu) (net 45))
-  (segment (start 196.2032 136.16) (end 197.2192 135.144) (width 0.3048) (layer F.Cu) (net 45))
   (segment (start 197.2192 135.144) (end 198.374 135.144) (width 0.3048) (layer F.Cu) (net 45) (status 20))
+  (segment (start 195.58 135.645) (end 196.587 135.645) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 197.088 135.144) (end 197.2192 135.144) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 196.587 135.645) (end 197.088 135.144) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 194.265 136.16) (end 194.78 135.645) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 189.992 136.16) (end 194.265 136.16) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 194.78 135.645) (end 195.58 135.645) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 188.878 130.531) (end 189.909522 130.531) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 190.5 131.121478) (end 190.5 132.85) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 190.5 132.85) (end 189.016401 134.333599) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 189.016401 134.333599) (end 189.016401 135.184401) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 189.909522 130.531) (end 190.5 131.121478) (width 0.3048) (layer F.Cu) (net 45))
+  (segment (start 189.016401 135.184401) (end 189.992 136.16) (width 0.3048) (layer F.Cu) (net 45))
   (segment (start 195.834 127.524) (end 198.374 130.064) (width 0.3048) (layer F.Cu) (net 46) (status 20))
   (segment (start 191.77 127.016) (end 192.278 127.524) (width 0.3048) (layer F.Cu) (net 46))
   (segment (start 192.278 127.524) (end 195.834 127.524) (width 0.3048) (layer F.Cu) (net 46))
@@ -6030,11 +6070,10 @@
     )
     (filled_polygon
       (pts
-        (xy 190.481188 133.811518) (xy 190.468928 133.936) (xy 190.472 134.35025) (xy 190.63075 134.509) (xy 191.4675 134.509)
-        (xy 191.4675 134.489) (xy 191.7215 134.489) (xy 191.7215 134.509) (xy 191.7415 134.509) (xy 191.7415 134.763)
-        (xy 191.7215 134.763) (xy 191.7215 134.783) (xy 191.4675 134.783) (xy 191.4675 134.763) (xy 190.63075 134.763)
-        (xy 190.472 134.92175) (xy 190.468928 135.336) (xy 190.472533 135.3726) (xy 190.318151 135.3726) (xy 189.803801 134.85825)
-        (xy 189.803801 134.413749) (xy 190.513913 133.703637)
+        (xy 190.472 134.35025) (xy 190.63075 134.509) (xy 191.4675 134.509) (xy 191.4675 134.489) (xy 191.7215 134.489)
+        (xy 191.7215 134.509) (xy 191.7415 134.509) (xy 191.7415 134.763) (xy 191.7215 134.763) (xy 191.7215 134.783)
+        (xy 191.4675 134.783) (xy 191.4675 134.763) (xy 190.63075 134.763) (xy 190.472 134.92175) (xy 190.468928 135.336)
+        (xy 190.472533 135.3726) (xy 190.318151 135.3726) (xy 189.803801 134.85825) (xy 189.803801 134.659749) (xy 190.46936 133.994191)
       )
     )
     (filled_polygon
@@ -6046,25 +6085,26 @@
         (xy 198.521 132.731) (xy 198.501 132.731) (xy 198.501 132.751) (xy 198.247 132.751) (xy 198.247 132.731)
         (xy 197.053845 132.731) (xy 196.932524 132.96089) (xy 196.977175 133.108099) (xy 197.102359 133.37092) (xy 197.276412 133.604269)
         (xy 197.360466 133.680034) (xy 197.27982 133.704498) (xy 197.169506 133.763463) (xy 197.072815 133.842815) (xy 196.993463 133.939506)
-        (xy 196.934498 134.04982) (xy 196.898188 134.169518) (xy 196.885928 134.294) (xy 196.885928 134.429315) (xy 196.779627 134.486134)
-        (xy 196.730398 134.526536) (xy 196.659731 134.584531) (xy 196.635077 134.614572) (xy 195.87705 135.3726) (xy 194.545271 135.3726)
-        (xy 194.578128 135.264285) (xy 194.595072 135.09225) (xy 194.595072 134.366962) (xy 194.5984 134.333173) (xy 194.5984 134.333163)
-        (xy 194.602208 134.2945) (xy 194.5984 134.255837) (xy 194.5984 133.300968) (xy 194.629387 133.284405) (xy 194.763962 133.173962)
-        (xy 194.874405 133.039387) (xy 194.956472 132.885851) (xy 195.007008 132.719255) (xy 195.024072 132.546001) (xy 195.024072 131.645999)
-        (xy 195.007008 131.472745) (xy 194.956472 131.306149) (xy 194.874405 131.152613) (xy 194.763962 131.018038) (xy 194.629387 130.907595)
-        (xy 194.475851 130.825528) (xy 194.309255 130.774992) (xy 194.136001 130.757928) (xy 193.485999 130.757928) (xy 193.312745 130.774992)
-        (xy 193.146149 130.825528) (xy 192.992613 130.907595) (xy 192.858038 131.018038) (xy 192.786 131.105816) (xy 192.713962 131.018038)
-        (xy 192.579387 130.907595) (xy 192.425851 130.825528) (xy 192.259255 130.774992) (xy 192.086001 130.757928) (xy 191.9224 130.757928)
-        (xy 191.9224 130.495143) (xy 191.926208 130.456478) (xy 191.9224 130.417813) (xy 191.9224 130.417805) (xy 191.919275 130.386072)
-        (xy 192.095001 130.386072) (xy 192.268255 130.369008) (xy 192.434851 130.318472) (xy 192.588387 130.236405) (xy 192.722962 130.125962)
-        (xy 192.728342 130.119406) (xy 192.793815 130.199185) (xy 192.890506 130.278537) (xy 193.00082 130.337502) (xy 193.120518 130.373812)
-        (xy 193.245 130.386072) (xy 193.53425 130.383) (xy 193.693 130.22425) (xy 193.693 129.175) (xy 193.947 129.175)
-        (xy 193.947 130.22425) (xy 194.10575 130.383) (xy 194.395 130.386072) (xy 194.519482 130.373812) (xy 194.63918 130.337502)
-        (xy 194.749494 130.278537) (xy 194.846185 130.199185) (xy 194.925537 130.102494) (xy 194.984502 129.99218) (xy 195.020812 129.872482)
-        (xy 195.033072 129.748) (xy 195.03 129.33375) (xy 194.87125 129.175) (xy 193.947 129.175) (xy 193.693 129.175)
-        (xy 193.673 129.175) (xy 193.673 128.921) (xy 193.693 128.921) (xy 193.693 128.901) (xy 193.947 128.901)
-        (xy 193.947 128.921) (xy 194.87125 128.921) (xy 195.03 128.76225) (xy 195.033072 128.348) (xy 195.029467 128.3114)
-        (xy 195.50785 128.3114)
+        (xy 196.934498 134.04982) (xy 196.917394 134.106203) (xy 196.915 133.88075) (xy 196.75625 133.722) (xy 195.707 133.722)
+        (xy 195.707 133.742) (xy 195.453 133.742) (xy 195.453 133.722) (xy 195.433 133.722) (xy 195.433 133.468)
+        (xy 195.453 133.468) (xy 195.453 132.54375) (xy 195.707 132.54375) (xy 195.707 133.468) (xy 196.75625 133.468)
+        (xy 196.915 133.30925) (xy 196.918072 133.02) (xy 196.905812 132.895518) (xy 196.869502 132.77582) (xy 196.810537 132.665506)
+        (xy 196.731185 132.568815) (xy 196.634494 132.489463) (xy 196.52418 132.430498) (xy 196.404482 132.394188) (xy 196.28 132.381928)
+        (xy 195.86575 132.385) (xy 195.707 132.54375) (xy 195.453 132.54375) (xy 195.29425 132.385) (xy 195.024072 132.382996)
+        (xy 195.024072 131.645999) (xy 195.007008 131.472745) (xy 194.956472 131.306149) (xy 194.874405 131.152613) (xy 194.763962 131.018038)
+        (xy 194.629387 130.907595) (xy 194.475851 130.825528) (xy 194.309255 130.774992) (xy 194.136001 130.757928) (xy 193.485999 130.757928)
+        (xy 193.312745 130.774992) (xy 193.146149 130.825528) (xy 192.992613 130.907595) (xy 192.858038 131.018038) (xy 192.786 131.105816)
+        (xy 192.713962 131.018038) (xy 192.579387 130.907595) (xy 192.425851 130.825528) (xy 192.259255 130.774992) (xy 192.086001 130.757928)
+        (xy 191.9224 130.757928) (xy 191.9224 130.495143) (xy 191.926208 130.456478) (xy 191.9224 130.417813) (xy 191.9224 130.417805)
+        (xy 191.919275 130.386072) (xy 192.095001 130.386072) (xy 192.268255 130.369008) (xy 192.434851 130.318472) (xy 192.588387 130.236405)
+        (xy 192.722962 130.125962) (xy 192.728342 130.119406) (xy 192.793815 130.199185) (xy 192.890506 130.278537) (xy 193.00082 130.337502)
+        (xy 193.120518 130.373812) (xy 193.245 130.386072) (xy 193.53425 130.383) (xy 193.693 130.22425) (xy 193.693 129.175)
+        (xy 193.947 129.175) (xy 193.947 130.22425) (xy 194.10575 130.383) (xy 194.395 130.386072) (xy 194.519482 130.373812)
+        (xy 194.63918 130.337502) (xy 194.749494 130.278537) (xy 194.846185 130.199185) (xy 194.925537 130.102494) (xy 194.984502 129.99218)
+        (xy 195.020812 129.872482) (xy 195.033072 129.748) (xy 195.03 129.33375) (xy 194.87125 129.175) (xy 193.947 129.175)
+        (xy 193.693 129.175) (xy 193.673 129.175) (xy 193.673 128.921) (xy 193.693 128.921) (xy 193.693 128.901)
+        (xy 193.947 128.901) (xy 193.947 128.921) (xy 194.87125 128.921) (xy 195.03 128.76225) (xy 195.033072 128.348)
+        (xy 195.029467 128.3114) (xy 195.50785 128.3114)
       )
     )
     (filled_polygon

diff --git a/hardware/Sensor/chamber.sch b/hardware/Sensor/chamber.sch
@@ -849,7 +849,7 @@ L Device:C C32
 U 1 1 5CD8CBD9
 P 1400 2750
 F 0 "C32" H 1285 2796 50  0000 R CNN
-F 1 "3n2" H 1285 2705 50  0000 R CNN
+F 1 "3n3" H 1285 2705 50  0000 R CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 1438 2600 50  0001 C CNN
 F 3 "~" H 1400 2750 50  0001 C CNN
 	1    1400 2750