1 files changed, 109 insertions, 98 deletions
diff --git a/analog-driver/driver.kicad_pcb b/analog-driver/driver.kicad_pcb
index e743475..4b9ff71 100644
--- a/analog-driver/driver.kicad_pcb
+++ b/analog-driver/driver.kicad_pcb
@@ -2,18 +2,18 @@
 
   (general
     (thickness 1.6)
-    (drawings 27)
+    (drawings 33)
     (tracks 39)
     (zones 0)
     (modules 17)
-    (nets 10)
+    (nets 8)
   )
 
   (page USLetter)
   (title_block
     (title "Digital Photoreactor Driver")
-    (date 2021-01-29)
-    (rev 1.0.0)
+    (date 2021-03-05)
+    (rev B)
     (company "University of Wisconsin-Madison")
     (comment 1 "Department of Chemistry")
     (comment 2 "Gellman Group")
@@ -111,8 +111,6 @@
   (net 5 "Net-(J7-Pad2)")
   (net 6 "Net-(R2-Pad1)")
   (net 7 "Net-(R1-Pad2)")
-  (net 8 "Net-(J5-Pad4)")
-  (net 9 "Net-(J5-Pad3)")
 
   (net_class Default "This is the default net class."
     (clearance 0.381)
@@ -124,8 +122,6 @@
     (add_net +12V)
     (add_net GND)
     (add_net "Net-(D1-Pad2)")
-    (add_net "Net-(J5-Pad3)")
-    (add_net "Net-(J5-Pad4)")
     (add_net "Net-(J7-Pad1)")
     (add_net "Net-(J7-Pad2)")
     (add_net "Net-(R1-Pad2)")
@@ -201,10 +197,10 @@
     (tags "resistor handsolder")
     (path /60156E27)
     (attr smd)
-    (fp_text reference R2 (at 0 -1.905 90) (layer F.SilkS)
+    (fp_text reference R2 (at 1.27 -1.905 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 470 (at 0 1.82 90) (layer F.Fab)
+    (fp_text value 100 (at 0 1.82 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 2.45 1.12) (end -2.45 1.12) (layer F.CrtYd) (width 0.05))
@@ -220,9 +216,9 @@
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (pad 2 smd roundrect (at 1.55 0 270) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923076923076923)
+    (pad 2 smd roundrect (at 1.55 0 270) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923069230769231)
       (net 1 GND))
-    (pad 1 smd roundrect (at -1.55 0 270) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923076923076923)
+    (pad 1 smd roundrect (at -1.55 0 270) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923069230769231)
       (net 6 "Net-(R2-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1206_3216Metric.wrl
       (at (xyz 0 0 0))
@@ -237,10 +233,10 @@
     (tags "resistor handsolder")
     (path /6015726B)
     (attr smd)
-    (fp_text reference R1 (at 0 1.905 90) (layer F.SilkS)
+    (fp_text reference R1 (at -1.27 1.905 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10k (at 0 1.82 90) (layer F.Fab)
+    (fp_text value 6.8k (at 0 1.82 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 2.45 1.12) (end -2.45 1.12) (layer F.CrtYd) (width 0.05))
@@ -256,9 +252,9 @@
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (pad 2 smd roundrect (at 1.55 0 90) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923076923076923)
+    (pad 2 smd roundrect (at 1.55 0 90) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923069230769231)
       (net 7 "Net-(R1-Pad2)"))
-    (pad 1 smd roundrect (at -1.55 0 90) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923076923076923)
+    (pad 1 smd roundrect (at -1.55 0 90) (size 1.3 1.75) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1923069230769231)
       (net 2 +12V))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1206_3216Metric.wrl
       (at (xyz 0 0 0))
@@ -268,12 +264,12 @@
   )
 
   (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 6011E889)
-    (at 148.59 87.9725 270)
+    (at 148.59 87.63 270)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /600F4EFC)
     (attr smd)
-    (fp_text reference C2 (at 0 -1.85 90) (layer F.SilkS)
+    (fp_text reference C2 (at 0 -1.85 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 10u (at 0 1.85 90) (layer F.Fab)
@@ -292,9 +288,9 @@
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1886784905660377)
+    (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1886777358490566)
       (net 1 GND))
-    (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1886784905660377)
+    (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.1886777358490566)
       (net 2 +12V))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
       (at (xyz 0 0 0))
@@ -306,7 +302,7 @@
   (module footprints:TRIM_3362P-1-202TLF (layer F.Cu) (tedit 6011D7E3) (tstamp 6011E0DE)
     (at 97.79 86.36)
     (path /60152C38)
-    (fp_text reference RV1 (at 0 0.635) (layer F.SilkS)
+    (fp_text reference RV1 (at 0 0.635) (layer F.SilkS) hide
       (effects (font (size 1.002756 1.002756) (thickness 0.015)))
     )
     (fp_text value 2.2k (at 8.68646 4.67565) (layer F.Fab)
@@ -341,7 +337,7 @@
     (tags "resistor handsolder")
     (path /60212114)
     (attr smd)
-    (fp_text reference R5 (at 0 -1.905) (layer F.SilkS)
+    (fp_text reference R5 (at 0 -1.905) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 1k (at 0 1.82) (layer F.Fab)
@@ -1348,10 +1344,8 @@
     (fp_text user %R (at 0 3.81 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 4 thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 8 "Net-(J5-Pad4)"))
-    (pad 3 thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 9 "Net-(J5-Pad3)"))
+    (pad 4 thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+    (pad 3 thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
     (pad 2 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 +12V))
     (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
@@ -1403,7 +1397,25 @@
     )
   )
 
-  (gr_text "DIM\n0 to 2.5 V\n0 to 100 %" (at 89.535 88.9 270) (layer F.SilkS)
+  (gr_text 10μF (at 150.495 87.63 90) (layer F.SilkS) (tstamp 60425657)
+    (effects (font (size 1 1) (thickness 0.15875)))
+  )
+  (gr_text 1K (at 135.89 92.075) (layer F.SilkS) (tstamp 604254DD)
+    (effects (font (size 1 1) (thickness 0.15875)))
+  )
+  (gr_text 6.8K (at 99.695 93.345 90) (layer F.SilkS) (tstamp 603FF2F7)
+    (effects (font (size 1 1) (thickness 0.15875)))
+  )
+  (gr_text 100 (at 94.615 93.345 90) (layer F.SilkS) (tstamp 603FF2E2)
+    (effects (font (size 1 1) (thickness 0.15875)))
+  )
+  (gr_text BLU (at 148.59 99.06 90) (layer F.SilkS) (tstamp 603FEE63)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (gr_text "BLAISE THOMPSON\nUW-MADSION" (at 148.59 82.55) (layer B.SilkS) (tstamp 603FEB30)
+    (effects (font (size 1 1) (thickness 0.25)) (justify mirror))
+  )
+  (gr_text "DIM\n0.5 to 2.5 V\n20 to 100 %" (at 89.535 89.535 270) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (gr_text DIM (at 92.71 82.55) (layer F.SilkS) (tstamp 60144D91)
@@ -1418,13 +1430,13 @@
   (gr_text FAN (at 143.51 102.87 90) (layer F.SilkS) (tstamp 600F4C1E)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text GND (at 148.59 106.68 90) (layer F.SilkS)
+  (gr_text BLK (at 148.59 106.68 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text - (at 113.03 85.09) (layer F.SilkS)
+  (gr_text + (at 113.03 85.09) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text + (at 115.57 85.09) (layer F.SilkS)
+  (gr_text - (at 115.57 85.09) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (gr_text POWER (at 135.89 101.6) (layer F.SilkS)
@@ -1453,8 +1465,8 @@
   (gr_arc (start 88.9 106.68) (end 86.36 106.68) (angle -90) (layer Edge.Cuts) (width 0.1))
   (gr_arc (start 165.1 106.68) (end 165.1 109.22) (angle -90) (layer Edge.Cuts) (width 0.1))
   (gr_arc (start 165.1 81.28) (end 167.64 81.28) (angle -90) (layer Edge.Cuts) (width 0.1))
-  (gr_text "REVISION 1.0.0\nJANUARY 2021" (at 142.24 82.55) (layer B.SilkS) (tstamp 5FE1CECA)
-    (effects (font (size 1 1) (thickness 0.25)) (justify mirror))
+  (gr_text "REVISION B\nMARCH 2021" (at 148.59 82.55) (layer F.SilkS) (tstamp 5FE1CECA)
+    (effects (font (size 1 1) (thickness 0.25)))
   )
 
   (segment (start 158.75 101.6) (end 158.75 102.87) (width 0.889) (layer F.Cu) (net 2))
@@ -1521,16 +1533,16 @@
         (xy 120.081445 85.196457) (xy 120.133148 85.230808) (xy 120.184384 85.26589) (xy 120.192797 85.270439) (xy 120.630493 85.503166)
         (xy 120.687882 85.52682) (xy 120.744958 85.551283) (xy 120.754095 85.554111) (xy 121.228659 85.69739) (xy 121.289577 85.709452)
         (xy 121.350289 85.722357) (xy 121.359801 85.723357) (xy 121.853156 85.771731) (xy 121.853163 85.771731) (xy 121.886353 85.775)
-        (xy 132.113647 85.775) (xy 132.144018 85.772009) (xy 132.159815 85.772119) (xy 132.169334 85.771186) (xy 132.394686 85.7475)
-        (xy 147.051928 85.7475) (xy 147.055 86.12425) (xy 147.21375 86.283) (xy 148.463 86.283) (xy 148.463 85.27125)
-        (xy 148.717 85.27125) (xy 148.717 86.283) (xy 149.96625 86.283) (xy 150.125 86.12425) (xy 150.128072 85.7475)
-        (xy 150.115812 85.623018) (xy 150.079502 85.50332) (xy 150.020537 85.393006) (xy 149.941185 85.296315) (xy 149.844494 85.216963)
-        (xy 149.73418 85.157998) (xy 149.614482 85.121688) (xy 149.49 85.109428) (xy 148.87575 85.1125) (xy 148.717 85.27125)
-        (xy 148.463 85.27125) (xy 148.30425 85.1125) (xy 147.69 85.109428) (xy 147.565518 85.121688) (xy 147.44582 85.157998)
-        (xy 147.335506 85.216963) (xy 147.238815 85.296315) (xy 147.159463 85.393006) (xy 147.100498 85.50332) (xy 147.064188 85.623018)
-        (xy 147.051928 85.7475) (xy 132.394686 85.7475) (xy 132.66234 85.719368) (xy 132.723121 85.706891) (xy 132.784142 85.695251)
-        (xy 132.793298 85.692487) (xy 133.266851 85.545897) (xy 133.324097 85.521833) (xy 133.381648 85.498581) (xy 133.390089 85.494093)
-        (xy 133.390094 85.494091) (xy 133.390098 85.494088) (xy 133.826153 85.258314) (xy 133.877616 85.223602) (xy 133.929573 85.189602)
+        (xy 132.113647 85.775) (xy 132.144018 85.772009) (xy 132.159815 85.772119) (xy 132.169334 85.771186) (xy 132.66234 85.719368)
+        (xy 132.723121 85.706891) (xy 132.784142 85.695251) (xy 132.793298 85.692487) (xy 133.266851 85.545897) (xy 133.324097 85.521833)
+        (xy 133.381648 85.498581) (xy 133.390089 85.494093) (xy 133.390094 85.494091) (xy 133.390098 85.494088) (xy 133.554862 85.405)
+        (xy 147.051928 85.405) (xy 147.055 85.78175) (xy 147.21375 85.9405) (xy 148.463 85.9405) (xy 148.463 84.92875)
+        (xy 148.717 84.92875) (xy 148.717 85.9405) (xy 149.96625 85.9405) (xy 150.125 85.78175) (xy 150.128072 85.405)
+        (xy 150.115812 85.280518) (xy 150.079502 85.16082) (xy 150.020537 85.050506) (xy 149.941185 84.953815) (xy 149.844494 84.874463)
+        (xy 149.73418 84.815498) (xy 149.614482 84.779188) (xy 149.49 84.766928) (xy 148.87575 84.77) (xy 148.717 84.92875)
+        (xy 148.463 84.92875) (xy 148.30425 84.77) (xy 147.69 84.766928) (xy 147.565518 84.779188) (xy 147.44582 84.815498)
+        (xy 147.335506 84.874463) (xy 147.238815 84.953815) (xy 147.159463 85.050506) (xy 147.100498 85.16082) (xy 147.064188 85.280518)
+        (xy 147.051928 85.405) (xy 133.554862 85.405) (xy 133.826153 85.258314) (xy 133.877616 85.223602) (xy 133.929573 85.189602)
         (xy 133.936985 85.183557) (xy 134.318945 84.867573) (xy 134.362712 84.8235) (xy 134.40705 84.78008) (xy 134.413147 84.772711)
         (xy 134.726457 84.388555) (xy 134.760808 84.336852) (xy 134.79589 84.285616) (xy 134.800439 84.277203) (xy 134.925683 84.041653)
         (xy 163.152952 84.041653) (xy 163.308962 84.357214) (xy 163.683745 84.54802) (xy 164.088551 84.662044) (xy 164.507824 84.694902)
@@ -1608,33 +1620,32 @@
         (xy 162.806637 87.539017) (xy 162.618556 87.8205) (xy 158.803021 87.8205) (xy 158.749999 87.815278) (xy 158.696978 87.8205)
         (xy 158.696971 87.8205) (xy 158.538381 87.83612) (xy 158.334894 87.897847) (xy 158.14736 87.998086) (xy 157.982985 88.132985)
         (xy 157.949178 88.174179) (xy 154.055001 92.068357) (xy 150.795827 88.809185) (xy 150.762015 88.767985) (xy 150.59764 88.633086)
-        (xy 150.410106 88.532847) (xy 150.206619 88.47112) (xy 150.048029 88.4555) (xy 149.995 88.450277) (xy 149.941971 88.4555)
-        (xy 149.820394 88.4555) (xy 149.733387 88.384095) (xy 149.579851 88.302028) (xy 149.413255 88.251492) (xy 149.240001 88.234428)
-        (xy 147.939999 88.234428) (xy 147.766745 88.251492) (xy 147.600149 88.302028) (xy 147.446613 88.384095) (xy 147.359606 88.4555)
-        (xy 141.667354 88.4555) (xy 141.578676 88.396247) (xy 141.344821 88.299381) (xy 141.096561 88.25) (xy 140.843439 88.25)
-        (xy 140.595179 88.299381) (xy 140.361324 88.396247) (xy 140.272646 88.4555) (xy 139.127354 88.4555) (xy 139.038676 88.396247)
-        (xy 138.804821 88.299381) (xy 138.556561 88.25) (xy 138.303439 88.25) (xy 138.055179 88.299381) (xy 137.821324 88.396247)
-        (xy 137.61086 88.536875) (xy 137.431875 88.71586) (xy 137.291247 88.926324) (xy 137.194381 89.160179) (xy 137.173574 89.264783)
-        (xy 133.97143 92.466928) (xy 133.939999 92.466928) (xy 133.766745 92.483992) (xy 133.600149 92.534528) (xy 133.446613 92.616595)
-        (xy 133.312038 92.727038) (xy 133.201595 92.861613) (xy 133.119528 93.015149) (xy 133.068992 93.181745) (xy 133.051928 93.354999)
-        (xy 133.051928 94.605001) (xy 133.068992 94.778255) (xy 133.119528 94.944851) (xy 133.201595 95.098387) (xy 133.312038 95.232962)
-        (xy 133.446613 95.343405) (xy 133.600149 95.425472) (xy 133.766745 95.476008) (xy 133.939999 95.493072) (xy 134.740001 95.493072)
-        (xy 134.913255 95.476008) (xy 135.079851 95.425472) (xy 135.233387 95.343405) (xy 135.367962 95.232962) (xy 135.478405 95.098387)
-        (xy 135.560472 94.944851) (xy 135.611008 94.778255) (xy 135.628072 94.605001) (xy 135.628072 93.86357) (xy 136.153598 93.338044)
-        (xy 136.151928 93.354999) (xy 136.151928 94.605001) (xy 136.168992 94.778255) (xy 136.210501 94.915092) (xy 136.2105 97.9003)
-        (xy 136.176595 97.941614) (xy 136.094528 98.09515) (xy 136.043992 98.261746) (xy 136.026928 98.435) (xy 136.026928 99.685)
-        (xy 136.043992 99.858254) (xy 136.094528 100.02485) (xy 136.176595 100.178386) (xy 136.287038 100.312962) (xy 136.421614 100.423405)
-        (xy 136.57515 100.505472) (xy 136.741746 100.556008) (xy 136.915 100.573072) (xy 137.665 100.573072) (xy 137.838254 100.556008)
-        (xy 138.00485 100.505472) (xy 138.158386 100.423405) (xy 138.292962 100.312962) (xy 138.403405 100.178386) (xy 138.485472 100.02485)
-        (xy 138.536008 99.858254) (xy 138.553072 99.685) (xy 138.553072 98.435) (xy 138.536008 98.261746) (xy 138.485472 98.09515)
-        (xy 138.403405 97.941614) (xy 138.3695 97.9003) (xy 138.3695 95.313768) (xy 138.467962 95.232962) (xy 138.578405 95.098387)
-        (xy 138.660472 94.944851) (xy 138.711008 94.778255) (xy 138.728072 94.605001) (xy 138.728072 93.354999) (xy 138.711008 93.181745)
-        (xy 138.660472 93.015149) (xy 138.578405 92.861613) (xy 138.467962 92.727038) (xy 138.333387 92.616595) (xy 138.179851 92.534528)
-        (xy 138.013255 92.483992) (xy 137.840001 92.466928) (xy 137.039999 92.466928) (xy 137.023045 92.468598) (xy 138.700217 90.791426)
-        (xy 138.804821 90.770619) (xy 139.038676 90.673753) (xy 139.127354 90.6145) (xy 140.272646 90.6145) (xy 140.361324 90.673753)
-        (xy 140.595179 90.770619) (xy 140.843439 90.82) (xy 141.096561 90.82) (xy 141.344821 90.770619) (xy 141.578676 90.673753)
-        (xy 141.667354 90.6145) (xy 147.359606 90.6145) (xy 147.446613 90.685905) (xy 147.600149 90.767972) (xy 147.766745 90.818508)
-        (xy 147.939999 90.835572) (xy 149.240001 90.835572) (xy 149.413255 90.818508) (xy 149.579851 90.767972) (xy 149.659015 90.725658)
+        (xy 150.410106 88.532847) (xy 150.206619 88.47112) (xy 150.065656 88.457236) (xy 150.060472 88.440148) (xy 149.978405 88.286613)
+        (xy 149.867962 88.152038) (xy 149.733387 88.041595) (xy 149.579852 87.959528) (xy 149.413256 87.908992) (xy 149.240002 87.891928)
+        (xy 147.939998 87.891928) (xy 147.766744 87.908992) (xy 147.600148 87.959528) (xy 147.446613 88.041595) (xy 147.312038 88.152038)
+        (xy 147.201595 88.286613) (xy 147.119528 88.440148) (xy 147.114871 88.4555) (xy 141.667354 88.4555) (xy 141.578676 88.396247)
+        (xy 141.344821 88.299381) (xy 141.096561 88.25) (xy 140.843439 88.25) (xy 140.595179 88.299381) (xy 140.361324 88.396247)
+        (xy 140.272646 88.4555) (xy 139.127354 88.4555) (xy 139.038676 88.396247) (xy 138.804821 88.299381) (xy 138.556561 88.25)
+        (xy 138.303439 88.25) (xy 138.055179 88.299381) (xy 137.821324 88.396247) (xy 137.61086 88.536875) (xy 137.431875 88.71586)
+        (xy 137.291247 88.926324) (xy 137.194381 89.160179) (xy 137.173574 89.264783) (xy 133.97143 92.466928) (xy 133.939999 92.466928)
+        (xy 133.766745 92.483992) (xy 133.600149 92.534528) (xy 133.446613 92.616595) (xy 133.312038 92.727038) (xy 133.201595 92.861613)
+        (xy 133.119528 93.015149) (xy 133.068992 93.181745) (xy 133.051928 93.354999) (xy 133.051928 94.605001) (xy 133.068992 94.778255)
+        (xy 133.119528 94.944851) (xy 133.201595 95.098387) (xy 133.312038 95.232962) (xy 133.446613 95.343405) (xy 133.600149 95.425472)
+        (xy 133.766745 95.476008) (xy 133.939999 95.493072) (xy 134.740001 95.493072) (xy 134.913255 95.476008) (xy 135.079851 95.425472)
+        (xy 135.233387 95.343405) (xy 135.367962 95.232962) (xy 135.478405 95.098387) (xy 135.560472 94.944851) (xy 135.611008 94.778255)
+        (xy 135.628072 94.605001) (xy 135.628072 93.86357) (xy 136.153598 93.338044) (xy 136.151928 93.354999) (xy 136.151928 94.605001)
+        (xy 136.168992 94.778255) (xy 136.210501 94.915092) (xy 136.2105 97.9003) (xy 136.176595 97.941614) (xy 136.094528 98.09515)
+        (xy 136.043992 98.261746) (xy 136.026928 98.435) (xy 136.026928 99.685) (xy 136.043992 99.858254) (xy 136.094528 100.02485)
+        (xy 136.176595 100.178386) (xy 136.287038 100.312962) (xy 136.421614 100.423405) (xy 136.57515 100.505472) (xy 136.741746 100.556008)
+        (xy 136.915 100.573072) (xy 137.665 100.573072) (xy 137.838254 100.556008) (xy 138.00485 100.505472) (xy 138.158386 100.423405)
+        (xy 138.292962 100.312962) (xy 138.403405 100.178386) (xy 138.485472 100.02485) (xy 138.536008 99.858254) (xy 138.553072 99.685)
+        (xy 138.553072 98.435) (xy 138.536008 98.261746) (xy 138.485472 98.09515) (xy 138.403405 97.941614) (xy 138.3695 97.9003)
+        (xy 138.3695 95.313768) (xy 138.467962 95.232962) (xy 138.578405 95.098387) (xy 138.660472 94.944851) (xy 138.711008 94.778255)
+        (xy 138.728072 94.605001) (xy 138.728072 93.354999) (xy 138.711008 93.181745) (xy 138.660472 93.015149) (xy 138.578405 92.861613)
+        (xy 138.467962 92.727038) (xy 138.333387 92.616595) (xy 138.179851 92.534528) (xy 138.013255 92.483992) (xy 137.840001 92.466928)
+        (xy 137.039999 92.466928) (xy 137.023045 92.468598) (xy 138.700217 90.791426) (xy 138.804821 90.770619) (xy 139.038676 90.673753)
+        (xy 139.127354 90.6145) (xy 140.272646 90.6145) (xy 140.361324 90.673753) (xy 140.595179 90.770619) (xy 140.843439 90.82)
+        (xy 141.096561 90.82) (xy 141.344821 90.770619) (xy 141.578676 90.673753) (xy 141.667354 90.6145) (xy 149.547858 90.6145)
         (xy 153.0105 94.077144) (xy 153.010501 95.616961) (xy 153.005277 95.67) (xy 153.02612 95.881618) (xy 153.084945 96.075537)
         (xy 153.087848 96.085106) (xy 153.188087 96.27264) (xy 153.322986 96.437015) (xy 153.36418 96.470822) (xy 156.441388 99.54803)
         (xy 156.410498 99.60582) (xy 156.374188 99.725518) (xy 156.361928 99.85) (xy 156.361928 103.35) (xy 156.374188 103.474482)
@@ -1697,13 +1708,13 @@
         (xy 134.635 89.408439) (xy 134.585619 89.160179) (xy 134.488753 88.926324) (xy 134.348125 88.71586) (xy 134.16914 88.536875)
         (xy 133.958676 88.396247) (xy 133.724821 88.299381) (xy 133.476561 88.25) (xy 133.223439 88.25) (xy 132.975179 88.299381)
         (xy 132.741324 88.396247) (xy 132.53086 88.536875) (xy 132.351875 88.71586) (xy 132.211247 88.926324) (xy 132.114381 89.160179)
-        (xy 132.065 89.408439) (xy 119.1895 89.408439) (xy 119.1895 87.0725) (xy 147.051928 87.0725) (xy 147.064188 87.196982)
-        (xy 147.100498 87.31668) (xy 147.159463 87.426994) (xy 147.238815 87.523685) (xy 147.335506 87.603037) (xy 147.44582 87.662002)
-        (xy 147.565518 87.698312) (xy 147.69 87.710572) (xy 148.30425 87.7075) (xy 148.463 87.54875) (xy 148.463 86.537)
-        (xy 148.717 86.537) (xy 148.717 87.54875) (xy 148.87575 87.7075) (xy 149.49 87.710572) (xy 149.614482 87.698312)
-        (xy 149.73418 87.662002) (xy 149.844494 87.603037) (xy 149.941185 87.523685) (xy 150.020537 87.426994) (xy 150.079502 87.31668)
-        (xy 150.115812 87.196982) (xy 150.128072 87.0725) (xy 150.125 86.69575) (xy 149.96625 86.537) (xy 148.717 86.537)
-        (xy 148.463 86.537) (xy 147.21375 86.537) (xy 147.055 86.69575) (xy 147.051928 87.0725) (xy 119.1895 87.0725)
+        (xy 132.065 89.408439) (xy 119.1895 89.408439) (xy 119.1895 86.73) (xy 147.051928 86.73) (xy 147.064188 86.854482)
+        (xy 147.100498 86.97418) (xy 147.159463 87.084494) (xy 147.238815 87.181185) (xy 147.335506 87.260537) (xy 147.44582 87.319502)
+        (xy 147.565518 87.355812) (xy 147.69 87.368072) (xy 148.30425 87.365) (xy 148.463 87.20625) (xy 148.463 86.1945)
+        (xy 148.717 86.1945) (xy 148.717 87.20625) (xy 148.87575 87.365) (xy 149.49 87.368072) (xy 149.614482 87.355812)
+        (xy 149.73418 87.319502) (xy 149.844494 87.260537) (xy 149.941185 87.181185) (xy 150.020537 87.084494) (xy 150.079502 86.97418)
+        (xy 150.115812 86.854482) (xy 150.128072 86.73) (xy 150.125 86.35325) (xy 149.96625 86.1945) (xy 148.717 86.1945)
+        (xy 148.463 86.1945) (xy 147.21375 86.1945) (xy 147.055 86.35325) (xy 147.051928 86.73) (xy 119.1895 86.73)
         (xy 119.1895 85.143021) (xy 119.194722 85.089999) (xy 119.1895 85.036978) (xy 119.1895 85.036971) (xy 119.17388 84.878381)
         (xy 119.112153 84.674894) (xy 119.011914 84.48736) (xy 118.877015 84.322985) (xy 118.835821 84.289178) (xy 117.055 82.508358)
         (xy 117.055 82.40374) (xy 116.997932 82.116842) (xy 116.88599 81.846589) (xy 116.723475 81.603368) (xy 116.516632 81.396525)
@@ -1738,12 +1749,12 @@
         (xy 99.669774 100.015905) (xy 99.397821 100.422911) (xy 99.210497 100.875152) (xy 99.115 101.355249) (xy 97.638072 101.355249)
         (xy 97.638072 99.85) (xy 97.625812 99.725518) (xy 97.589502 99.60582) (xy 97.530537 99.495506) (xy 97.451185 99.398815)
         (xy 97.354494 99.319463) (xy 97.24418 99.260498) (xy 97.124482 99.224188) (xy 97 99.211928) (xy 96.3295 99.211928)
-        (xy 96.3295 97.882142) (xy 98.028571 96.183072) (xy 98.415 96.183072) (xy 98.588254 96.166008) (xy 98.75485 96.115472)
-        (xy 98.908386 96.033405) (xy 99.042962 95.922962) (xy 99.153405 95.788386) (xy 99.235472 95.63485) (xy 99.286008 95.468254)
-        (xy 99.303072 95.295) (xy 99.303072 94.495) (xy 99.286008 94.321746) (xy 99.235472 94.15515) (xy 99.153405 94.001614)
-        (xy 99.042962 93.867038) (xy 98.908386 93.756595) (xy 98.75485 93.674528) (xy 98.588254 93.623992) (xy 98.415 93.606928)
-        (xy 97.165 93.606928) (xy 96.991746 93.623992) (xy 96.82515 93.674528) (xy 96.671614 93.756595) (xy 96.537038 93.867038)
-        (xy 96.426595 94.001614) (xy 96.344528 94.15515) (xy 96.293992 94.321746) (xy 96.276928 94.495) (xy 96.276928 94.881429)
+        (xy 96.3295 97.882142) (xy 98.028571 96.183072) (xy 98.415001 96.183072) (xy 98.588255 96.166008) (xy 98.754851 96.115472)
+        (xy 98.908387 96.033405) (xy 99.042962 95.922962) (xy 99.153405 95.788387) (xy 99.235472 95.634851) (xy 99.286008 95.468255)
+        (xy 99.303072 95.295001) (xy 99.303072 94.494999) (xy 99.286008 94.321745) (xy 99.235472 94.155149) (xy 99.153405 94.001613)
+        (xy 99.042962 93.867038) (xy 98.908387 93.756595) (xy 98.754851 93.674528) (xy 98.588255 93.623992) (xy 98.415001 93.606928)
+        (xy 97.164999 93.606928) (xy 96.991745 93.623992) (xy 96.825149 93.674528) (xy 96.671613 93.756595) (xy 96.537038 93.867038)
+        (xy 96.426595 94.001613) (xy 96.344528 94.155149) (xy 96.293992 94.321745) (xy 96.276928 94.494999) (xy 96.276928 94.881429)
         (xy 94.52418 96.634178) (xy 94.482986 96.667985) (xy 94.348087 96.83236) (xy 94.247848 97.019894) (xy 94.247847 97.019896)
         (xy 94.18612 97.223382) (xy 94.165277 97.435) (xy 94.170501 97.488039) (xy 94.170501 99.211928) (xy 93.5 99.211928)
         (xy 93.375518 99.224188) (xy 93.25582 99.260498) (xy 93.145506 99.319463) (xy 93.048815 99.398815) (xy 92.969463 99.495506)
@@ -1780,12 +1791,12 @@
         (xy 93.939494 93.714463) (xy 93.82918 93.655498) (xy 93.709482 93.619188) (xy 93.585 93.606928) (xy 92.99575 93.61)
         (xy 92.837 93.76875) (xy 92.583 93.76875) (xy 92.42425 93.61) (xy 91.835 93.606928) (xy 91.710518 93.619188)
         (xy 91.59082 93.655498) (xy 91.480506 93.714463) (xy 91.383815 93.793815) (xy 91.304463 93.890506) (xy 91.245498 94.00082)
-        (xy 91.209188 94.120518) (xy 91.196928 94.245) (xy 87.045 94.245) (xy 87.045 91.395) (xy 91.196928 91.395)
-        (xy 91.196928 92.195) (xy 91.213992 92.368254) (xy 91.264528 92.53485) (xy 91.346595 92.688386) (xy 91.457038 92.822962)
-        (xy 91.591614 92.933405) (xy 91.74515 93.015472) (xy 91.911746 93.066008) (xy 92.085 93.083072) (xy 93.335 93.083072)
-        (xy 93.508254 93.066008) (xy 93.67485 93.015472) (xy 93.828386 92.933405) (xy 93.962962 92.822962) (xy 94.073405 92.688386)
-        (xy 94.155472 92.53485) (xy 94.206008 92.368254) (xy 94.223072 92.195) (xy 94.223072 91.395) (xy 94.206008 91.221746)
-        (xy 94.155472 91.05515) (xy 94.073405 90.901614) (xy 93.962962 90.767038) (xy 93.828386 90.656595) (xy 93.7895 90.63581)
+        (xy 91.209188 94.120518) (xy 91.196928 94.245) (xy 87.045 94.245) (xy 87.045 91.394999) (xy 91.196928 91.394999)
+        (xy 91.196928 92.195001) (xy 91.213992 92.368255) (xy 91.264528 92.534851) (xy 91.346595 92.688387) (xy 91.457038 92.822962)
+        (xy 91.591613 92.933405) (xy 91.745149 93.015472) (xy 91.911745 93.066008) (xy 92.084999 93.083072) (xy 93.335001 93.083072)
+        (xy 93.508255 93.066008) (xy 93.674851 93.015472) (xy 93.828387 92.933405) (xy 93.962962 92.822962) (xy 94.073405 92.688387)
+        (xy 94.155472 92.534851) (xy 94.206008 92.368255) (xy 94.223072 92.195001) (xy 94.223072 91.394999) (xy 94.206008 91.221745)
+        (xy 94.155472 91.055149) (xy 94.073405 90.901613) (xy 93.962962 90.767038) (xy 93.828387 90.656595) (xy 93.7895 90.635809)
         (xy 93.7895 89.347142) (xy 95.527571 87.609072) (xy 95.861 87.609072) (xy 95.985482 87.596812) (xy 96.10518 87.560502)
         (xy 96.215494 87.501537) (xy 96.312185 87.422185) (xy 96.391537 87.325494) (xy 96.450502 87.21518) (xy 96.486812 87.095482)
         (xy 96.499072 86.971) (xy 96.499072 85.749) (xy 96.486812 85.624518) (xy 96.450502 85.50482) (xy 96.391537 85.394506)
@@ -1793,19 +1804,19 @@
         (xy 94.639 85.110928) (xy 94.514518 85.123188) (xy 94.39482 85.159498) (xy 94.284506 85.218463) (xy 94.187815 85.297815)
         (xy 94.108463 85.394506) (xy 94.049498 85.50482) (xy 94.013188 85.624518) (xy 94.000928 85.749) (xy 94.000928 86.082429)
         (xy 91.984185 88.099173) (xy 91.942985 88.132985) (xy 91.808086 88.29736) (xy 91.707847 88.484895) (xy 91.707847 88.484896)
-        (xy 91.64612 88.688382) (xy 91.625277 88.9) (xy 91.6305 88.953029) (xy 91.630501 90.63581) (xy 91.591614 90.656595)
-        (xy 91.457038 90.767038) (xy 91.346595 90.901614) (xy 91.264528 91.05515) (xy 91.213992 91.221746) (xy 91.196928 91.395)
-        (xy 87.045 91.395) (xy 87.045 82.339721) (xy 87.4 82.339721) (xy 87.4 82.760279) (xy 87.482047 83.172756)
+        (xy 91.64612 88.688382) (xy 91.625277 88.9) (xy 91.6305 88.953029) (xy 91.630501 90.635809) (xy 91.591613 90.656595)
+        (xy 91.457038 90.767038) (xy 91.346595 90.901613) (xy 91.264528 91.055149) (xy 91.213992 91.221745) (xy 91.196928 91.394999)
+        (xy 87.045 91.394999) (xy 87.045 82.339721) (xy 87.4 82.339721) (xy 87.4 82.760279) (xy 87.482047 83.172756)
         (xy 87.642988 83.561302) (xy 87.876637 83.910983) (xy 88.174017 84.208363) (xy 88.523698 84.442012) (xy 88.912244 84.602953)
         (xy 89.324721 84.685) (xy 89.745279 84.685) (xy 90.076983 84.61902) (xy 90.20236 84.721914) (xy 90.389894 84.822153)
         (xy 90.593381 84.88388) (xy 90.751971 84.8995) (xy 90.751978 84.8995) (xy 90.804999 84.904722) (xy 90.858021 84.8995)
-        (xy 96.7105 84.8995) (xy 96.710501 90.635809) (xy 96.671614 90.656595) (xy 96.537038 90.767038) (xy 96.426595 90.901614)
-        (xy 96.344528 91.05515) (xy 96.293992 91.221746) (xy 96.276928 91.395) (xy 96.276928 92.195) (xy 96.293992 92.368254)
-        (xy 96.344528 92.53485) (xy 96.426595 92.688386) (xy 96.537038 92.822962) (xy 96.671614 92.933405) (xy 96.82515 93.015472)
-        (xy 96.991746 93.066008) (xy 97.165 93.083072) (xy 98.415 93.083072) (xy 98.588254 93.066008) (xy 98.75485 93.015472)
-        (xy 98.908386 92.933405) (xy 99.042962 92.822962) (xy 99.153405 92.688386) (xy 99.235472 92.53485) (xy 99.286008 92.368254)
-        (xy 99.303072 92.195) (xy 99.303072 91.395) (xy 99.286008 91.221746) (xy 99.235472 91.05515) (xy 99.153405 90.901614)
-        (xy 99.042962 90.767038) (xy 98.908386 90.656595) (xy 98.8695 90.63581) (xy 98.8695 86.426143) (xy 99.123213 86.679855)
+        (xy 96.7105 84.8995) (xy 96.710501 90.635809) (xy 96.671613 90.656595) (xy 96.537038 90.767038) (xy 96.426595 90.901613)
+        (xy 96.344528 91.055149) (xy 96.293992 91.221745) (xy 96.276928 91.394999) (xy 96.276928 92.195001) (xy 96.293992 92.368255)
+        (xy 96.344528 92.534851) (xy 96.426595 92.688387) (xy 96.537038 92.822962) (xy 96.671613 92.933405) (xy 96.825149 93.015472)
+        (xy 96.991745 93.066008) (xy 97.164999 93.083072) (xy 98.415001 93.083072) (xy 98.588255 93.066008) (xy 98.754851 93.015472)
+        (xy 98.908387 92.933405) (xy 99.042962 92.822962) (xy 99.153405 92.688387) (xy 99.235472 92.534851) (xy 99.286008 92.368255)
+        (xy 99.303072 92.195001) (xy 99.303072 91.394999) (xy 99.286008 91.221745) (xy 99.235472 91.055149) (xy 99.153405 90.901613)
+        (xy 99.042962 90.767038) (xy 98.908387 90.656595) (xy 98.8695 90.635809) (xy 98.8695 86.426143) (xy 99.123213 86.679855)
         (xy 99.131883 86.723445) (xy 99.225809 86.950202) (xy 99.362168 87.154279) (xy 99.535721 87.327832) (xy 99.739798 87.464191)
         (xy 99.966555 87.558117) (xy 100.20728 87.606) (xy 100.45272 87.606) (xy 100.693445 87.558117) (xy 100.920202 87.464191)
         (xy 101.124279 87.327832) (xy 101.297832 87.154279) (xy 101.434191 86.950202) (xy 101.528117 86.723445) (xy 101.576 86.48272)